Merge pull request #357 from Olen/fix/remove-orphaned-plant-entity

fix: tie plant entity to config entry for proper cleanup

Author: Olen

custom_components/plant/__init__.py

@@ -207,9 +207,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     component = EntityComponent(_LOGGER, DOMAIN, hass)
     await component.async_add_entities(plant_entities)
 
-    # Add the entities to device registry together with plant
+    # Add the entities to device registry and tie to config entry
     device_id = plant.device_id
-    await _plant_add_to_device_registry(hass, plant_entities, device_id)
+    await _plant_add_to_device_registry(hass, plant_entities, device_id, entry)
 
     # Set up utility sensor
     hass.data.setdefault(DATA_UTILITY, {})
@@ -317,9 +317,12 @@ async def replace_sensor(call: ServiceCall) -> None:
 
 
 async def _plant_add_to_device_registry(
-    hass: HomeAssistant, plant_entities: list[Entity], device_id: str
+    hass: HomeAssistant,
+    plant_entities: list[Entity],
+    device_id: str,
+    entry: ConfigEntry,
 ) -> None:
-    """Add all related entities to the correct device_id"""
+    """Add all related entities to the correct device and config entry."""
 
     # There must be a better way to do this, but I just can't find a way to set the
     # device_id when adding the entities.
@@ -329,7 +332,11 @@ async def _plant_add_to_device_registry(
             raise ConfigEntryNotReady(
                 f"Entity {entity.entity_id} not yet registered, retrying setup"
             )
-        erreg.async_update_entity(entity.registry_entry.entity_id, device_id=device_id)
+        erreg.async_update_entity(
+            entity.registry_entry.entity_id,
+            device_id=device_id,
+            config_entry_id=entry.entry_id,
+        )
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:

custom_components/plant/manifest.json

@@ -17,5 +17,5 @@
   "requirements": [
     "async-timeout>=4.0.2"
   ],
-  "version": "2026.2.1-beta2"
+  "version": "2026.2.1-beta3"
 }

tests/test_init.py

@@ -104,6 +104,12 @@ async def test_remove_entry(
         assert len(entities_before) > 0
         assert device_before is not None
 
+        # Verify the main plant entity is tied to the config entry
+        plant_entity_id = entity_registry.async_get_entity_id(DOMAIN, DOMAIN, entry_id)
+        assert plant_entity_id is not None
+        plant_entry = entity_registry.async_get(plant_entity_id)
+        assert plant_entry.config_entry_id == entry_id
+
         # Remove the config entry (this calls async_remove_entry)
         await hass.config_entries.async_remove(entry_id)
         await hass.async_block_till_done()
@@ -112,6 +118,9 @@ async def test_remove_entry(
         entities_after = er.async_entries_for_config_entry(entity_registry, entry_id)
         assert len(entities_after) == 0
 
+        # Verify the main plant entity is also removed
+        assert entity_registry.async_get(plant_entity_id) is None
+
         # Verify device is removed from registry
         device_after = device_registry.async_get_device(
             identifiers={(DOMAIN, entry_id)}