Bump version to 2025.4.0b5

Update frontend to 20250327.1 (#141596 )
Fix typing error in NMBS (#141589 )
2025-03-27 20:03:14 +00:00 · 2025-03-27 20:03:01 +00:00 · 2025-03-27 20:02:58 +00:00 · 2025-03-27 20:02:55 +00:00 · 2025-03-27 20:02:51 +00:00 · 2025-03-27 16:59:36 +00:00
50 changed files with 803 additions and 154 deletions
@@ -859,14 +859,8 @@ async def _async_set_up_integrations(
    integrations, all_integrations = await _async_resolve_domains_and_preload(
        hass, config
    )
-    # Detect all cycles
-    integrations_after_dependencies = (
-        await loader.resolve_integrations_after_dependencies(
-            hass, all_integrations.values(), set(all_integrations)
-        )
-    )
-    all_domains = set(integrations_after_dependencies)
-    domains = set(integrations) & all_domains
+    all_domains = set(all_integrations)
+    domains = set(integrations)

    _LOGGER.info(
        "Domains to be set up: %s | %s",
@@ -874,8 +868,6 @@ async def _async_set_up_integrations(
        all_domains - domains,
    )

-    async_set_domains_to_be_loaded(hass, all_domains)
-
    # Initialize recorder
    if "recorder" in all_domains:
        recorder.async_initialize_recorder(hass)
@@ -908,12 +900,24 @@ async def _async_set_up_integrations(
        stage_dep_domains_unfiltered = {
            dep
            for domain in stage_domains
-            for dep in integrations_after_dependencies[domain]
+            for dep in all_integrations[domain].all_dependencies
            if dep not in stage_domains
        }
        stage_dep_domains = stage_dep_domains_unfiltered - hass.config.components

        stage_all_domains = stage_domains | stage_dep_domains
+        stage_all_integrations = {
+            domain: all_integrations[domain] for domain in stage_all_domains
+        }
+        # Detect all cycles
+        stage_integrations_after_dependencies = (
+            await loader.resolve_integrations_after_dependencies(
+                hass, stage_all_integrations.values(), stage_all_domains
+            )
+        )
+        stage_all_domains = set(stage_integrations_after_dependencies)
+        stage_domains &= stage_all_domains
+        stage_dep_domains &= stage_all_domains

        _LOGGER.info(
            "Setting up stage %s: %s | %s\nDependencies: %s | %s",
@@ -924,6 +928,8 @@ async def _async_set_up_integrations(
            stage_dep_domains_unfiltered - stage_dep_domains,
        )

+        async_set_domains_to_be_loaded(hass, stage_all_domains)
+
        if timeout is None:
            await _async_setup_multi_components(hass, stage_all_domains, config)
            continue
@@ -0,0 +1,5 @@
+{
+  "domain": "bosch",
+  "name": "Bosch",
+  "integrations": ["bosch_alarm", "bosch_shc", "home_connect"]
+}
@@ -1,9 +1,11 @@
 """Base class for assist satellite entities."""

 import logging
+from pathlib import Path

 import voluptuous as vol

+from homeassistant.components.http import StaticPathConfig
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
@@ -15,6 +17,8 @@ from .const import (
    CONNECTION_TEST_DATA,
    DATA_COMPONENT,
    DOMAIN,
+    PREANNOUNCE_FILENAME,
+    PREANNOUNCE_URL,
    AssistSatelliteEntityFeature,
 )
 from .entity import (
@@ -56,7 +60,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                {
                    vol.Optional("message"): str,
                    vol.Optional("media_id"): str,
-                    vol.Optional("preannounce_media_id"): str,
+                    vol.Optional("preannounce_media_id"): vol.Any(str, None),
                }
            ),
            cv.has_at_least_one_key("message", "media_id"),
@@ -71,7 +75,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                {
                    vol.Optional("start_message"): str,
                    vol.Optional("start_media_id"): str,
-                    vol.Optional("preannounce_media_id"): str,
+                    vol.Optional("preannounce_media_id"): vol.Any(str, None),
                    vol.Optional("extra_system_prompt"): str,
                }
            ),
@@ -84,6 +88,15 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
    async_register_websocket_api(hass)
    hass.http.register_view(ConnectionTestView())

+    # Default preannounce sound
+    await hass.http.async_register_static_paths(
+        [
+            StaticPathConfig(
+                PREANNOUNCE_URL, str(Path(__file__).parent / PREANNOUNCE_FILENAME)
+            )
+        ]
+    )
+
    return True


@@ -20,6 +20,9 @@ CONNECTION_TEST_DATA: HassKey[dict[str, asyncio.Event]] = HassKey(
    f"{DOMAIN}_connection_tests"
 )

+PREANNOUNCE_FILENAME = "preannounce.mp3"
+PREANNOUNCE_URL = f"/api/assist_satellite/static/{PREANNOUNCE_FILENAME}"
+

 class AssistSatelliteEntityFeature(IntFlag):
    """Supported features of Assist satellite entity."""
@@ -28,7 +28,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import chat_session, entity
 from homeassistant.helpers.entity import EntityDescription

-from .const import AssistSatelliteEntityFeature
+from .const import PREANNOUNCE_URL, AssistSatelliteEntityFeature
 from .errors import AssistSatelliteError, SatelliteBusyError

 _LOGGER = logging.getLogger(__name__)
@@ -180,7 +180,7 @@ class AssistSatelliteEntity(entity.Entity):
        self,
        message: str | None = None,
        media_id: str | None = None,
-        preannounce_media_id: str | None = None,
+        preannounce_media_id: str | None = PREANNOUNCE_URL,
    ) -> None:
        """Play and show an announcement on the satellite.

@@ -190,7 +190,8 @@ class AssistSatelliteEntity(entity.Entity):
        If media_id is provided, it is played directly. It is possible
        to omit the message and the satellite will not show any text.

-        If preannounce_media_id is provided, it is played before the announcement.
+        If preannounce_media_id is provided, it overrides the default sound.
+        If preannounce_media_id is None, no sound is played.

        Calls async_announce with message and media id.
        """
@@ -228,7 +229,7 @@ class AssistSatelliteEntity(entity.Entity):
        start_message: str | None = None,
        start_media_id: str | None = None,
        extra_system_prompt: str | None = None,
-        preannounce_media_id: str | None = None,
+        preannounce_media_id: str | None = PREANNOUNCE_URL,
    ) -> None:
        """Start a conversation from the satellite.

@@ -239,6 +240,7 @@ class AssistSatelliteEntity(entity.Entity):
        to omit the message and the satellite will not show any text.

        If preannounce_media_id is provided, it is played before the announcement.
+        If preannounce_media_id is None, no sound is played.

        Calls async_start_conversation.
        """
@@ -4,13 +4,14 @@ from __future__ import annotations

 import asyncio
 from collections.abc import AsyncIterator, Callable, Coroutine, Mapping
+from http import HTTPStatus
 import logging
 import random
 from typing import Any

-from aiohttp import ClientError
+from aiohttp import ClientError, ClientResponseError
 from hass_nabucasa import Cloud, CloudError
-from hass_nabucasa.api import CloudApiNonRetryableError
+from hass_nabucasa.api import CloudApiError, CloudApiNonRetryableError
 from hass_nabucasa.cloud_api import (
    FilesHandlerListEntry,
    async_files_delete_file,
@@ -120,6 +121,8 @@ class CloudBackupAgent(BackupAgent):
        """
        if not backup.protected:
            raise BackupAgentError("Cloud backups must be protected")
+        if self._cloud.subscription_expired:
+            raise BackupAgentError("Cloud subscription has expired")

        size = backup.size
        try:
@@ -152,6 +155,13 @@ class CloudBackupAgent(BackupAgent):
                    ) from err
                raise BackupAgentError(f"Failed to upload backup {err}") from err
            except CloudError as err:
+                if (
+                    isinstance(err, CloudApiError)
+                    and isinstance(err.orig_exc, ClientResponseError)
+                    and err.orig_exc.status == HTTPStatus.FORBIDDEN
+                    and self._cloud.subscription_expired
+                ):
+                    raise BackupAgentError("Cloud subscription has expired") from err
                if tries == _RETRY_LIMIT:
                    raise BackupAgentError(f"Failed to upload backup {err}") from err
                tries += 1
@@ -41,6 +41,7 @@ ALARM_ACTIONS: dict[str, str] = {


 ALARM_AREA_ARMED_STATUS: dict[str, int] = {
+    DISABLE: 0,
    HOME_P1: 1,
    HOME_P2: 2,
    NIGHT: 3,
@@ -128,20 +129,38 @@ class ComelitAlarmEntity(CoordinatorEntity[ComelitVedoSystem], AlarmControlPanel
            AlarmAreaState.TRIGGERED: AlarmControlPanelState.TRIGGERED,
        }.get(self._area.human_status)

+    async def _async_update_state(self, area_state: AlarmAreaState, armed: int) -> None:
+        """Update state after action."""
+        self._area.human_status = area_state
+        self._area.armed = armed
+        await self.async_update_ha_state()
+
    async def async_alarm_disarm(self, code: str | None = None) -> None:
        """Send disarm command."""
        if code != str(self._api.device_pin):
            return
        await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[DISABLE])
+        await self._async_update_state(
+            AlarmAreaState.DISARMED, ALARM_AREA_ARMED_STATUS[DISABLE]
+        )

    async def async_alarm_arm_away(self, code: str | None = None) -> None:
        """Send arm away command."""
        await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[AWAY])
+        await self._async_update_state(
+            AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[AWAY]
+        )

    async def async_alarm_arm_home(self, code: str | None = None) -> None:
        """Send arm home command."""
        await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[HOME])
+        await self._async_update_state(
+            AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[HOME_P1]
+        )

    async def async_alarm_arm_night(self, code: str | None = None) -> None:
        """Send arm night command."""
        await self._api.set_zone_status(self._area.index, ALARM_ACTIONS[NIGHT])
+        await self._async_update_state(
+            AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[NIGHT]
+        )
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/ecovacs",
  "iot_class": "cloud_push",
  "loggers": ["sleekxmppfs", "sucks", "deebot_client"],
-  "requirements": ["py-sucks==0.9.10", "deebot-client==12.3.1"]
+  "requirements": ["py-sucks==0.9.10", "deebot-client==12.4.0"]
 }
@@ -20,5 +20,5 @@
  "documentation": "https://www.home-assistant.io/integrations/frontend",
  "integration_type": "system",
  "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20250326.0"]
+  "requirements": ["home-assistant-frontend==20250327.1"]
 }
@@ -5,7 +5,7 @@ from __future__ import annotations
 import mimetypes
 from pathlib import Path

-from google import genai  # type: ignore[attr-defined]
+from google.genai import Client
 from google.genai.errors import APIError, ClientError
 from requests.exceptions import Timeout
 import voluptuous as vol
@@ -43,7 +43,7 @@ CONF_FILENAMES = "filenames"
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 PLATFORMS = (Platform.CONVERSATION,)

-type GoogleGenerativeAIConfigEntry = ConfigEntry[genai.Client]
+type GoogleGenerativeAIConfigEntry = ConfigEntry[Client]


 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
@@ -139,7 +139,11 @@ async def async_setup_entry(
    """Set up Google Generative AI Conversation from a config entry."""

    try:
-        client = genai.Client(api_key=entry.data[CONF_API_KEY])
+
+        def _init_client() -> Client:
+            return Client(api_key=entry.data[CONF_API_KEY])
+
+        client = await hass.async_add_executor_job(_init_client)
        await client.aio.models.get(
            model=entry.options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL),
            config={"http_options": {"timeout": TIMEOUT_MILLIS}},
@@ -244,6 +244,7 @@ class HomeConnectDoorBinarySensor(HomeConnectBinarySensor):
                    BSH_DOOR_STATE_LOCKED: False,
                    BSH_DOOR_STATE_OPEN: True,
                },
+                entity_registry_enabled_default=False,
            ),
        )
        self._attr_unique_id = f"{appliance.info.ha_id}-Door"
@@ -283,7 +284,8 @@ class HomeConnectDoorBinarySensor(HomeConnectBinarySensor):
            DOMAIN,
            f"deprecated_binary_common_door_sensor_{self.entity_id}",
            breaks_in_ha_version="2025.5.0",
-            is_fixable=False,
+            is_fixable=True,
+            is_persistent=True,
            severity=IssueSeverity.WARNING,
            translation_key="deprecated_binary_common_door_sensor",
            translation_placeholders={
@@ -134,15 +134,47 @@
    },
    "deprecated_binary_common_door_sensor": {
      "title": "Deprecated binary door sensor detected in some automations or scripts",
-      "description": "The binary door sensor `{entity}`, which is deprecated, is used in the following automations or scripts:\n{items}\n\nA sensor entity with additional possible states is available and should be used going forward; Please use it on the above automations or scripts to fix this issue."
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_binary_common_door_sensor::title%]",
+            "description": "The binary door sensor `{entity}`, which is deprecated, is used in the following automations or scripts:\n{items}\n\nA sensor entity with additional possible states is available and should be used going forward; Please use it on the above automations or scripts to fix this issue."
+          }
+        }
+      }
    },
    "deprecated_command_actions": {
      "title": "The command related actions are deprecated in favor of the new buttons",
-      "description": "The `pause_program` and `resume_program` actions have been deprecated in favor of new button entities, if the command is available for your appliance. Please update your automations, scripts and panels that use this action to use the button entities instead, and press on submit to fix the issue."
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_command_actions::title%]",
+            "description": "The `pause_program` and `resume_program` actions have been deprecated in favor of new button entities, if the command is available for your appliance. Please update your automations, scripts and panels that use this action to use the button entities instead, and press on submit to fix the issue."
+          }
+        }
+      }
+    },
+    "deprecated_program_switch_in_automations_scripts": {
+      "title": "Deprecated program switch detected in some automations or scripts",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_program_switch_in_automations_scripts::title%]",
+            "description": "Program switches are deprecated and {entity_id} is used in the following automations or scripts:\n{items}\n\nYou can use the active program select entity to run the program without any additional options and get the current running program on the above automations or scripts to fix this issue."
+          }
+        }
+      }
    },
    "deprecated_program_switch": {
-      "title": "Deprecated program switch detected in some automations or scripts",
-      "description": "Program switches are deprecated and {entity_id} is used in the following automations or scripts:\n{items}\n\nYou can use the active program select entity to run the program without any additional options and get the current running program on the above automations or scripts to fix this issue."
+      "title": "Deprecated program switch entities",
+      "fix_flow": {
+        "step": {
+          "confirm": {
+            "title": "[%key:component::home_connect::issues::deprecated_program_switch::title%]",
+            "description": "The switch entity `{entity_id}` and all the other program switches are deprecated.\n\nPlease use the active program select entity instead."
+          }
+        }
+      }
    },
    "deprecated_set_program_and_option_actions": {
      "title": "The executed action is deprecated",
@@ -266,7 +266,10 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):
        super().__init__(
            coordinator,
            appliance,
-            SwitchEntityDescription(key=EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM),
+            SwitchEntityDescription(
+                key=EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
+                entity_registry_enabled_default=False,
+            ),
        )
        self._attr_name = f"{appliance.info.name} {desc}"
        self._attr_unique_id = f"{appliance.info.ha_id}-{desc}"
@@ -304,11 +307,12 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):
        async_create_issue(
            self.hass,
            DOMAIN,
-            f"deprecated_program_switch_{self.entity_id}",
+            f"deprecated_program_switch_in_automations_scripts_{self.entity_id}",
            breaks_in_ha_version="2025.6.0",
-            is_fixable=False,
+            is_fixable=True,
+            is_persistent=True,
            severity=IssueSeverity.WARNING,
-            translation_key="deprecated_program_switch",
+            translation_key="deprecated_program_switch_in_automations_scripts",
            translation_placeholders={
                "entity_id": self.entity_id,
                "items": "\n".join(items_list),
@@ -317,12 +321,34 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):

    async def async_will_remove_from_hass(self) -> None:
        """Call when entity will be removed from hass."""
+        async_delete_issue(
+            self.hass,
+            DOMAIN,
+            f"deprecated_program_switch_in_automations_scripts_{self.entity_id}",
+        )
        async_delete_issue(
            self.hass, DOMAIN, f"deprecated_program_switch_{self.entity_id}"
        )

+    def create_action_handler_issue(self) -> None:
+        """Create deprecation issue."""
+        async_create_issue(
+            self.hass,
+            DOMAIN,
+            f"deprecated_program_switch_{self.entity_id}",
+            breaks_in_ha_version="2025.6.0",
+            is_fixable=True,
+            is_persistent=True,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_program_switch",
+            translation_placeholders={
+                "entity_id": self.entity_id,
+            },
+        )
+
    async def async_turn_on(self, **kwargs: Any) -> None:
        """Start the program."""
+        self.create_action_handler_issue()
        try:
            await self.coordinator.client.start_program(
                self.appliance.info.ha_id, program_key=self.program.key
@@ -339,6 +365,7 @@ class HomeConnectProgramSwitch(HomeConnectEntity, SwitchEntity):

    async def async_turn_off(self, **kwargs: Any) -> None:
        """Stop the program."""
+        self.create_action_handler_issue()
        try:
            await self.coordinator.client.stop_program(self.appliance.info.ha_id)
        except HomeConnectError as err:
@@ -1,4 +1,28 @@
 {
+  "entity": {
+    "light": {
+      "hue_light": {
+        "state_attributes": {
+          "effect": {
+            "state": {
+              "candle": "mdi:candle",
+              "sparkle": "mdi:shimmer",
+              "glisten": "mdi:creation",
+              "sunrise": "mdi:weather-sunset-up",
+              "sunset": "mdi:weather-sunset",
+              "fire": "mdi:fire",
+              "prism": "mdi:triangle-outline",
+              "opal": "mdi:diamond-stone",
+              "underwater": "mdi:waves",
+              "cosmos": "mdi:star-shooting",
+              "sunbeam": "mdi:spotlight-beam",
+              "enchant": "mdi:magic-staff"
+            }
+          }
+        }
+      }
+    }
+  },
  "services": {
    "hue_activate_scene": {
      "service": "mdi:palette"
@@ -227,12 +227,16 @@ def _get_work_area_names(data: MowerAttributes) -> list[str]:
@callback
 def _get_current_work_area_name(data: MowerAttributes) -> str:
    """Return the name of the current work area."""
-    if data.mower.work_area_id is None:
-        return STATE_NO_WORK_AREA_ACTIVE
    if TYPE_CHECKING:
        # Sensor does not get created if values are None
        assert data.work_areas is not None
-    return data.work_areas[data.mower.work_area_id].name
+    if (
+        data.mower.work_area_id is not None
+        and data.mower.work_area_id in data.work_areas
+    ):
+        return data.work_areas[data.mower.work_area_id].name
+
+    return STATE_NO_WORK_AREA_ACTIVE


@callback
@@ -2,19 +2,19 @@
  "config": {
    "step": {
      "import_confirm": {
-        "title": "Import Konnected Device",
-        "description": "A Konnected Alarm Panel with ID {id} has been discovered in configuration.yaml. This flow will allow you to import it into a config entry."
+        "title": "Import Konnected device",
+        "description": "A Konnected alarm panel with ID {id} has been discovered in configuration.yaml. This flow will allow you to import it into a config entry."
      },
      "user": {
-        "description": "Please enter the host information for your Konnected Panel.",
+        "description": "Please enter the host information for your Konnected panel.",
        "data": {
          "host": "[%key:common::config_flow::data::ip%]",
          "port": "[%key:common::config_flow::data::port%]"
        }
      },
      "confirm": {
-        "title": "Konnected Device Ready",
-        "description": "Model: {model}\nID: {id}\nHost: {host}\nPort: {port}\n\nYou can configure the IO and panel behavior in the Konnected Alarm Panel settings."
+        "title": "Konnected device ready",
+        "description": "Model: {model}\nID: {id}\nHost: {host}\nPort: {port}\n\nYou can configure the IO and panel behavior in the Konnected alarm panel settings."
      }
    },
    "error": {
@@ -45,8 +45,8 @@
        }
      },
      "options_io_ext": {
-        "title": "Configure Extended I/O",
-        "description": "Select the configuration of the remaining I/O below.  You'll be able to configure detailed options in the next steps.",
+        "title": "Configure extended I/O",
+        "description": "Select the configuration of the remaining I/O below. You'll be able to configure detailed options in the next steps.",
        "data": {
          "8": "Zone 8",
          "9": "Zone 9",
@@ -59,25 +59,25 @@
        }
      },
      "options_binary": {
-        "title": "Configure Binary Sensor",
+        "title": "Configure binary sensor",
        "description": "{zone} options",
        "data": {
-          "type": "Binary Sensor Type",
+          "type": "Binary sensor type",
          "name": "[%key:common::config_flow::data::name%]",
          "inverse": "Invert the open/close state"
        }
      },
      "options_digital": {
-        "title": "Configure Digital Sensor",
+        "title": "Configure digital sensor",
        "description": "[%key:component::konnected::options::step::options_binary::description%]",
        "data": {
-          "type": "Sensor Type",
+          "type": "Sensor type",
          "name": "[%key:common::config_flow::data::name%]",
-          "poll_interval": "Poll Interval (minutes)"
+          "poll_interval": "Poll interval (minutes)"
        }
      },
      "options_switch": {
-        "title": "Configure Switchable Output",
+        "title": "Configure switchable output",
        "description": "{zone} options: state {state}",
        "data": {
          "name": "[%key:common::config_flow::data::name%]",
@@ -89,18 +89,18 @@
        }
      },
      "options_misc": {
-        "title": "Configure Misc",
+        "title": "Configure misc",
        "description": "Please select the desired behavior for your panel",
        "data": {
          "discovery": "Respond to discovery requests on your network",
          "blink": "Blink panel LED on when sending state change",
-          "override_api_host": "Override default Home Assistant API host panel URL",
-          "api_host": "Override API host URL"
+          "override_api_host": "Override default Home Assistant API host URL",
+          "api_host": "Custom API host URL"
        }
      }
    },
    "error": {
-      "bad_host": "Invalid Override API host URL"
+      "bad_host": "Invalid custom API host URL"
    },
    "abort": {
      "not_konn_panel": "[%key:component::konnected::config::abort::not_konn_panel%]"
@@ -7,6 +7,6 @@
  "integration_type": "hub",
  "iot_class": "local_polling",
  "loggers": ["linkplay"],
-  "requirements": ["python-linkplay==0.2.1"],
+  "requirements": ["python-linkplay==0.2.2"],
  "zeroconf": ["_linkplay._tcp.local."]
 }
@@ -23,7 +23,11 @@ from homeassistant.helpers.network import (
 from .const import CONTENT_AUTH_EXPIRY_TIME, MediaClass, MediaType

 # Paths that we don't need to sign
-PATHS_WITHOUT_AUTH = ("/api/tts_proxy/", "/api/esphome/ffmpeg_proxy/")
+PATHS_WITHOUT_AUTH = (
+    "/api/tts_proxy/",
+    "/api/esphome/ffmpeg_proxy/",
+    "/api/assist_satellite/static/",
+)


@callback
@@ -153,7 +153,6 @@ from .util import (
    learn_more_url,
    valid_birth_will,
    valid_publish_topic,
-    valid_qos_schema,
    valid_subscribe_topic,
    valid_subscribe_topic_template,
 )
@@ -182,7 +181,6 @@ PASSWORD_SELECTOR = TextSelector(TextSelectorConfig(type=TextSelectorType.PASSWO
 QOS_SELECTOR = NumberSelector(
    NumberSelectorConfig(mode=NumberSelectorMode.BOX, min=0, max=2)
 )
-QOS_DATA_SCHEMA = vol.All(QOS_SELECTOR, valid_qos_schema)
 KEEPALIVE_SELECTOR = vol.All(
    NumberSelector(
        NumberSelectorConfig(
@@ -1145,7 +1143,7 @@ class MQTTOptionsFlowHandler(OptionsFlow):
                "birth_payload", description={"suggested_value": birth[CONF_PAYLOAD]}
            )
        ] = TEXT_SELECTOR
-        fields[vol.Optional("birth_qos", default=birth[ATTR_QOS])] = QOS_DATA_SCHEMA
+        fields[vol.Optional("birth_qos", default=birth[ATTR_QOS])] = QOS_SELECTOR
        fields[vol.Optional("birth_retain", default=birth[ATTR_RETAIN])] = (
            BOOLEAN_SELECTOR
        )
@@ -1168,7 +1166,7 @@ class MQTTOptionsFlowHandler(OptionsFlow):
                "will_payload", description={"suggested_value": will[CONF_PAYLOAD]}
            )
        ] = TEXT_SELECTOR
-        fields[vol.Optional("will_qos", default=will[ATTR_QOS])] = QOS_DATA_SCHEMA
+        fields[vol.Optional("will_qos", default=will[ATTR_QOS])] = QOS_SELECTOR
        fields[vol.Optional("will_retain", default=will[ATTR_RETAIN])] = (
            BOOLEAN_SELECTOR
        )
@@ -1269,13 +1267,9 @@ class MQTTSubentryFlowHandler(ConfigSubentryFlow):
            reconfig=True,
        )
        if user_input is not None:
-            merged_user_input, errors = validate_user_input(
-                user_input, MQTT_DEVICE_PLATFORM_FIELDS
-            )
+            _, errors = validate_user_input(user_input, MQTT_DEVICE_PLATFORM_FIELDS)
            if not errors:
-                self._subentry_data[CONF_DEVICE] = cast(
-                    MqttDeviceData, merged_user_input
-                )
+                self._subentry_data[CONF_DEVICE] = cast(MqttDeviceData, user_input)
                if self.source == SOURCE_RECONFIGURE:
                    return await self.async_step_summary_menu()
                return await self.async_step_entity()
@@ -360,7 +360,7 @@ class NMBSSensor(SensorEntity):
            attrs[ATTR_LONGITUDE] = self.station_coordinates[1]

        if self.is_via_connection and not self._excl_vias:
-            via = self._attrs.vias.via[0]
+            via = self._attrs.vias[0]

            attrs["via"] = via.station
            attrs["via_arrival_platform"] = via.arrival.platform
@@ -31,6 +31,7 @@ class PyLoadData:
    download: bool
    reconnect: bool
    captcha: bool | None = None
+    proxy: bool | None = None
    free_space: int


@@ -42,6 +42,10 @@ class RemoteCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
        self._async_abort_entries_match(
            {CONF_CALENDAR_NAME: user_input[CONF_CALENDAR_NAME]}
        )
+        if user_input[CONF_URL].startswith("webcal://"):
+            user_input[CONF_URL] = user_input[CONF_URL].replace(
+                "webcal://", "https://", 1
+            )
        self._async_abort_entries_match({CONF_URL: user_input[CONF_URL]})
        client = get_async_client(self.hass)
        try:
@@ -143,6 +143,7 @@ class RoborockFlowHandler(ConfigFlow, domain=DOMAIN):
        self, discovery_info: DhcpServiceInfo
    ) -> ConfigFlowResult:
        """Handle a flow started by a dhcp discovery."""
+        await self._async_handle_discovery_without_unique_id()
        device_registry = dr.async_get(self.hass)
        device = device_registry.async_get_device(
            connections={
@@ -352,7 +352,10 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
                        return {
                            "new_unique_id": f"{device_id}_{MAIN}_{Capability.THREE_AXIS}_{Attribute.THREE_AXIS}_{new_attribute}",
                        }
-                    if attribute == Attribute.MACHINE_STATE:
+                    if attribute in {
+                        Attribute.MACHINE_STATE,
+                        Attribute.COMPLETION_TIME,
+                    }:
                        capability = determine_machine_type(
                            hass, entry.entry_id, device_id
                        )
@@ -410,7 +413,9 @@ def create_devices(
    rooms: dict[str, str],
 ) -> None:
    """Create devices in the device registry."""
-    for device in devices.values():
+    for device in sorted(
+        devices.values(), key=lambda d: d.device.parent_device_id or ""
+    ):
        kwargs: dict[str, Any] = {}
        if device.device.hub is not None:
            kwargs = {
@@ -4,7 +4,7 @@ from __future__ import annotations

 from pysmartthings import Attribute, Capability, Command, SmartThings

-from homeassistant.components.number import NumberEntity
+from homeassistant.components.number import NumberEntity, NumberMode
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

@@ -32,6 +32,7 @@ class SmartThingsWasherRinseCyclesNumberEntity(SmartThingsEntity, NumberEntity):

    _attr_translation_key = "washer_rinse_cycles"
    _attr_native_step = 1.0
+    _attr_mode = NumberMode.BOX

    def __init__(self, client: SmartThings, device: FullDevice) -> None:
        """Initialize the instance."""
@@ -5,7 +5,7 @@
        "title": "Define the API parameters for this installation",
        "data": {
          "name": "The name of this installation",
-          "site_id": "The SolarEdge site-id",
+          "site_id": "The SolarEdge site ID",
          "api_key": "[%key:common::config_flow::data::api_key%]"
        }
      }
@@ -14,7 +14,7 @@
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
      "site_not_active": "The site is not active",
-      "could_not_connect": "Could not connect to the solaredge API"
+      "could_not_connect": "Could not connect to the SolarEdge API"
    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
@@ -65,7 +65,7 @@
        "name": "Grid power"
      },
      "storage_power": {
-        "name": "Stored power"
+        "name": "Storage power"
      },
      "purchased_energy": {
        "name": "Imported energy"
@@ -22,10 +22,7 @@ from homeassistant.config_entries import (
 )
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.service_info.zeroconf import (
-    ATTR_PROPERTIES_ID,
-    ZeroconfServiceInfo,
-)
+from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo

 from .const import (
    CONF_FALLBACK,
@@ -164,12 +161,16 @@ class TadoConfigFlow(ConfigFlow, domain=DOMAIN):
        self, discovery_info: ZeroconfServiceInfo
    ) -> ConfigFlowResult:
        """Handle HomeKit discovery."""
-        self._async_abort_entries_match()
-        properties = {
-            key.lower(): value for key, value in discovery_info.properties.items()
-        }
-        await self.async_set_unique_id(properties[ATTR_PROPERTIES_ID])
-        self._abort_if_unique_id_configured()
+        await self._async_handle_discovery_without_unique_id()
+        return await self.async_step_homekit_confirm()
+
+    async def async_step_homekit_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Prepare for Homekit."""
+        if user_input is None:
+            return self.async_show_form(step_id="homekit_confirm")
+
        return await self.async_step_user()

    @staticmethod
@@ -16,6 +16,10 @@
        "title": "Authenticate with Tado",
        "description": "You need to reauthenticate with Tado. Press `Submit` to start the authentication process."
      },
+      "homekit": {
+        "title": "Authenticate with Tado",
+        "description": "Your device has been discovered and needs to authenticate with Tado. Press `Submit` to start the authentication process."
+      },
      "timeout": {
        "description": "The authentication process timed out. Please try again."
      }
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["aiowebdav2"],
  "quality_scale": "bronze",
-  "requirements": ["aiowebdav2==0.4.2"]
+  "requirements": ["aiowebdav2==0.4.3"]
 }
@@ -25,7 +25,7 @@ if TYPE_CHECKING:
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2025
 MINOR_VERSION: Final = 4
-PATCH_VERSION: Final = "0.dev0"
+PATCH_VERSION: Final = "0b5"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 13, 0)
@@ -759,17 +759,28 @@
      "config_flow": true,
      "iot_class": "local_push"
    },
-    "bosch_alarm": {
-      "name": "Bosch Alarm",
-      "integration_type": "device",
-      "config_flow": true,
-      "iot_class": "local_push"
-    },
-    "bosch_shc": {
-      "name": "Bosch SHC",
-      "integration_type": "hub",
-      "config_flow": true,
-      "iot_class": "local_push"
+    "bosch": {
+      "name": "Bosch",
+      "integrations": {
+        "bosch_alarm": {
+          "integration_type": "device",
+          "config_flow": true,
+          "iot_class": "local_push",
+          "name": "Bosch Alarm"
+        },
+        "bosch_shc": {
+          "integration_type": "hub",
+          "config_flow": true,
+          "iot_class": "local_push",
+          "name": "Bosch SHC"
+        },
+        "home_connect": {
+          "integration_type": "hub",
+          "config_flow": true,
+          "iot_class": "cloud_push",
+          "name": "Home Connect"
+        }
+      }
    },
    "brandt": {
      "name": "Brandt Smart Control",
@@ -2639,13 +2650,6 @@
      "config_flow": true,
      "iot_class": "local_polling"
    },
-    "home_connect": {
-      "name": "Home Connect",
-      "integration_type": "hub",
-      "config_flow": true,
-      "iot_class": "cloud_push",
-      "single_config_entry": true
-    },
    "home_plus_control": {
      "name": "Legrand Home+ Control",
      "integration_type": "virtual",
@@ -38,7 +38,7 @@ habluetooth==3.37.0
 hass-nabucasa==0.94.0
 hassil==2.2.3
 home-assistant-bluetooth==1.13.1
-home-assistant-frontend==20250326.0
+home-assistant-frontend==20250327.1
 home-assistant-intents==2025.3.24
 httpx==0.28.1
 ifaddr==0.2.0
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name        = "homeassistant"
-version     = "2025.4.0.dev0"
+version     = "2025.4.0b5"
 license     = "Apache-2.0"
 license-files = ["LICENSE*", "homeassistant/backports/LICENSE*"]
 description = "Open-source home automation platform running on Python 3."
@@ -422,7 +422,7 @@ aiowaqi==3.1.0
 aiowatttime==0.1.1

 # homeassistant.components.webdav
-aiowebdav2==0.4.2
+aiowebdav2==0.4.3

 # homeassistant.components.webostv
 aiowebostv==0.7.3
@@ -758,7 +758,7 @@ debugpy==1.8.13
 # decora==0.6

 # homeassistant.components.ecovacs
-deebot-client==12.3.1
+deebot-client==12.4.0

 # homeassistant.components.ihc
 # homeassistant.components.namecheapdns
@@ -1157,7 +1157,7 @@ hole==0.8.0
 holidays==0.69

 # homeassistant.components.frontend
-home-assistant-frontend==20250326.0
+home-assistant-frontend==20250327.1

 # homeassistant.components.conversation
 home-assistant-intents==2025.3.24
@@ -2430,7 +2430,7 @@ python-juicenet==1.1.0
 python-kasa[speedups]==0.10.2

 # homeassistant.components.linkplay
-python-linkplay==0.2.1
+python-linkplay==0.2.2

 # homeassistant.components.lirc
 # python-lirc==1.2.3
@@ -404,7 +404,7 @@ aiowaqi==3.1.0
 aiowatttime==0.1.1

 # homeassistant.components.webdav
-aiowebdav2==0.4.2
+aiowebdav2==0.4.3

 # homeassistant.components.webostv
 aiowebostv==0.7.3
@@ -649,7 +649,7 @@ dbus-fast==2.43.0
 debugpy==1.8.13

 # homeassistant.components.ecovacs
-deebot-client==12.3.1
+deebot-client==12.4.0

 # homeassistant.components.ihc
 # homeassistant.components.namecheapdns
@@ -984,7 +984,7 @@ hole==0.8.0
 holidays==0.69

 # homeassistant.components.frontend
-home-assistant-frontend==20250326.0
+home-assistant-frontend==20250327.1

 # homeassistant.components.conversation
 home-assistant-intents==2025.3.24
@@ -1967,7 +1967,7 @@ python-juicenet==1.1.0
 python-kasa[speedups]==0.10.2

 # homeassistant.components.linkplay
-python-linkplay==0.2.1
+python-linkplay==0.2.2

 # homeassistant.components.matter
 python-matter-server==7.0.0
@@ -22,6 +22,7 @@ from homeassistant.components.assist_satellite import (
    AssistSatelliteAnnouncement,
    SatelliteBusyError,
 )
+from homeassistant.components.assist_satellite.const import PREANNOUNCE_URL
 from homeassistant.components.assist_satellite.entity import AssistSatelliteState
 from homeassistant.components.media_source import PlayMedia
 from homeassistant.config_entries import ConfigEntry
@@ -185,7 +186,7 @@ async def test_new_pipeline_cancels_pipeline(
    ("service_data", "expected_params"),
    [
        (
-            {"message": "Hello"},
+            {"message": "Hello", "preannounce_media_id": None},
            AssistSatelliteAnnouncement(
                message="Hello",
                media_id="http://10.10.10.10:8123/api/tts_proxy/test-token",
@@ -198,6 +199,7 @@ async def test_new_pipeline_cancels_pipeline(
            {
                "message": "Hello",
                "media_id": "media-source://given",
+                "preannounce_media_id": None,
            },
            AssistSatelliteAnnouncement(
                message="Hello",
@@ -208,7 +210,7 @@ async def test_new_pipeline_cancels_pipeline(
            ),
        ),
        (
-            {"media_id": "http://example.com/bla.mp3"},
+            {"media_id": "http://example.com/bla.mp3", "preannounce_media_id": None},
            AssistSatelliteAnnouncement(
                message="",
                media_id="http://example.com/bla.mp3",
@@ -368,6 +370,24 @@ async def test_announce_cancels_pipeline(
        mock_async_announce.assert_called_once()


+async def test_announce_default_preannounce(
+    hass: HomeAssistant, init_components: ConfigEntry, entity: MockAssistSatellite
+) -> None:
+    """Test announcing on a device with the default preannouncement sound."""
+
+    async def async_announce(announcement):
+        assert announcement.preannounce_media_id.endswith(PREANNOUNCE_URL)
+
+    with patch.object(entity, "async_announce", new=async_announce):
+        await hass.services.async_call(
+            "assist_satellite",
+            "announce",
+            {"media_id": "test-media-id"},
+            target={"entity_id": "assist_satellite.test_entity"},
+            blocking=True,
+        )
+
+
 async def test_context_refresh(
    hass: HomeAssistant, init_components: ConfigEntry, entity: MockAssistSatellite
 ) -> None:
@@ -521,6 +541,7 @@ async def test_vad_sensitivity_entity_not_found(
            {
                "start_message": "Hello",
                "extra_system_prompt": "Better system prompt",
+                "preannounce_media_id": None,
            },
            (
                "mock-conversation-id",
@@ -538,6 +559,7 @@ async def test_vad_sensitivity_entity_not_found(
            {
                "start_message": "Hello",
                "start_media_id": "media-source://given",
+                "preannounce_media_id": None,
            },
            (
                "mock-conversation-id",
@@ -552,7 +574,10 @@ async def test_vad_sensitivity_entity_not_found(
            ),
        ),
        (
-            {"start_media_id": "http://example.com/given.mp3"},
+            {
+                "start_media_id": "http://example.com/given.mp3",
+                "preannounce_media_id": None,
+            },
            (
                "mock-conversation-id",
                None,
@@ -657,6 +682,32 @@ async def test_start_conversation_reject_builtin_agent(
        )


+async def test_start_conversation_default_preannounce(
+    hass: HomeAssistant, init_components: ConfigEntry, entity: MockAssistSatellite
+) -> None:
+    """Test starting a conversation on a device with the default preannouncement sound."""
+
+    async def async_start_conversation(start_announcement):
+        assert PREANNOUNCE_URL in start_announcement.preannounce_media_id
+
+    await async_update_pipeline(
+        hass,
+        async_get_pipeline(hass),
+        conversation_engine="conversation.some_llm",
+    )
+
+    with (
+        patch.object(entity, "async_start_conversation", new=async_start_conversation),
+    ):
+        await hass.services.async_call(
+            "assist_satellite",
+            "start_conversation",
+            {"start_media_id": "test-media-id"},
+            target={"entity_id": "assist_satellite.test_entity"},
+            blocking=True,
+        )
+
+
 async def test_wake_word_start_keeps_responding(
    hass: HomeAssistant, init_components: ConfigEntry, entity: MockAssistSatellite
 ) -> None:
@@ -5,9 +5,9 @@ from io import StringIO
 from typing import Any
 from unittest.mock import ANY, Mock, PropertyMock, patch

-from aiohttp import ClientError
+from aiohttp import ClientError, ClientResponseError
 from hass_nabucasa import CloudError
-from hass_nabucasa.api import CloudApiNonRetryableError
+from hass_nabucasa.api import CloudApiError, CloudApiNonRetryableError
 from hass_nabucasa.files import FilesError, StorageType
 import pytest

@@ -547,6 +547,120 @@ async def test_agents_upload_not_protected(
    assert stored_backup["failed_agent_ids"] == ["cloud.cloud"]


+@pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
+async def test_agents_upload_not_subscribed(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    hass_storage: dict[str, Any],
+    cloud: Mock,
+) -> None:
+    """Test upload backup when cloud user is not subscribed."""
+    cloud.subscription_expired = True
+    client = await hass_client()
+    backup_data = "test"
+    backup_id = "test-backup"
+    test_backup = AgentBackup(
+        addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
+        backup_id=backup_id,
+        database_included=True,
+        date="1970-01-01T00:00:00.000Z",
+        extra_metadata={},
+        folders=[Folder.MEDIA, Folder.SHARE],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0",
+        name="Test",
+        protected=True,
+        size=len(backup_data),
+    )
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[backup_data.encode(), b""])
+        fetch_backup.return_value = test_backup
+        resp = await client.post(
+            "/api/backup/upload?agent_id=cloud.cloud",
+            data={"file": StringIO(backup_data)},
+        )
+        await hass.async_block_till_done()
+
+    assert resp.status == 201
+    assert cloud.files.upload.call_count == 0
+    store_backups = hass_storage[BACKUP_DOMAIN]["data"]["backups"]
+    assert len(store_backups) == 1
+    stored_backup = store_backups[0]
+    assert stored_backup["backup_id"] == backup_id
+    assert stored_backup["failed_agent_ids"] == ["cloud.cloud"]
+
+
+@pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
+async def test_agents_upload_not_subscribed_midway(
+    hass: HomeAssistant,
+    hass_client: ClientSessionGenerator,
+    hass_storage: dict[str, Any],
+    cloud: Mock,
+) -> None:
+    """Test upload backup when cloud subscription expires during the call."""
+    client = await hass_client()
+    backup_data = "test"
+    backup_id = "test-backup"
+    test_backup = AgentBackup(
+        addons=[AddonInfo(name="Test", slug="test", version="1.0.0")],
+        backup_id=backup_id,
+        database_included=True,
+        date="1970-01-01T00:00:00.000Z",
+        extra_metadata={},
+        folders=[Folder.MEDIA, Folder.SHARE],
+        homeassistant_included=True,
+        homeassistant_version="2024.12.0",
+        name="Test",
+        protected=True,
+        size=len(backup_data),
+    )
+
+    async def mock_upload(*args: Any, **kwargs: Any) -> None:
+        """Mock file upload."""
+        cloud.subscription_expired = True
+        raise CloudApiError(
+            "Boom!", orig_exc=ClientResponseError(Mock(), Mock(), status=403)
+        )
+
+    cloud.files.upload.side_effect = mock_upload
+
+    with (
+        patch(
+            "homeassistant.components.backup.manager.BackupManager.async_get_backup",
+        ) as fetch_backup,
+        patch(
+            "homeassistant.components.backup.manager.read_backup",
+            return_value=test_backup,
+        ),
+        patch("pathlib.Path.open") as mocked_open,
+    ):
+        mocked_open.return_value.read = Mock(side_effect=[backup_data.encode(), b""])
+        fetch_backup.return_value = test_backup
+        resp = await client.post(
+            "/api/backup/upload?agent_id=cloud.cloud",
+            data={"file": StringIO(backup_data)},
+        )
+        await hass.async_block_till_done()
+
+    assert resp.status == 201
+    assert cloud.files.upload.call_count == 1
+    store_backups = hass_storage[BACKUP_DOMAIN]["data"]["backups"]
+    assert len(store_backups) == 1
+    stored_backup = store_backups[0]
+    assert stored_backup["backup_id"] == backup_id
+    assert stored_backup["failed_agent_ids"] == ["cloud.cloud"]
+
+
@pytest.mark.usefixtures("cloud_logged_in", "mock_list_files")
 async def test_agents_upload_wrong_size(
    hass: HomeAssistant,
@@ -1249,7 +1249,11 @@ async def test_announce_message(
            await hass.services.async_call(
                assist_satellite.DOMAIN,
                "announce",
-                {"entity_id": satellite.entity_id, "message": "test-text"},
+                {
+                    "entity_id": satellite.entity_id,
+                    "message": "test-text",
+                    "preannounce_media_id": None,
+                },
                blocking=True,
            )
            await done.wait()
@@ -1338,6 +1342,7 @@ async def test_announce_media_id(
                {
                    "entity_id": satellite.entity_id,
                    "media_id": "https://www.home-assistant.io/resolved.mp3",
+                    "preannounce_media_id": None,
                },
                blocking=True,
            )
@@ -1545,7 +1550,11 @@ async def test_start_conversation_message(
            await hass.services.async_call(
                assist_satellite.DOMAIN,
                "start_conversation",
-                {"entity_id": satellite.entity_id, "start_message": "test-text"},
+                {
+                    "entity_id": satellite.entity_id,
+                    "start_message": "test-text",
+                    "preannounce_media_id": None,
+                },
                blocking=True,
            )
            await done.wait()
@@ -1653,6 +1662,7 @@ async def test_start_conversation_media_id(
                {
                    "entity_id": satellite.entity_id,
                    "start_media_id": "https://www.home-assistant.io/resolved.mp3",
+                    "preannounce_media_id": None,
                },
                blocking=True,
            )
@@ -1,6 +1,7 @@
 """Tests for home_connect binary_sensor entities."""

 from collections.abc import Awaitable, Callable
+from http import HTTPStatus
 from unittest.mock import AsyncMock, MagicMock

 from aiohomeconnect.model import (
@@ -39,6 +40,7 @@ import homeassistant.helpers.issue_registry as ir
 from homeassistant.setup import async_setup_component

 from tests.common import MockConfigEntry
+from tests.typing import ClientSessionGenerator


@pytest.fixture
@@ -165,6 +167,7 @@ async def test_connected_devices(
    assert len(new_entity_entries) > len(entity_entries)


+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
 async def test_binary_sensors_entity_availability(
    hass: HomeAssistant,
@@ -219,6 +222,7 @@ async def test_binary_sensors_entity_availability(
        assert state.state != STATE_UNAVAILABLE


+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
@pytest.mark.parametrize("appliance", ["Washer"], indirect=True)
@pytest.mark.parametrize(
    ("value", "expected"),
@@ -402,7 +406,7 @@ async def test_connected_sensor_functionality(


@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_create_issue(
+async def test_create_door_binary_sensor_deprecation_issue(
    hass: HomeAssistant,
    config_entry: MockConfigEntry,
    integration_setup: Callable[[MagicMock], Awaitable[bool]],
@@ -410,7 +414,7 @@ async def test_create_issue(
    client: MagicMock,
    issue_registry: ir.IssueRegistry,
 ) -> None:
-    """Test we create an issue when an automation or script is using a deprecated entity."""
+    """Test that we create an issue when an automation or script is using a door binary sensor entity."""
    entity_id = "binary_sensor.washer_door"
    issue_id = f"deprecated_binary_common_door_sensor_{entity_id}"

@@ -464,3 +468,76 @@ async def test_create_issue(
    # Assert the issue is no longer present
    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
    assert len(issue_registry.issues) == 0
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+async def test_door_binary_sensor_deprecation_issue_fix(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    issue_registry: ir.IssueRegistry,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test that we create an issue when an automation or script is using a door binary sensor entity."""
+    entity_id = "binary_sensor.washer_door"
+    issue_id = f"deprecated_binary_common_door_sensor_{entity_id}"
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: {
+                "alias": "test",
+                "trigger": {"platform": "state", "entity_id": entity_id},
+                "action": {
+                    "action": "automation.turn_on",
+                    "target": {
+                        "entity_id": "automation.test",
+                    },
+                },
+            }
+        },
+    )
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
+        {
+            script.DOMAIN: {
+                "test": {
+                    "sequence": [
+                        {
+                            "condition": "state",
+                            "entity_id": entity_id,
+                            "state": "on",
+                        },
+                    ],
+                }
+            }
+        },
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
+    assert scripts_with_entity(hass, entity_id)[0] == "script.test"
+
+    assert len(issue_registry.issues) == 1
+    issue = issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert issue
+
+    _client = await hass_client()
+    resp = await _client.post(
+        "/api/repairs/issues/fix",
+        json={"handler": DOMAIN, "issue_id": issue.issue_id},
+    )
+    assert resp.status == HTTPStatus.OK
+    flow_id = (await resp.json())["flow_id"]
+    resp = await _client.post(f"/api/repairs/issues/fix/{flow_id}")
+
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert len(issue_registry.issues) == 0
@@ -1,6 +1,7 @@
 """Tests for home_connect sensor entities."""

 from collections.abc import Awaitable, Callable
+from http import HTTPStatus
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock

@@ -59,6 +60,7 @@ from homeassistant.helpers import (
 from homeassistant.setup import async_setup_component

 from tests.common import MockConfigEntry
+from tests.typing import ClientSessionGenerator


@pytest.fixture
@@ -209,6 +211,7 @@ async def test_connected_devices(
    assert len(new_entity_entries) > len(entity_entries)


+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
@pytest.mark.parametrize("appliance", ["Dishwasher"], indirect=True)
 async def test_switch_entity_availability(
    hass: HomeAssistant,
@@ -320,6 +323,7 @@ async def test_switch_functionality(
    assert hass.states.is_state(entity_id, state)


+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
@pytest.mark.parametrize(
    ("entity_id", "program_key", "initial_state", "appliance"),
    [
@@ -397,6 +401,7 @@ async def test_program_switch_functionality(
    client.stop_program.assert_awaited_once_with(appliance.ha_id)


+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
@pytest.mark.parametrize(
    (
        "entity_id",
@@ -801,18 +806,24 @@ async def test_power_switch_service_validation_errors(


@pytest.mark.usefixtures("entity_registry_enabled_by_default")
-async def test_create_issue(
+@pytest.mark.parametrize(
+    "service",
+    [SERVICE_TURN_ON, SERVICE_TURN_OFF],
+)
+async def test_create_program_switch_deprecation_issue(
    hass: HomeAssistant,
    appliance: HomeAppliance,
+    service: str,
    config_entry: MockConfigEntry,
    integration_setup: Callable[[MagicMock], Awaitable[bool]],
    setup_credentials: None,
    client: MagicMock,
    issue_registry: ir.IssueRegistry,
 ) -> None:
-    """Test we create an issue when an automation or script is using a deprecated entity."""
+    """Test that we create an issue when an automation or script is using a program switch entity or the entity is used by the user."""
    entity_id = "switch.washer_program_mix"
-    issue_id = f"deprecated_program_switch_{entity_id}"
+    automation_script_issue_id = f"deprecated_program_switch_{entity_id}"
+    action_handler_issue_id = f"deprecated_program_switch_{entity_id}"

    assert await async_setup_component(
        hass,
@@ -851,17 +862,118 @@ async def test_create_issue(
    assert await integration_setup(client)
    assert config_entry.state == ConfigEntryState.LOADED

+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        service,
+        {
+            ATTR_ENTITY_ID: entity_id,
+        },
+        blocking=True,
+    )
+
    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
    assert scripts_with_entity(hass, entity_id)[0] == "script.test"

-    assert len(issue_registry.issues) == 1
-    assert issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert len(issue_registry.issues) == 2
+    assert issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)

    await hass.config_entries.async_unload(config_entry.entry_id)
    await hass.async_block_till_done()

    # Assert the issue is no longer present
-    assert not issue_registry.async_get_issue(DOMAIN, issue_id)
+    assert not issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert not issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
+    assert len(issue_registry.issues) == 0
+
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default")
+@pytest.mark.parametrize(
+    "service",
+    [SERVICE_TURN_ON, SERVICE_TURN_OFF],
+)
+async def test_program_switch_deprecation_issue_fix(
+    hass: HomeAssistant,
+    appliance: HomeAppliance,
+    service: str,
+    config_entry: MockConfigEntry,
+    integration_setup: Callable[[MagicMock], Awaitable[bool]],
+    setup_credentials: None,
+    client: MagicMock,
+    issue_registry: ir.IssueRegistry,
+    hass_client: ClientSessionGenerator,
+) -> None:
+    """Test we can fix the issues created when a program switch entity is in an automation or in a script or when is used."""
+    entity_id = "switch.washer_program_mix"
+    automation_script_issue_id = f"deprecated_program_switch_{entity_id}"
+    action_handler_issue_id = f"deprecated_program_switch_{entity_id}"
+
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: {
+                "alias": "test",
+                "trigger": {"platform": "state", "entity_id": entity_id},
+                "action": {
+                    "action": "automation.turn_on",
+                    "target": {
+                        "entity_id": "automation.test",
+                    },
+                },
+            }
+        },
+    )
+    assert await async_setup_component(
+        hass,
+        script.DOMAIN,
+        {
+            script.DOMAIN: {
+                "test": {
+                    "sequence": [
+                        {
+                            "action": "switch.turn_on",
+                            "entity_id": entity_id,
+                        },
+                    ],
+                }
+            }
+        },
+    )
+
+    assert config_entry.state == ConfigEntryState.NOT_LOADED
+    assert await integration_setup(client)
+    assert config_entry.state == ConfigEntryState.LOADED
+
+    await hass.services.async_call(
+        SWITCH_DOMAIN,
+        service,
+        {
+            ATTR_ENTITY_ID: entity_id,
+        },
+        blocking=True,
+    )
+
+    assert automations_with_entity(hass, entity_id)[0] == "automation.test"
+    assert scripts_with_entity(hass, entity_id)[0] == "script.test"
+
+    assert len(issue_registry.issues) == 2
+    assert issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
+
+    for issue in issue_registry.issues.copy().values():
+        _client = await hass_client()
+        resp = await _client.post(
+            "/api/repairs/issues/fix",
+            json={"handler": DOMAIN, "issue_id": issue.issue_id},
+        )
+        assert resp.status == HTTPStatus.OK
+        flow_id = (await resp.json())["flow_id"]
+        resp = await _client.post(f"/api/repairs/issues/fix/{flow_id}")
+
+    # Assert the issue is no longer present
+    assert not issue_registry.async_get_issue(DOMAIN, automation_script_issue_id)
+    assert not issue_registry.async_get_issue(DOMAIN, action_handler_issue_id)
    assert len(issue_registry.issues) == 0


@@ -320,7 +320,7 @@ async def test_time_entity_error(

@pytest.mark.usefixtures("entity_registry_enabled_by_default")
@pytest.mark.parametrize("appliance", ["Oven"], indirect=True)
-async def test_create_issue(
+async def test_create_alarm_clock_deprecation_issue(
    hass: HomeAssistant,
    appliance: HomeAppliance,
    config_entry: MockConfigEntry,
@@ -329,7 +329,7 @@ async def test_create_issue(
    client: MagicMock,
    issue_registry: ir.IssueRegistry,
 ) -> None:
-    """Test we create an issue when an automation or script is using a deprecated entity."""
+    """Test that we create an issue when an automation or script is using a alarm clock time entity or the entity is used by the user."""
    entity_id = f"{TIME_DOMAIN}.oven_alarm_clock"
    automation_script_issue_id = (
        f"deprecated_time_alarm_clock_in_automations_scripts_{entity_id}"
@@ -401,7 +401,7 @@ async def test_create_issue(

@pytest.mark.usefixtures("entity_registry_enabled_by_default")
@pytest.mark.parametrize("appliance", ["Oven"], indirect=True)
-async def test_issue_fix(
+async def test_alarm_clock_deprecation_issue_fix(
    hass: HomeAssistant,
    appliance: HomeAppliance,
    config_entry: MockConfigEntry,
@@ -411,7 +411,7 @@ async def test_issue_fix(
    issue_registry: ir.IssueRegistry,
    hass_client: ClientSessionGenerator,
 ) -> None:
-    """Test we create an issue when an automation or script is using a deprecated entity."""
+    """Test we can fix the issues created when a alarm clock time entity is in an automation or in a script or when is used."""
    entity_id = f"{TIME_DOMAIN}.oven_alarm_clock"
    automation_script_issue_id = (
        f"deprecated_time_alarm_clock_in_automations_scripts_{entity_id}"
@@ -110,6 +110,18 @@ async def test_work_area_sensor(
    state = hass.states.get("sensor.test_mower_1_work_area")
    assert state.state == "my_lawn"

+    # Test EPOS mower, which returns work_area_id = 0, when no
+    # work area is active and has no default work_area_id=0
+    values[TEST_MOWER_ID].mower.work_area_id = 0
+    del values[TEST_MOWER_ID].work_areas[0]
+    del values[TEST_MOWER_ID].work_area_dict[0]
+    mock_automower_client.get_status.return_value = values
+    freezer.tick(SCAN_INTERVAL)
+    async_fire_time_changed(hass)
+    await hass.async_block_till_done()
+    state = hass.states.get("sensor.test_mower_1_work_area")
+    assert state.state == "no_work_area_active"
+

@pytest.mark.usefixtures("entity_registry_enabled_by_default")
@pytest.mark.parametrize(
@@ -2908,6 +2908,10 @@ async def test_subentry_configflow(
        iter(config_subentries_data["components"].values())
    )

+    subentry_device_data = next(iter(config_entry.subentries.values())).data["device"]
+    for option, value in mock_device_user_input.items():
+        assert subentry_device_data[option] == value
+
    await hass.async_block_till_done()


@@ -13,6 +13,7 @@
      'download': True,
      'free_space': 99999999999,
      'pause': False,
+      'proxy': None,
      'queue': 6,
      'reconnect': False,
      'speed': 5405963.0,
@@ -45,6 +45,35 @@ async def test_form_import_ics(hass: HomeAssistant, ics_content: str) -> None:
    }


+@respx.mock
+async def test_form_import_webcal(hass: HomeAssistant, ics_content: str) -> None:
+    """Test we get the import form."""
+    respx.get(CALENDER_URL).mock(
+        return_value=Response(
+            status_code=200,
+            text=ics_content,
+        )
+    )
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_CALENDAR_NAME: CALENDAR_NAME,
+            CONF_URL: "webcal://some.calendar.com/calendar.ics",
+        },
+    )
+    assert result2["type"] is FlowResultType.CREATE_ENTRY
+    assert result2["title"] == CALENDAR_NAME
+    assert result2["data"] == {
+        CONF_CALENDAR_NAME: CALENDAR_NAME,
+        CONF_URL: CALENDER_URL,
+    }
+
+
@pytest.mark.parametrize(
    ("side_effect"),
    [
@@ -7,7 +7,7 @@
    'capabilities': dict({
      'max': 5,
      'min': 0,
-      'mode': <NumberMode.AUTO: 'auto'>,
+      'mode': <NumberMode.BOX: 'box'>,
      'step': 1.0,
    }),
    'config_entry_id': <ANY>,
@@ -44,7 +44,7 @@
      'friendly_name': 'Washer Rinse cycles',
      'max': 5,
      'min': 0,
-      'mode': <NumberMode.AUTO: 'auto'>,
+      'mode': <NumberMode.BOX: 'box'>,
      'step': 1.0,
      'unit_of_measurement': 'cycles',
    }),
@@ -64,7 +64,7 @@
    'capabilities': dict({
      'max': 5,
      'min': 0,
-      'mode': <NumberMode.AUTO: 'auto'>,
+      'mode': <NumberMode.BOX: 'box'>,
      'step': 1.0,
    }),
    'config_entry_id': <ANY>,
@@ -101,7 +101,7 @@
      'friendly_name': 'Washing Machine Rinse cycles',
      'max': 5,
      'min': 0,
-      'mode': <NumberMode.AUTO: 'auto'>,
+      'mode': <NumberMode.BOX: 'box'>,
      'step': 1.0,
      'unit_of_measurement': 'cycles',
    }),
@@ -529,12 +529,28 @@ async def test_entity_unique_id_migration(
            "microwave_machine_state",
            "2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_machineState_machineState",
        ),
+        (
+            "da_ks_microwave_0101x",
+            SENSOR_DOMAIN,
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a.ovenJobState",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a.completionTime",
+            "microwave_completion_time",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_ks_microwave_0101x",
+            SENSOR_DOMAIN,
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_ovenJobState_ovenJobState",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a.completionTime",
+            "microwave_completion_time",
+            "2bad3237-4886-e699-1b90-4a51a3d55c8a_main_ovenOperatingState_completionTime_completionTime",
+        ),
        (
            "da_wm_dw_000001",
            SENSOR_DOMAIN,
            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.dishwasherJobState",
            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.machineState",
-            "microwave_machine_state",
+            "dishwasher_machine_state",
            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_machineState_machineState",
        ),
        (
@@ -542,9 +558,25 @@ async def test_entity_unique_id_migration(
            SENSOR_DOMAIN,
            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_dishwasherJobState_dishwasherJobState",
            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.machineState",
-            "microwave_machine_state",
+            "dishwasher_machine_state",
            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_machineState_machineState",
        ),
+        (
+            "da_wm_dw_000001",
+            SENSOR_DOMAIN,
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.dishwasherJobState",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.completionTime",
+            "dishwasher_completion_time",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_wm_dw_000001",
+            SENSOR_DOMAIN,
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_dishwasherJobState_dishwasherJobState",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676.completionTime",
+            "dishwasher_completion_time",
+            "f36dc7ce-cac0-0667-dc14-a3704eb5e676_main_dishwasherOperatingState_completionTime_completionTime",
+        ),
        (
            "da_wm_wd_000001",
            SENSOR_DOMAIN,
@@ -561,6 +593,22 @@ async def test_entity_unique_id_migration(
            "dryer_machine_state",
            "02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_machineState_machineState",
        ),
+        (
+            "da_wm_wd_000001",
+            SENSOR_DOMAIN,
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b.dryerJobState",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b.completionTime",
+            "dryer_completion_time",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_wm_wd_000001",
+            SENSOR_DOMAIN,
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_dryerJobState_dryerJobState",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b.completionTime",
+            "dryer_completion_time",
+            "02f7256e-8353-5bdd-547f-bd5b1647e01b_main_dryerOperatingState_completionTime_completionTime",
+        ),
        (
            "da_wm_wm_000001",
            SENSOR_DOMAIN,
@@ -577,6 +625,22 @@ async def test_entity_unique_id_migration(
            "washer_machine_state",
            "f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_machineState_machineState",
        ),
+        (
+            "da_wm_wm_000001",
+            SENSOR_DOMAIN,
+            "f984b91d-f250-9d42-3436-33f09a422a47.washerJobState",
+            "f984b91d-f250-9d42-3436-33f09a422a47.completionTime",
+            "washer_completion_time",
+            "f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_completionTime_completionTime",
+        ),
+        (
+            "da_wm_wm_000001",
+            SENSOR_DOMAIN,
+            "f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_washerJobState_washerJobState",
+            "f984b91d-f250-9d42-3436-33f09a422a47.completionTime",
+            "washer_completion_time",
+            "f984b91d-f250-9d42-3436-33f09a422a47_main_washerOperatingState_completionTime_completionTime",
+        ),
    ],
 )
 async def test_entity_unique_id_migration_machine_state(
@@ -234,13 +234,19 @@ async def test_homekit(hass: HomeAssistant, mock_tado_api: MagicMock) -> None:
            type="mock_type",
        ),
    )
-    assert result["type"] is FlowResultType.SHOW_PROGRESS_DONE
-    flow = next(
-        flow
-        for flow in hass.config_entries.flow.async_progress()
-        if flow["flow_id"] == result["flow_id"]
-    )
-    assert flow["context"]["unique_id"] == "AA:BB:CC:DD:EE:FF"
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "homekit_confirm"
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["result"].unique_id == "1"
+
+
+async def test_homekit_already_setup(
+    hass: HomeAssistant, mock_tado_api: MagicMock
+) -> None:
+    """Test that we abort from homekit if tado is already setup."""

    entry = MockConfigEntry(
        domain=DOMAIN, data={CONF_USERNAME: "mock", CONF_PASSWORD: "mock"}
@@ -261,3 +267,4 @@ async def test_homekit(hass: HomeAssistant, mock_tado_api: MagicMock) -> None:
        ),
    )
    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "already_configured"
@@ -252,8 +252,8 @@ async def test_setup_after_deps_all_present(hass: HomeAssistant) -> None:


@pytest.mark.parametrize("load_registries", [False])
-async def test_setup_after_deps_in_stage_1(hass: HomeAssistant) -> None:
-    """Test after_dependencies are promoted in stage 1."""
+async def test_setup_after_deps_in_stage_1_ignored(hass: HomeAssistant) -> None:
+    """Test after_dependencies are ignored in stage 1."""
    # This test relies on this
    assert "cloud" in bootstrap.STAGE_1_INTEGRATIONS
    order = []
@@ -295,7 +295,7 @@ async def test_setup_after_deps_in_stage_1(hass: HomeAssistant) -> None:

    assert "normal_integration" in hass.config.components
    assert "cloud" in hass.config.components
-    assert order == ["an_after_dep", "normal_integration", "cloud"]
+    assert order == ["cloud", "an_after_dep", "normal_integration"]


@pytest.mark.parametrize("load_registries", [False])
@@ -304,7 +304,7 @@ async def test_setup_after_deps_manifests_are_loaded_even_if_not_setup(
 ) -> None:
    """Ensure we preload manifests for after deps even if they are not setup.

-    It's important that we preload the after dep manifests even if they are not setup
+    Its important that we preload the after dep manifests even if they are not setup
    since we will always have to check their requirements since any integration
    that lists an after dep may import it and we have to ensure requirements are
    up to date before the after dep can be imported.
@@ -371,7 +371,7 @@ async def test_setup_after_deps_manifests_are_loaded_even_if_not_setup(
    assert "an_after_dep" not in hass.config.components
    assert "an_after_dep_of_after_dep" not in hass.config.components
    assert "an_after_dep_of_after_dep_of_after_dep" not in hass.config.components
-    assert order == ["normal_integration", "cloud"]
+    assert order == ["cloud", "normal_integration"]
    assert loader.async_get_loaded_integration(hass, "an_after_dep") is not None
    assert (
        loader.async_get_loaded_integration(hass, "an_after_dep_of_after_dep")
@@ -456,9 +456,9 @@ async def test_setup_frontend_before_recorder(hass: HomeAssistant) -> None:

    assert order == [
        "http",
-        "an_after_dep",
        "frontend",
        "recorder",
+        "an_after_dep",
        "normal_integration",
    ]

@@ -1577,10 +1577,8 @@ async def test_no_base_platforms_loaded_before_recorder(hass: HomeAssistant) ->
        assert not isinstance(integrations_or_excs, Exception)
        integrations[domain] = integration

-    integrations_all_dependencies = (
-        await loader.resolve_integrations_after_dependencies(
-            hass, integrations.values(), ignore_exceptions=True
-        )
+    integrations_all_dependencies = await loader.resolve_integrations_dependencies(
+        hass, integrations.values()
    )
    all_integrations = integrations.copy()
    all_integrations.update(
Author	SHA1	Message	Date
Franck Nijhof	4f3e8e9b94	Bump version to 2025.4.0b5	2025-03-27 20:03:14 +00:00
Paul Bottein	46c1cbbc9c	Update frontend to 20250327.1 (#141596 )	2025-03-27 20:03:01 +00:00
Simon Lamon	8d9a4ea278	Fix typing error in NMBS (#141589 ) Fix typing error	2025-03-27 20:02:58 +00:00
Jan-Philipp Benecke	22c83e2393	Bump aiowebdav2 to 0.4.3 (#141586 )	2025-03-27 20:02:55 +00:00
Joost Lekkerkerker	c83a75f6f9	Add brand for Bosch (#141561 )	2025-03-27 20:02:51 +00:00
Franck Nijhof	841c727112	Bump version to 2025.4.0b4	2025-03-27 16:59:36 +00:00
Bram Kragten	d8c9655bfd	Update frontend to 20250327.0 (#141585 )	2025-03-27 16:59:29 +00:00
Erik Montnemery	942ed89cc4	Revert "Promote after dependencies in bootstrap" (#141584 ) Revert "Promote after dependencies in bootstrap (#140352)" This reverts commit `3766040960`.	2025-03-27 16:59:25 +00:00
Franck Nijhof	a1fe6b9cf3	Bump version to 2025.4.0b3	2025-03-27 15:38:31 +00:00
Luke Lashley	2567181cc2	Better handle Roborock discovery (#141575 )	2025-03-27 15:38:24 +00:00
Joost Lekkerkerker	028e4f6029	Also migrate completion time entities in SmartThings (#141572 )	2025-03-27 15:38:21 +00:00
Martin Hjelmare	b82e1a9bef	Handle cloud subscription expired for backup upload (#141564 ) Handle cloud backup subscription expired for upload	2025-03-27 15:38:18 +00:00
Joost Lekkerkerker	438f226c31	Add icons to hue effects (#141559 )	2025-03-27 15:38:15 +00:00
Erwin Douna	2f139e3cb1	Tado fix HomeKit flow (#141525 ) * Initial commit * Fix * Fix --------- Co-authored-by: Joostlek <joostlek@outlook.com>	2025-03-27 15:38:07 +00:00
Franck Nijhof	5d75e96fbf	Bump version to 2025.4.0b2	2025-03-27 10:19:35 +00:00
Norbert Rittel	dcf2ec5c37	Fix sentence-casing in `konnected` strings, replace "override" with "custom" (#141553 ) Fix sentence-casing in `konnected`strings, replace "Override" with "Custom" Make string consistent with HA standards. As "Override" can be misunderstood as the verb, replace it with "Custom".	2025-03-27 10:19:22 +00:00
Simon Lamon	2431e1ba98	Bump linkplay to v0.2.2 (#141542 ) Bump linkplay	2025-03-27 10:19:18 +00:00
Thomas55555	4ead108c15	Handle webcal prefix in remote calendar (#141541 ) Handel webcal prefix in remote calendar	2025-03-27 10:19:14 +00:00
Michael Hansen	ec8363fa49	Add default preannounce sound to Assist satellites (#141522 ) * Add default preannounce sound * Allow None to disable sound * Register static path instead of HTTP view * Fix path --------- Co-authored-by: Paulus Schoutsen <balloob@gmail.com>	2025-03-27 10:19:09 +00:00
J. Diego Rodríguez Royo	e7ff0a3f8b	Improve some Home Connect deprecations (#141508 )	2025-03-27 10:19:06 +00:00
Ivan Lopez Hernandez	f4c0eb4189	Initialize google.genai.Client in the executor (#141432 ) * Intialize the client on an executor thread * Fix MyPy error * MyPy error * Exception error * Fix ruff * Update __init__.py --------- Co-authored-by: tronikos <tronikos@users.noreply.github.com>	2025-03-27 10:19:02 +00:00
Manu	b1ee5a76e1	Support for upcoming pyLoad-ng release in pyLoad integration (#141297 ) Fix extra key `proxy` in pyLoad	2025-03-27 10:18:58 +00:00
Norbert Rittel	6b9e8c301b	Fix wrong friendly name for `storage_power` in `solaredge` (#141269 ) * Fix wrong friendly name for `storage_power` in `solaredge` "Stored power" is a contradiction in itself. You can only store energy. * Two additional spelling fixes * Sentence-case "site"	2025-03-27 10:18:53 +00:00
Franck Nijhof	89c3266c7e	Bump version to 2025.4.0b1	2025-03-26 23:21:26 +00:00
Jan Bouwhuis	cff0a632e8	Fix QoS schema issue in MQTT subentries (#141531 )	2025-03-26 23:21:17 +00:00
Jan Bouwhuis	e04d8557ae	Fix MQTT options flow QoS selector can not serialize (#141528 )	2025-03-26 23:21:14 +00:00
Thomas55555	ca6286f241	Fix work area sensor for Husqvarna Automower (#141527 ) * Fix work area sensor for Husqvarna Automower * simplify	2025-03-26 23:21:10 +00:00
Robert Resch	35bcc9d5af	Show box for Smartthings rise number entity (#141526 )	2025-03-26 23:21:07 +00:00
Joost Lekkerkerker	25b45ce867	Sort SmartThings devices to be created by parent device id (#141515 )	2025-03-26 23:21:03 +00:00
Robert Resch	d568209bd5	Bump deebot-client to 12.4.0 (#141501 )	2025-03-26 23:21:00 +00:00
Simone Chemelli	8a43e8af9e	Fix refresh state for Comelit alarm (#141370 )	2025-03-26 23:20:56 +00:00
Franck Nijhof	785e5b2c16	Bump version to 2025.4.0b0	2025-03-26 17:41:03 +00:00