[pull] dev from home-assistant:dev

.github/workflows/ci.yaml

@@ -736,7 +736,7 @@ jobs:
           apt-cache-version: ${{ env.APT_CACHE_VERSION }}
       - name: Restore pytest test counts cache
         id: cache-pytest-counts
-        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: pytest_test_counts.json
           # Primary key is a sentinel; restore-keys pick the most recent
@@ -769,7 +769,7 @@ jobs:
             steps.cache-pytest-counts.outputs.cache-matched-key,
             steps.cache-pytest-counts-hash.outputs.hash
           )
-        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: pytest_test_counts.json
           key: >-

.github/workflows/codeql.yml

@@ -28,7 +28,7 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@e0647621c2984b5ed2f768cb892365bf2a616ad1 # v4.37.2
+        uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
         with:
           languages: python
 

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.10.0", "home-assistant-intents==2026.6.24"]
+  "requirements": ["hassil==3.10.0", "home-assistant-intents==2026.7.30"]
 }

homeassistant/components/ecovacs/__init__.py

@@ -3,14 +3,15 @@
 from sucks import VacBot
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
+from homeassistant.const import CONF_DEVICE_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN
+from .const import CONF_OVERRIDE_REST_URL, DOMAIN
 from .controller import EcovacsController
 from .services import async_setup_services
+from .util import get_client_device_id
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -61,3 +62,18 @@ async def _async_wait_connect(device: VacBot) -> None:
 async def async_unload_entry(hass: HomeAssistant, entry: EcovacsConfigEntry) -> bool:
     """Unload config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def async_migrate_entry(hass: HomeAssistant, entry: EcovacsConfigEntry) -> bool:
+    """Migrate an old entry."""
+    if entry.version == 1 and entry.minor_version < 2:
+        # Persist the client device ID, which was generated on every start before
+        rest_url = entry.data.get(CONF_OVERRIDE_REST_URL)
+        device_id = get_client_device_id(hass, rest_url is not None, entry.data)
+        hass.config_entries.async_update_entry(
+            entry,
+            data=entry.data | {CONF_DEVICE_ID: device_id},
+            minor_version=2,
+        )
+
+    return True