Bump version to 2026.2.0b1

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.github/workflows/builder.yml

@@ -10,12 +10,12 @@ on:
 
 env:
   BUILD_TYPE: core
-  DEFAULT_PYTHON: "3.14.2"
+  DEFAULT_PYTHON: "3.13"
   PIP_TIMEOUT: 60
   UV_HTTP_TIMEOUT: 60
   UV_SYSTEM_PYTHON: "true"
   # Base image version from https://github.com/home-assistant/docker
-  BASE_IMAGE_VERSION: "2026.01.0"
+  BASE_IMAGE_VERSION: "2025.12.0"
   ARCHITECTURES: '["amd64", "aarch64"]'
 
 jobs:
@@ -100,7 +100,7 @@ jobs:
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@5c98f0b039f36ef966fdb7dfa9779262785ecb05 # v14
+        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/frontend
@@ -111,7 +111,7 @@ jobs:
 
       - name: Download nightly wheels of intents
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@5c98f0b039f36ef966fdb7dfa9779262785ecb05 # v14
+        uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392 # v12
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: OHF-Voice/intents-package
@@ -184,7 +184,7 @@ jobs:
           echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -287,7 +287,7 @@ jobs:
           fi
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -358,13 +358,13 @@ jobs:
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -522,7 +522,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

.github/workflows/ci.yaml

@@ -40,9 +40,9 @@ env:
   CACHE_VERSION: 2
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.3"
-  DEFAULT_PYTHON: "3.14.2"
-  ALL_PYTHON_VERSIONS: "['3.14.2']"
+  HA_SHORT_VERSION: "2026.2"
+  DEFAULT_PYTHON: "3.13.11"
+  ALL_PYTHON_VERSIONS: "['3.13.11', '3.14.2']"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
   # 10.6 is the current long-term-support
@@ -310,7 +310,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 actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        uses: &actions-cache actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: venv
           key: &key-python-venv >-
@@ -374,7 +374,7 @@ jobs:
           fi
       - name: Save apt cache
         if: steps.cache-apt-check.outputs.cache-hit != 'true'
-        uses: &actions-cache-save actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        uses: &actions-cache-save actions/cache/save@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: *path-apt-cache
           key: *key-apt-cache
@@ -425,7 +425,7 @@ jobs:
     steps:
       - &cache-restore-apt
         name: Restore apt cache
-        uses: &actions-cache-restore actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        uses: &actions-cache-restore actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: *path-apt-cache
           fail-on-cache-miss: true

.github/workflows/translations.yml

@@ -10,7 +10,7 @@ on:
       - "**strings.json"
 
 env:
-  DEFAULT_PYTHON: "3.14.2"
+  DEFAULT_PYTHON: "3.13"
 
 jobs:
   upload:

.github/workflows/wheels.yml

@@ -17,7 +17,7 @@ on:
       - "script/gen_requirements_all.py"
 
 env:
-  DEFAULT_PYTHON: "3.14.2"
+  DEFAULT_PYTHON: "3.13"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name}}

.python-version

@@ -1 +1 @@
-3.14
+3.13

.strict-typing

@@ -389,7 +389,6 @@ homeassistant.components.onkyo.*
 homeassistant.components.open_meteo.*
 homeassistant.components.open_router.*
 homeassistant.components.openai_conversation.*
-homeassistant.components.openevse.*
 homeassistant.components.openexchangerates.*
 homeassistant.components.opensky.*
 homeassistant.components.openuv.*

CODEOWNERS

@@ -921,8 +921,6 @@ build.json @home-assistant/supervisor
 /tests/components/libre_hardware_monitor/ @Sab44
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
-/homeassistant/components/liebherr/ @mettolen
-/tests/components/liebherr/ @mettolen
 /homeassistant/components/lifx/ @Djelibeybi
 /tests/components/lifx/ @Djelibeybi
 /homeassistant/components/light/ @home-assistant/core
@@ -1880,8 +1878,6 @@ build.json @home-assistant/supervisor
 /tests/components/worldclock/ @fabaff
 /homeassistant/components/ws66i/ @ssaenger
 /tests/components/ws66i/ @ssaenger
-/homeassistant/components/wsdot/ @ucodery
-/tests/components/wsdot/ @ucodery
 /homeassistant/components/wyoming/ @synesthesiam
 /tests/components/wyoming/ @synesthesiam
 /homeassistant/components/xbox/ @hunterjm @tr4nt0r

Dockerfile.dev

@@ -52,9 +52,6 @@ RUN --mount=type=bind,source=requirements.txt,target=requirements.txt \
     --mount=type=bind,source=requirements_test_pre_commit.txt,target=requirements_test_pre_commit.txt \
     uv pip install -r requirements.txt -r requirements_test.txt
 
-# Claude Code native install
-RUN curl -fsSL https://claude.ai/install.sh | bash
-
 WORKDIR /workspaces
 
 # Set the default shell to bash instead of sh

homeassistant/components/agent_dvr/__init__.py

@@ -7,12 +7,10 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.typing import ConfigType
 
 from .const import DOMAIN, SERVER_URL
-from .services import async_setup_services
 
 ATTRIBUTION = "ispyconnect.com"
 DEFAULT_BRAND = "Agent DVR by ispyconnect.com"
@@ -21,14 +19,6 @@ PLATFORMS = [Platform.ALARM_CONTROL_PANEL, Platform.CAMERA]
 
 AgentDVRConfigEntry = ConfigEntry[Agent]
 
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the component."""
-    async_setup_services(hass)
-    return True
-
 
 async def async_setup_entry(
     hass: HomeAssistant, config_entry: AgentDVRConfigEntry

homeassistant/components/agent_dvr/camera.py

@@ -9,7 +9,10 @@ from homeassistant.components.camera import CameraEntityFeature
 from homeassistant.components.mjpeg import MjpegCamera, filter_urllib3_logging
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    async_get_current_platform,
+)
 
 from . import AgentDVRConfigEntry
 from .const import ATTRIBUTION, CAMERA_SCAN_INTERVAL_SECS, DOMAIN
@@ -18,6 +21,20 @@ SCAN_INTERVAL = timedelta(seconds=CAMERA_SCAN_INTERVAL_SECS)
 
 _LOGGER = logging.getLogger(__name__)
 
+_DEV_EN_ALT = "enable_alerts"
+_DEV_DS_ALT = "disable_alerts"
+_DEV_EN_REC = "start_recording"
+_DEV_DS_REC = "stop_recording"
+_DEV_SNAP = "snapshot"
+
+CAMERA_SERVICES = {
+    _DEV_EN_ALT: "async_enable_alerts",
+    _DEV_DS_ALT: "async_disable_alerts",
+    _DEV_EN_REC: "async_start_recording",
+    _DEV_DS_REC: "async_stop_recording",
+    _DEV_SNAP: "async_snapshot",
+}
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -40,6 +57,10 @@ async def async_setup_entry(
 
     async_add_entities(cameras)
 
+    platform = async_get_current_platform()
+    for service, method in CAMERA_SERVICES.items():
+        platform.async_register_entity_service(service, None, method)
+
 
 class AgentCamera(MjpegCamera):
     """Representation of an Agent Device Stream."""

homeassistant/components/agent_dvr/services.py

@@ -1,38 +0,0 @@
-"""Services for Agent DVR."""
-
-from __future__ import annotations
-
-from homeassistant.components.camera import DOMAIN as CAMERA_DOMAIN
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import service
-
-from .const import DOMAIN
-
-_DEV_EN_ALT = "enable_alerts"
-_DEV_DS_ALT = "disable_alerts"
-_DEV_EN_REC = "start_recording"
-_DEV_DS_REC = "stop_recording"
-_DEV_SNAP = "snapshot"
-
-CAMERA_SERVICES = {
-    _DEV_EN_ALT: "async_enable_alerts",
-    _DEV_DS_ALT: "async_disable_alerts",
-    _DEV_EN_REC: "async_start_recording",
-    _DEV_DS_REC: "async_stop_recording",
-    _DEV_SNAP: "async_snapshot",
-}
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Home Assistant services."""
-
-    for service_name, method in CAMERA_SERVICES.items():
-        service.async_register_platform_entity_service(
-            hass,
-            DOMAIN,
-            service_name,
-            entity_domain=CAMERA_DOMAIN,
-            schema=None,
-            func=method,
-        )

homeassistant/components/alarmdecoder/__init__.py

@@ -18,15 +18,12 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.event import async_call_later
-from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     CONF_DEVICE_BAUD,
     CONF_DEVICE_PATH,
-    DOMAIN,
     PROTOCOL_SERIAL,
     PROTOCOL_SOCKET,
     SIGNAL_PANEL_MESSAGE,
@@ -35,11 +32,9 @@ from .const import (
     SIGNAL_ZONE_FAULT,
     SIGNAL_ZONE_RESTORE,
 )
-from .services import async_setup_services
 
 _LOGGER = logging.getLogger(__name__)
 
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 PLATFORMS = [
     Platform.ALARM_CONTROL_PANEL,
     Platform.BINARY_SENSOR,
@@ -59,12 +54,6 @@ class AlarmDecoderData:
     restart: bool
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the component."""
-    async_setup_services(hass)
-    return True
-
-
 async def async_setup_entry(
     hass: HomeAssistant, entry: AlarmDecoderConfigEntry
 ) -> bool:

homeassistant/components/alarmdecoder/alarm_control_panel.py

@@ -2,13 +2,17 @@
 
 from __future__ import annotations
 
+import voluptuous as vol
+
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
     AlarmControlPanelState,
     CodeFormat,
 )
+from homeassistant.const import ATTR_CODE
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
@@ -23,6 +27,11 @@ from .const import (
 )
 from .entity import AlarmDecoderEntity
 
+SERVICE_ALARM_TOGGLE_CHIME = "alarm_toggle_chime"
+
+SERVICE_ALARM_KEYPRESS = "alarm_keypress"
+ATTR_KEYPRESS = "keypress"
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -41,6 +50,23 @@ async def async_setup_entry(
     )
     async_add_entities([entity])
 
+    platform = entity_platform.async_get_current_platform()
+    platform.async_register_entity_service(
+        SERVICE_ALARM_TOGGLE_CHIME,
+        {
+            vol.Required(ATTR_CODE): cv.string,
+        },
+        "alarm_toggle_chime",
+    )
+
+    platform.async_register_entity_service(
+        SERVICE_ALARM_KEYPRESS,
+        {
+            vol.Required(ATTR_KEYPRESS): cv.string,
+        },
+        "alarm_keypress",
+    )
+
 
 class AlarmDecoderAlarmPanel(AlarmDecoderEntity, AlarmControlPanelEntity):
     """Representation of an AlarmDecoder-based alarm panel."""

homeassistant/components/alarmdecoder/services.py

@@ -1,46 +0,0 @@
-"""Support for AlarmDecoder-based alarm control panels (Honeywell/DSC)."""
-
-from __future__ import annotations
-
-import voluptuous as vol
-
-from homeassistant.components.alarm_control_panel import (
-    DOMAIN as ALARM_CONTROL_PANEL_DOMAIN,
-)
-from homeassistant.const import ATTR_CODE
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, service
-
-from .const import DOMAIN
-
-SERVICE_ALARM_TOGGLE_CHIME = "alarm_toggle_chime"
-
-SERVICE_ALARM_KEYPRESS = "alarm_keypress"
-ATTR_KEYPRESS = "keypress"
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Home Assistant services."""
-
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_ALARM_TOGGLE_CHIME,
-        entity_domain=ALARM_CONTROL_PANEL_DOMAIN,
-        schema={
-            vol.Required(ATTR_CODE): cv.string,
-        },
-        func="alarm_toggle_chime",
-    )
-
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_ALARM_KEYPRESS,
-        entity_domain=ALARM_CONTROL_PANEL_DOMAIN,
-        schema={
-            vol.Required(ATTR_KEYPRESS): cv.string,
-        },
-        func="alarm_keypress",
-    )

homeassistant/components/analytics/manifest.json

@@ -10,7 +10,6 @@
   "preview_features": {
     "snapshots": {
       "feedback_url": "https://forms.gle/GqvRmgmghSDco8M46",
-      "learn_more_url": "https://www.home-assistant.io/blog/2026/02/02/about-device-database/",
       "report_issue_url": "https://github.com/OHF-Device-Database/device-database/issues/new"
     }
   },

homeassistant/components/anthropic/entity.py

@@ -600,16 +600,6 @@ class AnthropicBaseLLMEntity(Entity):
         system = chat_log.content[0]
         if not isinstance(system, conversation.SystemContent):
             raise TypeError("First message must be a system message")
-
-        # System prompt with caching enabled
-        system_prompt: list[TextBlockParam] = [
-            TextBlockParam(
-                type="text",
-                text=system.content,
-                cache_control={"type": "ephemeral"},
-            )
-        ]
-
         messages = _convert_content(chat_log.content[1:])
 
         model = options.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL])
@@ -618,7 +608,7 @@ class AnthropicBaseLLMEntity(Entity):
             model=model,
             messages=messages,
             max_tokens=options.get(CONF_MAX_TOKENS, DEFAULT[CONF_MAX_TOKENS]),
-            system=system_prompt,
+            system=system.content,
             stream=True,
         )
 
@@ -705,6 +695,10 @@ class AnthropicBaseLLMEntity(Entity):
                     type="auto",
                 )
 
+                if isinstance(model_args["system"], str):
+                    model_args["system"] = [
+                        TextBlockParam(type="text", text=model_args["system"])
+                    ]
                 model_args["system"].append(  # type: ignore[union-attr]
                     TextBlockParam(
                         type="text",

homeassistant/components/apcupsd/sensor.py

@@ -540,17 +540,7 @@ class APCUPSdSensor(APCUPSdEntity, SensorEntity):
         data = self.coordinator.data[key]
 
         if self.entity_description.device_class == SensorDeviceClass.TIMESTAMP:
-            # The date could be "N/A" for certain fields (e.g., XOFFBATT), indicating there is no value yet.
-            if data == "N/A":
-                self._attr_native_value = None
-                return
-
-            try:
-                self._attr_native_value = dateutil.parser.parse(data)
-            except (dateutil.parser.ParserError, OverflowError):
-                # If parsing fails we should mark it as unknown, with a log for further debugging.
-                _LOGGER.warning('Failed to parse date for %s: "%s"', key, data)
-                self._attr_native_value = None
+            self._attr_native_value = dateutil.parser.parse(data)
             return
 
         self._attr_native_value, inferred_unit = infer_unit(data)

homeassistant/components/baidu/tts.py

@@ -1,7 +1,6 @@
 """Support for Baidu speech service."""
 
 import logging
-from typing import Any
 
 from aip import AipSpeech
 import voluptuous as vol
@@ -10,7 +9,6 @@ from homeassistant.components.tts import (
     CONF_LANG,
     PLATFORM_SCHEMA as TTS_PLATFORM_SCHEMA,
     Provider,
-    TtsAudioType,
 )
 from homeassistant.const import CONF_API_KEY
 from homeassistant.helpers import config_validation as cv
@@ -87,17 +85,17 @@ class BaiduTTSProvider(Provider):
         }
 
     @property
-    def default_language(self) -> str:
+    def default_language(self):
         """Return the default language."""
         return self._lang
 
     @property
-    def supported_languages(self) -> list[str]:
+    def supported_languages(self):
         """Return a list of supported languages."""
         return SUPPORTED_LANGUAGES
 
     @property
-    def default_options(self) -> dict[str, Any]:
+    def default_options(self):
         """Return a dict including default options."""
         return {
             CONF_PERSON: self._speech_conf_data[_OPTIONS[CONF_PERSON]],
@@ -107,16 +105,11 @@ class BaiduTTSProvider(Provider):
         }
 
     @property
-    def supported_options(self) -> list[str]:
+    def supported_options(self):
         """Return a list of supported options."""
         return SUPPORTED_OPTIONS
 
-    def get_tts_audio(
-        self,
-        message: str,
-        language: str,
-        options: dict[str, Any],
-    ) -> TtsAudioType:
+    def get_tts_audio(self, message, language, options):
         """Load TTS from BaiduTTS."""
 
         aip_speech = AipSpeech(

homeassistant/components/bang_olufsen/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/bang_olufsen",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["mozart-api==5.3.1.108.2"],
+  "requirements": ["mozart-api==5.3.1.108.0"],
   "zeroconf": ["_bangolufsen._tcp.local."]
 }

homeassistant/components/bang_olufsen/media_player.py

@@ -8,7 +8,6 @@ from datetime import timedelta
 import json
 import logging
 from typing import TYPE_CHECKING, Any, cast
-from uuid import UUID
 
 from aiohttp import ClientConnectorError
 from mozart_api import __version__ as MOZART_API_VERSION
@@ -736,7 +735,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
             await self._client.set_active_source(source_id=key)
         else:
             # Video
-            await self._client.post_remote_trigger(id=UUID(key))
+            await self._client.post_remote_trigger(id=key)
 
     async def async_select_sound_mode(self, sound_mode: str) -> None:
         """Select a sound mode."""
@@ -895,7 +894,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
                     translation_key="play_media_error",
                     translation_placeholders={
                         "media_type": media_type,
-                        "error_message": json.loads(cast(str, error.body))["message"],
+                        "error_message": json.loads(error.body)["message"],
                     },
                 ) from error
 

homeassistant/components/blink/__init__.py

@@ -6,9 +6,16 @@ from typing import Any
 
 from blinkpy.auth import Auth
 from blinkpy.blinkpy import Blink
+import voluptuous as vol
 
 from homeassistant.components import persistent_notification
-from homeassistant.const import CONF_SCAN_INTERVAL
+from homeassistant.const import (
+    CONF_FILE_PATH,
+    CONF_FILENAME,
+    CONF_NAME,
+    CONF_PIN,
+    CONF_SCAN_INTERVAL,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -20,6 +27,13 @@ from .services import async_setup_services
 
 _LOGGER = logging.getLogger(__name__)
 
+SERVICE_SAVE_VIDEO_SCHEMA = vol.Schema(
+    {vol.Required(CONF_NAME): cv.string, vol.Required(CONF_FILENAME): cv.string}
+)
+SERVICE_SEND_PIN_SCHEMA = vol.Schema({vol.Optional(CONF_PIN): cv.string})
+SERVICE_SAVE_RECENT_CLIPS_SCHEMA = vol.Schema(
+    {vol.Required(CONF_NAME): cv.string, vol.Required(CONF_FILE_PATH): cv.string}
+)
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 

homeassistant/components/blink/camera.py

@@ -9,23 +9,35 @@ from typing import Any
 from blinkpy.auth import UnauthorizedError
 from blinkpy.camera import BlinkCamera as BlinkCameraAPI
 from requests.exceptions import ChunkedEncodingError
+import voluptuous as vol
 
 from homeassistant.components.camera import Camera
+from homeassistant.const import CONF_FILE_PATH, CONF_FILENAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import (
     ConfigEntryAuthFailed,
     HomeAssistantError,
     ServiceValidationError,
 )
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DEFAULT_BRAND, DOMAIN
+from .const import (
+    DEFAULT_BRAND,
+    DOMAIN,
+    SERVICE_RECORD,
+    SERVICE_SAVE_RECENT_CLIPS,
+    SERVICE_SAVE_VIDEO,
+    SERVICE_TRIGGER,
+)
 from .coordinator import BlinkConfigEntry, BlinkUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
+ATTR_VIDEO_CLIP = "video"
+ATTR_IMAGE = "image"
 PARALLEL_UPDATES = 1
 
 
@@ -44,6 +56,20 @@ async def async_setup_entry(
 
     async_add_entities(entities)
 
+    platform = entity_platform.async_get_current_platform()
+    platform.async_register_entity_service(SERVICE_RECORD, None, "record")
+    platform.async_register_entity_service(SERVICE_TRIGGER, None, "trigger_camera")
+    platform.async_register_entity_service(
+        SERVICE_SAVE_RECENT_CLIPS,
+        {vol.Required(CONF_FILE_PATH): cv.string},
+        "save_recent_clips",
+    )
+    platform.async_register_entity_service(
+        SERVICE_SAVE_VIDEO,
+        {vol.Required(CONF_FILENAME): cv.string},
+        "save_video",
+    )
+
 
 class BlinkCamera(CoordinatorEntity[BlinkUpdateCoordinator], Camera):
     """An implementation of a Blink Camera."""

homeassistant/components/blink/const.py

@@ -20,6 +20,11 @@ TYPE_TEMPERATURE = "temperature"
 TYPE_BATTERY = "battery"
 TYPE_WIFI_STRENGTH = "wifi_strength"
 
+SERVICE_RECORD = "record"
+SERVICE_TRIGGER = "trigger_camera"
+SERVICE_SAVE_VIDEO = "save_video"
+SERVICE_SAVE_RECENT_CLIPS = "save_recent_clips"
+SERVICE_SEND_PIN = "send_pin"
 
 PLATFORMS = [
     Platform.ALARM_CONTROL_PANEL,

homeassistant/components/blink/services.py

@@ -4,27 +4,13 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-from homeassistant.components.camera import DOMAIN as CAMERA_DOMAIN
-from homeassistant.const import (
-    ATTR_CONFIG_ENTRY_ID,
-    CONF_FILE_PATH,
-    CONF_FILENAME,
-    CONF_PIN,
-)
+from homeassistant.const import ATTR_CONFIG_ENTRY_ID, CONF_PIN
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv, issue_registry as ir, service
+from homeassistant.helpers import config_validation as cv, issue_registry as ir
 
-from .const import DOMAIN
+from .const import DOMAIN, SERVICE_SEND_PIN
 
-SERVICE_RECORD = "record"
-SERVICE_TRIGGER = "trigger_camera"
-SERVICE_SAVE_VIDEO = "save_video"
-SERVICE_SAVE_RECENT_CLIPS = "save_recent_clips"
-
-
-# Deprecated
-SERVICE_SEND_PIN = "send_pin"
 SERVICE_SEND_PIN_SCHEMA = vol.Schema(
     {
         vol.Required(ATTR_CONFIG_ENTRY_ID): vol.All(cv.ensure_list, [cv.string]),
@@ -66,36 +52,3 @@ def async_setup_services(hass: HomeAssistant) -> None:
         _send_pin,
         schema=SERVICE_SEND_PIN_SCHEMA,
     )
-
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_RECORD,
-        entity_domain=CAMERA_DOMAIN,
-        schema=None,
-        func="record",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_TRIGGER,
-        entity_domain=CAMERA_DOMAIN,
-        schema=None,
-        func="trigger_camera",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_SAVE_RECENT_CLIPS,
-        entity_domain=CAMERA_DOMAIN,
-        schema={vol.Required(CONF_FILE_PATH): cv.string},
-        func="save_recent_clips",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_SAVE_VIDEO,
-        entity_domain=CAMERA_DOMAIN,
-        schema={vol.Required(CONF_FILENAME): cv.string},
-        func="save_video",
-    )

homeassistant/components/bond/__init__.py

@@ -16,17 +16,14 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.entity import SLOW_UPDATE_WARNING
-from homeassistant.helpers.typing import ConfigType
 
 from .const import BRIDGE_MAKE, DOMAIN
 from .models import BondData
-from .services import async_setup_services
 from .utils import BondHub
 
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 PLATFORMS = [
     Platform.BUTTON,
     Platform.COVER,
@@ -41,12 +38,6 @@ _LOGGER = logging.getLogger(__name__)
 type BondConfigEntry = ConfigEntry[BondData]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the component."""
-    async_setup_services(hass)
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: BondConfigEntry) -> bool:
     """Set up Bond from a config entry."""
     host = entry.data[CONF_HOST]

homeassistant/components/bond/const.py

@@ -5,3 +5,10 @@ BRIDGE_MAKE = "Olibra"
 DOMAIN = "bond"
 
 CONF_BOND_ID: str = "bond_id"
+
+
+SERVICE_SET_FAN_SPEED_TRACKED_STATE = "set_fan_speed_tracked_state"
+SERVICE_SET_POWER_TRACKED_STATE = "set_switch_power_tracked_state"
+SERVICE_SET_LIGHT_POWER_TRACKED_STATE = "set_light_power_tracked_state"
+SERVICE_SET_LIGHT_BRIGHTNESS_TRACKED_STATE = "set_light_brightness_tracked_state"
+ATTR_POWER_STATE = "power_state"

homeassistant/components/bond/fan.py

@@ -8,6 +8,7 @@ from typing import Any
 
 from aiohttp.client_exceptions import ClientResponseError
 from bond_async import Action, DeviceType, Direction
+import voluptuous as vol
 
 from homeassistant.components.fan import (
     DIRECTION_FORWARD,
@@ -17,6 +18,7 @@ from homeassistant.components.fan import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import entity_platform
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
@@ -25,6 +27,7 @@ from homeassistant.util.percentage import (
 from homeassistant.util.scaling import int_states_in_range
 
 from . import BondConfigEntry
+from .const import SERVICE_SET_FAN_SPEED_TRACKED_STATE
 from .entity import BondEntity
 from .models import BondData
 from .utils import BondDevice
@@ -41,6 +44,12 @@ async def async_setup_entry(
 ) -> None:
     """Set up Bond fan devices."""
     data = entry.runtime_data
+    platform = entity_platform.async_get_current_platform()
+    platform.async_register_entity_service(
+        SERVICE_SET_FAN_SPEED_TRACKED_STATE,
+        {vol.Required("speed"): vol.All(vol.Number(scale=0), vol.Range(0, 100))},
+        "async_set_speed_belief",
+    )
 
     async_add_entities(
         BondFan(data, device)

homeassistant/components/bond/light.py

@@ -7,20 +7,37 @@ from typing import Any
 
 from aiohttp.client_exceptions import ClientResponseError
 from bond_async import Action, DeviceType
+import voluptuous as vol
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BondConfigEntry
+from .const import (
+    ATTR_POWER_STATE,
+    SERVICE_SET_LIGHT_BRIGHTNESS_TRACKED_STATE,
+    SERVICE_SET_LIGHT_POWER_TRACKED_STATE,
+)
 from .entity import BondEntity
 from .models import BondData
 from .utils import BondDevice
 
 _LOGGER = logging.getLogger(__name__)
 
+SERVICE_START_INCREASING_BRIGHTNESS = "start_increasing_brightness"
+SERVICE_START_DECREASING_BRIGHTNESS = "start_decreasing_brightness"
+SERVICE_STOP = "stop"
+
+ENTITY_SERVICES = [
+    SERVICE_START_INCREASING_BRIGHTNESS,
+    SERVICE_START_DECREASING_BRIGHTNESS,
+    SERVICE_STOP,
+]
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -31,6 +48,14 @@ async def async_setup_entry(
     data = entry.runtime_data
     hub = data.hub
 
+    platform = entity_platform.async_get_current_platform()
+    for service in ENTITY_SERVICES:
+        platform.async_register_entity_service(
+            service,
+            None,
+            f"async_{service}",
+        )
+
     fan_lights: list[Entity] = [
         BondLight(data, device)
         for device in hub.devices
@@ -69,6 +94,22 @@ async def async_setup_entry(
         if DeviceType.is_light(device.type)
     ]
 
+    platform.async_register_entity_service(
+        SERVICE_SET_LIGHT_BRIGHTNESS_TRACKED_STATE,
+        {
+            vol.Required(ATTR_BRIGHTNESS): vol.All(
+                vol.Number(scale=0), vol.Range(0, 255)
+            )
+        },
+        "async_set_brightness_belief",
+    )
+
+    platform.async_register_entity_service(
+        SERVICE_SET_LIGHT_POWER_TRACKED_STATE,
+        {vol.Required(ATTR_POWER_STATE): vol.All(cv.boolean)},
+        "async_set_power_belief",
+    )
+
     async_add_entities(
         fan_lights + fan_up_lights + fan_down_lights + fireplaces + fp_lights + lights,
     )

homeassistant/components/bond/services.py

@@ -1,101 +0,0 @@
-"""Support for Bond services."""
-
-from __future__ import annotations
-
-import voluptuous as vol
-
-from homeassistant.components.fan import DOMAIN as FAN_DOMAIN
-from homeassistant.components.light import ATTR_BRIGHTNESS, DOMAIN as LIGHT_DOMAIN
-from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, service
-
-from .const import DOMAIN
-
-ATTR_POWER_STATE = "power_state"
-
-# Fan
-SERVICE_SET_FAN_SPEED_TRACKED_STATE = "set_fan_speed_tracked_state"
-
-# Switch
-SERVICE_SET_POWER_TRACKED_STATE = "set_switch_power_tracked_state"
-
-# Light
-SERVICE_SET_LIGHT_POWER_TRACKED_STATE = "set_light_power_tracked_state"
-SERVICE_SET_LIGHT_BRIGHTNESS_TRACKED_STATE = "set_light_brightness_tracked_state"
-SERVICE_START_INCREASING_BRIGHTNESS = "start_increasing_brightness"
-SERVICE_START_DECREASING_BRIGHTNESS = "start_decreasing_brightness"
-SERVICE_STOP = "stop"
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Home Assistant services."""
-
-    # Fan entity services
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_SET_FAN_SPEED_TRACKED_STATE,
-        entity_domain=FAN_DOMAIN,
-        schema={vol.Required("speed"): vol.All(vol.Number(scale=0), vol.Range(0, 100))},
-        func="async_set_speed_belief",
-    )
-
-    # Light entity services
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_START_INCREASING_BRIGHTNESS,
-        entity_domain=LIGHT_DOMAIN,
-        schema=None,
-        func="async_start_increasing_brightness",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_START_DECREASING_BRIGHTNESS,
-        entity_domain=LIGHT_DOMAIN,
-        schema=None,
-        func="async_start_decreasing_brightness",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_STOP,
-        entity_domain=LIGHT_DOMAIN,
-        schema=None,
-        func="async_stop",
-    )
-
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_SET_LIGHT_BRIGHTNESS_TRACKED_STATE,
-        entity_domain=LIGHT_DOMAIN,
-        schema={
-            vol.Required(ATTR_BRIGHTNESS): vol.All(
-                vol.Number(scale=0), vol.Range(0, 255)
-            )
-        },
-        func="async_set_brightness_belief",
-    )
-
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_SET_LIGHT_POWER_TRACKED_STATE,
-        entity_domain=LIGHT_DOMAIN,
-        schema={vol.Required(ATTR_POWER_STATE): vol.All(cv.boolean)},
-        func="async_set_power_belief",
-    )
-
-    # Switch entity services
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_SET_POWER_TRACKED_STATE,
-        entity_domain=SWITCH_DOMAIN,
-        schema={vol.Required(ATTR_POWER_STATE): cv.boolean},
-        func="async_set_power_belief",
-    )

homeassistant/components/bond/switch.py

@@ -6,13 +6,16 @@ from typing import Any
 
 from aiohttp.client_exceptions import ClientResponseError
 from bond_async import Action, DeviceType
+import voluptuous as vol
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BondConfigEntry
+from .const import ATTR_POWER_STATE, SERVICE_SET_POWER_TRACKED_STATE
 from .entity import BondEntity
 
 
@@ -23,6 +26,12 @@ async def async_setup_entry(
 ) -> None:
     """Set up Bond generic devices."""
     data = entry.runtime_data
+    platform = entity_platform.async_get_current_platform()
+    platform.async_register_entity_service(
+        SERVICE_SET_POWER_TRACKED_STATE,
+        {vol.Required(ATTR_POWER_STATE): cv.boolean},
+        "async_set_power_belief",
+    )
 
     async_add_entities(
         BondSwitch(data, device)

homeassistant/components/bthome/__init__.py

@@ -15,7 +15,7 @@ from homeassistant.components.bluetooth import (
 )
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr, issue_registry as ir
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH, DeviceRegistry
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.util.signal_type import SignalType
@@ -36,45 +36,6 @@ PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.EVENT, Platform.SE
 _LOGGER = logging.getLogger(__name__)
 
 
-def get_encryption_issue_id(entry_id: str) -> str:
-    """Return the repair issue id for encryption removal."""
-    return f"encryption_removed_{entry_id}"
-
-
-def _async_create_encryption_downgrade_issue(
-    hass: HomeAssistant, entry: BTHomeConfigEntry, issue_id: str
-) -> None:
-    """Create a repair issue for encryption downgrade."""
-    _LOGGER.warning(
-        "BTHome device %s was previously encrypted but is now sending "
-        "unencrypted data. This could be a spoofing attempt. "
-        "Data will be ignored until resolved",
-        entry.title,
-    )
-    ir.async_create_issue(
-        hass,
-        DOMAIN,
-        issue_id,
-        is_fixable=True,
-        is_persistent=True,
-        severity=ir.IssueSeverity.WARNING,
-        translation_key="encryption_removed",
-        translation_placeholders={"name": entry.title},
-        data={"entry_id": entry.entry_id},
-    )
-
-
-def _async_clear_encryption_downgrade_issue(
-    hass: HomeAssistant, entry: BTHomeConfigEntry, issue_id: str
-) -> None:
-    """Clear the encryption downgrade repair issue."""
-    ir.async_delete_issue(hass, DOMAIN, issue_id)
-    _LOGGER.info(
-        "BTHome device %s is now sending encrypted data again. Resuming normal operation",
-        entry.title,
-    )
-
-
 def process_service_info(
     hass: HomeAssistant,
     entry: BTHomeConfigEntry,
@@ -84,26 +45,7 @@ def process_service_info(
     """Process a BluetoothServiceInfoBleak, running side effects and returning sensor data."""
     coordinator = entry.runtime_data
     data = coordinator.device_data
-    issue_registry = ir.async_get(hass)
-    issue_id = get_encryption_issue_id(entry.entry_id)
     update = data.update(service_info)
-
-    # Block unencrypted payloads for devices that were previously verified as encrypted.
-    if entry.data.get(CONF_BINDKEY) and data.downgrade_detected:
-        if not coordinator.encryption_downgrade_logged:
-            coordinator.encryption_downgrade_logged = True
-            if not issue_registry.async_get_issue(DOMAIN, issue_id):
-                _async_create_encryption_downgrade_issue(hass, entry, issue_id)
-        return SensorUpdate(title=None, devices={})
-
-    if data.bindkey_verified and (
-        (existing_issue := issue_registry.async_get_issue(DOMAIN, issue_id))
-        or coordinator.encryption_downgrade_logged
-    ):
-        coordinator.encryption_downgrade_logged = False
-        if existing_issue:
-            _async_clear_encryption_downgrade_issue(hass, entry, issue_id)
-
     discovered_event_classes = coordinator.discovered_event_classes
     if entry.data.get(CONF_SLEEPY_DEVICE, False) != data.sleepy_device:
         hass.config_entries.async_update_entry(
@@ -208,8 +150,3 @@ async def async_setup_entry(hass: HomeAssistant, entry: BTHomeConfigEntry) -> bo
 async def async_unload_entry(hass: HomeAssistant, entry: BTHomeConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-
-async def async_remove_entry(hass: HomeAssistant, entry: BTHomeConfigEntry) -> None:
-    """Remove a config entry."""
-    ir.async_delete_issue(hass, DOMAIN, get_encryption_issue_id(entry.entry_id))

homeassistant/components/bthome/coordinator.py

@@ -41,8 +41,6 @@ class BTHomePassiveBluetoothProcessorCoordinator(
         self.discovered_event_classes = discovered_event_classes
         self.device_data = device_data
         self.entry = entry
-        # Track whether we've already logged the encryption downgrade this session.
-        self.encryption_downgrade_logged = False
 
     @property
     def sleepy_device(self) -> bool:

homeassistant/components/bthome/manifest.json

@@ -20,5 +20,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/bthome",
   "iot_class": "local_push",
-  "requirements": ["bthome-ble==3.17.0"]
+  "requirements": ["bthome-ble==3.16.0"]
 }

homeassistant/components/bthome/repairs.py

@@ -1,65 +0,0 @@
-"""Repairs for the BTHome integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant import data_entry_flow
-from homeassistant.components.repairs import RepairsFlow
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import issue_registry as ir
-
-from . import get_encryption_issue_id
-from .const import CONF_BINDKEY, DOMAIN
-
-
-class EncryptionRemovedRepairFlow(RepairsFlow):
-    """Handle the repair flow when encryption is disabled."""
-
-    def __init__(self, entry_id: str, entry_title: str) -> None:
-        """Initialize the repair flow."""
-        self._entry_id = entry_id
-        self._entry_title = entry_title
-
-    async def async_step_init(
-        self, user_input: dict[str, Any] | None = None
-    ) -> data_entry_flow.FlowResult:
-        """Handle the initial step of the repair flow."""
-        return await self.async_step_confirm()
-
-    async def async_step_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> data_entry_flow.FlowResult:
-        """Handle confirmation, remove the bindkey, and reload the entry."""
-        if user_input is not None:
-            entry = self.hass.config_entries.async_get_entry(self._entry_id)
-            if not entry:
-                return self.async_abort(reason="entry_removed")
-
-            new_data = {k: v for k, v in entry.data.items() if k != CONF_BINDKEY}
-            self.hass.config_entries.async_update_entry(entry, data=new_data)
-
-            ir.async_delete_issue(
-                self.hass, DOMAIN, get_encryption_issue_id(self._entry_id)
-            )
-
-            await self.hass.config_entries.async_reload(self._entry_id)
-
-            return self.async_create_entry(data={})
-
-        return self.async_show_form(
-            step_id="confirm",
-            description_placeholders={"name": self._entry_title},
-        )
-
-
-async def async_create_fix_flow(
-    hass: HomeAssistant, issue_id: str, data: dict[str, Any] | None
-) -> RepairsFlow:
-    """Create the repair flow for removing the encryption key."""
-    if not data or "entry_id" not in data:
-        raise ValueError("Missing data for repair flow")
-    entry_id = data["entry_id"]
-    entry = hass.config_entries.async_get_entry(entry_id)
-    entry_title = entry.title if entry else "Unknown device"
-    return EncryptionRemovedRepairFlow(entry_id, entry_title)

homeassistant/components/bthome/strings.json

@@ -117,21 +117,5 @@
         "name": "UV Index"
       }
     }
-  },
-  "issues": {
-    "encryption_removed": {
-      "fix_flow": {
-        "abort": {
-          "entry_removed": "The device has been removed"
-        },
-        "step": {
-          "confirm": {
-            "description": "The BTHome device **{name}** was configured with encryption but is now broadcasting unencrypted data. Data from this device is being ignored until this is resolved.\n\nIf you disabled encryption on the device, select **Submit** to remove the encryption key and resume receiving data.\n\nIf you did not disable encryption, someone may be attempting to spoof your device. Do not submit this form and the unencrypted data will continue to be ignored.",
-            "title": "Remove encryption key for {name}"
-          }
-        }
-      },
-      "title": "Encryption disabled on {name}"
-    }
   }
 }

homeassistant/components/calendar/__init__.py

@@ -506,8 +506,6 @@ def is_offset_reached(
 class CalendarEntityDescription(EntityDescription, frozen_or_thawed=True):
     """A class that describes calendar entities."""
 
-    initial_color: str | None = None
-
 
 class CalendarEntity(Entity):
     """Base class for calendar event entities."""
@@ -518,16 +516,12 @@ class CalendarEntity(Entity):
 
     _alarm_unsubs: list[CALLBACK_TYPE] | None = None
 
-    _attr_initial_color: str | None
+    _attr_initial_color: str | None = None
 
     @property
     def initial_color(self) -> str | None:
         """Return the initial color for the calendar entity."""
-        if hasattr(self, "_attr_initial_color"):
-            return self._attr_initial_color
-        if hasattr(self, "entity_description"):
-            return self.entity_description.initial_color
-        return None
+        return self._attr_initial_color
 
     def get_initial_entity_options(self) -> er.EntityOptionsType | None:
         """Return initial entity options."""

homeassistant/components/camera/strings.json

@@ -50,11 +50,11 @@
   "selector": {},
   "services": {
     "disable_motion_detection": {
-      "description": "Disables the motion detection of a camera.",
+      "description": "Disables the motion detection.",
       "name": "Disable motion detection"
     },
     "enable_motion_detection": {
-      "description": "Enables the motion detection of a camera.",
+      "description": "Enables the motion detection.",
       "name": "Enable motion detection"
     },
     "play_stream": {
@@ -100,11 +100,11 @@
       "name": "Take snapshot"
     },
     "turn_off": {
-      "description": "Turns off a camera.",
+      "description": "Turns off the camera.",
       "name": "[%key:common::action::turn_off%]"
     },
     "turn_on": {
-      "description": "Turns on a camera.",
+      "description": "Turns on the camera.",
       "name": "[%key:common::action::turn_on%]"
     }
   },

homeassistant/components/co2signal/helpers.py

@@ -21,7 +21,7 @@ async def fetch_latest_carbon_intensity(
     em: ElectricityMaps,
     config: Mapping[str, Any],
 ) -> HomeAssistantCarbonIntensityResponse:
-    """Fetch the latest carbon intensity based on zone key or location coordinates."""
+    """Fetch the latest carbon intensity based on country code or location coordinates."""
     request: CoordinatesRequest | ZoneRequest = CoordinatesRequest(
         lat=config.get(CONF_LATITUDE, hass.config.latitude),
         lon=config.get(CONF_LONGITUDE, hass.config.longitude),

homeassistant/components/co2signal/strings.json

@@ -5,7 +5,7 @@
     },
     "error": {
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "no_data": "No data is available for the location or zone you have selected.",
+      "no_data": "No data is available for the location you have selected.",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "step": {
@@ -17,20 +17,20 @@
       },
       "country": {
         "data": {
-          "country_code": "Zone key"
+          "country_code": "Country code"
         }
       },
       "reauth_confirm": {
         "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]"
+          "api_key": "[%key:common::config_flow::data::access_token%]"
         }
       },
       "user": {
         "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]",
+          "api_key": "[%key:common::config_flow::data::access_token%]",
           "location": "[%key:common::config_flow::data::location%]"
         },
-        "description": "Visit the [Electricity Maps app]({register_link}) to request an API key."
+        "description": "Visit the [Electricity Maps page]({register_link}) to request a token."
       }
     }
   },
@@ -40,7 +40,7 @@
         "name": "CO2 intensity",
         "state_attributes": {
           "country_code": {
-            "name": "Zone key"
+            "name": "Country code"
           }
         }
       },
@@ -58,7 +58,7 @@
     "location": {
       "options": {
         "specify_coordinates": "Specify coordinates",
-        "specify_country_code": "Specify zone key",
+        "specify_country_code": "Specify country code",
         "use_home_location": "Use home location"
       }
     }

homeassistant/components/compit/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["compit"],
   "quality_scale": "bronze",
-  "requirements": ["compit-inext-api==0.7.0"]
+  "requirements": ["compit-inext-api==0.6.0"]
 }

homeassistant/components/conversation/__init__.py

@@ -335,18 +335,20 @@ def _get_config_intents(config: ConfigType, hass_config_path: str) -> dict[str,
     """Return config intents."""
     intents = config.get(DOMAIN, {}).get("intents", {})
     return {
-        intent_name: {
-            "data": [
-                {
-                    "sentences": sentences,
-                    "metadata": {
-                        METADATA_CUSTOM_SENTENCE: True,
-                        METADATA_CUSTOM_FILE: hass_config_path,
-                    },
-                }
-            ]
+        "intents": {
+            intent_name: {
+                "data": [
+                    {
+                        "sentences": sentences,
+                        "metadata": {
+                            METADATA_CUSTOM_SENTENCE: True,
+                            METADATA_CUSTOM_FILE: hass_config_path,
+                        },
+                    }
+                ]
+            }
+            for intent_name, sentences in intents.items()
         }
-        for intent_name, sentences in intents.items()
     }
 
 

homeassistant/components/conversation/agent_manager.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
 import dataclasses
 import logging
 from typing import TYPE_CHECKING, Any
@@ -19,7 +18,7 @@ from homeassistant.core import (
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, intent, singleton
 
-from .const import DATA_COMPONENT, HOME_ASSISTANT_AGENT, IntentSource
+from .const import DATA_COMPONENT, HOME_ASSISTANT_AGENT
 from .entity import ConversationEntity
 from .models import (
     AbstractConversationAgent,
@@ -35,11 +34,9 @@ from .trace import (
 
 _LOGGER = logging.getLogger(__name__)
 
-TRIGGER_INTENT_NAME_PREFIX = "HassSentenceTrigger"
-
 if TYPE_CHECKING:
     from .default_agent import DefaultAgent
-    from .trigger import TRIGGER_CALLBACK_TYPE
+    from .trigger import TriggerDetails
 
 
 @singleton.singleton("conversation_agent")
@@ -142,10 +139,6 @@ async def async_converse(
         return result
 
 
-type IntentSourceConfig = dict[str, dict[str, Any]]
-type IntentsCallback = Callable[[dict[IntentSource, IntentSourceConfig]], None]
-
-
 class AgentManager:
     """Class to manage conversation agents."""
 
@@ -154,13 +147,8 @@ class AgentManager:
         self.hass = hass
         self._agents: dict[str, AbstractConversationAgent] = {}
         self.default_agent: DefaultAgent | None = None
-        self._intents: dict[IntentSource, IntentSourceConfig] = {
-            IntentSource.CONFIG: {"intents": {}},
-            IntentSource.TRIGGER: {"intents": {}},
-        }
-        self._intents_subscribers: list[IntentsCallback] = []
-        self._trigger_callbacks: dict[int, TRIGGER_CALLBACK_TYPE] = {}
-        self._trigger_callback_counter: int = 0
+        self.config_intents: dict[str, Any] = {}
+        self.triggers_details: list[TriggerDetails] = []
 
     @callback
     def async_get_agent(self, agent_id: str) -> AbstractConversationAgent | None:
@@ -212,75 +200,27 @@ class AgentManager:
 
     async def async_setup_default_agent(self, agent: DefaultAgent) -> None:
         """Set up the default agent."""
+        agent.update_config_intents(self.config_intents)
+        agent.update_triggers(self.triggers_details)
         self.default_agent = agent
 
-    @callback
-    def subscribe_intents(self, subscriber: IntentsCallback) -> CALLBACK_TYPE:
-        """Subscribe to intents updates.
-
-        The subscriber callback is called immediately with all intent sources
-        and whenever intents are updated (only with the changed source).
-        """
-        subscriber(self._intents)
-        self._intents_subscribers.append(subscriber)
-
-        @callback
-        def unsubscribe() -> None:
-            """Unsubscribe from intents updates."""
-            self._intents_subscribers.remove(subscriber)
-
-        return unsubscribe
-
-    def _notify_intents_subscribers(self, source: IntentSource) -> None:
-        """Notify all intents subscribers of a change to a specific source."""
-        update = {source: self._intents[source]}
-        for subscriber in self._intents_subscribers:
-            subscriber(update)
-
     def update_config_intents(self, intents: dict[str, Any]) -> None:
         """Update config intents."""
-        self._intents[IntentSource.CONFIG]["intents"] = intents
-        self._notify_intents_subscribers(IntentSource.CONFIG)
+        self.config_intents = intents
+        if self.default_agent is not None:
+            self.default_agent.update_config_intents(intents)
 
-    def register_trigger(
-        self, sentences: list[str], trigger_callback: TRIGGER_CALLBACK_TYPE
-    ) -> CALLBACK_TYPE:
+    def register_trigger(self, trigger_details: TriggerDetails) -> CALLBACK_TYPE:
         """Register a trigger."""
-        trigger_id = self._trigger_callback_counter
-        self._trigger_callback_counter += 1
-        trigger_intent_name = f"{TRIGGER_INTENT_NAME_PREFIX}{trigger_id}"
-
-        trigger_intents = self._intents[IntentSource.TRIGGER]
-        trigger_intents["intents"][trigger_intent_name] = {
-            "data": [{"sentences": sentences}]
-        }
-        self._trigger_callbacks[trigger_id] = trigger_callback
-        self._notify_intents_subscribers(IntentSource.TRIGGER)
+        self.triggers_details.append(trigger_details)
+        if self.default_agent is not None:
+            self.default_agent.update_triggers(self.triggers_details)
 
         @callback
         def unregister_trigger() -> None:
             """Unregister the trigger."""
-            del trigger_intents["intents"][trigger_intent_name]
-            del self._trigger_callbacks[trigger_id]
-            self._notify_intents_subscribers(IntentSource.TRIGGER)
+            self.triggers_details.remove(trigger_details)
+            if self.default_agent is not None:
+                self.default_agent.update_triggers(self.triggers_details)
 
         return unregister_trigger
-
-    @property
-    def trigger_sentences(self) -> list[str]:
-        """Get all trigger sentences."""
-        sentences: list[str] = []
-        trigger_intents = self._intents[IntentSource.TRIGGER]
-        for trigger_intent in trigger_intents.get("intents", {}).values():
-            for data in trigger_intent.get("data", []):
-                sentences.extend(data.get("sentences", []))
-        return sentences
-
-    def get_trigger_callback(
-        self, trigger_intent_name: str
-    ) -> TRIGGER_CALLBACK_TYPE | None:
-        """Get the callback for a trigger from its intent name."""
-        if not trigger_intent_name.startswith(TRIGGER_INTENT_NAME_PREFIX):
-            return None
-        trigger_id = int(trigger_intent_name[len(TRIGGER_INTENT_NAME_PREFIX) :])
-        return self._trigger_callbacks.get(trigger_id)

homeassistant/components/conversation/const.py

@@ -36,13 +36,6 @@ METADATA_CUSTOM_SENTENCE = "hass_custom_sentence"
 METADATA_CUSTOM_FILE = "hass_custom_file"
 
 
-class IntentSource(StrEnum):
-    """Source of intents."""
-
-    CONFIG = "config"
-    TRIGGER = "trigger"
-
-
 class ChatLogEventType(StrEnum):
     """Chat log event type."""
 

homeassistant/components/conversation/default_agent.py

@@ -76,18 +76,18 @@ from homeassistant.helpers.event import async_track_state_added_domain
 from homeassistant.util import language as language_util
 from homeassistant.util.json import JsonObjectType, json_loads_object
 
-from .agent_manager import IntentSourceConfig, get_agent_manager
+from .agent_manager import get_agent_manager
 from .chat_log import AssistantContent, ChatLog, ToolResultContent
 from .const import (
     DOMAIN,
     METADATA_CUSTOM_FILE,
     METADATA_CUSTOM_SENTENCE,
     ConversationEntityFeature,
-    IntentSource,
 )
 from .entity import ConversationEntity
 from .models import ConversationInput, ConversationResult
 from .trace import ConversationTraceEventType, async_conversation_trace_append
+from .trigger import TriggerDetails
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -126,7 +126,7 @@ class SentenceTriggerResult:
 
     sentence: str
     sentence_template: str | None
-    matched_triggers: dict[str, RecognizeResult]
+    matched_triggers: dict[int, RecognizeResult]
 
 
 class IntentMatchingStage(Enum):
@@ -236,19 +236,15 @@ class DefaultAgent(ConversationEntity):
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the default agent."""
         self.hass = hass
-
         self._lang_intents: dict[str, LanguageIntents | object] = {}
         self._load_intents_lock = asyncio.Lock()
 
         # Intents from common conversation config
-        self._config_intents_config: IntentSourceConfig = {}
+        self._config_intents: dict[str, Any] = {}
 
-        # Intents from conversation triggers
+        # Sentences that will trigger a callback (skipping intent recognition)
+        self._triggers_details: list[TriggerDetails] = []
         self._trigger_intents: Intents | None = None
-        self._trigger_intents_config: IntentSourceConfig = {}
-
-        # Subscription to intents updates
-        self._unsub_intents: Callable[[], None] | None = None
 
         # Slot lists for entities, areas, etc.
         self._slot_lists: dict[str, SlotList] | None = None
@@ -265,33 +261,6 @@ class DefaultAgent(ConversationEntity):
         self.fuzzy_matching = True
         self._fuzzy_config: FuzzyConfig | None = None
 
-    async def async_added_to_hass(self) -> None:
-        """Subscribe to intents updates when added to hass."""
-        self._unsub_intents = get_agent_manager(self.hass).subscribe_intents(
-            self._update_intents
-        )
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Unsubscribe from intents updates when removed from hass."""
-        if self._unsub_intents is not None:
-            self._unsub_intents()
-            self._unsub_intents = None
-
-    @callback
-    def _update_intents(
-        self, intents_update: dict[IntentSource, IntentSourceConfig]
-    ) -> None:
-        """Handle intents update from agent_manager subscription."""
-        if IntentSource.CONFIG in intents_update:
-            self._config_intents_config = intents_update[IntentSource.CONFIG]
-            # Intents have changed, so we must clear the cache
-            self._intent_cache.clear()
-
-        if IntentSource.TRIGGER in intents_update:
-            self._trigger_intents_config = intents_update[IntentSource.TRIGGER]
-            # Force rebuild on next use
-            self._trigger_intents = None
-
     @property
     def supported_languages(self) -> list[str]:
         """Return a list of supported languages."""
@@ -1090,6 +1059,14 @@ class DefaultAgent(ConversationEntity):
         # Intents have changed, so we must clear the cache
         self._intent_cache.clear()
 
+    @callback
+    def update_config_intents(self, intents: dict[str, Any]) -> None:
+        """Update config intents."""
+        self._config_intents = intents
+
+        # Intents have changed, so we must clear the cache
+        self._intent_cache.clear()
+
     async def async_prepare(self, language: str | None = None) -> None:
         """Load intents for a language."""
         if language is None:
@@ -1216,7 +1193,7 @@ class DefaultAgent(ConversationEntity):
 
         merge_dict(
             intents_dict,
-            self._config_intents_config,
+            self._config_intents,
         )
 
         if not intents_dict:
@@ -1484,12 +1461,27 @@ class DefaultAgent(ConversationEntity):
 
         return response_template.async_render(response_args)
 
+    @callback
+    def update_triggers(self, triggers_details: list[TriggerDetails]) -> None:
+        """Update triggers."""
+        self._triggers_details = triggers_details
+
+        # Force rebuild on next use
+        self._trigger_intents = None
+
     def _rebuild_trigger_intents(self) -> None:
-        """Rebuild the HassIL intents object from the trigger intents dict."""
+        """Rebuild the HassIL intents object from the current trigger sentences."""
         intents_dict = {
             "language": self.hass.config.language,
-            **self._trigger_intents_config,
+            "intents": {
+                # Use trigger data index as a virtual intent name for HassIL.
+                # This works because the intents are rebuilt on every
+                # register/unregister.
+                str(trigger_id): {"data": [{"sentences": trigger_details.sentences}]}
+                for trigger_id, trigger_details in enumerate(self._triggers_details)
+            },
         }
+
         trigger_intents = Intents.from_dict(intents_dict)
 
         # Assume slot list references are wildcards
@@ -1504,7 +1496,7 @@ class DefaultAgent(ConversationEntity):
 
         self._trigger_intents = trigger_intents
 
-        _LOGGER.debug("Rebuilt trigger intents: %s", self._trigger_intents_config)
+        _LOGGER.debug("Rebuilt trigger intents: %s", intents_dict)
 
     async def async_recognize_sentence_trigger(
         self, user_input: ConversationInput
@@ -1514,7 +1506,7 @@ class DefaultAgent(ConversationEntity):
         Calls the registered callbacks if there's a match and returns a sentence
         trigger result.
         """
-        if not self._trigger_intents_config.get("intents"):
+        if not self._triggers_details:
             # No triggers registered
             return None
 
@@ -1524,18 +1516,18 @@ class DefaultAgent(ConversationEntity):
 
         assert self._trigger_intents is not None
 
-        matched_triggers: dict[str, RecognizeResult] = {}
+        matched_triggers: dict[int, RecognizeResult] = {}
         matched_template: str | None = None
         for result in recognize_all(user_input.text, self._trigger_intents):
             if result.intent_sentence is not None:
                 matched_template = result.intent_sentence.text
 
-            trigger_intent_name = result.intent.name
-            if trigger_intent_name in matched_triggers:
+            trigger_id = int(result.intent.name)
+            if trigger_id in matched_triggers:
                 # Already matched a sentence from this trigger
                 break
 
-            matched_triggers[trigger_intent_name] = result
+            matched_triggers[trigger_id] = result
 
         if not matched_triggers:
             # Sentence did not match any trigger sentences
@@ -1559,14 +1551,10 @@ class DefaultAgent(ConversationEntity):
         chat_log: ChatLog,
     ) -> str:
         """Run sentence trigger callbacks and return response text."""
-        manager = get_agent_manager(self.hass)
-
         # Gather callback responses in parallel
         trigger_callbacks = [
-            trigger_callback(user_input, trigger_result)
-            for trigger_intent_name, trigger_result in result.matched_triggers.items()
-            if (trigger_callback := manager.get_trigger_callback(trigger_intent_name))
-            is not None
+            self._triggers_details[trigger_id].callback(user_input, trigger_result)
+            for trigger_id, trigger_result in result.matched_triggers.items()
         ]
 
         tool_input = llm.ToolInput(

homeassistant/components/conversation/http.py

@@ -165,7 +165,11 @@ async def websocket_list_sentences(
     """List custom registered sentences."""
     manager = get_agent_manager(hass)
 
-    connection.send_result(msg["id"], {"trigger_sentences": manager.trigger_sentences})
+    sentences = []
+    for trigger_details in manager.triggers_details:
+        sentences.extend(trigger_details.sentences)
+
+    connection.send_result(msg["id"], {"trigger_sentences": sentences})
 
 
 @websocket_api.websocket_command(

homeassistant/components/conversation/trigger.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
 from typing import Any
 
 from hassil.recognize import RecognizeResult
@@ -30,6 +31,14 @@ TRIGGER_CALLBACK_TYPE = Callable[
 ]
 
 
+@dataclass(slots=True)
+class TriggerDetails:
+    """List of sentences and the callback for a trigger."""
+
+    sentences: list[str]
+    callback: TRIGGER_CALLBACK_TYPE
+
+
 def has_no_punctuation(value: list[str]) -> list[str]:
     """Validate result does not contain punctuation."""
     for sentence in value:
@@ -140,5 +149,5 @@ async def async_attach_trigger(
         return None
 
     return get_agent_manager(hass).register_trigger(
-        sentences=sentences, trigger_callback=call_action
+        TriggerDetails(sentences=sentences, callback=call_action)
     )

homeassistant/components/datadog/__init__.py

@@ -3,8 +3,9 @@
 import logging
 
 from datadog import DogStatsd, initialize
+import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_PORT,
@@ -15,15 +16,53 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, state as state_helper
+from homeassistant.helpers.typing import ConfigType
 
 from . import config_flow as config_flow
-from .const import CONF_RATE, DOMAIN
+from .const import (
+    CONF_RATE,
+    DEFAULT_HOST,
+    DEFAULT_PORT,
+    DEFAULT_PREFIX,
+    DEFAULT_RATE,
+    DOMAIN,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
 type DatadogConfigEntry = ConfigEntry[DogStatsd]
 
-CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
+CONFIG_SCHEMA = vol.Schema(
+    {
+        DOMAIN: vol.Schema(
+            {
+                vol.Required(CONF_HOST, default=DEFAULT_HOST): cv.string,
+                vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+                vol.Optional(CONF_PREFIX, default=DEFAULT_PREFIX): cv.string,
+                vol.Optional(CONF_RATE, default=DEFAULT_RATE): vol.All(
+                    vol.Coerce(int), vol.Range(min=1)
+                ),
+            }
+        )
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Datadog integration from YAML, initiating config flow import."""
+    if DOMAIN not in config:
+        return True
+
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={"source": SOURCE_IMPORT},
+            data=config[DOMAIN],
+        )
+    )
+
+    return True
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: DatadogConfigEntry) -> bool:

homeassistant/components/datadog/config_flow.py

@@ -12,7 +12,8 @@ from homeassistant.config_entries import (
     OptionsFlow,
 )
 from homeassistant.const import CONF_HOST, CONF_PORT, CONF_PREFIX
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, callback
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 
 from .const import (
     CONF_RATE,
@@ -70,6 +71,22 @@ class DatadogConfigFlow(ConfigFlow, domain=DOMAIN):
             errors=errors,
         )
 
+    async def async_step_import(self, user_input: dict[str, Any]) -> ConfigFlowResult:
+        """Handle import from configuration.yaml."""
+        # Check for duplicates
+        self._async_abort_entries_match(
+            {CONF_HOST: user_input[CONF_HOST], CONF_PORT: user_input[CONF_PORT]}
+        )
+
+        result = await self.async_step_user(user_input)
+
+        if errors := result.get("errors"):
+            await deprecate_yaml_issue(self.hass, False)
+            return self.async_abort(reason=errors["base"])
+
+        await deprecate_yaml_issue(self.hass, True)
+        return result
+
     @staticmethod
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
@@ -146,3 +163,41 @@ async def validate_datadog_connection(
         return False
     else:
         return True
+
+
+async def deprecate_yaml_issue(
+    hass: HomeAssistant,
+    import_success: bool,
+) -> None:
+    """Create an issue to deprecate YAML config."""
+    if import_success:
+        async_create_issue(
+            hass,
+            HOMEASSISTANT_DOMAIN,
+            f"deprecated_yaml_{DOMAIN}",
+            is_fixable=False,
+            issue_domain=DOMAIN,
+            breaks_in_ha_version="2026.2.0",
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_yaml",
+            translation_placeholders={
+                "domain": DOMAIN,
+                "integration_title": "Datadog",
+            },
+        )
+    else:
+        async_create_issue(
+            hass,
+            DOMAIN,
+            "deprecated_yaml_import_connection_error",
+            breaks_in_ha_version="2026.2.0",
+            is_fixable=False,
+            issue_domain=DOMAIN,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_yaml_import_connection_error",
+            translation_placeholders={
+                "domain": DOMAIN,
+                "integration_title": "Datadog",
+                "url": f"/config/integrations/dashboard/add?domain={DOMAIN}",
+            },
+        )

homeassistant/components/datadog/strings.json

@@ -25,6 +25,12 @@
       }
     }
   },
+  "issues": {
+    "deprecated_yaml_import_connection_error": {
+      "description": "There was an error connecting to the Datadog Agent when trying to import the YAML configuration.\n\nEnsure the YAML configuration is correct and restart Home Assistant to try again or remove the {domain} configuration from your `configuration.yaml` file and continue to [set up the integration]({url}) manually.",
+      "title": "{domain} YAML configuration import failed"
+    }
+  },
   "options": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",

homeassistant/components/derivative/__init__.py

@@ -7,7 +7,10 @@ import logging
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_SOURCE, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device import async_entity_id_to_device_id
+from homeassistant.helpers.device import (
+    async_entity_id_to_device_id,
+    async_remove_stale_devices_links_keep_entity_device,
+)
 from homeassistant.helpers.helper_integration import (
     async_handle_source_entity_changes,
     async_remove_helper_config_entry_from_source_device,
@@ -19,6 +22,11 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Derivative from a config entry."""
 
+    # This can be removed in HA Core 2026.2
+    async_remove_stale_devices_links_keep_entity_device(
+        hass, entry.entry_id, entry.options[CONF_SOURCE]
+    )
+
     def set_source_entity_id_or_uuid(source_entity_id: str) -> None:
         hass.config_entries.async_update_entry(
             entry,

homeassistant/components/dlink/data.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from datetime import datetime
 import logging
-import urllib.error
+import urllib
 
 from pyW215.pyW215 import SmartPlug
 

homeassistant/components/dsmr_reader/sensor.py

@@ -46,12 +46,13 @@ class DSMRSensor(SensorEntity):
         @callback
         def message_received(message):
             """Handle new MQTT messages."""
-            if not (payload := message.payload):
+            if message.payload == "":
                 self._attr_native_value = None
-            elif (state := self.entity_description.state) is not None:
-                self._attr_native_value = state(payload)
+            elif self.entity_description.state is not None:
+                # Perform optional additional parsing
+                self._attr_native_value = self.entity_description.state(message.payload)
             else:
-                self._attr_native_value = payload
+                self._attr_native_value = message.payload
 
             self.async_write_ha_state()
 

homeassistant/components/eafm/config_flow.py

@@ -41,20 +41,13 @@ class UKFloodsFlowHandler(ConfigFlow, domain=DOMAIN):
         self.stations = {}
         for station in stations:
             label = station["label"]
-            rloId = station["RLOIid"]
 
             # API annoyingly sometimes returns a list and some times returns a string
             # E.g. L3121 has a label of ['Scurf Dyke', 'Scurf Dyke Dyke Level']
             if isinstance(label, list):
                 label = label[-1]
 
-            # Similar for RLOIid
-            # E.g. 0018 has an RLOIid of ['10427', '9154']
-            if isinstance(rloId, list):
-                rloId = rloId[-1]
-
-            fullName = label + " - " + rloId
-            self.stations[fullName] = station["stationReference"]
+            self.stations[label] = station["stationReference"]
 
         if not self.stations:
             return self.async_abort(reason="no_stations")

homeassistant/components/eheimdigital/manifest.json

@@ -8,7 +8,7 @@
   "iot_class": "local_polling",
   "loggers": ["eheimdigital"],
   "quality_scale": "platinum",
-  "requirements": ["eheimdigital==1.6.0"],
+  "requirements": ["eheimdigital==1.5.0"],
   "zeroconf": [
     { "name": "eheimdigital._http._tcp.local.", "type": "_http._tcp.local." }
   ]

homeassistant/components/elgato/__init__.py

@@ -2,23 +2,12 @@
 
 from homeassistant.const import 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 .coordinator import ElgatoConfigEntry, ElgatoDataUpdateCoordinator
-from .services import async_setup_services
 
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 PLATFORMS = [Platform.BUTTON, Platform.LIGHT, Platform.SENSOR, Platform.SWITCH]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the component."""
-    async_setup_services(hass)
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ElgatoConfigEntry) -> bool:
     """Set up Elgato Light from a config entry."""
     coordinator = ElgatoDataUpdateCoordinator(hass, entry)

homeassistant/components/elgato/const.py

@@ -14,3 +14,6 @@ SCAN_INTERVAL = timedelta(seconds=10)
 
 # Attributes
 ATTR_ON = "on"
+
+# Services
+SERVICE_IDENTIFY = "identify"

homeassistant/components/elgato/light.py

@@ -15,9 +15,13 @@ from homeassistant.components.light import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    async_get_current_platform,
+)
 from homeassistant.util import color as color_util
 
+from .const import SERVICE_IDENTIFY
 from .coordinator import ElgatoConfigEntry, ElgatoDataUpdateCoordinator
 from .entity import ElgatoEntity
 
@@ -33,6 +37,13 @@ async def async_setup_entry(
     coordinator = entry.runtime_data
     async_add_entities([ElgatoLight(coordinator)])
 
+    platform = async_get_current_platform()
+    platform.async_register_entity_service(
+        SERVICE_IDENTIFY,
+        None,
+        ElgatoLight.async_identify.__name__,
+    )
+
 
 class ElgatoLight(ElgatoEntity, LightEntity):
     """Defines an Elgato Light."""

homeassistant/components/elgato/services.py

@@ -1,25 +0,0 @@
-"""Support for Elgato services."""
-
-from __future__ import annotations
-
-from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import service
-
-from .const import DOMAIN
-
-SERVICE_IDENTIFY = "identify"
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Set up services."""
-
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_IDENTIFY,
-        entity_domain=LIGHT_DOMAIN,
-        schema=None,
-        func="async_identify",
-    )

homeassistant/components/enocean/__init__.py

@@ -8,11 +8,9 @@ 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 DATA_ENOCEAN, DOMAIN, ENOCEAN_DONGLE
 from .dongle import EnOceanDongle
 
-type EnOceanConfigEntry = ConfigEntry[EnOceanDongle]
-
 CONFIG_SCHEMA = vol.Schema(
     {DOMAIN: vol.Schema({vol.Required(CONF_DEVICE): cv.string})}, extra=vol.ALLOW_EXTRA
 )
@@ -38,23 +36,21 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-async def async_setup_entry(
-    hass: HomeAssistant, config_entry: EnOceanConfigEntry
-) -> bool:
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up an EnOcean dongle for the given entry."""
+    enocean_data = hass.data.setdefault(DATA_ENOCEAN, {})
     usb_dongle = EnOceanDongle(hass, config_entry.data[CONF_DEVICE])
     await usb_dongle.async_setup()
-    config_entry.runtime_data = usb_dongle
+    enocean_data[ENOCEAN_DONGLE] = usb_dongle
 
     return True
 
 
-async def async_unload_entry(
-    hass: HomeAssistant, config_entry: EnOceanConfigEntry
-) -> bool:
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Unload EnOcean config entry."""
 
-    enocean_dongle = config_entry.runtime_data
+    enocean_dongle = hass.data[DATA_ENOCEAN][ENOCEAN_DONGLE]
     enocean_dongle.unload()
+    hass.data.pop(DATA_ENOCEAN)
 
     return True

homeassistant/components/enocean/const.py

@@ -5,6 +5,8 @@ import logging
 from homeassistant.const import Platform
 
 DOMAIN = "enocean"
+DATA_ENOCEAN = "enocean"
+ENOCEAN_DONGLE = "dongle"
 
 ERROR_INVALID_DONGLE_PATH = "invalid_dongle_path"
 

homeassistant/components/flexit_bacnet/climate.py

@@ -4,8 +4,6 @@ import asyncio.exceptions
 from typing import Any
 
 from flexit_bacnet import (
-    OPERATION_MODE_FIREPLACE,
-    OPERATION_MODE_OFF,
     VENTILATION_MODE_AWAY,
     VENTILATION_MODE_HOME,
     VENTILATION_MODE_STOP,
@@ -14,6 +12,7 @@ from flexit_bacnet.bacnet import DecodingError
 
 from homeassistant.components.climate import (
     PRESET_AWAY,
+    PRESET_BOOST,
     PRESET_HOME,
     ClimateEntity,
     ClimateEntityFeature,
@@ -29,10 +28,8 @@ from .const import (
     DOMAIN,
     MAX_TEMP,
     MIN_TEMP,
-    OPERATION_TO_PRESET_MODE_MAP,
-    PRESET_FIREPLACE,
-    PRESET_HIGH,
     PRESET_TO_VENTILATION_MODE_MAP,
+    VENTILATION_TO_PRESET_MODE_MAP,
 )
 from .coordinator import FlexitConfigEntry, FlexitCoordinator
 from .entity import FlexitEntity
@@ -54,7 +51,6 @@ class FlexitClimateEntity(FlexitEntity, ClimateEntity):
     """Flexit air handling unit."""
 
     _attr_name = None
-    _attr_translation_key = "flexit_bacnet"
 
     _attr_hvac_modes = [
         HVACMode.OFF,
@@ -64,8 +60,7 @@ class FlexitClimateEntity(FlexitEntity, ClimateEntity):
     _attr_preset_modes = [
         PRESET_AWAY,
         PRESET_HOME,
-        PRESET_HIGH,
-        PRESET_FIREPLACE,
+        PRESET_BOOST,
     ]
 
     _attr_supported_features = (
@@ -132,29 +127,20 @@ class FlexitClimateEntity(FlexitEntity, ClimateEntity):
 
         Requires ClimateEntityFeature.PRESET_MODE.
         """
-        return OPERATION_TO_PRESET_MODE_MAP[self.device.operation_mode]
+        return VENTILATION_TO_PRESET_MODE_MAP[self.device.ventilation_mode]
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set new preset mode."""
-        try:
-            if preset_mode == PRESET_FIREPLACE:
-                # Use trigger method for fireplace mode
-                await self.device.trigger_fireplace_mode()
-            else:
-                # If currently in fireplace mode, toggle it off first
-                # trigger_fireplace_mode() acts as a toggle
-                if self.device.operation_mode == OPERATION_MODE_FIREPLACE:
-                    await self.device.trigger_fireplace_mode()
+        ventilation_mode = PRESET_TO_VENTILATION_MODE_MAP[preset_mode]
 
-                # Set the desired ventilation mode
-                ventilation_mode = PRESET_TO_VENTILATION_MODE_MAP[preset_mode]
-                await self.device.set_ventilation_mode(ventilation_mode)
+        try:
+            await self.device.set_ventilation_mode(ventilation_mode)
         except (asyncio.exceptions.TimeoutError, ConnectionError, DecodingError) as exc:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
                 translation_key="set_preset_mode",
                 translation_placeholders={
-                    "preset": preset_mode,
+                    "preset": str(ventilation_mode),
                 },
             ) from exc
         finally:
@@ -163,7 +149,7 @@ class FlexitClimateEntity(FlexitEntity, ClimateEntity):
     @property
     def hvac_mode(self) -> HVACMode:
         """Return hvac operation ie. heat, cool mode."""
-        if self.device.operation_mode == OPERATION_MODE_OFF:
+        if self.device.ventilation_mode == VENTILATION_MODE_STOP:
             return HVACMode.OFF
 
         return HVACMode.FAN_ONLY

homeassistant/components/flexit_bacnet/const.py

@@ -1,40 +1,34 @@
 """Constants for the Flexit Nordic (BACnet) integration."""
 
 from flexit_bacnet import (
-    OPERATION_MODE_AWAY,
-    OPERATION_MODE_FIREPLACE,
-    OPERATION_MODE_HIGH,
-    OPERATION_MODE_HOME,
-    OPERATION_MODE_OFF,
     VENTILATION_MODE_AWAY,
     VENTILATION_MODE_HIGH,
     VENTILATION_MODE_HOME,
     VENTILATION_MODE_STOP,
 )
 
-from homeassistant.components.climate import PRESET_AWAY, PRESET_HOME, PRESET_NONE
+from homeassistant.components.climate import (
+    PRESET_AWAY,
+    PRESET_BOOST,
+    PRESET_HOME,
+    PRESET_NONE,
+)
 
 DOMAIN = "flexit_bacnet"
 
 MAX_TEMP = 30
 MIN_TEMP = 10
 
-PRESET_HIGH = "high"
-PRESET_FIREPLACE = "fireplace"
-
-# Map operation mode (what device reports) to Home Assistant preset
-OPERATION_TO_PRESET_MODE_MAP = {
-    OPERATION_MODE_OFF: PRESET_NONE,
-    OPERATION_MODE_AWAY: PRESET_AWAY,
-    OPERATION_MODE_HOME: PRESET_HOME,
-    OPERATION_MODE_HIGH: PRESET_HIGH,
-    OPERATION_MODE_FIREPLACE: PRESET_FIREPLACE,
+VENTILATION_TO_PRESET_MODE_MAP = {
+    VENTILATION_MODE_STOP: PRESET_NONE,
+    VENTILATION_MODE_AWAY: PRESET_AWAY,
+    VENTILATION_MODE_HOME: PRESET_HOME,
+    VENTILATION_MODE_HIGH: PRESET_BOOST,
 }
 
-# Map preset to ventilation mode (for setting standard modes)
 PRESET_TO_VENTILATION_MODE_MAP = {
     PRESET_NONE: VENTILATION_MODE_STOP,
     PRESET_AWAY: VENTILATION_MODE_AWAY,
     PRESET_HOME: VENTILATION_MODE_HOME,
-    PRESET_HIGH: VENTILATION_MODE_HIGH,
+    PRESET_BOOST: VENTILATION_MODE_HIGH,
 }

homeassistant/components/flexit_bacnet/icons.json

@@ -1,17 +1,5 @@
 {
   "entity": {
-    "climate": {
-      "flexit_bacnet": {
-        "state_attributes": {
-          "preset_mode": {
-            "state": {
-              "fireplace": "mdi:fireplace",
-              "high": "mdi:fan-speed-3"
-            }
-          }
-        }
-      }
-    },
     "number": {
       "away_extract_fan_setpoint": {
         "default": "mdi:fan-minus"

homeassistant/components/flexit_bacnet/strings.json

@@ -26,18 +26,6 @@
         "name": "Air filter polluted"
       }
     },
-    "climate": {
-      "flexit_bacnet": {
-        "state_attributes": {
-          "preset_mode": {
-            "state": {
-              "fireplace": "Fireplace",
-              "high": "[%key:common::state::high%]"
-            }
-          }
-        }
-      }
-    },
     "number": {
       "away_extract_fan_setpoint": {
         "name": "Away extract fan setpoint"
@@ -151,11 +139,5 @@
     "switch_turn": {
       "message": "Failed to turn the switch {state}."
     }
-  },
-  "issues": {
-    "deprecated_fireplace_switch": {
-      "description": "The fireplace mode switch entity `{entity_id}` is deprecated and will be removed in a future version.\n\nFireplace mode has been moved to a climate preset on the climate entity to better match the device interface.\n\nPlease update your automations to use the `climate.set_preset_mode` action with preset mode `fireplace` instead of using the switch entity.\n\nAfter updating your automations, you can safely disable this switch entity.",
-      "title": "Fireplace mode switch is deprecated"
-    }
   }
 }

homeassistant/components/flexit_bacnet/switch.py

@@ -13,12 +13,9 @@ from homeassistant.components.switch import (
     SwitchEntity,
     SwitchEntityDescription,
 )
-from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 
 from .const import DOMAIN
 from .coordinator import FlexitConfigEntry, FlexitCoordinator
@@ -42,13 +39,6 @@ SWITCHES: tuple[FlexitSwitchEntityDescription, ...] = (
         turn_on_fn=lambda data: data.enable_electric_heater(),
         turn_off_fn=lambda data: data.disable_electric_heater(),
     ),
-    FlexitSwitchEntityDescription(
-        key="cooker_hood_mode",
-        translation_key="cooker_hood_mode",
-        is_on_fn=lambda data: data.cooker_hood_status,
-        turn_on_fn=lambda data: data.activate_cooker_hood(),
-        turn_off_fn=lambda data: data.deactivate_cooker_hood(),
-    ),
     FlexitSwitchEntityDescription(
         key="fireplace_mode",
         translation_key="fireplace_mode",
@@ -56,6 +46,13 @@ SWITCHES: tuple[FlexitSwitchEntityDescription, ...] = (
         turn_on_fn=lambda data: data.trigger_fireplace_mode(),
         turn_off_fn=lambda data: data.trigger_fireplace_mode(),
     ),
+    FlexitSwitchEntityDescription(
+        key="cooker_hood_mode",
+        translation_key="cooker_hood_mode",
+        is_on_fn=lambda data: data.cooker_hood_status,
+        turn_on_fn=lambda data: data.activate_cooker_hood(),
+        turn_off_fn=lambda data: data.deactivate_cooker_hood(),
+    ),
 )
 
 
@@ -67,42 +64,9 @@ async def async_setup_entry(
     """Set up Flexit (bacnet) switch from a config entry."""
     coordinator = config_entry.runtime_data
 
-    entities: list[FlexitSwitch] = []
-    for description in SWITCHES:
-        if description.key == "fireplace_mode":
-            # Check if deprecated fireplace switch is enabled and create repair issue
-            entity_reg = er.async_get(hass)
-            fireplace_switch_unique_id = (
-                f"{coordinator.device.serial_number}-fireplace_mode"
-            )
-            # Look up the fireplace switch entity by unique_id
-            fireplace_switch_entity_id = entity_reg.async_get_entity_id(
-                Platform.SWITCH, DOMAIN, fireplace_switch_unique_id
-            )
-            if not fireplace_switch_entity_id:
-                continue
-            entity_registry_entry = entity_reg.async_get(fireplace_switch_entity_id)
-
-            if entity_registry_entry:
-                if entity_registry_entry.disabled:
-                    entity_reg.async_remove(fireplace_switch_entity_id)
-                else:
-                    async_create_issue(
-                        hass,
-                        DOMAIN,
-                        f"deprecated_switch_{fireplace_switch_unique_id}",
-                        is_fixable=False,
-                        issue_domain=DOMAIN,
-                        severity=IssueSeverity.WARNING,
-                        translation_key="deprecated_fireplace_switch",
-                        translation_placeholders={
-                            "entity_id": fireplace_switch_entity_id,
-                        },
-                    )
-                    entities.append(FlexitSwitch(coordinator, description))
-        else:
-            entities.append(FlexitSwitch(coordinator, description))
-        async_add_entities(entities)
+    async_add_entities(
+        FlexitSwitch(coordinator, description) for description in SWITCHES
+    )
 
 
 PARALLEL_UPDATES = 1

homeassistant/components/fressnapf_tracker/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "quality_scale": "bronze",
-  "requirements": ["fressnapftracker==0.2.2"]
+  "requirements": ["fressnapftracker==0.2.1"]
 }

homeassistant/components/frontend/manifest.json

@@ -21,5 +21,5 @@
   "integration_type": "system",
   "preview_features": { "winter_mode": {} },
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20260128.4"]
+  "requirements": ["home-assistant-frontend==20260128.3"]
 }

homeassistant/components/generic_hygrostat/__init__.py

@@ -13,7 +13,10 @@ from homeassistant.helpers import (
     discovery,
     entity_registry as er,
 )
-from homeassistant.helpers.device import async_entity_id_to_device_id
+from homeassistant.helpers.device import (
+    async_entity_id_to_device_id,
+    async_remove_stale_devices_links_keep_entity_device,
+)
 from homeassistant.helpers.event import async_track_entity_registry_updated_event
 from homeassistant.helpers.helper_integration import (
     async_handle_source_entity_changes,
@@ -93,6 +96,13 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up from a config entry."""
 
+    # This can be removed in HA Core 2026.2
+    async_remove_stale_devices_links_keep_entity_device(
+        hass,
+        entry.entry_id,
+        entry.options[CONF_HUMIDIFIER],
+    )
+
     def set_humidifier_entity_id_or_uuid(source_entity_id: str) -> None:
         hass.config_entries.async_update_entry(
             entry,

homeassistant/components/generic_thermostat/__init__.py

@@ -5,7 +5,10 @@ import logging
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.device import async_entity_id_to_device_id
+from homeassistant.helpers.device import (
+    async_entity_id_to_device_id,
+    async_remove_stale_devices_links_keep_entity_device,
+)
 from homeassistant.helpers.event import async_track_entity_registry_updated_event
 from homeassistant.helpers.helper_integration import (
     async_handle_source_entity_changes,
@@ -20,6 +23,13 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up from a config entry."""
 
+    # This can be removed in HA Core 2026.2
+    async_remove_stale_devices_links_keep_entity_device(
+        hass,
+        entry.entry_id,
+        entry.options[CONF_HEATER],
+    )
+
     def set_humidifier_entity_id_or_uuid(source_entity_id: str) -> None:
         hass.config_entries.async_update_entry(
             entry,

homeassistant/components/google/calendar.py

@@ -101,6 +101,7 @@ class GoogleCalendarEntityDescription(CalendarEntityDescription):
     search: str | None
     local_sync: bool
     device_id: str
+    initial_color: str | None = None
     event_type: EventTypeEnum | None = None
 
 
@@ -360,6 +361,7 @@ class GoogleCalendarEntity(
         if entity_description.entity_id:
             self.entity_id = entity_description.entity_id
         self._attr_unique_id = unique_id
+        self._attr_initial_color = entity_description.initial_color
         if not entity_description.read_only:
             self._attr_supported_features = (
                 CalendarEntityFeature.CREATE_EVENT | CalendarEntityFeature.DELETE_EVENT

homeassistant/components/google/manifest.json

@@ -8,5 +8,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["googleapiclient"],
-  "requirements": ["gcal-sync==8.0.0", "oauth2client==4.1.3", "ical==12.1.3"]
+  "requirements": ["gcal-sync==8.0.0", "oauth2client==4.1.3", "ical==12.1.2"]
 }

homeassistant/components/gpslogger/device_tracker.py

@@ -86,7 +86,7 @@ class GPSLoggerEntity(TrackerEntity, RestoreEntity):
         )
 
     @property
-    def battery_level(self) -> int | None:
+    def battery_level(self):
         """Return battery value of the device."""
         return self._battery
 

homeassistant/components/growatt_server/__init__.py

@@ -27,7 +27,7 @@ from .const import (
 )
 from .coordinator import GrowattConfigEntry, GrowattCoordinator
 from .models import GrowattRuntimeData
-from .services import async_setup_services
+from .services import async_register_services
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -37,7 +37,7 @@ CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Growatt Server component."""
     # Register services
-    async_setup_services(hass)
+    await async_register_services(hass)
     return True
 
 

homeassistant/components/growatt_server/services.py

@@ -6,7 +6,7 @@ from datetime import datetime
 from typing import TYPE_CHECKING, Any
 
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant, ServiceCall, SupportsResponse, callback
+from homeassistant.core import HomeAssistant, ServiceCall, SupportsResponse
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import device_registry as dr
 
@@ -21,8 +21,7 @@ if TYPE_CHECKING:
     from .coordinator import GrowattCoordinator
 
 
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
+async def async_register_services(hass: HomeAssistant) -> None:
     """Register services for Growatt Server integration."""
 
     def get_min_coordinators() -> dict[str, GrowattCoordinator]:

homeassistant/components/hdfury/manifest.json

@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/hdfury",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "quality_scale": "gold",
+  "quality_scale": "silver",
   "requirements": ["hdfury==1.4.2"],
   "zeroconf": [
     { "name": "diva-*", "type": "_http._tcp.local." },

homeassistant/components/hdfury/quality_scale.yaml

@@ -46,26 +46,24 @@ rules:
   diagnostics: done
   discovery-update-info: done
   discovery: done
-  docs-data-update: done
-  docs-examples: done
-  docs-known-limitations: done
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
   docs-supported-devices: done
   docs-supported-functions: done
-  docs-troubleshooting: done
+  docs-troubleshooting: todo
   docs-use-cases: done
   dynamic-devices:
     status: exempt
     comment: Device type integration.
   entity-category: done
   entity-device-class: done
-  entity-disabled-by-default: done
+  entity-disabled-by-default: todo
   entity-translations: done
   exception-translations: done
   icon-translations: done
   reconfiguration-flow: done
-  repair-issues:
-    status: exempt
-    comment: The integration doesn't have any repair cases.
+  repair-issues: todo
   stale-devices:
     status: exempt
     comment: Device type integration.

homeassistant/components/hikvision/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "loggers": ["pyhik"],
   "quality_scale": "legacy",
-  "requirements": ["pyHik==0.4.2"]
+  "requirements": ["pyHik==0.4.1"]
 }

homeassistant/components/history_stats/__init__.py

@@ -8,7 +8,10 @@ import logging
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ENTITY_ID, CONF_STATE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device import async_entity_id_to_device_id
+from homeassistant.helpers.device import (
+    async_entity_id_to_device_id,
+    async_remove_stale_devices_links_keep_entity_device,
+)
 from homeassistant.helpers.helper_integration import (
     async_handle_source_entity_changes,
     async_remove_helper_config_entry_from_source_device,
@@ -50,6 +53,13 @@ async def async_setup_entry(
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
+    # This can be removed in HA Core 2026.2
+    async_remove_stale_devices_links_keep_entity_device(
+        hass,
+        entry.entry_id,
+        entry.options[CONF_ENTITY_ID],
+    )
+
     def set_source_entity_id_or_uuid(source_entity_id: str) -> None:
         hass.config_entries.async_update_entry(
             entry,

homeassistant/components/home_connect/binary_sensor.py

@@ -169,7 +169,6 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Home Connect binary sensor."""
     setup_home_connect_entry(
-        hass,
         entry,
         _get_entities_for_appliance,
         async_add_entities,

homeassistant/components/home_connect/button.py

@@ -73,7 +73,6 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Home Connect button entities."""
     setup_home_connect_entry(
-        hass,
         entry,
         _get_entities_for_appliance,
         async_add_entities,

homeassistant/components/home_connect/common.py

@@ -7,44 +7,18 @@ from typing import cast
 
 from aiohomeconnect.model import EventKey
 
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN
 from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
 from .entity import HomeConnectEntity, HomeConnectOptionEntity
 
 
-def should_add_option_entity(
-    description: EntityDescription,
-    appliance: HomeConnectApplianceData,
-    entity_registry: er.EntityRegistry,
-    platform: Platform,
-) -> bool:
-    """Check if the option entity should be added for the appliance.
-
-    This function returns `True` if the option is available in the appliance options
-    or if the entity was added in previous loads of this integration.
-    """
-    description_key = description.key
-    return description_key in appliance.options or (
-        entity_registry.async_get_entity_id(
-            platform, DOMAIN, f"{appliance.info.ha_id}-{description_key}"
-        )
-        is not None
-    )
-
-
 def _create_option_entities(
-    entity_registry: er.EntityRegistry,
     entry: HomeConnectConfigEntry,
     appliance: HomeConnectApplianceData,
     known_entity_unique_ids: dict[str, str],
     get_option_entities_for_appliance: Callable[
-        [HomeConnectConfigEntry, HomeConnectApplianceData, er.EntityRegistry],
+        [HomeConnectConfigEntry, HomeConnectApplianceData],
         list[HomeConnectOptionEntity],
     ],
     async_add_entities: AddConfigEntryEntitiesCallback,
@@ -52,9 +26,7 @@ def _create_option_entities(
     """Create the required option entities for the appliances."""
     option_entities_to_add = [
         entity
-        for entity in get_option_entities_for_appliance(
-            entry, appliance, entity_registry
-        )
+        for entity in get_option_entities_for_appliance(entry, appliance)
         if entity.unique_id not in known_entity_unique_ids
     ]
     known_entity_unique_ids.update(
@@ -67,14 +39,13 @@ def _create_option_entities(
 
 
 def _handle_paired_or_connected_appliance(
-    hass: HomeAssistant,
     entry: HomeConnectConfigEntry,
     known_entity_unique_ids: dict[str, str],
     get_entities_for_appliance: Callable[
         [HomeConnectConfigEntry, HomeConnectApplianceData], list[HomeConnectEntity]
     ],
     get_option_entities_for_appliance: Callable[
-        [HomeConnectConfigEntry, HomeConnectApplianceData, er.EntityRegistry],
+        [HomeConnectConfigEntry, HomeConnectApplianceData],
         list[HomeConnectOptionEntity],
     ]
     | None,
@@ -89,7 +60,6 @@ def _handle_paired_or_connected_appliance(
     already or it is the first time we see them when the appliance is connected.
     """
     entities: list[HomeConnectEntity] = []
-    entity_registry = er.async_get(hass)
     for appliance in entry.runtime_data.data.values():
         entities_to_add = [
             entity
@@ -99,9 +69,7 @@ def _handle_paired_or_connected_appliance(
         if get_option_entities_for_appliance:
             entities_to_add.extend(
                 entity
-                for entity in get_option_entities_for_appliance(
-                    entry, appliance, entity_registry
-                )
+                for entity in get_option_entities_for_appliance(entry, appliance)
                 if entity.unique_id not in known_entity_unique_ids
             )
             for event_key in (
@@ -112,7 +80,6 @@ def _handle_paired_or_connected_appliance(
                     entry.runtime_data.async_add_listener(
                         partial(
                             _create_option_entities,
-                            entity_registry,
                             entry,
                             appliance,
                             known_entity_unique_ids,
@@ -153,14 +120,13 @@ def _handle_depaired_appliance(
 
 
 def setup_home_connect_entry(
-    hass: HomeAssistant,
     entry: HomeConnectConfigEntry,
     get_entities_for_appliance: Callable[
         [HomeConnectConfigEntry, HomeConnectApplianceData], list[HomeConnectEntity]
     ],
     async_add_entities: AddConfigEntryEntitiesCallback,
     get_option_entities_for_appliance: Callable[
-        [HomeConnectConfigEntry, HomeConnectApplianceData, er.EntityRegistry],
+        [HomeConnectConfigEntry, HomeConnectApplianceData],
         list[HomeConnectOptionEntity],
     ]
     | None = None,
@@ -175,7 +141,6 @@ def setup_home_connect_entry(
         entry.runtime_data.async_add_special_listener(
             partial(
                 _handle_paired_or_connected_appliance,
-                hass,
                 entry,
                 known_entity_unique_ids,
                 get_entities_for_appliance,

homeassistant/components/home_connect/light.py

@@ -96,7 +96,6 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Home Connect light."""
     setup_home_connect_entry(
-        hass,
         entry,
         _get_entities_for_appliance,
         async_add_entities,

homeassistant/components/home_connect/number.py

@@ -11,13 +11,12 @@ from homeassistant.components.number import (
     NumberEntity,
     NumberEntityDescription,
 )
-from homeassistant.const import PERCENTAGE, Platform
+from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .common import setup_home_connect_entry, should_add_option_entity
+from .common import setup_home_connect_entry
 from .const import DOMAIN, UNIT_MAP
 from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
 from .entity import HomeConnectEntity, HomeConnectOptionEntity, constraint_fetcher
@@ -137,15 +136,12 @@ def _get_entities_for_appliance(
 def _get_option_entities_for_appliance(
     entry: HomeConnectConfigEntry,
     appliance: HomeConnectApplianceData,
-    entity_registry: er.EntityRegistry,
 ) -> list[HomeConnectOptionEntity]:
     """Get a list of currently available option entities."""
     return [
         HomeConnectOptionNumberEntity(entry.runtime_data, appliance, description)
         for description in NUMBER_OPTIONS
-        if should_add_option_entity(
-            description, appliance, entity_registry, Platform.NUMBER
-        )
+        if description.key in appliance.options
     ]
 
 
@@ -156,7 +152,6 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Home Connect number."""
     setup_home_connect_entry(
-        hass,
         entry,
         _get_entities_for_appliance,
         async_add_entities,

homeassistant/components/home_connect/select.py

@@ -11,13 +11,11 @@ from aiohomeconnect.model.error import HomeConnectError
 from aiohomeconnect.model.program import Execution
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .common import setup_home_connect_entry, should_add_option_entity
+from .common import setup_home_connect_entry
 from .const import (
     AVAILABLE_MAPS_ENUM,
     BEAN_AMOUNT_OPTIONS,
@@ -360,13 +358,12 @@ def _get_entities_for_appliance(
 def _get_option_entities_for_appliance(
     entry: HomeConnectConfigEntry,
     appliance: HomeConnectApplianceData,
-    entity_registry: er.EntityRegistry,
 ) -> list[HomeConnectOptionEntity]:
     """Get a list of entities."""
     return [
         HomeConnectSelectOptionEntity(entry.runtime_data, appliance, desc)
         for desc in PROGRAM_SELECT_OPTION_ENTITY_DESCRIPTIONS
-        if should_add_option_entity(desc, appliance, entity_registry, Platform.SELECT)
+        if desc.key in appliance.options
     ]
 
 
@@ -377,7 +374,6 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Home Connect select entities."""
     setup_home_connect_entry(
-        hass,
         entry,
         _get_entities_for_appliance,
         async_add_entities,

homeassistant/components/home_connect/sensor.py

@@ -115,6 +115,7 @@ SENSORS = (
         entity_category=EntityCategory.DIAGNOSTIC,
         native_unit_of_measurement=UnitOfVolume.MILLILITERS,
         device_class=SensorDeviceClass.VOLUME,
+        state_class=SensorStateClass.TOTAL_INCREASING,
         translation_key="hot_water_counter",
     ),
     HomeConnectSensorEntityDescription(
@@ -539,7 +540,6 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Home Connect sensor."""
     setup_home_connect_entry(
-        hass,
         entry,
         _get_entities_for_appliance,
         async_add_entities,

homeassistant/components/home_connect/switch.py

@@ -7,14 +7,12 @@ from aiohomeconnect.model import OptionKey, SettingKey
 from aiohomeconnect.model.error import HomeConnectError
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 
-from .common import setup_home_connect_entry, should_add_option_entity
+from .common import setup_home_connect_entry
 from .const import BSH_POWER_OFF, BSH_POWER_ON, BSH_POWER_STANDBY, DOMAIN
 from .coordinator import HomeConnectApplianceData, HomeConnectConfigEntry
 from .entity import HomeConnectEntity, HomeConnectOptionEntity
@@ -192,15 +190,12 @@ def _get_entities_for_appliance(
 def _get_option_entities_for_appliance(
     entry: HomeConnectConfigEntry,
     appliance: HomeConnectApplianceData,
-    entity_registry: er.EntityRegistry,
 ) -> list[HomeConnectOptionEntity]:
     """Get a list of currently available option entities."""
     return [
         HomeConnectSwitchOptionEntity(entry.runtime_data, appliance, description)
         for description in SWITCH_OPTIONS
-        if should_add_option_entity(
-            description, appliance, entity_registry, Platform.SWITCH
-        )
+        if description.key in appliance.options
     ]
 
 
@@ -211,7 +206,6 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Home Connect switch."""
     setup_home_connect_entry(
-        hass,
         entry,
         _get_entities_for_appliance,
         async_add_entities,

homeassistant/components/husqvarna_automower/__init__.py

@@ -1,25 +1,21 @@
 """The Husqvarna Automower integration."""
 
+import logging
+
 from aioautomower.session import AutomowerSession
 from aiohttp import ClientResponseError
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import (
-    aiohttp_client,
-    config_entry_oauth2_flow,
-    config_validation as cv,
-)
-from homeassistant.helpers.typing import ConfigType
+from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
 from homeassistant.util import dt as dt_util
 
 from . import api
-from .const import DOMAIN
 from .coordinator import AutomowerConfigEntry, AutomowerDataUpdateCoordinator
-from .services import async_setup_services
 
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+_LOGGER = logging.getLogger(__name__)
+
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
     Platform.BUTTON,
@@ -34,12 +30,6 @@ PLATFORMS: list[Platform] = [
 ]
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the component."""
-    async_setup_services(hass)
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: AutomowerConfigEntry) -> bool:
     """Set up this integration using UI."""
     implementation = (

homeassistant/components/husqvarna_automower/const.py

@@ -142,6 +142,3 @@ ERROR_KEYS = [
     "wrong_pin_code",
     "zone_generator_problem",
 ]
-
-MOW = "mow"
-PARK = "park"

homeassistant/components/husqvarna_automower/lawn_mower.py

@@ -1,9 +1,11 @@
 """Husqvarna Automower lawn mower entity."""
 
 from datetime import timedelta
+import logging
 from typing import TYPE_CHECKING
 
 from aioautomower.model import MowerActivities, MowerStates, WorkArea
+import voluptuous as vol
 
 from homeassistant.components.lawn_mower import (
     LawnMowerActivity,
@@ -12,13 +14,16 @@ from homeassistant.components.lawn_mower import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AutomowerConfigEntry
-from .const import DOMAIN, ERROR_STATES, MOW, PARK
+from .const import DOMAIN, ERROR_STATES
 from .coordinator import AutomowerDataUpdateCoordinator
 from .entity import AutomowerBaseEntity, handle_sending_exception
 
+_LOGGER = logging.getLogger(__name__)
+
 PARALLEL_UPDATES = 1
 
 DOCKED_ACTIVITIES = (MowerActivities.PARKED_IN_CS, MowerActivities.CHARGING)
@@ -36,6 +41,9 @@ SUPPORT_STATE_SERVICES = (
     | LawnMowerEntityFeature.PAUSE
     | LawnMowerEntityFeature.START_MOWING
 )
+MOW = "mow"
+PARK = "park"
+OVERRIDE_MODES = [MOW, PARK]
 
 
 async def async_setup_entry(
@@ -54,6 +62,31 @@ async def async_setup_entry(
     _async_add_new_devices(set(coordinator.data))
 
     coordinator.new_devices_callbacks.append(_async_add_new_devices)
+    platform = entity_platform.async_get_current_platform()
+    platform.async_register_entity_service(
+        "override_schedule",
+        {
+            vol.Required("override_mode"): vol.In(OVERRIDE_MODES),
+            vol.Required("duration"): vol.All(
+                cv.time_period,
+                cv.positive_timedelta,
+                vol.Range(min=timedelta(minutes=1), max=timedelta(days=42)),
+            ),
+        },
+        "async_override_schedule",
+    )
+    platform.async_register_entity_service(
+        "override_schedule_work_area",
+        {
+            vol.Required("work_area_id"): vol.Coerce(int),
+            vol.Required("duration"): vol.All(
+                cv.time_period,
+                cv.positive_timedelta,
+                vol.Range(min=timedelta(minutes=1), max=timedelta(days=42)),
+            ),
+        },
+        "async_override_schedule_work_area",
+    )
 
 
 class AutomowerLawnMowerEntity(AutomowerBaseEntity, LawnMowerEntity):

homeassistant/components/husqvarna_automower/services.py

@@ -1,49 +0,0 @@
-"""Husqvarna Automower services."""
-
-from datetime import timedelta
-
-import voluptuous as vol
-
-from homeassistant.components.lawn_mower import DOMAIN as LAWN_MOWER_DOMAIN
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, service
-
-from .const import DOMAIN, MOW, PARK
-
-OVERRIDE_MODES = [MOW, PARK]
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Set up services."""
-
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        "override_schedule",
-        entity_domain=LAWN_MOWER_DOMAIN,
-        schema={
-            vol.Required("override_mode"): vol.In(OVERRIDE_MODES),
-            vol.Required("duration"): vol.All(
-                cv.time_period,
-                cv.positive_timedelta,
-                vol.Range(min=timedelta(minutes=1), max=timedelta(days=42)),
-            ),
-        },
-        func="async_override_schedule",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        "override_schedule_work_area",
-        entity_domain=LAWN_MOWER_DOMAIN,
-        schema={
-            vol.Required("work_area_id"): vol.Coerce(int),
-            vol.Required("duration"): vol.All(
-                cv.time_period,
-                cv.positive_timedelta,
-                vol.Range(min=timedelta(minutes=1), max=timedelta(days=42)),
-            ),
-        },
-        func="async_override_schedule_work_area",
-    )

homeassistant/components/incomfort/manifest.json

@@ -12,5 +12,5 @@
   "iot_class": "local_polling",
   "loggers": ["incomfortclient"],
   "quality_scale": "platinum",
-  "requirements": ["incomfort-client==0.6.12"]
+  "requirements": ["incomfort-client==0.6.11"]
 }

homeassistant/components/incomfort/strings.json

@@ -90,7 +90,6 @@
           "boiler_int": "Boiler internal",
           "buffer": "Buffer",
           "central_heating": "Central heating",
-          "central_heating_low": "Central heating low",
           "central_heating_rf": "Central heating rf",
           "cv_temperature_too_high_e1": "Temperature too high",
           "flame_detection_fault_e6": "Flame detection fault",

homeassistant/components/input_boolean/strings.json

@@ -23,15 +23,15 @@
       "name": "[%key:common::action::reload%]"
     },
     "toggle": {
-      "description": "Toggles an input boolean on/off.",
+      "description": "Toggles the helper on/off.",
       "name": "[%key:common::action::toggle%]"
     },
     "turn_off": {
-      "description": "Turns off an input boolean.",
+      "description": "Turns off the helper.",
       "name": "[%key:common::action::turn_off%]"
     },
     "turn_on": {
-      "description": "Turns on an input boolean.",
+      "description": "Turns on the helper.",
       "name": "[%key:common::action::turn_on%]"
     }
   },

homeassistant/components/input_button/strings.json

@@ -15,7 +15,7 @@
   },
   "services": {
     "press": {
-      "description": "Mimics a physical button press on a device.",
+      "description": "Mimics the physical button press on the device.",
       "name": "Press"
     },
     "reload": {

homeassistant/components/input_number/strings.json

@@ -35,11 +35,11 @@
   },
   "services": {
     "decrement": {
-      "description": "Decrements the value of an input number by 1 step.",
+      "description": "Decrements the current value by 1 step.",
       "name": "Decrement"
     },
     "increment": {
-      "description": "Increments the value of an input number by 1 step.",
+      "description": "Increments the current value by 1 step.",
       "name": "Increment"
     },
     "reload": {
@@ -47,7 +47,7 @@
       "name": "[%key:common::action::reload%]"
     },
     "set_value": {
-      "description": "Sets the value of an input number.",
+      "description": "Sets the value.",
       "fields": {
         "value": {
           "description": "The target value.",

homeassistant/components/integration/__init__.py

@@ -7,7 +7,10 @@ import logging
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device import async_entity_id_to_device_id
+from homeassistant.helpers.device import (
+    async_entity_id_to_device_id,
+    async_remove_stale_devices_links_keep_entity_device,
+)
 from homeassistant.helpers.helper_integration import (
     async_handle_source_entity_changes,
     async_remove_helper_config_entry_from_source_device,
@@ -21,6 +24,13 @@ _LOGGER = logging.getLogger(__name__)
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Integration from a config entry."""
 
+    # This can be removed in HA Core 2026.2
+    async_remove_stale_devices_links_keep_entity_device(
+        hass,
+        entry.entry_id,
+        entry.options[CONF_SOURCE_SENSOR],
+    )
+
     def set_source_entity_id_or_uuid(source_entity_id: str) -> None:
         hass.config_entries.async_update_entry(
             entry,

homeassistant/components/iometer/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["iometer==0.4.0"],
+  "requirements": ["iometer==0.3.0"],
   "zeroconf": ["_iometer._tcp.local."]
 }

homeassistant/components/jvc_projector/__init__.py

@@ -76,7 +76,7 @@ async def async_migrate_entities(
     def _update_entry(entry: RegistryEntry) -> dict[str, str] | None:
         """Fix unique_id of power binary_sensor entry."""
         if entry.domain == Platform.BINARY_SENSOR and ":" not in entry.unique_id:
-            if entry.unique_id.endswith("_power"):
+            if "_power" in entry.unique_id:
                 return {"new_unique_id": f"{coordinator.unique_id}_power"}
         return None
 

homeassistant/components/jvc_projector/binary_sensor.py

@@ -8,6 +8,7 @@ from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
+from .const import POWER
 from .coordinator import JVCConfigEntry, JvcProjectorDataUpdateCoordinator
 from .entity import JvcProjectorEntity
 
@@ -40,4 +41,4 @@ class JvcBinarySensor(JvcProjectorEntity, BinarySensorEntity):
     @property
     def is_on(self) -> bool:
         """Return true if the JVC Projector is on."""
-        return self.coordinator.data[cmd.Power.name] in ON_STATUS
+        return self.coordinator.data[POWER] in ON_STATUS

homeassistant/components/jvc_projector/const.py

@@ -3,3 +3,7 @@
 NAME = "JVC Projector"
 DOMAIN = "jvc_projector"
 MANUFACTURER = "JVC"
+
+POWER = "power"
+INPUT = "input"
+SOURCE = "source"