2025.10.0 (#152881)

Co-authored-by: Erik Montnemery <erik@montnemery.com>

.github/workflows/ci.yaml

@@ -40,7 +40,7 @@ env:
   CACHE_VERSION: 8
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.11"
+  HA_SHORT_VERSION: "2025.10"
   DEFAULT_PYTHON: "3.13"
   ALL_PYTHON_VERSIONS: "['3.13']"
   # 10.3 is the oldest supported version
@@ -263,7 +263,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           key: >-
@@ -279,7 +279,7 @@ jobs:
           uv pip install "$(cat requirements_test.txt | grep pre-commit)"
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           lookup-only: true
@@ -309,7 +309,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -318,7 +318,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -349,7 +349,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -358,7 +358,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -389,7 +389,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -398,7 +398,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -505,7 +505,7 @@ jobs:
             env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           key: >-
@@ -513,7 +513,7 @@ jobs:
             needs.info.outputs.python_cache_key }}
       - name: Restore uv wheel cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: ${{ env.UV_CACHE_DIR }}
           key: >-
@@ -525,7 +525,7 @@ jobs:
             env.HA_SHORT_VERSION }}-
       - name: Check if apt cache exists
         id: cache-apt-check
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           lookup-only: ${{ steps.cache-venv.outputs.cache-hit == 'true' }}
           path: |
@@ -570,7 +570,7 @@ jobs:
           fi
       - name: Save apt cache
         if: steps.cache-apt-check.outputs.cache-hit != 'true'
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -622,7 +622,7 @@ jobs:
       - base
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@v4.3.0
+        uses: actions/cache/restore@v4.2.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -651,7 +651,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -684,7 +684,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -711,7 +711,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Dependency review
-        uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
+        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
         with:
           license-check: false # We use our own license audit checks
 
@@ -741,7 +741,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -784,7 +784,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -831,7 +831,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -883,7 +883,7 @@ jobs:
             env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -891,7 +891,7 @@ jobs:
             ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Restore mypy cache
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: .mypy_cache
           key: >-
@@ -935,7 +935,7 @@ jobs:
     name: Split tests for full run
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@v4.3.0
+        uses: actions/cache/restore@v4.2.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -967,7 +967,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1009,7 +1009,7 @@ jobs:
       Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@v4.3.0
+        uses: actions/cache/restore@v4.2.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -1042,7 +1042,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1156,7 +1156,7 @@ jobs:
       Run ${{ matrix.mariadb-group }} tests Python ${{ matrix.python-version }}
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@v4.3.0
+        uses: actions/cache/restore@v4.2.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -1189,7 +1189,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1310,7 +1310,7 @@ jobs:
       Run ${{ matrix.postgresql-group }} tests Python ${{ matrix.python-version }}
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@v4.3.0
+        uses: actions/cache/restore@v4.2.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -1345,7 +1345,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1485,7 +1485,7 @@ jobs:
       Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@v4.3.0
+        uses: actions/cache/restore@v4.2.4
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -1518,7 +1518,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
         with:
           path: venv
           fail-on-cache-miss: true

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
+        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
+        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
         with:
           category: "/language:python"

homeassistant/brands/eltako.json

@@ -0,0 +1,5 @@
+{
+  "domain": "eltako",
+  "name": "Eltako",
+  "iot_standards": ["matter"]
+}

homeassistant/brands/konnected.json

@@ -0,0 +1,5 @@
+{
+  "domain": "konnected",
+  "name": "Konnected",
+  "integrations": ["konnected", "konnected_esphome"]
+}

homeassistant/brands/level.json

@@ -0,0 +1,5 @@
+{
+  "domain": "level",
+  "name": "Level",
+  "iot_standards": ["matter"]
+}

homeassistant/components/airos/config_flow.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Mapping
 import logging
 from typing import Any
 
@@ -15,7 +14,7 @@ from airos.exceptions import (
 )
 import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import (
     CONF_HOST,
     CONF_PASSWORD,
@@ -25,11 +24,6 @@ from homeassistant.const import (
 )
 from homeassistant.data_entry_flow import section
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.selector import (
-    TextSelector,
-    TextSelectorConfig,
-    TextSelectorType,
-)
 
 from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, DOMAIN, SECTION_ADVANCED_SETTINGS
 from .coordinator import AirOS8
@@ -60,107 +54,50 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
     VERSION = 1
     MINOR_VERSION = 2
 
-    def __init__(self) -> None:
-        """Initialize the config flow."""
-        super().__init__()
-        self.airos_device: AirOS8
-        self.errors: dict[str, str] = {}
-
     async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
+        self,
+        user_input: dict[str, Any] | None = None,
     ) -> ConfigFlowResult:
-        """Handle the manual input of host and credentials."""
-        self.errors = {}
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
         if user_input is not None:
-            validated_info = await self._validate_and_get_device_info(user_input)
-            if validated_info:
-                return self.async_create_entry(
-                    title=validated_info["title"],
-                    data=validated_info["data"],
-                )
-        return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=self.errors
-        )
+            # By default airOS 8 comes with self-signed SSL certificates,
+            # with no option in the web UI to change or upload a custom certificate.
+            session = async_get_clientsession(
+                self.hass,
+                verify_ssl=user_input[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL],
+            )
 
-    async def _validate_and_get_device_info(
-        self, config_data: dict[str, Any]
-    ) -> dict[str, Any] | None:
-        """Validate user input with the device API."""
-        # By default airOS 8 comes with self-signed SSL certificates,
-        # with no option in the web UI to change or upload a custom certificate.
-        session = async_get_clientsession(
-            self.hass,
-            verify_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL],
-        )
+            airos_device = AirOS8(
+                host=user_input[CONF_HOST],
+                username=user_input[CONF_USERNAME],
+                password=user_input[CONF_PASSWORD],
+                session=session,
+                use_ssl=user_input[SECTION_ADVANCED_SETTINGS][CONF_SSL],
+            )
+            try:
+                await airos_device.login()
+                airos_data = await airos_device.status()
 
-        airos_device = AirOS8(
-            host=config_data[CONF_HOST],
-            username=config_data[CONF_USERNAME],
-            password=config_data[CONF_PASSWORD],
-            session=session,
-            use_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
-        )
-        try:
-            await airos_device.login()
-            airos_data = await airos_device.status()
-
-        except (
-            AirOSConnectionSetupError,
-            AirOSDeviceConnectionError,
-        ):
-            self.errors["base"] = "cannot_connect"
-        except (AirOSConnectionAuthenticationError, AirOSDataMissingError):
-            self.errors["base"] = "invalid_auth"
-        except AirOSKeyDataMissingError:
-            self.errors["base"] = "key_data_missing"
-        except Exception:
-            _LOGGER.exception("Unexpected exception during credential validation")
-            self.errors["base"] = "unknown"
-        else:
-            await self.async_set_unique_id(airos_data.derived.mac)
-
-            if self.source == SOURCE_REAUTH:
-                self._abort_if_unique_id_mismatch()
+            except (
+                AirOSConnectionSetupError,
+                AirOSDeviceConnectionError,
+            ):
+                errors["base"] = "cannot_connect"
+            except (AirOSConnectionAuthenticationError, AirOSDataMissingError):
+                errors["base"] = "invalid_auth"
+            except AirOSKeyDataMissingError:
+                errors["base"] = "key_data_missing"
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"
             else:
+                await self.async_set_unique_id(airos_data.derived.mac)
                 self._abort_if_unique_id_configured()
-
-            return {"title": airos_data.host.hostname, "data": config_data}
-
-        return None
-
-    async def async_step_reauth(
-        self,
-        user_input: Mapping[str, Any],
-    ) -> ConfigFlowResult:
-        """Perform reauthentication upon an API authentication error."""
-        return await self.async_step_reauth_confirm(user_input)
-
-    async def async_step_reauth_confirm(
-        self,
-        user_input: Mapping[str, Any],
-    ) -> ConfigFlowResult:
-        """Perform reauthentication upon an API authentication error."""
-        self.errors = {}
-
-        if user_input:
-            validate_data = {**self._get_reauth_entry().data, **user_input}
-            if await self._validate_and_get_device_info(config_data=validate_data):
-                return self.async_update_reload_and_abort(
-                    self._get_reauth_entry(),
-                    data_updates=validate_data,
+                return self.async_create_entry(
+                    title=airos_data.host.hostname, data=user_input
                 )
 
         return self.async_show_form(
-            step_id="reauth_confirm",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_PASSWORD): TextSelector(
-                        TextSelectorConfig(
-                            type=TextSelectorType.PASSWORD,
-                            autocomplete="current-password",
-                        )
-                    ),
-                }
-            ),
-            errors=self.errors,
+            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
         )

homeassistant/components/airos/coordinator.py

@@ -14,7 +14,7 @@ from airos.exceptions import (
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.exceptions import ConfigEntryError
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, SCAN_INTERVAL
@@ -47,9 +47,9 @@ class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
         try:
             await self.airos_device.login()
             return await self.airos_device.status()
-        except AirOSConnectionAuthenticationError as err:
+        except (AirOSConnectionAuthenticationError,) as err:
             _LOGGER.exception("Error authenticating with airOS device")
-            raise ConfigEntryAuthFailed(
+            raise ConfigEntryError(
                 translation_domain=DOMAIN, translation_key="invalid_auth"
             ) from err
         except (

homeassistant/components/airos/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airos",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["airos==0.5.3"]
+  "requirements": ["airos==0.5.1"]
 }

homeassistant/components/airos/strings.json

@@ -2,14 +2,6 @@
   "config": {
     "flow_title": "Ubiquiti airOS device",
     "step": {
-      "reauth_confirm": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "password": "[%key:component::airos::config::step::user::data_description::password%]"
-        }
-      },
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
@@ -42,9 +34,7 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "unique_id_mismatch": "Re-authentication should be used for the same device not a new one"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "entity": {

homeassistant/components/aladdin_connect/config_flow.py

@@ -22,6 +22,17 @@ class OAuth2FlowHandler(
     VERSION = CONFIG_FLOW_VERSION
     MINOR_VERSION = CONFIG_FLOW_MINOR_VERSION
 
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Check we have the cloud integration set up."""
+        if "cloud" not in self.hass.config.components:
+            return self.async_abort(
+                reason="cloud_not_enabled",
+                description_placeholders={"default_config": "default_config"},
+            )
+        return await super().async_step_user(user_input)
+
     async def async_step_reauth(
         self, user_input: Mapping[str, Any]
     ) -> ConfigFlowResult:

homeassistant/components/aladdin_connect/strings.json

@@ -24,7 +24,8 @@
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
       "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "wrong_account": "You are authenticated with a different account than the one set up. Please authenticate with the configured account."
+      "wrong_account": "You are authenticated with a different account than the one set up. Please authenticate with the configured account.",
+      "cloud_not_enabled": "Please make sure you run Home Assistant with `{default_config}` enabled in your configuration.yaml."
     },
     "create_entry": {
       "default": "[%key:common::config_flow::create_entry::authenticated%]"

homeassistant/components/analytics/analytics.py

@@ -505,7 +505,7 @@ DEFAULT_DEVICE_ANALYTICS_CONFIG = DeviceAnalyticsModifications()
 DEFAULT_ENTITY_ANALYTICS_CONFIG = EntityAnalyticsModifications()
 
 
-async def async_devices_payload(hass: HomeAssistant) -> dict:
+async def async_devices_payload(hass: HomeAssistant) -> dict:  # noqa: C901
     """Return detailed information about entities and devices."""
     dev_reg = dr.async_get(hass)
     ent_reg = er.async_get(hass)
@@ -513,6 +513,8 @@ async def async_devices_payload(hass: HomeAssistant) -> dict:
     integration_inputs: dict[str, tuple[list[str], list[str]]] = {}
     integration_configs: dict[str, AnalyticsModifications] = {}
 
+    removed_devices: set[str] = set()
+
     # Get device list
     for device_entry in dev_reg.devices.values():
         if not device_entry.primary_config_entry:
@@ -525,6 +527,10 @@ async def async_devices_payload(hass: HomeAssistant) -> dict:
         if config_entry is None:
             continue
 
+        if device_entry.entry_type is dr.DeviceEntryType.SERVICE:
+            removed_devices.add(device_entry.id)
+            continue
+
         integration_domain = config_entry.domain
 
         integration_input = integration_inputs.setdefault(integration_domain, ([], []))
@@ -614,11 +620,12 @@ async def async_devices_payload(hass: HomeAssistant) -> dict:
                 device_config = integration_config.devices.get(device_id, device_config)
 
             if device_config.remove:
+                removed_devices.add(device_id)
                 continue
 
             device_entry = dev_reg.devices[device_id]
 
-            device_id_mapping[device_entry.id] = (integration_domain, len(devices_info))
+            device_id_mapping[device_id] = (integration_domain, len(devices_info))
 
             devices_info.append(
                 {
@@ -669,7 +676,7 @@ async def async_devices_payload(hass: HomeAssistant) -> dict:
 
             entity_entry = ent_reg.entities[entity_id]
 
-            entity_state = hass.states.get(entity_entry.entity_id)
+            entity_state = hass.states.get(entity_id)
 
             entity_info = {
                 # LIMITATION: `assumed_state` can be overridden by users;
@@ -690,15 +697,19 @@ async def async_devices_payload(hass: HomeAssistant) -> dict:
                 "unit_of_measurement": entity_entry.unit_of_measurement,
             }
 
-            if (
-                ((device_id_ := entity_entry.device_id) is not None)
-                and ((new_device_id := device_id_mapping.get(device_id_)) is not None)
-                and (new_device_id[0] == integration_domain)
-            ):
-                device_info = devices_info[new_device_id[1]]
-                device_info["entities"].append(entity_info)
-            else:
-                entities_info.append(entity_info)
+            if (device_id_ := entity_entry.device_id) is not None:
+                if device_id_ in removed_devices:
+                    # The device was removed, so we remove the entity too
+                    continue
+
+                if (
+                    new_device_id := device_id_mapping.get(device_id_)
+                ) is not None and (new_device_id[0] == integration_domain):
+                    device_info = devices_info[new_device_id[1]]
+                    device_info["entities"].append(entity_info)
+                    continue
+
+            entities_info.append(entity_info)
 
     return {
         "version": "home-assistant:1",

homeassistant/components/backup/http.py

@@ -17,7 +17,6 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import frame
 from homeassistant.util import slugify
-from homeassistant.util.async_iterator import AsyncIteratorReader, AsyncIteratorWriter
 
 from . import util
 from .agent import BackupAgent
@@ -145,7 +144,7 @@ class DownloadBackupView(HomeAssistantView):
                 return Response(status=HTTPStatus.NOT_FOUND)
         else:
             stream = await agent.async_download_backup(backup_id)
-            reader = cast(IO[bytes], AsyncIteratorReader(hass.loop, stream))
+            reader = cast(IO[bytes], util.AsyncIteratorReader(hass, stream))
 
         worker_done_event = asyncio.Event()
 
@@ -153,7 +152,7 @@ class DownloadBackupView(HomeAssistantView):
             """Call by the worker thread when it's done."""
             hass.loop.call_soon_threadsafe(worker_done_event.set)
 
-        stream = AsyncIteratorWriter(hass.loop)
+        stream = util.AsyncIteratorWriter(hass)
         worker = threading.Thread(
             target=util.decrypt_backup,
             args=[backup, reader, stream, password, on_done, 0, []],

homeassistant/components/backup/manager.py

@@ -38,7 +38,6 @@ from homeassistant.helpers import (
 )
 from homeassistant.helpers.json import json_bytes
 from homeassistant.util import dt as dt_util, json as json_util
-from homeassistant.util.async_iterator import AsyncIteratorReader
 
 from . import util as backup_util
 from .agent import (
@@ -73,6 +72,7 @@ from .models import (
 )
 from .store import BackupStore
 from .util import (
+    AsyncIteratorReader,
     DecryptedBackupStreamer,
     EncryptedBackupStreamer,
     make_backup_dir,
@@ -1525,7 +1525,7 @@ class BackupManager:
             reader = await self.hass.async_add_executor_job(open, path.as_posix(), "rb")
         else:
             backup_stream = await agent.async_download_backup(backup_id)
-            reader = cast(IO[bytes], AsyncIteratorReader(self.hass.loop, backup_stream))
+            reader = cast(IO[bytes], AsyncIteratorReader(self.hass, backup_stream))
         try:
             await self.hass.async_add_executor_job(
                 validate_password_stream, reader, password

homeassistant/components/backup/util.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import asyncio
 from collections.abc import AsyncIterator, Callable, Coroutine
+from concurrent.futures import CancelledError, Future
 import copy
 from dataclasses import dataclass, replace
 from io import BytesIO
@@ -13,7 +14,7 @@ from pathlib import Path, PurePath
 from queue import SimpleQueue
 import tarfile
 import threading
-from typing import IO, Any, cast
+from typing import IO, Any, Self, cast
 
 import aiohttp
 from securetar import SecureTarError, SecureTarFile, SecureTarReadError
@@ -22,11 +23,6 @@ from homeassistant.backup_restore import password_to_key
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.util import dt as dt_util
-from homeassistant.util.async_iterator import (
-    Abort,
-    AsyncIteratorReader,
-    AsyncIteratorWriter,
-)
 from homeassistant.util.json import JsonObjectType, json_loads_object
 
 from .const import BUF_SIZE, LOGGER
@@ -63,6 +59,12 @@ class BackupEmpty(DecryptError):
     _message = "No tar files found in the backup."
 
 
+class AbortCipher(HomeAssistantError):
+    """Abort the cipher operation."""
+
+    _message = "Abort cipher operation."
+
+
 def make_backup_dir(path: Path) -> None:
     """Create a backup directory if it does not exist."""
     path.mkdir(exist_ok=True)
@@ -164,6 +166,106 @@ def validate_password(path: Path, password: str | None) -> bool:
     return False
 
 
+class AsyncIteratorReader:
+    """Wrap an AsyncIterator."""
+
+    def __init__(self, hass: HomeAssistant, stream: AsyncIterator[bytes]) -> None:
+        """Initialize the wrapper."""
+        self._aborted = False
+        self._hass = hass
+        self._stream = stream
+        self._buffer: bytes | None = None
+        self._next_future: Future[bytes | None] | None = None
+        self._pos: int = 0
+
+    async def _next(self) -> bytes | None:
+        """Get the next chunk from the iterator."""
+        return await anext(self._stream, None)
+
+    def abort(self) -> None:
+        """Abort the reader."""
+        self._aborted = True
+        if self._next_future is not None:
+            self._next_future.cancel()
+
+    def read(self, n: int = -1, /) -> bytes:
+        """Read data from the iterator."""
+        result = bytearray()
+        while n < 0 or len(result) < n:
+            if not self._buffer:
+                self._next_future = asyncio.run_coroutine_threadsafe(
+                    self._next(), self._hass.loop
+                )
+                if self._aborted:
+                    self._next_future.cancel()
+                    raise AbortCipher
+                try:
+                    self._buffer = self._next_future.result()
+                except CancelledError as err:
+                    raise AbortCipher from err
+                self._pos = 0
+            if not self._buffer:
+                # The stream is exhausted
+                break
+            chunk = self._buffer[self._pos : self._pos + n]
+            result.extend(chunk)
+            n -= len(chunk)
+            self._pos += len(chunk)
+            if self._pos == len(self._buffer):
+                self._buffer = None
+        return bytes(result)
+
+    def close(self) -> None:
+        """Close the iterator."""
+
+
+class AsyncIteratorWriter:
+    """Wrap an AsyncIterator."""
+
+    def __init__(self, hass: HomeAssistant) -> None:
+        """Initialize the wrapper."""
+        self._aborted = False
+        self._hass = hass
+        self._pos: int = 0
+        self._queue: asyncio.Queue[bytes | None] = asyncio.Queue(maxsize=1)
+        self._write_future: Future[bytes | None] | None = None
+
+    def __aiter__(self) -> Self:
+        """Return the iterator."""
+        return self
+
+    async def __anext__(self) -> bytes:
+        """Get the next chunk from the iterator."""
+        if data := await self._queue.get():
+            return data
+        raise StopAsyncIteration
+
+    def abort(self) -> None:
+        """Abort the writer."""
+        self._aborted = True
+        if self._write_future is not None:
+            self._write_future.cancel()
+
+    def tell(self) -> int:
+        """Return the current position in the iterator."""
+        return self._pos
+
+    def write(self, s: bytes, /) -> int:
+        """Write data to the iterator."""
+        self._write_future = asyncio.run_coroutine_threadsafe(
+            self._queue.put(s), self._hass.loop
+        )
+        if self._aborted:
+            self._write_future.cancel()
+            raise AbortCipher
+        try:
+            self._write_future.result()
+        except CancelledError as err:
+            raise AbortCipher from err
+        self._pos += len(s)
+        return len(s)
+
+
 def validate_password_stream(
     input_stream: IO[bytes],
     password: str | None,
@@ -240,7 +342,7 @@ def decrypt_backup(
         finally:
             # Write an empty chunk to signal the end of the stream
             output_stream.write(b"")
-    except Abort:
+    except AbortCipher:
         LOGGER.debug("Cipher operation aborted")
     finally:
         on_done(error)
@@ -328,7 +430,7 @@ def encrypt_backup(
         finally:
             # Write an empty chunk to signal the end of the stream
             output_stream.write(b"")
-    except Abort:
+    except AbortCipher:
         LOGGER.debug("Cipher operation aborted")
     finally:
         on_done(error)
@@ -455,8 +557,8 @@ class _CipherBackupStreamer:
             self._hass.loop.call_soon_threadsafe(worker_status.done.set)
 
         stream = await self._open_stream()
-        reader = AsyncIteratorReader(self._hass.loop, stream)
-        writer = AsyncIteratorWriter(self._hass.loop)
+        reader = AsyncIteratorReader(self._hass, stream)
+        writer = AsyncIteratorWriter(self._hass)
         worker = threading.Thread(
             target=self._cipher_func,
             args=[

homeassistant/components/bang_olufsen/services.yaml

@@ -3,12 +3,16 @@ beolink_allstandby:
     entity:
       integration: bang_olufsen
       domain: media_player
+    device:
+      integration: bang_olufsen
 
 beolink_expand:
   target:
     entity:
       integration: bang_olufsen
       domain: media_player
+    device:
+      integration: bang_olufsen
   fields:
     all_discovered:
       required: false
@@ -33,6 +37,8 @@ beolink_join:
     entity:
       integration: bang_olufsen
       domain: media_player
+    device:
+      integration: bang_olufsen
   fields:
     jid_options:
       collapsed: false
@@ -65,12 +71,16 @@ beolink_leave:
     entity:
       integration: bang_olufsen
       domain: media_player
+    device:
+      integration: bang_olufsen
 
 beolink_unexpand:
   target:
     entity:
       integration: bang_olufsen
       domain: media_player
+    device:
+      integration: bang_olufsen
   fields:
     jid_options:
       collapsed: false

homeassistant/components/bayesian/binary_sensor.py

@@ -272,6 +272,13 @@ async def async_setup_entry(
     observations: list[ConfigType] = [
         dict(subentry.data) for subentry in config_entry.subentries.values()
     ]
+
+    for observation in observations:
+        if observation[CONF_PLATFORM] == CONF_TEMPLATE:
+            observation[CONF_VALUE_TEMPLATE] = Template(
+                observation[CONF_VALUE_TEMPLATE], hass
+            )
+
     prior: float = config[CONF_PRIOR]
     probability_threshold: float = config[CONF_PROBABILITY_THRESHOLD]
     device_class: BinarySensorDeviceClass | None = config.get(CONF_DEVICE_CLASS)

homeassistant/components/calendar/__init__.py

@@ -315,7 +315,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     hass.http.register_view(CalendarListView(component))
     hass.http.register_view(CalendarEventView(component))
 
-    frontend.async_register_built_in_panel(hass, "calendar", "calendar", "mdi:calendar")
+    frontend.async_register_built_in_panel(
+        hass, "calendar", "calendar", "hass:calendar"
+    )
 
     websocket_api.async_register_command(hass, handle_calendar_event_create)
     websocket_api.async_register_command(hass, handle_calendar_event_delete)

homeassistant/components/cloud/manifest.json

@@ -13,6 +13,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==1.1.2"],
+  "requirements": ["hass-nabucasa==1.1.1"],
   "single_config_entry": true
 }

homeassistant/components/config/__init__.py

@@ -49,7 +49,7 @@ CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the config component."""
     frontend.async_register_built_in_panel(
-        hass, "config", "config", "mdi:cog", require_admin=True
+        hass, "config", "config", "hass:cog", require_admin=True
     )
 
     for panel in SECTIONS:

homeassistant/components/conversation/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/conversation",
   "integration_type": "entity",
   "quality_scale": "internal",
-  "requirements": ["hassil==3.2.0", "home-assistant-intents==2025.9.24"]
+  "requirements": ["hassil==3.2.0", "home-assistant-intents==2025.10.1"]
 }

homeassistant/components/derivative/__init__.py

@@ -32,7 +32,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry,
             options={**entry.options, CONF_SOURCE: source_entity_id},
         )
-        hass.config_entries.async_schedule_reload(entry.entry_id)
 
     entry.async_on_unload(
         async_handle_source_entity_changes(
@@ -47,9 +46,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         )
     )
     await hass.config_entries.async_forward_entry_setups(entry, (Platform.SENSOR,))
+    entry.async_on_unload(entry.add_update_listener(config_entry_update_listener))
     return True
 
 
+async def config_entry_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Update listener, called when the config entry options are changed."""
+    await hass.config_entries.async_reload(entry.entry_id)
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, (Platform.SENSOR,))

homeassistant/components/derivative/config_flow.py

@@ -140,7 +140,6 @@ class ConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
 
     config_flow = CONFIG_FLOW
     options_flow = OPTIONS_FLOW
-    options_flow_reloads = True
 
     VERSION = 1
     MINOR_VERSION = 4

homeassistant/components/device_automation/condition.py

@@ -6,13 +6,12 @@ from typing import TYPE_CHECKING, Any, Protocol
 
 import voluptuous as vol
 
-from homeassistant.const import CONF_DOMAIN, CONF_OPTIONS
+from homeassistant.const import CONF_DOMAIN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.condition import (
     Condition,
     ConditionCheckerType,
-    ConditionConfig,
     trace_condition_function,
 )
 from homeassistant.helpers.typing import ConfigType
@@ -56,40 +55,19 @@ class DeviceAutomationConditionProtocol(Protocol):
 class DeviceCondition(Condition):
     """Device condition."""
 
-    _hass: HomeAssistant
-    _config: ConfigType
-
-    @classmethod
-    async def async_validate_complete_config(
-        cls, hass: HomeAssistant, complete_config: ConfigType
-    ) -> ConfigType:
-        """Validate complete config."""
-        complete_config = await async_validate_device_automation_config(
-            hass,
-            complete_config,
-            cv.DEVICE_CONDITION_SCHEMA,
-            DeviceAutomationType.CONDITION,
-        )
-        # Since we don't want to migrate device conditions to a new format
-        # we just pass the entire config as options.
-        complete_config[CONF_OPTIONS] = complete_config.copy()
-        return complete_config
+    def __init__(self, hass: HomeAssistant, config: ConfigType) -> None:
+        """Initialize condition."""
+        self._config = config
+        self._hass = hass
 
     @classmethod
     async def async_validate_config(
         cls, hass: HomeAssistant, config: ConfigType
     ) -> ConfigType:
-        """Validate config.
-
-        This is here just to satisfy the abstract class interface. It is never called.
-        """
-        raise NotImplementedError
-
-    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
-        """Initialize condition."""
-        self._hass = hass
-        assert config.options is not None
-        self._config = config.options
+        """Validate device condition config."""
+        return await async_validate_device_automation_config(
+            hass, config, cv.DEVICE_CONDITION_SCHEMA, DeviceAutomationType.CONDITION
+        )
 
     async def async_get_checker(self) -> condition.ConditionCheckerType:
         """Test a device condition."""

homeassistant/components/ecobee/strings.json

@@ -176,7 +176,7 @@
       "description": "Sets the participating sensors for a climate program.",
       "fields": {
         "preset_mode": {
-          "name": "Climate Name",
+          "name": "Climate program",
           "description": "Name of the climate program to set the sensors active on.\nDefaults to currently active program."
         },
         "device_ids": {
@@ -188,7 +188,7 @@
   },
   "exceptions": {
     "invalid_preset": {
-      "message": "Invalid climate name, available options are: {options}"
+      "message": "Invalid climate program, available options are: {options}"
     },
     "invalid_sensor": {
       "message": "Invalid sensor for thermostat, available options are: {options}"

homeassistant/components/ecowitt/manifest.json

@@ -6,5 +6,5 @@
   "dependencies": ["webhook"],
   "documentation": "https://www.home-assistant.io/integrations/ecowitt",
   "iot_class": "local_push",
-  "requirements": ["aioecowitt==2025.9.1"]
+  "requirements": ["aioecowitt==2025.9.2"]
 }

homeassistant/components/esphome/analytics.py

@@ -0,0 +1,11 @@
+"""Analytics platform."""
+
+from homeassistant.components.analytics import AnalyticsInput, AnalyticsModifications
+from homeassistant.core import HomeAssistant
+
+
+async def async_modify_analytics(
+    hass: HomeAssistant, analytics_input: AnalyticsInput
+) -> AnalyticsModifications:
+    """Modify the analytics."""
+    return AnalyticsModifications(remove=True)

homeassistant/components/filter/__init__.py

@@ -10,6 +10,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Filter from a config entry."""
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    entry.async_on_unload(entry.add_update_listener(update_listener))
 
     return True
 
@@ -17,3 +18,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload Filter config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle options update."""
+    await hass.config_entries.async_reload(entry.entry_id)

homeassistant/components/filter/config_flow.py

@@ -246,7 +246,6 @@ class FilterConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
 
     config_flow = CONFIG_FLOW
     options_flow = OPTIONS_FLOW
-    options_flow_reloads = True
 
     def async_config_entry_title(self, options: Mapping[str, Any]) -> str:
         """Return config entry title."""

homeassistant/components/frontend/__init__.py

@@ -459,7 +459,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         "developer-tools",
         require_admin=True,
         sidebar_title="developer_tools",
-        sidebar_icon="mdi:hammer",
+        sidebar_icon="hass:hammer",
     )
 
     @callback

homeassistant/components/frontend/manifest.json

@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/frontend",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20250926.0"]
+  "requirements": ["home-assistant-frontend==20251001.0"]
 }

homeassistant/components/fully_kiosk/services.yaml

@@ -1,10 +1,8 @@
 load_url:
+  target:
+    device:
+      integration: fully_kiosk
   fields:
-    device_id:
-      required: true
-      selector:
-        device:
-          integration: fully_kiosk
     url:
       example: "https://home-assistant.io"
       required: true
@@ -12,12 +10,10 @@ load_url:
         text:
 
 set_config:
+  target:
+    device:
+      integration: fully_kiosk
   fields:
-    device_id:
-      required: true
-      selector:
-        device:
-          integration: fully_kiosk
     key:
       example: "motionSensitivity"
       required: true
@@ -30,14 +26,12 @@ set_config:
         text:
 
 start_application:
+  target:
+    device:
+      integration: fully_kiosk
   fields:
     application:
       example: "de.ozerov.fully"
       required: true
       selector:
         text:
-    device_id:
-      required: true
-      selector:
-        device:
-          integration: fully_kiosk

homeassistant/components/fully_kiosk/strings.json

@@ -147,10 +147,6 @@
       "name": "Load URL",
       "description": "Loads a URL on Fully Kiosk Browser.",
       "fields": {
-        "device_id": {
-          "name": "Device ID",
-          "description": "The target device for this action."
-        },
         "url": {
           "name": "[%key:common::config_flow::data::url%]",
           "description": "URL to load."
@@ -161,10 +157,6 @@
       "name": "Set configuration",
       "description": "Sets a configuration parameter on Fully Kiosk Browser.",
       "fields": {
-        "device_id": {
-          "name": "[%key:component::fully_kiosk::services::load_url::fields::device_id::name%]",
-          "description": "[%key:component::fully_kiosk::services::load_url::fields::device_id::description%]"
-        },
         "key": {
           "name": "Key",
           "description": "Configuration parameter to set."
@@ -182,10 +174,6 @@
         "application": {
           "name": "Application",
           "description": "Package name of the application to start."
-        },
-        "device_id": {
-          "name": "[%key:component::fully_kiosk::services::load_url::fields::device_id::name%]",
-          "description": "[%key:component::fully_kiosk::services::load_url::fields::device_id::description%]"
         }
       }
     }

homeassistant/components/generic_hygrostat/__init__.py

@@ -108,7 +108,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry,
             options={**entry.options, CONF_HUMIDIFIER: source_entity_id},
         )
-        hass.config_entries.async_schedule_reload(entry.entry_id)
 
     entry.async_on_unload(
         # We use async_handle_source_entity_changes to track changes to the humidifer,
@@ -141,7 +140,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry,
             options={**entry.options, CONF_SENSOR: data["entity_id"]},
         )
-        hass.config_entries.async_schedule_reload(entry.entry_id)
 
     entry.async_on_unload(
         async_track_entity_registry_updated_event(
@@ -150,6 +148,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )
 
     await hass.config_entries.async_forward_entry_setups(entry, (Platform.HUMIDIFIER,))
+    entry.async_on_unload(entry.add_update_listener(config_entry_update_listener))
     return True
 
 
@@ -187,6 +186,11 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     return True
 
 
+async def config_entry_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Update listener, called when the config entry options are changed."""
+    await hass.config_entries.async_reload(entry.entry_id)
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(

homeassistant/components/generic_hygrostat/config_flow.py

@@ -96,7 +96,6 @@ class ConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
 
     config_flow = CONFIG_FLOW
     options_flow = OPTIONS_FLOW
-    options_flow_reloads = True
 
     def async_config_entry_title(self, options: Mapping[str, Any]) -> str:
         """Return config entry title."""

homeassistant/components/generic_thermostat/__init__.py

@@ -35,7 +35,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry,
             options={**entry.options, CONF_HEATER: source_entity_id},
         )
-        hass.config_entries.async_schedule_reload(entry.entry_id)
 
     entry.async_on_unload(
         # We use async_handle_source_entity_changes to track changes to the heater, but
@@ -68,7 +67,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry,
             options={**entry.options, CONF_SENSOR: data["entity_id"]},
         )
-        hass.config_entries.async_schedule_reload(entry.entry_id)
 
     entry.async_on_unload(
         async_track_entity_registry_updated_event(
@@ -77,6 +75,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    entry.async_on_unload(entry.add_update_listener(config_entry_update_listener))
     return True
 
 
@@ -114,6 +113,11 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     return True
 
 
+async def config_entry_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Update listener, called when the config entry options are changed."""
+    await hass.config_entries.async_reload(entry.entry_id)
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/generic_thermostat/config_flow.py

@@ -104,7 +104,6 @@ class ConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
 
     config_flow = CONFIG_FLOW
     options_flow = OPTIONS_FLOW
-    options_flow_reloads = True
 
     def async_config_entry_title(self, options: Mapping[str, Any]) -> str:
         """Return config entry title."""

homeassistant/components/google_mail/services.yaml

@@ -1,5 +1,7 @@
 set_vacation:
   target:
+    device:
+      integration: google_mail
     entity:
       integration: google_mail
   fields:

homeassistant/components/group/__init__.py

@@ -141,9 +141,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     await hass.config_entries.async_forward_entry_setups(
         entry, (entry.options["group_type"],)
     )
+    entry.async_on_unload(entry.add_update_listener(config_entry_update_listener))
     return True
 
 
+async def config_entry_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Update listener, called when the config entry options are changed."""
+    await hass.config_entries.async_reload(entry.entry_id)
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(

homeassistant/components/group/config_flow.py

@@ -329,7 +329,6 @@ class GroupConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
 
     config_flow = CONFIG_FLOW
     options_flow = OPTIONS_FLOW
-    options_flow_reloads = True
 
     @callback
     def async_config_entry_title(self, options: Mapping[str, Any]) -> str:

homeassistant/components/history/__init__.py

@@ -46,7 +46,7 @@ CONFIG_SCHEMA = vol.Schema(
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the history hooks."""
     hass.http.register_view(HistoryPeriodView())
-    frontend.async_register_built_in_panel(hass, "history", "history", "mdi:chart-box")
+    frontend.async_register_built_in_panel(hass, "history", "history", "hass:chart-box")
     websocket_api.async_setup(hass)
     return True
 

homeassistant/components/history_stats/__init__.py

@@ -65,7 +65,6 @@ async def async_setup_entry(
             entry,
             options={**entry.options, CONF_ENTITY_ID: source_entity_id},
         )
-        hass.config_entries.async_schedule_reload(entry.entry_id)
 
     async def source_entity_removed() -> None:
         # The source entity has been removed, we remove the config entry because
@@ -87,6 +86,7 @@ async def async_setup_entry(
     )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    entry.async_on_unload(entry.add_update_listener(update_listener))
 
     return True
 
@@ -130,3 +130,8 @@ async def async_unload_entry(
 ) -> bool:
     """Unload History stats config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle options update."""
+    await hass.config_entries.async_reload(entry.entry_id)

homeassistant/components/history_stats/config_flow.py

@@ -162,7 +162,6 @@ class HistoryStatsConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
 
     config_flow = CONFIG_FLOW
     options_flow = OPTIONS_FLOW
-    options_flow_reloads = True
 
     def async_config_entry_title(self, options: Mapping[str, Any]) -> str:
         """Return config entry title."""

homeassistant/components/home_connect/manifest.json

@@ -22,6 +22,6 @@
   "iot_class": "cloud_push",
   "loggers": ["aiohomeconnect"],
   "quality_scale": "platinum",
-  "requirements": ["aiohomeconnect==0.20.0"],
+  "requirements": ["aiohomeconnect==0.19.0"],
   "zeroconf": ["_homeconnect._tcp.local."]
 }

homeassistant/components/homeassistant/services.yaml

@@ -32,12 +32,15 @@ set_location:
 stop:
 toggle:
   target:
+    entity: {}
 
 turn_on:
   target:
+    entity: {}
 
 turn_off:
   target:
+    entity: {}
 
 update_entity:
   fields:
@@ -50,6 +53,8 @@ update_entity:
 reload_custom_templates:
 reload_config_entry:
   target:
+    entity: {}
+    device: {}
   fields:
     entry_id:
       advanced: true

homeassistant/components/homeassistant_connect_zbt2/config_flow.py

@@ -10,6 +10,7 @@ from homeassistant.components.homeassistant_hardware import firmware_config_flow
 from homeassistant.components.homeassistant_hardware.util import (
     ApplicationType,
     FirmwareInfo,
+    ResetTarget,
 )
 from homeassistant.config_entries import (
     ConfigEntry,
@@ -67,6 +68,11 @@ class ZBT2FirmwareMixin(ConfigEntryBaseFlow, FirmwareInstallFlowProtocol):
 
     context: ConfigFlowContext
 
+    # `rts_dtr` targets older adapters, `baudrate` works for newer ones. The reason we
+    # try them in this order is that on older adapters `baudrate` entered the ESP32-S3
+    # bootloader instead of the MG24 bootloader.
+    BOOTLOADER_RESET_METHODS = [ResetTarget.RTS_DTR, ResetTarget.BAUDRATE]
+
     async def async_step_install_zigbee_firmware(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:

homeassistant/components/homeassistant_connect_zbt2/update.py

@@ -16,6 +16,7 @@ from homeassistant.components.homeassistant_hardware.update import (
 from homeassistant.components.homeassistant_hardware.util import (
     ApplicationType,
     FirmwareInfo,
+    ResetTarget,
 )
 from homeassistant.components.update import UpdateDeviceClass
 from homeassistant.config_entries import ConfigEntry
@@ -156,7 +157,7 @@ async def async_setup_entry(
 class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
     """Connect ZBT-2 firmware update entity."""
 
-    bootloader_reset_type = None
+    bootloader_reset_methods = [ResetTarget.RTS_DTR, ResetTarget.BAUDRATE]
 
     def __init__(
         self,

homeassistant/components/homeassistant_hardware/firmware_config_flow.py

@@ -39,6 +39,7 @@ from .util import (
     FirmwareInfo,
     OwningAddon,
     OwningIntegration,
+    ResetTarget,
     async_flash_silabs_firmware,
     get_otbr_addon_manager,
     guess_firmware_info,
@@ -79,6 +80,8 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
     """Base flow to install firmware."""
 
     ZIGBEE_BAUDRATE = 115200  # Default, subclasses may override
+    BOOTLOADER_RESET_METHODS: list[ResetTarget] = []  # Default, subclasses may override
+
     _picked_firmware_type: PickedFirmwareType
     _zigbee_flow_strategy: ZigbeeFlowStrategy = ZigbeeFlowStrategy.RECOMMENDED
 
@@ -155,34 +158,6 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
             description_placeholders=self._get_translation_placeholders(),
         )
 
-    async def _probe_firmware_info(
-        self,
-        probe_methods: tuple[ApplicationType, ...] = (
-            # We probe in order of frequency: Zigbee, Thread, then multi-PAN
-            ApplicationType.GECKO_BOOTLOADER,
-            ApplicationType.EZSP,
-            ApplicationType.SPINEL,
-            ApplicationType.CPC,
-        ),
-    ) -> bool:
-        """Probe the firmware currently on the device."""
-        assert self._device is not None
-
-        self._probed_firmware_info = await probe_silabs_firmware_info(
-            self._device,
-            probe_methods=probe_methods,
-        )
-
-        return (
-            self._probed_firmware_info is not None
-            and self._probed_firmware_info.firmware_type
-            in (
-                ApplicationType.EZSP,
-                ApplicationType.SPINEL,
-                ApplicationType.CPC,
-            )
-        )
-
     async def _install_firmware_step(
         self,
         fw_update_url: str,
@@ -236,12 +211,6 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         expected_installed_firmware_type: ApplicationType,
     ) -> None:
         """Install firmware."""
-        if not await self._probe_firmware_info():
-            raise AbortFlow(
-                reason="unsupported_firmware",
-                description_placeholders=self._get_translation_placeholders(),
-            )
-
         assert self._device is not None
 
         # Keep track of the firmware we're working with, for error messages
@@ -250,6 +219,8 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         # Installing new firmware is only truly required if the wrong type is
         # installed: upgrading to the latest release of the current firmware type
         # isn't strictly necessary for functionality.
+        self._probed_firmware_info = await probe_silabs_firmware_info(self._device)
+
         firmware_install_required = self._probed_firmware_info is None or (
             self._probed_firmware_info.firmware_type != expected_installed_firmware_type
         )
@@ -301,12 +272,12 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
             # Otherwise, fail
             raise AbortFlow(reason="firmware_download_failed") from err
 
-        await async_flash_silabs_firmware(
+        self._probed_firmware_info = await async_flash_silabs_firmware(
             hass=self.hass,
             device=self._device,
             fw_data=fw_data,
             expected_installed_firmware_type=expected_installed_firmware_type,
-            bootloader_reset_type=None,
+            bootloader_reset_methods=self.BOOTLOADER_RESET_METHODS,
             progress_callback=lambda offset, total: self.async_update_progress(
                 offset / total
             ),
@@ -314,15 +285,6 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
 
     async def _configure_and_start_otbr_addon(self) -> None:
         """Configure and start the OTBR addon."""
-
-        # Before we start the addon, confirm that the correct firmware is running
-        # and populate `self._probed_firmware_info` with the correct information
-        if not await self._probe_firmware_info(probe_methods=(ApplicationType.SPINEL,)):
-            raise AbortFlow(
-                "unsupported_firmware",
-                description_placeholders=self._get_translation_placeholders(),
-            )
-
         otbr_manager = get_otbr_addon_manager(self.hass)
         addon_info = await self._async_get_addon_info(otbr_manager)
 
@@ -444,12 +406,12 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         if self._picked_firmware_type == PickedFirmwareType.ZIGBEE:
             return await self.async_step_install_zigbee_firmware()
 
-        return await self.async_step_prepare_thread_installation()
+        return await self.async_step_install_thread_firmware()
 
-    async def async_step_prepare_thread_installation(
+    async def async_step_finish_thread_installation(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Prepare for Thread installation by stopping the OTBR addon if needed."""
+        """Finish Thread installation by starting the OTBR addon."""
         if not is_hassio(self.hass):
             return self.async_abort(
                 reason="not_hassio_thread",
@@ -459,22 +421,12 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         otbr_manager = get_otbr_addon_manager(self.hass)
         addon_info = await self._async_get_addon_info(otbr_manager)
 
-        if addon_info.state == AddonState.RUNNING:
-            # Stop the addon before continuing to flash firmware
-            await otbr_manager.async_stop_addon()
-
-        return await self.async_step_install_thread_firmware()
-
-    async def async_step_finish_thread_installation(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Finish Thread installation by starting the OTBR addon."""
-        otbr_manager = get_otbr_addon_manager(self.hass)
-        addon_info = await self._async_get_addon_info(otbr_manager)
-
         if addon_info.state == AddonState.NOT_INSTALLED:
             return await self.async_step_install_otbr_addon()
 
+        if addon_info.state == AddonState.RUNNING:
+            await otbr_manager.async_stop_addon()
+
         return await self.async_step_start_otbr_addon()
 
     async def async_step_pick_firmware_zigbee(
@@ -511,12 +463,6 @@ class BaseFirmwareInstallFlow(ConfigEntryBaseFlow, ABC):
         assert self._device is not None
         assert self._hardware_name is not None
 
-        if not await self._probe_firmware_info(probe_methods=(ApplicationType.EZSP,)):
-            return self.async_abort(
-                reason="unsupported_firmware",
-                description_placeholders=self._get_translation_placeholders(),
-            )
-
         if self._zigbee_integration == ZigbeeIntegration.OTHER:
             return self._async_flow_finished()
 

homeassistant/components/homeassistant_hardware/manifest.json

@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/homeassistant_hardware",
   "integration_type": "system",
   "requirements": [
-    "universal-silabs-flasher==0.0.32",
+    "universal-silabs-flasher==0.0.34",
     "ha-silabs-firmware-client==0.2.0"
   ]
 }

homeassistant/components/homeassistant_hardware/update.py

@@ -22,7 +22,12 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .coordinator import FirmwareUpdateCoordinator
 from .helpers import async_register_firmware_info_callback
-from .util import ApplicationType, FirmwareInfo, async_flash_silabs_firmware
+from .util import (
+    ApplicationType,
+    FirmwareInfo,
+    ResetTarget,
+    async_flash_silabs_firmware,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -81,7 +86,7 @@ class BaseFirmwareUpdateEntity(
 
     # Subclasses provide the mapping between firmware types and entity descriptions
     entity_description: FirmwareUpdateEntityDescription
-    bootloader_reset_type: str | None = None
+    bootloader_reset_methods: list[ResetTarget] = []
 
     _attr_supported_features = (
         UpdateEntityFeature.INSTALL | UpdateEntityFeature.PROGRESS
@@ -268,7 +273,7 @@ class BaseFirmwareUpdateEntity(
                 device=self._current_device,
                 fw_data=fw_data,
                 expected_installed_firmware_type=self.entity_description.expected_firmware_type,
-                bootloader_reset_type=self.bootloader_reset_type,
+                bootloader_reset_methods=self.bootloader_reset_methods,
                 progress_callback=self._update_progress,
             )
         finally:

homeassistant/components/homeassistant_hardware/util.py

@@ -4,13 +4,16 @@ from __future__ import annotations
 
 import asyncio
 from collections import defaultdict
-from collections.abc import AsyncIterator, Callable, Iterable
+from collections.abc import AsyncIterator, Callable, Iterable, Sequence
 from contextlib import AsyncExitStack, asynccontextmanager
 from dataclasses import dataclass
 from enum import StrEnum
 import logging
 
-from universal_silabs_flasher.const import ApplicationType as FlasherApplicationType
+from universal_silabs_flasher.const import (
+    ApplicationType as FlasherApplicationType,
+    ResetTarget as FlasherResetTarget,
+)
 from universal_silabs_flasher.firmware import parse_firmware_image
 from universal_silabs_flasher.flasher import Flasher
 
@@ -42,9 +45,9 @@ class ApplicationType(StrEnum):
     """Application type running on a device."""
 
     GECKO_BOOTLOADER = "bootloader"
-    CPC = "cpc"
     EZSP = "ezsp"
     SPINEL = "spinel"
+    CPC = "cpc"
     ROUTER = "router"
 
     @classmethod
@@ -59,6 +62,18 @@ class ApplicationType(StrEnum):
         return FlasherApplicationType(self.value)
 
 
+class ResetTarget(StrEnum):
+    """Methods to reset a device into bootloader mode."""
+
+    RTS_DTR = "rts_dtr"
+    BAUDRATE = "baudrate"
+    YELLOW = "yellow"
+
+    def as_flasher_reset_target(self) -> FlasherResetTarget:
+        """Convert the reset target enum into one compatible with USF."""
+        return FlasherResetTarget(self.value)
+
+
 @singleton(OTBR_ADDON_MANAGER_DATA)
 @callback
 def get_otbr_addon_manager(hass: HomeAssistant) -> WaitingAddonManager:
@@ -342,7 +357,7 @@ async def async_flash_silabs_firmware(
     device: str,
     fw_data: bytes,
     expected_installed_firmware_type: ApplicationType,
-    bootloader_reset_type: str | None = None,
+    bootloader_reset_methods: Sequence[ResetTarget] = (),
     progress_callback: Callable[[int, int], None] | None = None,
 ) -> FirmwareInfo:
     """Flash firmware to the SiLabs device."""
@@ -359,7 +374,9 @@ async def async_flash_silabs_firmware(
             ApplicationType.SPINEL.as_flasher_application_type(),
             ApplicationType.CPC.as_flasher_application_type(),
         ),
-        bootloader_reset=bootloader_reset_type,
+        bootloader_reset=tuple(
+            m.as_flasher_reset_target() for m in bootloader_reset_methods
+        ),
     )
 
     async with AsyncExitStack() as stack:

homeassistant/components/homeassistant_sky_connect/update.py

@@ -168,7 +168,8 @@ async def async_setup_entry(
 class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
     """SkyConnect firmware update entity."""
 
-    bootloader_reset_type = None
+    # The ZBT-1 does not have a hardware bootloader trigger
+    bootloader_reset_methods = []
 
     def __init__(
         self,

homeassistant/components/homeassistant_yellow/config_flow.py

@@ -27,6 +27,8 @@ from homeassistant.components.homeassistant_hardware.silabs_multiprotocol_addon
 from homeassistant.components.homeassistant_hardware.util import (
     ApplicationType,
     FirmwareInfo,
+    ResetTarget,
+    probe_silabs_firmware_info,
 )
 from homeassistant.config_entries import (
     SOURCE_HARDWARE,
@@ -82,6 +84,8 @@ else:
 class YellowFirmwareMixin(ConfigEntryBaseFlow, FirmwareInstallFlowProtocol):
     """Mixin for Home Assistant Yellow firmware methods."""
 
+    BOOTLOADER_RESET_METHODS = [ResetTarget.YELLOW]
+
     async def async_step_install_zigbee_firmware(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -141,8 +145,10 @@ class HomeAssistantYellowConfigFlow(
         self, data: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle the initial step."""
+        assert self._device is not None
+
         # We do not actually use any portion of `BaseFirmwareConfigFlow` beyond this
-        await self._probe_firmware_info()
+        self._probed_firmware_info = await probe_silabs_firmware_info(self._device)
 
         # Kick off ZHA hardware discovery automatically if Zigbee firmware is running
         if (

homeassistant/components/homeassistant_yellow/update.py

@@ -16,6 +16,7 @@ from homeassistant.components.homeassistant_hardware.update import (
 from homeassistant.components.homeassistant_hardware.util import (
     ApplicationType,
     FirmwareInfo,
+    ResetTarget,
 )
 from homeassistant.components.update import UpdateDeviceClass
 from homeassistant.config_entries import ConfigEntry
@@ -173,7 +174,7 @@ async def async_setup_entry(
 class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
     """Yellow firmware update entity."""
 
-    bootloader_reset_type = "yellow"  # Triggers a GPIO reset
+    bootloader_reset_methods = [ResetTarget.YELLOW]  # Triggers a GPIO reset
 
     def __init__(
         self,

homeassistant/components/imap/__init__.py

@@ -3,9 +3,7 @@
 from __future__ import annotations
 
 import asyncio
-from email.message import Message
 import logging
-from typing import Any
 
 from aioimaplib import IMAP4_SSL, AioImapException, Response
 import voluptuous as vol
@@ -35,7 +33,6 @@ from .coordinator import (
     ImapPollingDataUpdateCoordinator,
     ImapPushDataUpdateCoordinator,
     connect_to_server,
-    get_parts,
 )
 from .errors import InvalidAuth, InvalidFolder
 
@@ -43,7 +40,6 @@ PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 CONF_ENTRY = "entry"
 CONF_SEEN = "seen"
-CONF_PART = "part"
 CONF_UID = "uid"
 CONF_TARGET_FOLDER = "target_folder"
 
@@ -68,11 +64,6 @@ SERVICE_MOVE_SCHEMA = _SERVICE_UID_SCHEMA.extend(
 )
 SERVICE_DELETE_SCHEMA = _SERVICE_UID_SCHEMA
 SERVICE_FETCH_TEXT_SCHEMA = _SERVICE_UID_SCHEMA
-SERVICE_FETCH_PART_SCHEMA = _SERVICE_UID_SCHEMA.extend(
-    {
-        vol.Required(CONF_PART): cv.string,
-    }
-)
 
 type ImapConfigEntry = ConfigEntry[ImapDataUpdateCoordinator]
 
@@ -225,14 +216,12 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 translation_placeholders={"error": str(exc)},
             ) from exc
         raise_on_error(response, "fetch_failed")
-        # Index 1 of of the response lines contains the bytearray with the message data
         message = ImapMessage(response.lines[1])
         await client.close()
         return {
             "text": message.text,
             "sender": message.sender,
             "subject": message.subject,
-            "parts": get_parts(message.email_message),
             "uid": uid,
         }
 
@@ -244,73 +233,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         supports_response=SupportsResponse.ONLY,
     )
 
-    async def async_fetch_part(call: ServiceCall) -> ServiceResponse:
-        """Process fetch email part service and return content."""
-
-        @callback
-        def get_message_part(message: Message, part_key: str) -> Message:
-            part: Message | Any = message
-            for index in part_key.split(","):
-                sub_parts = part.get_payload()
-                try:
-                    assert isinstance(sub_parts, list)
-                    part = sub_parts[int(index)]
-                except (AssertionError, ValueError, IndexError) as exc:
-                    raise ServiceValidationError(
-                        translation_domain=DOMAIN,
-                        translation_key="invalid_part_index",
-                    ) from exc
-
-            return part
-
-        entry_id: str = call.data[CONF_ENTRY]
-        uid: str = call.data[CONF_UID]
-        part_key: str = call.data[CONF_PART]
-        _LOGGER.debug(
-            "Fetch part %s for message %s. Entry: %s",
-            part_key,
-            uid,
-            entry_id,
-        )
-        client = await async_get_imap_client(hass, entry_id)
-        try:
-            response = await client.fetch(uid, "BODY.PEEK[]")
-        except (TimeoutError, AioImapException) as exc:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="imap_server_fail",
-                translation_placeholders={"error": str(exc)},
-            ) from exc
-        raise_on_error(response, "fetch_failed")
-        # Index 1 of of the response lines contains the bytearray with the message data
-        message = ImapMessage(response.lines[1])
-        await client.close()
-        part_data = get_message_part(message.email_message, part_key)
-        part_data_content = part_data.get_payload(decode=False)
-        try:
-            assert isinstance(part_data_content, str)
-        except AssertionError as exc:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_part_index",
-            ) from exc
-        return {
-            "part_data": part_data_content,
-            "content_type": part_data.get_content_type(),
-            "content_transfer_encoding": part_data.get("Content-Transfer-Encoding"),
-            "filename": part_data.get_filename(),
-            "part": part_key,
-            "uid": uid,
-        }
-
-    hass.services.async_register(
-        DOMAIN,
-        "fetch_part",
-        async_fetch_part,
-        SERVICE_FETCH_PART_SCHEMA,
-        supports_response=SupportsResponse.ONLY,
-    )
-
     return True
 
 

homeassistant/components/imap/coordinator.py

@@ -21,7 +21,7 @@ from homeassistant.const import (
     CONF_VERIFY_SSL,
     CONTENT_TYPE_TEXT_PLAIN,
 )
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import (
     ConfigEntryAuthFailed,
     ConfigEntryError,
@@ -209,28 +209,6 @@ class ImapMessage:
         return str(self.email_message.get_payload())
 
 
-@callback
-def get_parts(message: Message, prefix: str | None = None) -> dict[str, Any]:
-    """Return information about the parts of a multipart message."""
-    parts: dict[str, Any] = {}
-    if not message.is_multipart():
-        return {}
-    for index, part in enumerate(message.get_payload(), 0):
-        if TYPE_CHECKING:
-            assert isinstance(part, Message)
-        key = f"{prefix},{index}" if prefix else f"{index}"
-        if part.is_multipart():
-            parts |= get_parts(part, key)
-            continue
-        parts[key] = {"content_type": part.get_content_type()}
-        if filename := part.get_filename():
-            parts[key]["filename"] = filename
-        if content_transfer_encoding := part.get("Content-Transfer-Encoding"):
-            parts[key]["content_transfer_encoding"] = content_transfer_encoding
-
-    return parts
-
-
 class ImapDataUpdateCoordinator(DataUpdateCoordinator[int | None]):
     """Base class for imap client."""
 
@@ -297,7 +275,6 @@ class ImapDataUpdateCoordinator(DataUpdateCoordinator[int | None]):
                 "sender": message.sender,
                 "subject": message.subject,
                 "uid": last_message_uid,
-                "parts": get_parts(message.email_message),
             }
             data.update({key: getattr(message, key) for key in self._event_data_keys})
             if self.custom_event_template is not None:

homeassistant/components/imap/icons.json

@@ -21,9 +21,6 @@
     },
     "fetch": {
       "service": "mdi:email-sync-outline"
-    },
-    "fetch_part": {
-      "service": "mdi:email-sync-outline"
     }
   }
 }

homeassistant/components/imap/services.yaml

@@ -56,22 +56,3 @@ fetch:
       example: "12"
       selector:
         text:
-
-fetch_part:
-  fields:
-    entry:
-      required: true
-      selector:
-        config_entry:
-          integration: "imap"
-    uid:
-      required: true
-      example: "12"
-      selector:
-        text:
-
-    part:
-      required: true
-      example: "0,1"
-      selector:
-        text:

homeassistant/components/imap/strings.json

@@ -84,9 +84,6 @@
     "imap_server_fail": {
       "message": "The IMAP server failed to connect: {error}."
     },
-    "invalid_part_index": {
-      "message": "Invalid part index."
-    },
     "seen_failed": {
       "message": "Marking message as seen failed with \"{error}\"."
     }
@@ -151,24 +148,6 @@
         }
       }
     },
-    "fetch_part": {
-      "name": "Fetch message part",
-      "description": "Fetches a message part or attachment from an email message.",
-      "fields": {
-        "entry": {
-          "name": "[%key:component::imap::services::fetch::fields::entry::name%]",
-          "description": "[%key:component::imap::services::fetch::fields::entry::description%]"
-        },
-        "uid": {
-          "name": "[%key:component::imap::services::fetch::fields::uid::name%]",
-          "description": "[%key:component::imap::services::fetch::fields::uid::description%]"
-        },
-        "part": {
-          "name": "Part",
-          "description": "The message part index."
-        }
-      }
-    },
     "seen": {
       "name": "Mark message as seen",
       "description": "Marks an email as seen.",

homeassistant/components/konnected_esphome/__init__.py

@@ -0,0 +1 @@
+"""Virtual integration: Konnected ESPHome."""

homeassistant/components/konnected_esphome/manifest.json

@@ -0,0 +1,6 @@
+{
+  "domain": "konnected_esphome",
+  "name": "Konnected",
+  "integration_type": "virtual",
+  "supported_by": "esphome"
+}

homeassistant/components/litterrobot/quality_scale.yaml

@@ -28,7 +28,7 @@ rules:
   docs-configuration-parameters:
     status: done
     comment: No options to configure
-  docs-installation-parameters: done
+  docs-installation-parameters: todo
   entity-unavailable: todo
   integration-owner: done
   log-when-unavailable: todo

homeassistant/components/local_file/__init__.py

@@ -22,6 +22,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    entry.async_on_unload(entry.add_update_listener(update_listener))
 
     return True
 
@@ -29,3 +30,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload Local file config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle options update."""
+    await hass.config_entries.async_reload(entry.entry_id)

homeassistant/components/local_file/config_flow.py

@@ -65,7 +65,6 @@ class LocalFileConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
 
     config_flow = CONFIG_FLOW
     options_flow = OPTIONS_FLOW
-    options_flow_reloads = True
 
     def async_config_entry_title(self, options: Mapping[str, Any]) -> str:
         """Return config entry title."""

homeassistant/components/logbook/__init__.py

@@ -115,7 +115,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         async_log_entry(hass, name, message, domain, entity_id, service.context)
 
     frontend.async_register_built_in_panel(
-        hass, "logbook", "logbook", "mdi:format-list-bulleted-type"
+        hass, "logbook", "logbook", "hass:format-list-bulleted-type"
     )
 
     recorder_conf = config.get(RECORDER_DOMAIN, {})

homeassistant/components/lovelace/const.py

@@ -24,7 +24,7 @@ if TYPE_CHECKING:
 DOMAIN = "lovelace"
 LOVELACE_DATA: HassKey[LovelaceData] = HassKey(DOMAIN)
 
-DEFAULT_ICON = "mdi:view-dashboard"
+DEFAULT_ICON = "hass:view-dashboard"
 
 MODE_YAML = "yaml"
 MODE_STORAGE = "storage"

homeassistant/components/lyric/services.yaml

@@ -1,5 +1,7 @@
 set_hold_time:
   target:
+    device:
+      integration: lyric
     entity:
       integration: lyric
       domain: climate

homeassistant/components/matter/icons.json

@@ -148,9 +148,6 @@
       },
       "evse_charging_switch": {
         "default": "mdi:ev-station"
-      },
-      "privacy_mode_button": {
-        "default": "mdi:shield-lock"
       }
     }
   }

homeassistant/components/matter/number.py

@@ -80,7 +80,9 @@ class MatterNumber(MatterEntity, NumberEntity):
         sendvalue = int(value)
         if value_convert := self.entity_description.ha_to_device:
             sendvalue = value_convert(value)
-        await self.write_attribute(value=sendvalue)
+        await self.write_attribute(
+            value=sendvalue,
+        )
 
     @callback
     def _update_from_device(self) -> None:
@@ -435,35 +437,4 @@ DISCOVERY_SCHEMAS = [
             custom_clusters.InovelliCluster.Attributes.LEDIndicatorIntensityOn,
         ),
     ),
-    MatterDiscoverySchema(
-        platform=Platform.NUMBER,
-        entity_description=MatterNumberEntityDescription(
-            key="DoorLockWrongCodeEntryLimit",
-            entity_category=EntityCategory.CONFIG,
-            translation_key="wrong_code_entry_limit",
-            native_max_value=255,
-            native_min_value=1,
-            native_step=1,
-            mode=NumberMode.BOX,
-        ),
-        entity_class=MatterNumber,
-        required_attributes=(clusters.DoorLock.Attributes.WrongCodeEntryLimit,),
-    ),
-    MatterDiscoverySchema(
-        platform=Platform.NUMBER,
-        entity_description=MatterNumberEntityDescription(
-            key="DoorLockUserCodeTemporaryDisableTime",
-            entity_category=EntityCategory.CONFIG,
-            translation_key="user_code_temporary_disable_time",
-            native_max_value=255,
-            native_min_value=1,
-            native_step=1,
-            native_unit_of_measurement=UnitOfTime.SECONDS,
-            mode=NumberMode.BOX,
-        ),
-        entity_class=MatterNumber,
-        required_attributes=(
-            clusters.DoorLock.Attributes.UserCodeTemporaryDisableTime,
-        ),
-    ),
 ]

homeassistant/components/matter/strings.json

@@ -198,9 +198,6 @@
       "pump_setpoint": {
         "name": "Setpoint"
       },
-      "user_code_temporary_disable_time": {
-        "name": "User code temporary disable time"
-      },
       "temperature_offset": {
         "name": "Temperature offset"
       },
@@ -221,9 +218,6 @@
       },
       "valve_configuration_and_control_default_open_duration": {
         "name": "Default open duration"
-      },
-      "wrong_code_entry_limit": {
-        "name": "Wrong code limit"
       }
     },
     "light": {
@@ -519,9 +513,6 @@
       },
       "evse_charging_switch": {
         "name": "Enable charging"
-      },
-      "privacy_mode_button": {
-        "name": "Privacy mode button"
       }
     },
     "vacuum": {

homeassistant/components/matter/switch.py

@@ -263,18 +263,6 @@ DISCOVERY_SCHEMAS = [
         ),
         vendor_id=(4874,),
     ),
-    MatterDiscoverySchema(
-        platform=Platform.SWITCH,
-        entity_description=MatterNumericSwitchEntityDescription(
-            key="DoorLockEnablePrivacyModeButton",
-            entity_category=EntityCategory.CONFIG,
-            translation_key="privacy_mode_button",
-            device_to_ha=bool,
-            ha_to_device=int,
-        ),
-        entity_class=MatterNumericSwitch,
-        required_attributes=(clusters.DoorLock.Attributes.EnablePrivacyModeButton,),
-    ),
     MatterDiscoverySchema(
         platform=Platform.SWITCH,
         entity_description=MatterGenericCommandSwitchEntityDescription(

homeassistant/components/mealie/config_flow.py

@@ -7,9 +7,8 @@ from aiomealie import MealieAuthenticationError, MealieClient, MealieConnectionE
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_API_TOKEN, CONF_HOST, CONF_PORT, CONF_VERIFY_SSL
+from homeassistant.const import CONF_API_TOKEN, CONF_HOST, CONF_VERIFY_SSL
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.service_info.hassio import HassioServiceInfo
 
 from .const import DOMAIN, LOGGER, MIN_REQUIRED_MEALIE_VERSION
 from .utils import create_version
@@ -26,21 +25,13 @@ REAUTH_SCHEMA = vol.Schema(
         vol.Required(CONF_API_TOKEN): str,
     }
 )
-DISCOVERY_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_API_TOKEN): str,
-    }
-)
 
 
 class MealieConfigFlow(ConfigFlow, domain=DOMAIN):
     """Mealie config flow."""
 
-    VERSION = 1
-
     host: str | None = None
     verify_ssl: bool = True
-    _hassio_discovery: dict[str, Any] | None = None
 
     async def check_connection(
         self, api_token: str
@@ -152,59 +143,3 @@ class MealieConfigFlow(ConfigFlow, domain=DOMAIN):
             data_schema=USER_SCHEMA,
             errors=errors,
         )
-
-    async def async_step_hassio(
-        self, discovery_info: HassioServiceInfo
-    ) -> ConfigFlowResult:
-        """Prepare configuration for a Mealie add-on.
-
-        This flow is triggered by the discovery component.
-        """
-        await self._async_handle_discovery_without_unique_id()
-
-        self._hassio_discovery = discovery_info.config
-
-        return await self.async_step_hassio_confirm()
-
-    async def async_step_hassio_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Confirm Supervisor discovery and prompt for API token."""
-        if user_input is None:
-            return await self._show_hassio_form()
-
-        assert self._hassio_discovery
-
-        self.host = (
-            f"{self._hassio_discovery[CONF_HOST]}:{self._hassio_discovery[CONF_PORT]}"
-        )
-        self.verify_ssl = True
-
-        errors, user_id = await self.check_connection(
-            user_input[CONF_API_TOKEN],
-        )
-
-        if not errors:
-            await self.async_set_unique_id(user_id)
-            self._abort_if_unique_id_configured()
-            return self.async_create_entry(
-                title="Mealie",
-                data={
-                    CONF_HOST: self.host,
-                    CONF_API_TOKEN: user_input[CONF_API_TOKEN],
-                    CONF_VERIFY_SSL: self.verify_ssl,
-                },
-            )
-        return await self._show_hassio_form(errors)
-
-    async def _show_hassio_form(
-        self, errors: dict[str, str] | None = None
-    ) -> ConfigFlowResult:
-        """Show the Hass.io confirmation form to the user."""
-        assert self._hassio_discovery
-        return self.async_show_form(
-            step_id="hassio_confirm",
-            data_schema=DISCOVERY_SCHEMA,
-            description_placeholders={"addon": self._hassio_discovery["addon"]},
-            errors=errors or {},
-        )

homeassistant/components/mealie/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "local_polling",
   "quality_scale": "silver",
-  "requirements": ["aiomealie==0.11.0"]
+  "requirements": ["aiomealie==0.10.2"]
 }

homeassistant/components/mealie/quality_scale.yaml

@@ -39,14 +39,8 @@ rules:
   # Gold
   devices: done
   diagnostics: done
-  discovery-update-info:
-    status: exempt
-    comment: |
-      This integration will only discover a Mealie addon that is local, not on the network.
-  discovery:
-    status: done
-    comment: |
-      The integration will discover a Mealie addon posting a discovery message.
+  discovery-update-info: todo
+  discovery: todo
   docs-data-update: done
   docs-examples: done
   docs-known-limitations: todo

homeassistant/components/mealie/strings.json

@@ -39,16 +39,6 @@
           "api_token": "[%key:component::mealie::common::data_description_api_token%]",
           "verify_ssl": "[%key:component::mealie::common::data_description_verify_ssl%]"
         }
-      },
-      "hassio_confirm": {
-        "title": "Mealie via Home Assistant add-on",
-        "description": "Do you want to configure Home Assistant to connect to the Mealie instance provided by the add-on: {addon}?",
-        "data": {
-          "api_token": "[%key:common::config_flow::data::api_token%]"
-        },
-        "data_description": {
-          "api_token": "[%key:component::mealie::common::data_description_api_token%]"
-        }
       }
     },
     "error": {
@@ -60,7 +50,6 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
       "wrong_account": "You have to use the same account that was used to configure the integration."

homeassistant/components/media_extractor/manifest.json

@@ -8,6 +8,6 @@
   "iot_class": "calculated",
   "loggers": ["yt_dlp"],
   "quality_scale": "internal",
-  "requirements": ["yt-dlp[default]==2025.09.23"],
+  "requirements": ["yt-dlp[default]==2025.09.26"],
   "single_config_entry": true
 }

homeassistant/components/media_source/http.py

@@ -25,7 +25,7 @@ def async_setup(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, websocket_browse_media)
     websocket_api.async_register_command(hass, websocket_resolve_media)
     frontend.async_register_built_in_panel(
-        hass, "media-browser", "media_browser", "mdi:play-box-multiple"
+        hass, "media-browser", "media_browser", "hass:play-box-multiple"
     )
 
 

homeassistant/components/mold_indicator/__init__.py

@@ -39,7 +39,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             entry,
             options={**entry.options, CONF_INDOOR_HUMIDITY: source_entity_id},
         )
-        hass.config_entries.async_schedule_reload(entry.entry_id)
 
     entry.async_on_unload(
         # We use async_handle_source_entity_changes to track changes to the humidity
@@ -80,7 +79,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
                     entry,
                     options={**entry.options, temp_sensor: data["entity_id"]},
                 )
-                hass.config_entries.async_schedule_reload(entry.entry_id)
 
             return async_sensor_updated
 
@@ -91,6 +89,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    entry.async_on_unload(entry.add_update_listener(update_listener))
 
     return True
 
@@ -100,6 +99,11 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle options update."""
+    await hass.config_entries.async_reload(entry.entry_id)
+
+
 async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Migrate old entry."""
 

homeassistant/components/mold_indicator/config_flow.py

@@ -100,7 +100,6 @@ class MoldIndicatorConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
 
     config_flow = CONFIG_FLOW
     options_flow = OPTIONS_FLOW
-    options_flow_reloads = True
 
     VERSION = 1
     MINOR_VERSION = 2

homeassistant/components/motioneye/services.yaml

@@ -1,7 +1,8 @@
 set_text_overlay:
   target:
+    device:
+      integration: motioneye
     entity:
-      domain: camera
       integration: motioneye
   fields:
     left_text:
@@ -47,8 +48,9 @@ set_text_overlay:
 
 action:
   target:
+    device:
+      integration: motioneye
     entity:
-      domain: camera
       integration: motioneye
   fields:
     action:
@@ -86,6 +88,7 @@ action:
 
 snapshot:
   target:
-    entity:
-      domain: camera
+    device:
+      integration: motioneye
+    entity:
       integration: motioneye

homeassistant/components/mqtt/config_flow.py

@@ -46,14 +46,6 @@ from homeassistant.components.light import (
     VALID_COLOR_MODES,
     valid_supported_color_modes,
 )
-from homeassistant.components.number import (
-    DEFAULT_MAX_VALUE,
-    DEFAULT_MIN_VALUE,
-    DEFAULT_STEP,
-    DEVICE_CLASS_UNITS as NUMBER_DEVICE_CLASS_UNITS,
-    NumberDeviceClass,
-    NumberMode,
-)
 from homeassistant.components.sensor import (
     CONF_STATE_CLASS,
     DEVICE_CLASS_UNITS,
@@ -87,7 +79,6 @@ from homeassistant.const import (
     CONF_EFFECT,
     CONF_ENTITY_CATEGORY,
     CONF_HOST,
-    CONF_MODE,
     CONF_NAME,
     CONF_OPTIMISTIC,
     CONF_PASSWORD,
@@ -220,9 +211,7 @@ from .const import (
     CONF_IMAGE_TOPIC,
     CONF_KEEPALIVE,
     CONF_LAST_RESET_VALUE_TEMPLATE,
-    CONF_MAX,
     CONF_MAX_KELVIN,
-    CONF_MIN,
     CONF_MIN_KELVIN,
     CONF_MODE_COMMAND_TEMPLATE,
     CONF_MODE_COMMAND_TOPIC,
@@ -304,7 +293,6 @@ from .const import (
     CONF_STATE_UNLOCKED,
     CONF_STATE_UNLOCKING,
     CONF_STATE_VALUE_TEMPLATE,
-    CONF_STEP,
     CONF_SUGGESTED_DISPLAY_PRECISION,
     CONF_SUPPORTED_COLOR_MODES,
     CONF_SUPPORTED_FEATURES,
@@ -456,7 +444,6 @@ SUBENTRY_PLATFORMS = [
     Platform.LIGHT,
     Platform.LOCK,
     Platform.NOTIFY,
-    Platform.NUMBER,
     Platform.SENSOR,
     Platform.SWITCH,
 ]
@@ -692,24 +679,6 @@ LIGHT_SCHEMA_SELECTOR = SelectSelector(
         translation_key="light_schema",
     )
 )
-MIN_MAX_SELECTOR = NumberSelector(NumberSelectorConfig(step=1e-3))
-NUMBER_DEVICE_CLASS_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=[device_class.value for device_class in NumberDeviceClass],
-        mode=SelectSelectorMode.DROPDOWN,
-        # The number device classes are all shared with the sensor device classes
-        translation_key="device_class_sensor",
-        sort=True,
-    )
-)
-NUMBER_MODE_SELECTOR = SelectSelector(
-    SelectSelectorConfig(
-        options=[mode.value for mode in NumberMode],
-        mode=SelectSelectorMode.DROPDOWN,
-        translation_key="number_mode",
-        sort=True,
-    )
-)
 ON_COMMAND_TYPE_SELECTOR = SelectSelector(
     SelectSelectorConfig(
         options=VALUES_ON_COMMAND_TYPE,
@@ -757,7 +726,6 @@ SENSOR_STATE_CLASS_SELECTOR = SelectSelector(
         translation_key=CONF_STATE_CLASS,
     )
 )
-STEP_SELECTOR = NumberSelector(NumberSelectorConfig(min=1e-3, step=1e-3))
 SUPPORTED_COLOR_MODES_SELECTOR = SelectSelector(
     SelectSelectorConfig(
         options=[platform.value for platform in VALID_COLOR_MODES],
@@ -914,23 +882,6 @@ def unit_of_measurement_selector(user_data: dict[str, Any | None]) -> Selector:
     )
 
 
-@callback
-def number_unit_of_measurement_selector(user_data: dict[str, Any | None]) -> Selector:
-    """Return a context based unit of measurement selector for number entities."""
-
-    if (
-        device_class := user_data.get(CONF_DEVICE_CLASS)
-    ) is None or device_class not in NUMBER_DEVICE_CLASS_UNITS:
-        return TEXT_SELECTOR
-    return SelectSelector(
-        SelectSelectorConfig(
-            options=[str(uom) for uom in NUMBER_DEVICE_CLASS_UNITS[device_class]],
-            sort=True,
-            custom_value=True,
-        )
-    )
-
-
 @callback
 def validate(validator: Callable[[Any], Any]) -> Callable[[Any], Any]:
     """Run validator, then return the unmodified input."""
@@ -1054,29 +1005,6 @@ def validate_light_platform_config(user_data: dict[str, Any]) -> dict[str, str]:
     return errors
 
 
-@callback
-def validate_number_platform_config(config: dict[str, Any]) -> dict[str, str]:
-    """Validate MQTT number configuration."""
-    errors: dict[str, Any] = {}
-    if (
-        CONF_MIN in config
-        and CONF_MAX in config
-        and config[CONF_MIN] > config[CONF_MAX]
-    ):
-        errors[CONF_MIN] = "max_below_min"
-        errors[CONF_MAX] = "max_below_min"
-
-    if (
-        (device_class := config.get(CONF_DEVICE_CLASS)) is not None
-        and device_class in NUMBER_DEVICE_CLASS_UNITS
-        and config.get(CONF_UNIT_OF_MEASUREMENT)
-        not in NUMBER_DEVICE_CLASS_UNITS[device_class]
-    ):
-        errors[CONF_UNIT_OF_MEASUREMENT] = "invalid_uom"
-
-    return errors
-
-
 @callback
 def validate_sensor_platform_config(
     config: dict[str, Any],
@@ -1139,7 +1067,6 @@ ENTITY_CONFIG_VALIDATOR: dict[
     Platform.LIGHT.value: validate_light_platform_config,
     Platform.LOCK.value: None,
     Platform.NOTIFY.value: None,
-    Platform.NUMBER.value: validate_number_platform_config,
     Platform.SENSOR.value: validate_sensor_platform_config,
     Platform.SWITCH.value: None,
 }
@@ -1355,17 +1282,6 @@ PLATFORM_ENTITY_FIELDS: dict[str, dict[str, PlatformField]] = {
     },
     Platform.LOCK.value: {},
     Platform.NOTIFY.value: {},
-    Platform.NUMBER: {
-        CONF_DEVICE_CLASS: PlatformField(
-            selector=NUMBER_DEVICE_CLASS_SELECTOR,
-            required=False,
-        ),
-        CONF_UNIT_OF_MEASUREMENT: PlatformField(
-            selector=number_unit_of_measurement_selector,
-            required=False,
-            custom_filtering=True,
-        ),
-    },
     Platform.SENSOR.value: {
         CONF_DEVICE_CLASS: PlatformField(
             selector=SENSOR_DEVICE_CLASS_SELECTOR, required=False
@@ -3050,58 +2966,6 @@ PLATFORM_MQTT_FIELDS: dict[str, dict[str, PlatformField]] = {
         ),
         CONF_RETAIN: PlatformField(selector=BOOLEAN_SELECTOR, required=False),
     },
-    Platform.NUMBER.value: {
-        CONF_COMMAND_TOPIC: PlatformField(
-            selector=TEXT_SELECTOR,
-            required=True,
-            validator=valid_publish_topic,
-            error="invalid_publish_topic",
-        ),
-        CONF_COMMAND_TEMPLATE: PlatformField(
-            selector=TEMPLATE_SELECTOR,
-            required=False,
-            validator=validate(cv.template),
-            error="invalid_template",
-        ),
-        CONF_STATE_TOPIC: PlatformField(
-            selector=TEXT_SELECTOR,
-            required=False,
-            validator=valid_subscribe_topic,
-            error="invalid_subscribe_topic",
-        ),
-        CONF_VALUE_TEMPLATE: PlatformField(
-            selector=TEMPLATE_SELECTOR,
-            required=False,
-            validator=validate(cv.template),
-            error="invalid_template",
-        ),
-        CONF_MIN: PlatformField(
-            selector=MIN_MAX_SELECTOR,
-            required=True,
-            default=DEFAULT_MIN_VALUE,
-        ),
-        CONF_MAX: PlatformField(
-            selector=MIN_MAX_SELECTOR,
-            required=True,
-            default=DEFAULT_MAX_VALUE,
-        ),
-        CONF_STEP: PlatformField(
-            selector=STEP_SELECTOR,
-            required=True,
-            default=DEFAULT_STEP,
-        ),
-        CONF_MODE: PlatformField(
-            selector=NUMBER_MODE_SELECTOR,
-            required=True,
-            default=NumberMode.AUTO.value,
-        ),
-        CONF_PAYLOAD_RESET: PlatformField(
-            selector=TEXT_SELECTOR,
-            required=False,
-            default=DEFAULT_PAYLOAD_RESET,
-        ),
-        CONF_RETAIN: PlatformField(selector=BOOLEAN_SELECTOR, required=False),
-    },
     Platform.SENSOR.value: {
         CONF_STATE_TOPIC: PlatformField(
             selector=TEXT_SELECTOR,

homeassistant/components/mqtt/const.py

@@ -120,10 +120,8 @@ CONF_HUMIDITY_STATE_TOPIC = "target_humidity_state_topic"
 CONF_HUMIDITY_MAX = "max_humidity"
 CONF_HUMIDITY_MIN = "min_humidity"
 CONF_LAST_RESET_VALUE_TEMPLATE = "last_reset_value_template"
-CONF_MAX = "max"
 CONF_MAX_KELVIN = "max_kelvin"
 CONF_MAX_MIREDS = "max_mireds"
-CONF_MIN = "min"
 CONF_MIN_KELVIN = "min_kelvin"
 CONF_MIN_MIREDS = "min_mireds"
 CONF_MODE_COMMAND_TEMPLATE = "mode_command_template"
@@ -198,7 +196,6 @@ CONF_STATE_OPENING = "state_opening"
 CONF_STATE_STOPPED = "state_stopped"
 CONF_STATE_UNLOCKED = "state_unlocked"
 CONF_STATE_UNLOCKING = "state_unlocking"
-CONF_STEP = "step"
 CONF_SUGGESTED_DISPLAY_PRECISION = "suggested_display_precision"
 CONF_SUPPORTED_COLOR_MODES = "supported_color_modes"
 CONF_SWING_HORIZONTAL_MODE_COMMAND_TEMPLATE = "swing_horizontal_mode_command_template"

homeassistant/components/mqtt/number.py

@@ -37,12 +37,8 @@ from .config import MQTT_RW_SCHEMA
 from .const import (
     CONF_COMMAND_TEMPLATE,
     CONF_COMMAND_TOPIC,
-    CONF_MAX,
-    CONF_MIN,
     CONF_PAYLOAD_RESET,
     CONF_STATE_TOPIC,
-    CONF_STEP,
-    DEFAULT_PAYLOAD_RESET,
 )
 from .entity import MqttEntity, async_setup_entity_entry_helper
 from .models import (
@@ -57,7 +53,12 @@ _LOGGER = logging.getLogger(__name__)
 
 PARALLEL_UPDATES = 0
 
+CONF_MIN = "min"
+CONF_MAX = "max"
+CONF_STEP = "step"
+
 DEFAULT_NAME = "MQTT Number"
+DEFAULT_PAYLOAD_RESET = "None"
 
 MQTT_NUMBER_ATTRIBUTES_BLOCKED = frozenset(
     {

homeassistant/components/mqtt/strings.json

@@ -298,7 +298,7 @@
             "suggested_display_precision": "The number of decimals which should be used in the {platform} entity state after rounding. [Learn more.]({url}#suggested_display_precision)",
             "supported_features": "The features that the entity supports.",
             "temperature_unit": "This determines the native unit of measurement the MQTT climate device works with.",
-            "unit_of_measurement": "Defines the unit of measurement, if any."
+            "unit_of_measurement": "Defines the unit of measurement of the sensor, if any."
           },
           "sections": {
             "advanced_settings": {
@@ -334,9 +334,6 @@
             "image_encoding": "Image encoding",
             "image_topic": "Image topic",
             "last_reset_value_template": "Last reset value template",
-            "max": "Maximum",
-            "min": "Minimum",
-            "mode": "Mode",
             "modes": "Supported operation modes",
             "mode_command_topic": "Operation mode command topic",
             "mode_command_template": "Operation mode command template",
@@ -347,7 +344,6 @@
             "payload_off": "Payload \"off\"",
             "payload_on": "Payload \"on\"",
             "payload_press": "Payload \"press\"",
-            "payload_reset": "Payload \"reset\"",
             "qos": "QoS",
             "red_template": "Red template",
             "retain": "Retain",
@@ -356,7 +352,6 @@
             "state_template": "State template",
             "state_topic": "State topic",
             "state_value_template": "State value template",
-            "step": "Step",
             "supported_color_modes": "Supported color modes",
             "url_template": "URL template",
             "url_topic": "URL topic",
@@ -381,9 +376,6 @@
             "image_encoding": "Select the encoding of the received image data",
             "image_topic": "The MQTT topic subscribed to receive messages containing the image data. [Learn more.]({url}#image_topic)",
             "last_reset_value_template": "Defines a [template](https://www.home-assistant.io/docs/configuration/templating/#using-value-templates-with-mqtt) to extract the last reset. When Last reset template is set, the State class option must be Total. [Learn more.]({url}#last_reset_value_template)",
-            "max": "Maximum value. [Learn more.]({url}#max)",
-            "min": "Minimum value. [Learn more.]({url}#min)",
-            "mode": "Control how the number should be displayed in the UI. [Learn more.]({url}#mode)",
             "modes": "A list of supported operation modes. [Learn more.]({url}#modes)",
             "mode_command_topic": "The MQTT topic to publish commands to change the climate operation mode. [Learn more.]({url}#mode_command_topic)",
             "mode_command_template": "[Template](https://www.home-assistant.io/docs/configuration/templating/#using-command-templates-with-mqtt) to define the operation mode to be sent to the operation mode command topic. [Learn more.]({url}#mode_command_template)",
@@ -394,7 +386,6 @@
             "payload_off": "The payload that represents the \"off\" state.",
             "payload_on": "The payload that represents the \"on\" state.",
             "payload_press": "The payload to send when the button is triggered.",
-            "payload_reset": "The payload received at the state topic that resets the entity to an unknown state.",
             "qos": "The QoS value a {platform} entity should use.",
             "red_template": "[Template](https://www.home-assistant.io/docs/configuration/templating/#using-value-templates-with-mqtt) to extract red color from the state payload value. Expected result of the template is an integer from 0-255 range.",
             "retain": "Select if values published by the {platform} entity should be retained at the MQTT broker.",
@@ -402,7 +393,6 @@
             "state_on": "The incoming payload that represents the \"on\" state. Use only when the value that represents \"on\" state in the state topic is different from value that should be sent to the command topic to turn the device on.",
             "state_template": "[Template](https://www.home-assistant.io/docs/configuration/templating/#using-value-templates-with-mqtt) to extract state from the state payload value.",
             "state_topic": "The MQTT topic subscribed to receive {platform} state values. [Learn more.]({url}#state_topic)",
-            "step": "Step value. Smallest value 0.001.",
             "supported_color_modes": "A list of color modes supported by the light. Possible color modes are On/Off, Brightness, Color temperature, HS, XY, RGB, RGBW, RGBWW, White. Note that if On/Off or Brightness are used, that must be the only value in the list. [Learn more.]({url}#supported_color_modes)",
             "url_template": "[Template](https://www.home-assistant.io/docs/configuration/templating/#using-value-templates-with-mqtt) to extract an URL from the received URL topic payload value. [Learn more.]({url}#url_template)",
             "url_topic": "The MQTT topic subscribed to receive messages containing the image URL. [Learn more.]({url}#url_topic)",
@@ -1005,7 +995,6 @@
         "invalid_uom_for_state_class": "The unit of measurement \"{unit_of_measurement}\" is not supported by the selected state class, please either remove the state class, select a state class which supports \"{unit_of_measurement}\", or pick a supported unit of measurement from the list",
         "invalid_url": "Invalid URL",
         "last_reset_not_with_state_class_total": "The last reset value template option should be used with state class 'Total' only",
-        "max_below_min": "Max value should be greater or equal to min value",
         "max_below_min_humidity": "Max humidity value should be greater than min humidity value",
         "max_below_min_kelvin": "Max Kelvin value should be greater than min Kelvin value",
         "max_below_min_temperature": "Max temperature value should be greater than min temperature value",
@@ -1305,13 +1294,6 @@
         "template": "Template"
       }
     },
-    "number_mode": {
-      "options": {
-        "auto": "[%key:component::number::entity_component::_::state_attributes::mode::state::auto%]",
-        "box": "[%key:component::number::entity_component::_::state_attributes::mode::state::box%]",
-        "slider": "[%key:component::number::entity_component::_::state_attributes::mode::state::slider%]"
-      }
-    },
     "on_command_type": {
       "options": {
         "brightness": "Brightness",
@@ -1331,7 +1313,6 @@
         "light": "[%key:component::light::title%]",
         "lock": "[%key:component::lock::title%]",
         "notify": "[%key:component::notify::title%]",
-        "number": "[%key:component::number::title%]",
         "sensor": "[%key:component::sensor::title%]",
         "switch": "[%key:component::switch::title%]"
       }

homeassistant/components/nibe_heatpump/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/nibe_heatpump",
   "iot_class": "local_polling",
-  "requirements": ["nibe==2.19.0"]
+  "requirements": ["nibe==2.18.0"]
 }

homeassistant/components/nmap_tracker/const.py

@@ -13,6 +13,6 @@ NMAP_TRACKED_DEVICES: Final = "nmap_tracked_devices"
 # Interval in minutes to exclude devices from a scan while they are home
 CONF_HOME_INTERVAL: Final = "home_interval"
 CONF_OPTIONS: Final = "scan_options"
-DEFAULT_OPTIONS: Final = "-n -sn -PR -T4 --min-rate 10 --host-timeout 5s"
+DEFAULT_OPTIONS: Final = "-F -T4 --min-rate 10 --host-timeout 5s"
 
 TRACKER_SCAN_INTERVAL: Final = 120

homeassistant/components/onkyo/__init__.py

@@ -52,10 +52,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: OnkyoConfigEntry) -> boo
 
     try:
         info = await async_interview(host)
-    except TimeoutError as exc:
-        raise ConfigEntryNotReady(f"Timed out interviewing: {host}") from exc
     except OSError as exc:
-        raise ConfigEntryNotReady(f"Unexpected exception interviewing: {host}") from exc
+        raise ConfigEntryNotReady(f"Unable to connect to: {host}") from exc
+    if info is None:
+        raise ConfigEntryNotReady(f"Unable to connect to: {host}")
 
     manager = ReceiverManager(hass, entry, info)
 

homeassistant/components/onkyo/config_flow.py

@@ -109,22 +109,24 @@ class OnkyoConfigFlow(ConfigFlow, domain=DOMAIN):
             _LOGGER.debug("Config flow manual: %s", host)
             try:
                 info = await async_interview(host)
-            except TimeoutError:
-                _LOGGER.warning("Timed out interviewing: %s", host)
-                errors["base"] = "cannot_connect"
             except OSError:
-                _LOGGER.exception("Unexpected exception interviewing: %s", host)
+                _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
-                self._receiver_info = info
-
-                await self.async_set_unique_id(info.identifier, raise_on_progress=False)
-                if self.source == SOURCE_RECONFIGURE:
-                    self._abort_if_unique_id_mismatch()
+                if info is None:
+                    errors["base"] = "cannot_connect"
                 else:
-                    self._abort_if_unique_id_configured()
+                    self._receiver_info = info
 
-                return await self.async_step_configure_receiver()
+                    await self.async_set_unique_id(
+                        info.identifier, raise_on_progress=False
+                    )
+                    if self.source == SOURCE_RECONFIGURE:
+                        self._abort_if_unique_id_mismatch()
+                    else:
+                        self._abort_if_unique_id_configured()
+
+                    return await self.async_step_configure_receiver()
 
         suggested_values = user_input
         if suggested_values is None and self.source == SOURCE_RECONFIGURE:
@@ -212,13 +214,14 @@ class OnkyoConfigFlow(ConfigFlow, domain=DOMAIN):
 
         try:
             info = await async_interview(host)
-        except TimeoutError:
-            _LOGGER.warning("Timed out interviewing: %s", host)
-            return self.async_abort(reason="cannot_connect")
         except OSError:
-            _LOGGER.exception("Unexpected exception interviewing: %s", host)
+            _LOGGER.exception("Unexpected exception interviewing host %s", host)
             return self.async_abort(reason="unknown")
 
+        if info is None:
+            _LOGGER.debug("SSDP eiscp is None: %s", host)
+            return self.async_abort(reason="cannot_connect")
+
         await self.async_set_unique_id(info.identifier)
         self._abort_if_unique_id_configured(updates={CONF_HOST: info.host})
 

homeassistant/components/onkyo/media_player.py

@@ -341,12 +341,12 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
     def process_update(self, message: status.Known) -> None:
         """Process update."""
         match message:
-            case status.Power(param=status.Power.Param.ON):
+            case status.Power(status.Power.Param.ON):
                 self._attr_state = MediaPlayerState.ON
-            case status.Power(param=status.Power.Param.STANDBY):
+            case status.Power(status.Power.Param.STANDBY):
                 self._attr_state = MediaPlayerState.OFF
 
-            case status.Volume(param=volume):
+            case status.Volume(volume):
                 if not self._supports_volume:
                     self._attr_supported_features |= SUPPORTED_FEATURES_VOLUME
                     self._supports_volume = True
@@ -356,10 +356,10 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
                 )
                 self._attr_volume_level = min(1, volume_level)
 
-            case status.Muting(param=muting):
+            case status.Muting(muting):
                 self._attr_is_volume_muted = bool(muting == status.Muting.Param.ON)
 
-            case status.InputSource(param=source):
+            case status.InputSource(source):
                 if source in self._source_mapping:
                     self._attr_source = self._source_mapping[source]
                 else:
@@ -373,7 +373,7 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
 
                 self._query_av_info_delayed()
 
-            case status.ListeningMode(param=sound_mode):
+            case status.ListeningMode(sound_mode):
                 if not self._supports_sound_mode:
                     self._attr_supported_features |= (
                         MediaPlayerEntityFeature.SELECT_SOUND_MODE
@@ -393,13 +393,13 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
 
                 self._query_av_info_delayed()
 
-            case status.HDMIOutput(param=hdmi_output):
+            case status.HDMIOutput(hdmi_output):
                 self._attr_extra_state_attributes[ATTR_VIDEO_OUT] = (
                     self._hdmi_output_mapping[hdmi_output]
                 )
                 self._query_av_info_delayed()
 
-            case status.TunerPreset(param=preset):
+            case status.TunerPreset(preset):
                 self._attr_extra_state_attributes[ATTR_PRESET] = preset
 
             case status.AudioInformation():
@@ -427,11 +427,11 @@ class OnkyoMediaPlayer(MediaPlayerEntity):
             case status.FLDisplay():
                 self._query_av_info_delayed()
 
-            case status.NotAvailable(kind=Kind.AUDIO_INFORMATION):
+            case status.NotAvailable(Kind.AUDIO_INFORMATION):
                 # Not available right now, but still supported
                 self._supports_audio_info = True
 
-            case status.NotAvailable(kind=Kind.VIDEO_INFORMATION):
+            case status.NotAvailable(Kind.VIDEO_INFORMATION):
                 # Not available right now, but still supported
                 self._supports_video_info = True
 

homeassistant/components/onkyo/receiver.py

@@ -124,10 +124,13 @@ class ReceiverManager:
         self.callbacks.clear()
 
 
-async def async_interview(host: str) -> ReceiverInfo:
+async def async_interview(host: str) -> ReceiverInfo | None:
     """Interview the receiver."""
-    async with asyncio.timeout(DEVICE_INTERVIEW_TIMEOUT):
-        return await aioonkyo.interview(host)
+    info: ReceiverInfo | None = None
+    with contextlib.suppress(asyncio.TimeoutError):
+        async with asyncio.timeout(DEVICE_INTERVIEW_TIMEOUT):
+            info = await aioonkyo.interview(host)
+    return info
 
 
 async def async_discover(hass: HomeAssistant) -> Iterable[ReceiverInfo]:

homeassistant/components/pi_hole/__init__.py

@@ -129,10 +129,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: PiHoleConfigEntry) -> bo
                         raise ConfigEntryAuthFailed
         except HoleError as err:
             if str(err) == "Authentication failed: Invalid password":
-                raise ConfigEntryAuthFailed from err
-            raise UpdateFailed(f"Failed to communicate with API: {err}") from err
+                raise ConfigEntryAuthFailed(
+                    f"Pi-hole {name} at host {host}, reported an invalid password"
+                ) from err
+            raise UpdateFailed(
+                f"Pi-hole {name} at host {host}, update failed with HoleError: {err}"
+            ) from err
         if not isinstance(api.data, dict):
-            raise ConfigEntryAuthFailed
+            raise ConfigEntryAuthFailed(
+                f"Pi-hole {name} at host {host}, returned an unexpected response: {api.data}, assuming authentication failed"
+            )
 
     coordinator = DataUpdateCoordinator(
         hass,

homeassistant/components/portainer/__init__.py

@@ -57,4 +57,9 @@ async def async_migrate_entry(hass: HomeAssistant, entry: PortainerConfigEntry)
         data[CONF_API_TOKEN] = data.pop(CONF_API_KEY)
         hass.config_entries.async_update_entry(entry=entry, data=data, version=2)
 
+    if entry.version < 3:
+        data = dict(entry.data)
+        data[CONF_VERIFY_SSL] = True
+        hass.config_entries.async_update_entry(entry=entry, data=data, version=3)
+
     return True

homeassistant/components/portainer/config_flow.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Mapping
 import logging
 from typing import Any
 
@@ -88,48 +87,6 @@ class PortainerConfigFlow(ConfigFlow, domain=DOMAIN):
             step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
         )
 
-    async def async_step_reauth(
-        self, entry_data: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Perform reauth when Portainer API authentication fails."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reauth: ask for new API token and validate."""
-        errors: dict[str, str] = {}
-        reauth_entry = self._get_reauth_entry()
-        if user_input is not None:
-            try:
-                await _validate_input(
-                    self.hass,
-                    data={
-                        **reauth_entry.data,
-                        CONF_API_TOKEN: user_input[CONF_API_TOKEN],
-                    },
-                )
-            except CannotConnect:
-                errors["base"] = "cannot_connect"
-            except InvalidAuth:
-                errors["base"] = "invalid_auth"
-            except PortainerTimeout:
-                errors["base"] = "timeout_connect"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                return self.async_update_reload_and_abort(
-                    reauth_entry,
-                    data_updates={CONF_API_TOKEN: user_input[CONF_API_TOKEN]},
-                )
-
-        return self.async_show_form(
-            step_id="reauth_confirm",
-            data_schema=vol.Schema({vol.Required(CONF_API_TOKEN): str}),
-            errors=errors,
-        )
-
 
 class CannotConnect(HomeAssistantError):
     """Error to indicate we cannot connect."""

homeassistant/components/portainer/coordinator.py

@@ -18,7 +18,7 @@ from pyportainer.models.portainer import Endpoint
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_URL
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN
@@ -66,7 +66,7 @@ class PortainerCoordinator(DataUpdateCoordinator[dict[int, PortainerCoordinatorD
         try:
             await self.portainer.get_endpoints()
         except PortainerAuthenticationError as err:
-            raise ConfigEntryAuthFailed(
+            raise ConfigEntryError(
                 translation_domain=DOMAIN,
                 translation_key="invalid_auth",
                 translation_placeholders={"error": repr(err)},
@@ -94,7 +94,7 @@ class PortainerCoordinator(DataUpdateCoordinator[dict[int, PortainerCoordinatorD
             endpoints = await self.portainer.get_endpoints()
         except PortainerAuthenticationError as err:
             _LOGGER.error("Authentication error: %s", repr(err))
-            raise ConfigEntryAuthFailed(
+            raise UpdateFailed(
                 translation_domain=DOMAIN,
                 translation_key="invalid_auth",
                 translation_placeholders={"error": repr(err)},
@@ -121,7 +121,7 @@ class PortainerCoordinator(DataUpdateCoordinator[dict[int, PortainerCoordinatorD
                 ) from err
             except PortainerAuthenticationError as err:
                 _LOGGER.exception("Authentication error")
-                raise ConfigEntryAuthFailed(
+                raise UpdateFailed(
                     translation_domain=DOMAIN,
                     translation_key="invalid_auth",
                     translation_placeholders={"error": repr(err)},

homeassistant/components/portainer/strings.json

@@ -13,15 +13,6 @@
           "verify_ssl": "Whether to verify SSL certificates. Disable only if you have a self-signed certificate"
         },
         "description": "You can create an access token in the Portainer UI. Go to **My account > Access tokens** and select **Add access token**"
-      },
-      "reauth_confirm": {
-        "data": {
-          "api_token": "[%key:common::config_flow::data::api_token%]"
-        },
-        "data_description": {
-          "api_token": "The new API access token for authenticating with Portainer"
-        },
-        "description": "The access token for your Portainer instance needs to be re-authenticated. You can create a new access token in the Portainer UI. Go to **My account > Access tokens** and select **Add access token**"
       }
     },
     "error": {
@@ -31,8 +22,7 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
   "device": {

homeassistant/components/random/__init__.py

@@ -9,9 +9,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     await hass.config_entries.async_forward_entry_setups(
         entry, (entry.options["entity_type"],)
     )
+    entry.async_on_unload(entry.add_update_listener(config_entry_update_listener))
     return True
 
 
+async def config_entry_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Update listener, called when the config entry options are changed."""
+    await hass.config_entries.async_reload(entry.entry_id)
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(

homeassistant/components/random/config_flow.py

@@ -184,7 +184,6 @@ class RandomConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
 
     config_flow = CONFIG_FLOW
     options_flow = OPTIONS_FLOW
-    options_flow_reloads = True
 
     @callback
     def async_config_entry_title(self, options: Mapping[str, Any]) -> str:

homeassistant/components/reolink/binary_sensor.py

@@ -74,28 +74,21 @@ BINARY_PUSH_SENSORS = (
     ),
     ReolinkBinarySensorEntityDescription(
         key=PERSON_DETECTION_TYPE,
-        cmd_id=[33, 600, 696],
+        cmd_id=[33, 600],
         translation_key="person",
         value=lambda api, ch: api.ai_detected(ch, PERSON_DETECTION_TYPE),
         supported=lambda api, ch: api.ai_supported(ch, PERSON_DETECTION_TYPE),
     ),
     ReolinkBinarySensorEntityDescription(
         key=VEHICLE_DETECTION_TYPE,
-        cmd_id=[33, 600, 696],
+        cmd_id=[33, 600],
         translation_key="vehicle",
         value=lambda api, ch: api.ai_detected(ch, VEHICLE_DETECTION_TYPE),
         supported=lambda api, ch: api.ai_supported(ch, VEHICLE_DETECTION_TYPE),
     ),
-    ReolinkBinarySensorEntityDescription(
-        key="non-motor_vehicle",
-        cmd_id=[600, 696],
-        translation_key="non-motor_vehicle",
-        value=lambda api, ch: api.ai_detected(ch, "non-motor vehicle"),
-        supported=lambda api, ch: api.supported(ch, "ai_non-motor vehicle"),
-    ),
     ReolinkBinarySensorEntityDescription(
         key=PET_DETECTION_TYPE,
-        cmd_id=[33, 600, 696],
+        cmd_id=[33, 600],
         translation_key="pet",
         value=lambda api, ch: api.ai_detected(ch, PET_DETECTION_TYPE),
         supported=lambda api, ch: (
@@ -105,14 +98,14 @@ BINARY_PUSH_SENSORS = (
     ),
     ReolinkBinarySensorEntityDescription(
         key=PET_DETECTION_TYPE,
-        cmd_id=[33, 600, 696],
+        cmd_id=[33, 600],
         translation_key="animal",
         value=lambda api, ch: api.ai_detected(ch, PET_DETECTION_TYPE),
         supported=lambda api, ch: api.supported(ch, "ai_animal"),
     ),
     ReolinkBinarySensorEntityDescription(
         key=PACKAGE_DETECTION_TYPE,
-        cmd_id=[33, 600, 696],
+        cmd_id=[33, 600],
         translation_key="package",
         value=lambda api, ch: api.ai_detected(ch, PACKAGE_DETECTION_TYPE),
         supported=lambda api, ch: api.ai_supported(ch, PACKAGE_DETECTION_TYPE),
@@ -127,7 +120,7 @@ BINARY_PUSH_SENSORS = (
     ),
     ReolinkBinarySensorEntityDescription(
         key="cry",
-        cmd_id=[33],
+        cmd_id=[33, 600],
         translation_key="cry",
         value=lambda api, ch: api.ai_detected(ch, "cry"),
         supported=lambda api, ch: api.ai_supported(ch, "cry"),

homeassistant/components/reolink/icons.json

@@ -13,12 +13,6 @@
           "on": "mdi:car"
         }
       },
-      "non-motor_vehicle": {
-        "default": "mdi:motorbike-off",
-        "state": {
-          "on": "mdi:motorbike"
-        }
-      },
       "pet": {
         "default": "mdi:dog-side-off",
         "state": {
@@ -229,9 +223,6 @@
       "ai_vehicle_sensitivity": {
         "default": "mdi:car"
       },
-      "ai_non_motor_vehicle_sensitivity": {
-        "default": "mdi:bicycle"
-      },
       "ai_package_sensitivity": {
         "default": "mdi:gift-outline"
       },
@@ -268,9 +259,6 @@
       "ai_vehicle_delay": {
         "default": "mdi:car"
       },
-      "ai_non_motor_vehicle_delay": {
-        "default": "mdi:bicycle"
-      },
       "ai_package_delay": {
         "default": "mdi:gift-outline"
       },
@@ -468,15 +456,6 @@
       },
       "sd_storage": {
         "default": "mdi:micro-sd"
-      },
-      "person_type": {
-        "default": "mdi:account"
-      },
-      "vehicle_type": {
-        "default": "mdi:car"
-      },
-      "animal_type": {
-        "default": "mdi:paw"
       }
     },
     "siren": {

homeassistant/components/reolink/number.py

@@ -255,23 +255,6 @@ NUMBER_ENTITIES = (
         value=lambda api, ch: api.ai_sensitivity(ch, "vehicle"),
         method=lambda api, ch, value: api.set_ai_sensitivity(ch, int(value), "vehicle"),
     ),
-    ReolinkNumberEntityDescription(
-        key="ai_non_motor_vehicle_sensitivity",
-        cmd_key="GetAiAlarm",
-        translation_key="ai_non_motor_vehicle_sensitivity",
-        entity_category=EntityCategory.CONFIG,
-        native_step=1,
-        native_min_value=0,
-        native_max_value=100,
-        supported=lambda api, ch: (
-            api.supported(ch, "ai_sensitivity")
-            and api.supported(ch, "ai_non-motor vehicle")
-        ),
-        value=lambda api, ch: api.ai_sensitivity(ch, "non-motor vehicle"),
-        method=lambda api, ch, value: (
-            api.set_ai_sensitivity(ch, int(value), "non-motor vehicle")
-        ),
-    ),
     ReolinkNumberEntityDescription(
         key="ai_package_sensititvity",
         cmd_key="GetAiAlarm",
@@ -362,25 +345,6 @@ NUMBER_ENTITIES = (
         value=lambda api, ch: api.ai_delay(ch, "people"),
         method=lambda api, ch, value: api.set_ai_delay(ch, int(value), "people"),
     ),
-    ReolinkNumberEntityDescription(
-        key="ai_non_motor_vehicle_delay",
-        cmd_key="GetAiAlarm",
-        translation_key="ai_non_motor_vehicle_delay",
-        entity_category=EntityCategory.CONFIG,
-        device_class=NumberDeviceClass.DURATION,
-        entity_registry_enabled_default=False,
-        native_step=1,
-        native_unit_of_measurement=UnitOfTime.SECONDS,
-        native_min_value=0,
-        native_max_value=8,
-        supported=lambda api, ch: (
-            api.supported(ch, "ai_delay") and api.supported(ch, "ai_non-motor vehicle")
-        ),
-        value=lambda api, ch: api.ai_delay(ch, "non-motor vehicle"),
-        method=lambda api, ch, value: (
-            api.set_ai_delay(ch, int(value), "non-motor vehicle")
-        ),
-    ),
     ReolinkNumberEntityDescription(
         key="ai_vehicle_delay",
         cmd_key="GetAiAlarm",