2026.5.3 (#171185)

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Paulus Schoutsen <balloob@gmail.com>

.claude/skills/ha-integration-knowledge/SKILL.md

@@ -15,7 +15,6 @@ description: Everything you need to know to build, test and review Home Assistan
 - For entity actions and entity services, avoid requesting redundant defensive checks for fields already enforced by Home Assistant validation schemas and entity filters; only request extra guards when values bypass validation or are transformed unsafely.
 - When validation guarantees a key is present, prefer direct dictionary indexing (`data["key"]`) over `.get("key")` so invalid assumptions fail fast.
 - Integrations should be thin wrappers. Protocol parsing, device state machines, or other domain logic belong in a separate PyPI library, not in the integration itself. If unsure, ask before inlining.
-- "potato" is a forbidden word for an integration and should never be used.
 
 The following platforms have extra guidelines:
 - **Diagnostics**: [`platform-diagnostics.md`](platform-diagnostics.md) for diagnostic data collection

.github/instructions/integrations.instructions.md

@@ -18,7 +18,6 @@ excludeAgent: "cloud-agent"
 - For entity actions and entity services, avoid requesting redundant defensive checks for fields already enforced by Home Assistant validation schemas and entity filters; only request extra guards when values bypass validation or are transformed unsafely.
 - When validation guarantees a key is present, prefer direct dictionary indexing (`data["key"]`) over `.get("key")` so invalid assumptions fail fast.
 - Integrations should be thin wrappers. Protocol parsing, device state machines, or other domain logic belong in a separate PyPI library, not in the integration itself. If unsure, ask before inlining.
-- "potato" is a forbidden word for an integration and should never be used.
 
 The following platforms have extra guidelines:
 - **Diagnostics**: [`platform-diagnostics.md`](platform-diagnostics.md) for diagnostic data collection

.github/renovate.json

@@ -6,7 +6,7 @@
     "pep621",
     "pip_requirements",
     "pre-commit",
-    "regex",
+    "custom.regex",
     "homeassistant-manifest"
   ],
 
@@ -27,8 +27,9 @@
     ]
   },
 
-  "regexManagers": [
+  "customManagers": [
     {
+      "customType": "regex",
       "description": "Update ruff required-version in pyproject.toml",
       "managerFilePatterns": ["/^pyproject\\.toml$/"],
       "matchStrings": ["required-version = \">=(?<currentValue>[\\d.]+)\""],

.github/workflows/ci.yaml

@@ -366,7 +366,7 @@ jobs:
           echo "key=uv-${UV_CACHE_VERSION}-${uv_version}-${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@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: venv
           key: >-
@@ -374,7 +374,8 @@ jobs:
             needs.info.outputs.python_cache_key }}
       - name: Restore uv wheel cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        id: cache-uv
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: ${{ env.UV_CACHE_DIR }}
           key: >-
@@ -398,6 +399,7 @@ jobs:
         if: |
           steps.cache-venv.outputs.cache-hit != 'true'
           || steps.cache-apt-check.outputs.cache-hit != 'true'
+        id: install-os-deps
         timeout-minutes: 10
         env:
           APT_CACHE_HIT: ${{ steps.cache-apt-check.outputs.cache-hit }}
@@ -431,7 +433,10 @@ jobs:
             sudo chmod -R 755 ${APT_CACHE_BASE}
           fi
       - name: Save apt cache
-        if: steps.cache-apt-check.outputs.cache-hit != 'true'
+        if: |
+          always()
+          && steps.cache-apt-check.outputs.cache-hit != 'true'
+          && steps.install-os-deps.outcome == 'success'
         uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
@@ -441,6 +446,7 @@ jobs:
             ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
+        id: create-venv
         run: |
           python -m venv venv
           . venv/bin/activate
@@ -471,6 +477,26 @@ jobs:
       - name: Check dirty
         run: |
           ./script/check_dirty
+      - name: Save uv wheel cache
+        if: |
+          (success() && steps.cache-venv.outputs.cache-hit != 'true')
+          || (always()
+            && steps.create-venv.outcome == 'success'
+            && steps.cache-uv.outputs.cache-matched-key == '')
+        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: ${{ env.UV_CACHE_DIR }}
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            steps.generate-uv-key.outputs.key }}
+      - name: Save base Python virtual environment
+        if: always() && steps.create-venv.outcome == 'success'
+        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: venv
+          key: >-
+            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
 
   hassfest:
     name: Check hassfest

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.10
+    rev: v0.15.12
     hooks:
       - id: ruff-check
         args:

CODEOWNERS

@@ -851,8 +851,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/input_select/ @home-assistant/core
 /homeassistant/components/input_text/ @home-assistant/core
 /tests/components/input_text/ @home-assistant/core
-/homeassistant/components/insteon/ @teharris1
-/tests/components/insteon/ @teharris1
+/homeassistant/components/insteon/ @teharris1 @ssyrell
+/tests/components/insteon/ @teharris1 @ssyrell
 /homeassistant/components/integration/ @dgomes
 /tests/components/integration/ @dgomes
 /homeassistant/components/intelliclima/ @dvdinth
@@ -1241,6 +1241,8 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/ollama/ @synesthesiam
 /tests/components/ollama/ @synesthesiam
 /homeassistant/components/ombi/ @larssont
+/homeassistant/components/omie/ @luuuis
+/tests/components/omie/ @luuuis
 /homeassistant/components/onboarding/ @home-assistant/core
 /tests/components/onboarding/ @home-assistant/core
 /homeassistant/components/ondilo_ico/ @JeromeHXP

homeassistant/auth/permissions/__init__.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
+from typing import TYPE_CHECKING
 
 import voluptuous as vol
 
@@ -13,6 +14,9 @@ from .models import PermissionLookup
 from .types import PolicyType
 from .util import test_all
 
+if TYPE_CHECKING:
+    from ..models import User
+
 POLICY_SCHEMA = vol.Schema({vol.Optional(CAT_ENTITIES): ENTITY_POLICY_SCHEMA})
 
 __all__ = [
@@ -22,10 +26,21 @@ __all__ = [
     "PermissionLookup",
     "PolicyPermissions",
     "PolicyType",
+    "filter_entity_ids_by_permission",
     "merge_policies",
 ]
 
 
+def filter_entity_ids_by_permission(
+    user: User, entity_ids: Iterable[str], key: str
+) -> list[str]:
+    """Filter entity IDs to those the user can access for the given policy key."""
+    if user.is_admin or user.permissions.access_all_entities(key):
+        return list(entity_ids)
+    check_entity = user.permissions.check_entity
+    return [entity_id for entity_id in entity_ids if check_entity(entity_id, key)]
+
+
 class AbstractPermissions:
     """Default permissions class."""
 

homeassistant/brands/sensereo.json

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

homeassistant/brands/zunzunbee.json

@@ -0,0 +1,5 @@
+{
+  "domain": "zunzunbee",
+  "name": "Zunzunbee",
+  "iot_standards": ["zigbee"]
+}

homeassistant/components/acaia/sensor.py

@@ -143,4 +143,4 @@ class AcaiaRestoreSensor(AcaiaEntity, RestoreSensor):
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
-        return super().available or self._restored_data is not None
+        return super().available or self.native_value is not None

homeassistant/components/acer_projector/manifest.json

@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/acer_projector",
   "iot_class": "local_polling",
   "quality_scale": "legacy",
-  "requirements": ["serialx==1.4.1"]
+  "requirements": ["serialx==1.7.3"]
 }

homeassistant/components/actron_air/climate.py

@@ -147,7 +147,7 @@ class ActronSystemClimate(ActronAirAcEntity, ActronAirClimateEntity):
     @property
     def target_temperature(self) -> float:
         """Return the target temperature."""
-        return self._status.user_aircon_settings.temperature_setpoint_cool_c
+        return self._status.user_aircon_settings.current_setpoint
 
     @actron_air_command
     async def async_set_fan_mode(self, fan_mode: str) -> None:
@@ -239,7 +239,7 @@ class ActronZoneClimate(ActronAirZoneEntity, ActronAirClimateEntity):
     @property
     def target_temperature(self) -> float | None:
         """Return the target temperature."""
-        return self._zone.temperature_setpoint_cool_c
+        return self._zone.current_setpoint
 
     @actron_air_command
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:

homeassistant/components/air_quality/condition.py

@@ -36,9 +36,7 @@ def _make_detected_condition(
 ) -> type[Condition]:
     """Create a detected condition for a binary sensor device class."""
     return make_entity_state_condition(
-        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)},
-        STATE_ON,
-        support_duration=True,
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_ON
     )
 
 
@@ -47,9 +45,7 @@ def _make_cleared_condition(
 ) -> type[Condition]:
     """Create a cleared condition for a binary sensor device class."""
     return make_entity_state_condition(
-        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)},
-        STATE_OFF,
-        support_duration=True,
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_OFF
     )
 
 

homeassistant/components/air_quality/conditions.yaml

@@ -4,11 +4,14 @@
   required: true
   default: any
   selector:
-    select:
-      translation_key: condition_behavior
-      options:
-        - all
-        - any
+    automation_behavior:
+      mode: condition
+
+.condition_for: &condition_for
+  required: true
+  default: 00:00:00
+  selector:
+    duration:
 
 # --- Unit lists for multi-unit pollutants ---
 
@@ -249,11 +252,7 @@
 .condition_binary_common: &condition_binary_common
   fields:
     behavior: *condition_behavior
-    for:
-      required: true
-      default: 00:00:00
-      selector:
-        duration:
+    for: *condition_for
 
 is_gas_detected:
   <<: *condition_binary_common
@@ -285,6 +284,7 @@ is_co_value:
   target: *target_co_sensor
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -299,6 +299,7 @@ is_ozone_value:
   target: *target_ozone
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -313,6 +314,7 @@ is_voc_value:
   target: *target_voc
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -327,6 +329,7 @@ is_voc_ratio_value:
   target: *target_voc_ratio
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -341,6 +344,7 @@ is_no_value:
   target: *target_no
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -355,6 +359,7 @@ is_no2_value:
   target: *target_no2
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -369,6 +374,7 @@ is_so2_value:
   target: *target_so2
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -385,6 +391,7 @@ is_co2_value:
   target: *target_co2
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -397,6 +404,7 @@ is_pm1_value:
   target: *target_pm1
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -409,6 +417,7 @@ is_pm25_value:
   target: *target_pm25
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -421,6 +430,7 @@ is_pm4_value:
   target: *target_pm4
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -433,6 +443,7 @@ is_pm10_value:
   target: *target_pm10
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -445,6 +456,7 @@ is_n2o_value:
   target: *target_n2o
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:

homeassistant/components/air_quality/strings.json

@@ -14,6 +14,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -50,6 +53,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -86,6 +92,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -98,6 +107,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -110,6 +122,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -122,6 +137,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -134,6 +152,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -146,6 +167,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -158,6 +182,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -170,6 +197,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -206,6 +236,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -218,6 +251,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -230,6 +266,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
@@ -237,21 +276,6 @@
       "name": "Volatile organic compounds value"
     }
   },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "title": "Air Quality",
   "triggers": {
     "co2_changed": {

homeassistant/components/air_quality/triggers.yaml

@@ -3,12 +3,8 @@
     required: true
     default: any
     selector:
-      select:
-        translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
+      automation_behavior:
+        mode: trigger
   for: &trigger_for
     required: true
     default: 00:00:00

homeassistant/components/alarm_control_panel/condition.py

@@ -4,7 +4,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.condition import (
-    ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL_FOR,
     Condition,
     EntityStateConditionBase,
     make_entity_state_condition,
@@ -26,7 +25,6 @@ class EntityStateRequiredFeaturesCondition(EntityStateConditionBase):
     """State condition."""
 
     _required_features: int
-    _schema = ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL_FOR
 
     def entity_filter(self, entities: set[str]) -> set[str]:
         """Filter entities of this domain with the required features."""
@@ -84,11 +82,9 @@ CONDITIONS: dict[str, type[Condition]] = {
         AlarmControlPanelState.ARMED_VACATION,
         AlarmControlPanelEntityFeature.ARM_VACATION,
     ),
-    "is_disarmed": make_entity_state_condition(
-        DOMAIN, AlarmControlPanelState.DISARMED, support_duration=True
-    ),
+    "is_disarmed": make_entity_state_condition(DOMAIN, AlarmControlPanelState.DISARMED),
     "is_triggered": make_entity_state_condition(
-        DOMAIN, AlarmControlPanelState.TRIGGERED, support_duration=True
+        DOMAIN, AlarmControlPanelState.TRIGGERED
     ),
 }
 

homeassistant/components/alarm_control_panel/conditions.yaml

@@ -1,22 +1,14 @@
 .condition_common: &condition_common
-  target: &condition_common_target
+  target:
     entity:
       domain: alarm_control_panel
   fields: &condition_common_fields
-    behavior: &condition_common_behavior
+    behavior:
       required: true
       default: any
       selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
-
-.condition_common_for: &condition_common_for
-  target: *condition_common_target
-  fields: &condition_common_for_fields
-    behavior: *condition_common_behavior
+        automation_behavior:
+          mode: condition
     for:
       required: true
       default: 00:00:00
@@ -26,7 +18,7 @@
 is_armed: *condition_common
 
 is_armed_away:
-  fields: *condition_common_for_fields
+  fields: *condition_common_fields
   target:
     entity:
       domain: alarm_control_panel
@@ -34,7 +26,7 @@ is_armed_away:
         - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_AWAY
 
 is_armed_home:
-  fields: *condition_common_for_fields
+  fields: *condition_common_fields
   target:
     entity:
       domain: alarm_control_panel
@@ -42,7 +34,7 @@ is_armed_home:
         - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_HOME
 
 is_armed_night:
-  fields: *condition_common_for_fields
+  fields: *condition_common_fields
   target:
     entity:
       domain: alarm_control_panel
@@ -50,13 +42,13 @@ is_armed_night:
         - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_NIGHT
 
 is_armed_vacation:
-  fields: *condition_common_for_fields
+  fields: *condition_common_fields
   target:
     entity:
       domain: alarm_control_panel
       supported_features:
         - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_VACATION
 
-is_disarmed: *condition_common_for
+is_disarmed: *condition_common
 
-is_triggered: *condition_common_for
+is_triggered: *condition_common

homeassistant/components/alarm_control_panel/strings.json

@@ -11,6 +11,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::alarm_control_panel::common::condition_for_name%]"
         }
       },
       "name": "Alarm is armed"
@@ -160,21 +163,6 @@
       "message": "Arming requires a code but none was given for {entity_id}."
     }
   },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "alarm_arm_away": {
       "description": "Arms an alarm in the away mode.",

homeassistant/components/alarm_control_panel/triggers.yaml

@@ -7,12 +7,8 @@
       required: true
       default: any
       selector:
-        select:
-          options:
-            - first
-            - last
-            - any
-          translation_key: trigger_behavior
+        automation_behavior:
+          mode: trigger
     for:
       required: true
       default: 00:00:00

homeassistant/components/alexa/state_report.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from asyncio import timeout
 from collections.abc import Mapping
+from datetime import datetime, timedelta
 from http import HTTPStatus
 import json
 import logging
@@ -13,7 +14,12 @@ from uuid import uuid4
 import aiohttp
 
 from homeassistant.components import event
-from homeassistant.const import EVENT_STATE_CHANGED, STATE_ON
+from homeassistant.const import (
+    EVENT_STATE_CHANGED,
+    STATE_ON,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+)
 from homeassistant.core import (
     CALLBACK_TYPE,
     Event,
@@ -53,6 +59,25 @@ DEFAULT_TIMEOUT = 10
 TO_REDACT = {"correlationToken", "token"}
 
 
+def valid_doorbell_timestamp(entity_id: str, event_state: str) -> bool:
+    """Check if doorbell event timestamp is valid."""
+    if event_state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
+        return False
+    try:
+        timestamp = datetime.fromisoformat(event_state)
+    except ValueError:
+        _LOGGER.debug(
+            "Unable to parse ISO timestamp from state for %s. Got %s",
+            entity_id,
+            event_state,
+        )
+        return False
+    else:
+        if (dt_util.utcnow() - timestamp) < timedelta(seconds=30):
+            return True
+        return False
+
+
 class AlexaDirective:
     """An incoming Alexa directive."""
 
@@ -317,9 +342,17 @@ async def async_enable_proactive_mode(
 
         if should_doorbell:
             old_state = data["old_state"]
-            if new_state.domain == event.DOMAIN or (
+            if (
+                new_state.domain == event.DOMAIN
+                and valid_doorbell_timestamp(new_state.entity_id, new_state.state)
+                and (old_state is None or old_state.state != STATE_UNAVAILABLE)
+                and (old_state is None or old_state.state != new_state.state)
+            ) or (
                 new_state.state == STATE_ON
-                and (old_state is None or old_state.state != STATE_ON)
+                and (
+                    old_state is None
+                    or old_state.state not in (STATE_ON, STATE_UNAVAILABLE)
+                )
             ):
                 await async_send_doorbell_event_message(
                     hass, smart_home_config, alexa_changed_entity

homeassistant/components/alexa_devices/__init__.py

@@ -11,6 +11,7 @@ from .services import async_setup_services
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
+    Platform.BUTTON,
     Platform.NOTIFY,
     Platform.SENSOR,
     Platform.SWITCH,

homeassistant/components/alexa_devices/button.py

@@ -0,0 +1,55 @@
+"""Support for buttons."""
+
+from homeassistant.components.button import ButtonEntity
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity import EntityDescription
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import slugify
+
+from .coordinator import AmazonConfigEntry, AmazonDevicesCoordinator
+from .entity import AmazonServiceEntity
+
+# Coordinator is used to centralize the data updates
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: AmazonConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up button entities for Alexa Devices."""
+    coordinator = entry.runtime_data
+
+    known_routines: set[str] = set()
+
+    def _check_routines() -> None:
+        current_routines = set(coordinator.api.routines)
+        new_routines = current_routines - known_routines
+        if new_routines:
+            known_routines.update(new_routines)
+            async_add_entities(
+                AmazonRoutineButton(coordinator, routine) for routine in new_routines
+            )
+
+    _check_routines()
+    entry.async_on_unload(coordinator.async_add_listener(_check_routines))
+
+
+class AmazonRoutineButton(AmazonServiceEntity, ButtonEntity):
+    """Button entity for Alexa routine."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: AmazonDevicesCoordinator, routine: str) -> None:
+        """Initialize the routine button entity."""
+        self._coordinator = coordinator
+        self._routine = routine
+        super().__init__(
+            coordinator,
+            EntityDescription(key=slugify(routine), name=routine),
+        )
+
+    async def async_press(self) -> None:
+        """Handle button press action."""
+        await self._coordinator.api.call_routine(self._routine)

homeassistant/components/alexa_devices/coordinator.py

@@ -12,12 +12,13 @@ from aioamazondevices.structures import AmazonDevice
 from aiohttp import ClientSession
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util import slugify
 
 from .const import _LOGGER, CONF_LOGIN_DATA, DOMAIN
 
@@ -64,6 +65,13 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
             for identifier_domain, identifier in device.identifiers
             if identifier_domain == DOMAIN
         }
+        self.previous_routines: set[str] = {
+            routine.unique_id
+            for routine in er.async_entries_for_config_entry(
+                er.async_get(hass), entry.entry_id
+            )
+            if routine.domain == Platform.BUTTON
+        }
 
     async def _async_update_data(self) -> dict[str, AmazonDevice]:
         """Update device data."""
@@ -92,8 +100,13 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
             current_devices = set(data.keys())
             if stale_devices := self.previous_devices - current_devices:
                 await self._async_remove_device_stale(stale_devices)
-
             self.previous_devices = current_devices
+
+            current_routines = {slugify(routine) for routine in self.api.routines}
+            if stale_routines := self.previous_routines - current_routines:
+                await self._async_remove_routine_stale(stale_routines)
+            self.previous_routines = current_routines
+
             return data
 
     async def _async_remove_device_stale(
@@ -116,3 +129,23 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
                     device_id=device.id,
                     remove_config_entry_id=self.config_entry.entry_id,
                 )
+
+    async def _async_remove_routine_stale(
+        self,
+        stale_routines: set[str],
+    ) -> None:
+        """Remove stale routine."""
+        entity_registry = er.async_get(self.hass)
+
+        for routine in stale_routines:
+            _LOGGER.debug(
+                "Detected change in routines: routine %s removed",
+                routine,
+            )
+            entity_id = entity_registry.async_get_entity_id(
+                Platform.BUTTON,
+                DOMAIN,
+                f"{slugify(self.config_entry.unique_id)}-{slugify(routine)}",
+            )
+            if entity_id:
+                entity_registry.async_remove(entity_id)

homeassistant/components/alexa_devices/entity.py

@@ -2,9 +2,10 @@
 
 from aioamazondevices.structures import AmazonDevice
 
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.util import slugify
 
 from .const import DOMAIN
 from .coordinator import AmazonDevicesCoordinator
@@ -50,3 +51,32 @@ class AmazonEntity(CoordinatorEntity[AmazonDevicesCoordinator]):
             and self._serial_num in self.coordinator.data
             and self.device.online
         )
+
+
+class AmazonServiceEntity(CoordinatorEntity[AmazonDevicesCoordinator]):
+    """Defines Alexa Devices entity for service device."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AmazonDevicesCoordinator,
+        description: EntityDescription,
+    ) -> None:
+        """Initialize the service entity."""
+
+        super().__init__(coordinator)
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, service_device_id(coordinator))},
+            manufacturer="Amazon",
+            entry_type=DeviceEntryType.SERVICE,
+        )
+        self.entity_description = description
+        self._attr_unique_id = (
+            f"{slugify(coordinator.config_entry.unique_id)}-{description.key}"
+        )
+
+
+def service_device_id(coordinator: AmazonDevicesCoordinator) -> str:
+    """Return service device id."""
+    return slugify(f"{coordinator.config_entry.unique_id}_service_device")

homeassistant/components/apple_tv/binary_sensor.py

@@ -7,7 +7,7 @@ from pyatv.interface import AppleTV, KeyboardListener
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
 from homeassistant.const import CONF_NAME
-from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
@@ -23,23 +23,33 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Load Apple TV binary sensor based on a config entry."""
-    # apple_tv config entries always have a unique id
     manager = config_entry.runtime_data
-    cb: CALLBACK_TYPE
+    added = False
 
+    @callback
     def setup_entities(atv: AppleTV) -> None:
+        nonlocal added
+        if added:
+            return
         if atv.features.in_state(FeatureState.Available, FeatureName.TextFocusState):
             assert config_entry.unique_id is not None
             name: str = config_entry.data[CONF_NAME]
             async_add_entities(
                 [AppleTVKeyboardFocused(name, config_entry.unique_id, manager)]
             )
-            cb()
+            added = True
 
-    cb = async_dispatcher_connect(
-        hass, f"{SIGNAL_CONNECTED}_{config_entry.unique_id}", setup_entities
+    config_entry.async_on_unload(
+        async_dispatcher_connect(
+            hass, f"{SIGNAL_CONNECTED}_{config_entry.unique_id}", setup_entities
+        )
     )
-    config_entry.async_on_unload(cb)
+
+    # The manager may have already connected (and dispatched SIGNAL_CONNECTED)
+    # before this platform was forwarded, in which case the signal above was
+    # missed; handle that case directly.
+    if manager.atv is not None:
+        setup_entities(manager.atv)
 
 
 class AppleTVKeyboardFocused(AppleTVEntity, BinarySensorEntity, KeyboardListener):

homeassistant/components/assist_satellite/condition.py

@@ -7,17 +7,13 @@ from .const import DOMAIN
 from .entity import AssistSatelliteState
 
 CONDITIONS: dict[str, type[Condition]] = {
-    "is_idle": make_entity_state_condition(
-        DOMAIN, AssistSatelliteState.IDLE, support_duration=True
-    ),
-    "is_listening": make_entity_state_condition(
-        DOMAIN, AssistSatelliteState.LISTENING, support_duration=True
-    ),
+    "is_idle": make_entity_state_condition(DOMAIN, AssistSatelliteState.IDLE),
+    "is_listening": make_entity_state_condition(DOMAIN, AssistSatelliteState.LISTENING),
     "is_processing": make_entity_state_condition(
-        DOMAIN, AssistSatelliteState.PROCESSING, support_duration=True
+        DOMAIN, AssistSatelliteState.PROCESSING
     ),
     "is_responding": make_entity_state_condition(
-        DOMAIN, AssistSatelliteState.RESPONDING, support_duration=True
+        DOMAIN, AssistSatelliteState.RESPONDING
     ),
 }
 

homeassistant/components/assist_satellite/conditions.yaml

@@ -7,11 +7,8 @@
       required: true
       default: any
       selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
+        automation_behavior:
+          mode: condition
     for:
       required: true
       default: 00:00:00

homeassistant/components/assist_satellite/strings.json

@@ -72,19 +72,6 @@
         "id": "Answer ID",
         "sentences": "Sentences"
       }
-    },
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
     }
   },
   "services": {

homeassistant/components/assist_satellite/triggers.yaml

@@ -7,12 +7,8 @@
       required: true
       default: any
       selector:
-        select:
-          options:
-            - first
-            - last
-            - any
-          translation_key: trigger_behavior
+        automation_behavior:
+          mode: trigger
     for:
       required: true
       default: 00:00:00

homeassistant/components/automation/__init__.py

@@ -194,6 +194,7 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "switch",
     "temperature",
     "text",
+    "timer",
     "todo",
     "update",
     "vacuum",
@@ -900,8 +901,13 @@ class AutomationEntity(BaseAutomationEntity, RestoreEntity):
     async def async_will_remove_from_hass(self) -> None:
         """Remove listeners when removing automation from Home Assistant."""
         await super().async_will_remove_from_hass()
-        await self._async_disable()
-        self.action_script.async_unload()
+        if self.registry_entry and self.registry_entry.entity_id != self.entity_id:
+            # Entity ID change, do not unload the script or conditions as they will
+            # be reused.
+            await self._async_disable()
+            return
+        await self._async_disable(stop_actions=False)
+        await self.action_script.async_unload()
         if self._condition is not None:
             self._condition.async_unload()
 

homeassistant/components/axis/const.py

@@ -18,4 +18,10 @@ DEFAULT_STREAM_PROFILE = "No stream profile"
 DEFAULT_TRIGGER_TIME = 0
 DEFAULT_VIDEO_SOURCE = "No video source"
 
-PLATFORMS = [Platform.BINARY_SENSOR, Platform.CAMERA, Platform.LIGHT, Platform.SWITCH]
+PLATFORMS = [
+    Platform.BINARY_SENSOR,
+    Platform.CAMERA,
+    Platform.EVENT,
+    Platform.LIGHT,
+    Platform.SWITCH,
+]

homeassistant/components/axis/event.py

@@ -0,0 +1,62 @@
+"""Support for Axis event entities."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from axis.models.event import Event, EventTopic
+
+from homeassistant.components.event import (
+    DoorbellEventType,
+    EventDeviceClass,
+    EventEntity,
+    EventEntityDescription,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import AxisConfigEntry
+from .entity import AxisEventDescription, AxisEventEntity
+
+DOORBELL_CONFIG = ("I8116-E", "0")
+
+
+@dataclass(frozen=True, kw_only=True)
+class AxisEventPlatformDescription(AxisEventDescription, EventEntityDescription):
+    """Axis event entity description."""
+
+
+ENTITY_DESCRIPTIONS = (
+    AxisEventPlatformDescription(
+        key="Doorbell",
+        device_class=EventDeviceClass.DOORBELL,
+        event_types=[DoorbellEventType.RING],
+        event_topic=EventTopic.PORT_INPUT,
+        name_fn=lambda _hub, _event: "Doorbell",
+        supported_fn=lambda hub, event: (hub.config.model, event.id) == DOORBELL_CONFIG,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: AxisConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up an Axis event platform."""
+    config_entry.runtime_data.entity_loader.register_platform(
+        async_add_entities, AxisEvent, ENTITY_DESCRIPTIONS
+    )
+
+
+class AxisEvent(AxisEventEntity, EventEntity):
+    """Representation of an Axis event entity."""
+
+    entity_description: AxisEventPlatformDescription
+
+    @callback
+    def async_event_callback(self, event: Event) -> None:
+        """Handle Axis event updates."""
+        if event.is_tripped:
+            self._trigger_event(DoorbellEventType.RING)
+            self.async_write_ha_state()

homeassistant/components/axis/manifest.json

@@ -29,7 +29,7 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["axis"],
-  "requirements": ["axis==69"],
+  "requirements": ["axis==71"],
   "ssdp": [
     {
       "manufacturer": "AXIS"

homeassistant/components/battery/condition.py

@@ -30,19 +30,29 @@ BATTERY_PERCENTAGE_DOMAIN_SPECS = {
 
 CONDITIONS: dict[str, type[Condition]] = {
     "is_low": make_entity_state_condition(
-        BATTERY_DOMAIN_SPECS, STATE_ON, support_duration=True
+        BATTERY_DOMAIN_SPECS,
+        STATE_ON,
+        primary_entities_only=False,
     ),
     "is_not_low": make_entity_state_condition(
-        BATTERY_DOMAIN_SPECS, STATE_OFF, support_duration=True
+        BATTERY_DOMAIN_SPECS,
+        STATE_OFF,
+        primary_entities_only=False,
     ),
     "is_charging": make_entity_state_condition(
-        BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON, support_duration=True
+        BATTERY_CHARGING_DOMAIN_SPECS,
+        STATE_ON,
+        primary_entities_only=False,
     ),
     "is_not_charging": make_entity_state_condition(
-        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF, support_duration=True
+        BATTERY_CHARGING_DOMAIN_SPECS,
+        STATE_OFF,
+        primary_entities_only=False,
     ),
     "is_level": make_entity_numerical_condition(
-        BATTERY_PERCENTAGE_DOMAIN_SPECS, PERCENTAGE
+        BATTERY_PERCENTAGE_DOMAIN_SPECS,
+        PERCENTAGE,
+        primary_entities_only=False,
     ),
 }
 

homeassistant/components/battery/conditions.yaml

@@ -3,16 +3,14 @@
     entity:
       - domain: binary_sensor
         device_class: battery
+    primary_entities_only: false
   fields:
     behavior: &condition_behavior
       required: true
       default: any
       selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
+        automation_behavior:
+          mode: condition
     for: &condition_for
       required: true
       default: 00:00:00
@@ -42,6 +40,7 @@ is_charging:
     entity:
       - domain: binary_sensor
         device_class: battery_charging
+    primary_entities_only: false
   fields:
     behavior: *condition_behavior
     for: *condition_for
@@ -51,6 +50,7 @@ is_not_charging:
     entity:
       - domain: binary_sensor
         device_class: battery_charging
+    primary_entities_only: false
   fields:
     behavior: *condition_behavior
     for: *condition_for
@@ -60,8 +60,10 @@ is_level:
     entity:
       - domain: sensor
         device_class: battery
+    primary_entities_only: false
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:

homeassistant/components/battery/strings.json

@@ -26,6 +26,9 @@
         "behavior": {
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::battery::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::battery::common::condition_threshold_name%]"
         }
@@ -69,21 +72,6 @@
       "name": "Battery is not low"
     }
   },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "title": "Battery",
   "triggers": {
     "level_changed": {

homeassistant/components/battery/triggers.yaml

@@ -3,12 +3,8 @@
     required: true
     default: any
     selector:
-      select:
-        translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
+      automation_behavior:
+        mode: trigger
   for: &trigger_for
     required: true
     default: 00:00:00

homeassistant/components/bayesian/config_flow.py

@@ -33,11 +33,13 @@ from homeassistant.components.update import DOMAIN as UPDATE_DOMAIN
 from homeassistant.components.weather import DOMAIN as WEATHER_DOMAIN
 from homeassistant.components.zone import DOMAIN as ZONE_DOMAIN
 from homeassistant.config_entries import (
+    SOURCE_USER,
     ConfigEntry,
     ConfigFlowResult,
     ConfigSubentry,
-    ConfigSubentryData,
     ConfigSubentryFlow,
+    FlowType,
+    SubentryFlowContext,
     SubentryFlowResult,
 )
 from homeassistant.const import (
@@ -62,7 +64,6 @@ from homeassistant.helpers.schema_config_entry_flow import (
 
 from .binary_sensor import above_greater_than_below, no_overlapping
 from .const import (
-    CONF_OBSERVATIONS,
     CONF_P_GIVEN_F,
     CONF_P_GIVEN_T,
     CONF_PRIOR,
@@ -373,26 +374,6 @@ def _validate_observation_subentry(
     return user_input
 
 
-async def _validate_subentry_from_config_entry(
-    handler: SchemaCommonFlowHandler, user_input: dict[str, Any]
-) -> dict[str, Any]:
-    # Standard behavior is to merge the result with the options.
-    # In this case, we want to add a subentry so we update the options directly.
-    observations: list[dict[str, Any]] = handler.options.setdefault(
-        CONF_OBSERVATIONS, []
-    )
-
-    if handler.parent_handler.cur_step is not None:
-        user_input[CONF_PLATFORM] = handler.parent_handler.cur_step["step_id"]
-        user_input = _validate_observation_subentry(
-            user_input[CONF_PLATFORM],
-            user_input,
-            other_subentries=handler.options[CONF_OBSERVATIONS],
-        )
-    observations.append(user_input)
-    return {}
-
-
 async def _get_description_placeholders(
     handler: SchemaCommonFlowHandler,
 ) -> dict[str, str]:
@@ -420,48 +401,12 @@ async def _get_description_placeholders(
     }
 
 
-async def _get_observation_menu_options(handler: SchemaCommonFlowHandler) -> list[str]:
-    """Return the menu options for the observation selector."""
-    options = [typ.value for typ in ObservationTypes]
-    if handler.options.get(CONF_OBSERVATIONS):
-        options.append("finish")
-    return options
-
-
 CONFIG_FLOW: dict[str, SchemaFlowMenuStep | SchemaFlowFormStep] = {
     str(USER): SchemaFlowFormStep(
         CONFIG_SCHEMA,
         validate_user_input=_validate_user,
-        next_step=str(OBSERVATION_SELECTOR),
         description_placeholders=_get_description_placeholders,
-    ),
-    str(OBSERVATION_SELECTOR): SchemaFlowMenuStep(
-        _get_observation_menu_options,
-    ),
-    str(ObservationTypes.STATE): SchemaFlowFormStep(
-        STATE_SUBSCHEMA,
-        next_step=str(OBSERVATION_SELECTOR),
-        validate_user_input=_validate_subentry_from_config_entry,
-        # Prevent the name of the bayesian sensor from being used as the suggested
-        # name of the observations
-        suggested_values=None,
-        description_placeholders=_get_description_placeholders,
-    ),
-    str(ObservationTypes.NUMERIC_STATE): SchemaFlowFormStep(
-        NUMERIC_STATE_SUBSCHEMA,
-        next_step=str(OBSERVATION_SELECTOR),
-        validate_user_input=_validate_subentry_from_config_entry,
-        suggested_values=None,
-        description_placeholders=_get_description_placeholders,
-    ),
-    str(ObservationTypes.TEMPLATE): SchemaFlowFormStep(
-        TEMPLATE_SUBSCHEMA,
-        next_step=str(OBSERVATION_SELECTOR),
-        validate_user_input=_validate_subentry_from_config_entry,
-        suggested_values=None,
-        description_placeholders=_get_description_placeholders,
-    ),
-    "finish": SchemaFlowFormStep(),
+    )
 }
 
 
@@ -497,27 +442,17 @@ class BayesianConfigFlowHandler(SchemaConfigFlowHandler, domain=DOMAIN):
         name: str = options[CONF_NAME]
         return name
 
-    @callback
-    def async_create_entry(
-        self,
-        data: Mapping[str, Any],
-        **kwargs: Any,
-    ) -> ConfigFlowResult:
-        """Finish config flow and create a config entry."""
-        data = dict(data)
-        observations = data.pop(CONF_OBSERVATIONS)
-        subentries: list[ConfigSubentryData] = [
-            ConfigSubentryData(
-                data=observation,
-                title=observation[CONF_NAME],
-                subentry_type="observation",
-                unique_id=None,
-            )
-            for observation in observations
-        ]
-
-        self.async_config_flow_finished(data)
-        return super().async_create_entry(data=data, subentries=subentries, **kwargs)
+    async def async_on_create_entry(self, result: ConfigFlowResult) -> ConfigFlowResult:
+        """Start subentry flow when config entry has been created."""
+        subentry_result = await self.hass.config_entries.subentries.async_init(
+            (result["result"].entry_id, "observation"),
+            context=SubentryFlowContext(source=SOURCE_USER),
+        )
+        result["next_flow"] = (
+            FlowType.CONFIG_SUBENTRIES_FLOW,
+            subentry_result["flow_id"],
+        )
+        return result
 
 
 class ObservationSubentryFlowHandler(ConfigSubentryFlow):

homeassistant/components/blebox/const.py

@@ -13,3 +13,7 @@ UNKNOWN = "unknown"
 
 DEFAULT_HOST = "192.168.0.2"
 DEFAULT_PORT = 80
+
+
+LIGHT_MAX_KELVINS = 6500  # 154 Mireds
+LIGHT_MIN_KELVINS = 2700  # 370 Mireds

homeassistant/components/blebox/cover.py

@@ -85,7 +85,9 @@ class BleBoxCoverEntity(BleBoxEntity[blebox_uniapi.cover.Cover], CoverEntity):
         if position == -1:  # possible for shutterBox
             return None
 
-        return None if position is None else 100 - position
+        if position is None:
+            return None
+        return 100 - position if self._feature.is_position_inverted else position
 
     @property
     def current_cover_tilt_position(self) -> int | None:

homeassistant/components/blebox/light.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from datetime import timedelta
 import logging
+import math
 from typing import Any
 
 import blebox_uniapi.light
@@ -22,9 +23,9 @@ from homeassistant.components.light import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.util import color as color_util
 
 from . import BleBoxConfigEntry
+from .const import LIGHT_MAX_KELVINS, LIGHT_MIN_KELVINS
 from .entity import BleBoxEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -59,8 +60,8 @@ COLOR_MODE_MAP = {
 class BleBoxLightEntity(BleBoxEntity[blebox_uniapi.light.Light], LightEntity):
     """Representation of BleBox lights."""
 
-    _attr_min_color_temp_kelvin = 2700  # 370 Mireds
-    _attr_max_color_temp_kelvin = 6500  # 154 Mireds
+    _attr_min_color_temp_kelvin = LIGHT_MIN_KELVINS
+    _attr_max_color_temp_kelvin = LIGHT_MAX_KELVINS
 
     def __init__(self, feature: blebox_uniapi.light.Light) -> None:
         """Initialize a BleBox light."""
@@ -78,10 +79,43 @@ class BleBoxLightEntity(BleBoxEntity[blebox_uniapi.light.Light], LightEntity):
         """Return the name."""
         return self._feature.brightness
 
+    def _color_temp_to_native_scale(self, x: int) -> int:
+        """Convert color temperature from Kelvin to native BleBox scale (0-255).
+
+        BleBox native scale is inverted relative to Kelvin: 0=warm (2700K), 255=cold (6500K).
+        """
+        scaled = (
+            (self._attr_max_color_temp_kelvin - x)
+            / (self._attr_max_color_temp_kelvin - self._attr_min_color_temp_kelvin)
+        ) * 255
+        # note: within the operating temperature range here the Kelvin
+        # scale has less "integer steps" than the native scale used
+        # by blebox devices. Thus we need to use rounding method that is opposite
+        # to the one used in _color_temp_from_native_scale in order to avoid
+        # temperature value jumping by one step when the temperature value is read
+        # back from the device
+        bounded = max(min(math.floor(scaled), 255), 0)
+        return int(bounded)
+
+    def _color_temp_from_native_scale(self, x: int) -> int:
+        """Convert color temperature from native BleBox scale (0-255) to Kelvin.
+
+        BleBox native scale is inverted relative to Kelvin: 0=warm (2700K), 255=cold (6500K).
+        """
+        scaled = self._attr_max_color_temp_kelvin - (x / 255) * (
+            self._attr_max_color_temp_kelvin - self._attr_min_color_temp_kelvin
+        )
+        # note: see _color_temp_to_native_scale for explanation of rounding method
+        bounded = max(
+            min(math.ceil(scaled), self._attr_max_color_temp_kelvin),
+            self._attr_min_color_temp_kelvin,
+        )
+        return int(bounded)
+
     @property
     def color_temp_kelvin(self) -> int:
         """Return the color temperature value in Kelvin."""
-        return color_util.color_temperature_mired_to_kelvin(self._feature.color_temp)
+        return self._color_temp_from_native_scale(self._feature.color_temp)
 
     @property
     def color_mode(self) -> ColorMode:
@@ -139,15 +173,16 @@ class BleBoxLightEntity(BleBoxEntity[blebox_uniapi.light.Light], LightEntity):
         effect = kwargs.get(ATTR_EFFECT)
         color_temp_kelvin = kwargs.get(ATTR_COLOR_TEMP_KELVIN)
         rgbww = kwargs.get(ATTR_RGBWW_COLOR)
+        rgb = kwargs.get(ATTR_RGB_COLOR)
+
         feature = self._feature
         value = feature.sensible_on_value
-        rgb = kwargs.get(ATTR_RGB_COLOR)
 
         if rgbw is not None:
             value = list(rgbw)
         if color_temp_kelvin is not None:
             value = feature.return_color_temp_with_brightness(
-                int(color_util.color_temperature_kelvin_to_mired(color_temp_kelvin)),
+                self._color_temp_to_native_scale(color_temp_kelvin),
                 self.brightness,
             )
 
@@ -162,14 +197,16 @@ class BleBoxLightEntity(BleBoxEntity[blebox_uniapi.light.Light], LightEntity):
         if brightness is not None:
             if self.color_mode == ColorMode.COLOR_TEMP:
                 value = feature.return_color_temp_with_brightness(
-                    color_util.color_temperature_kelvin_to_mired(
-                        self.color_temp_kelvin
-                    ),
+                    self._color_temp_to_native_scale(self.color_temp_kelvin),
                     brightness,
                 )
             else:
                 value = feature.apply_brightness(value, brightness)
 
+        if isinstance(value, (list, tuple)) and not any(value):
+            await self._feature.async_off()
+            return
+
         try:
             await self._feature.async_on(value)
         except ValueError as exc:

homeassistant/components/blebox/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["blebox_uniapi"],
-  "requirements": ["blebox-uniapi==2.5.1"],
+  "requirements": ["blebox-uniapi==2.5.3"],
   "zeroconf": ["_bbxsrv._tcp.local."]
 }

homeassistant/components/bluetooth/__init__.py

@@ -58,6 +58,7 @@ from .api import (
     async_address_present,
     async_ble_device_from_address,
     async_clear_address_from_match_history,
+    async_clear_advertisement_history,
     async_current_scanners,
     async_discovered_service_info,
     async_get_advertisement_callback,
@@ -116,6 +117,7 @@ __all__ = [
     "async_address_present",
     "async_ble_device_from_address",
     "async_clear_address_from_match_history",
+    "async_clear_advertisement_history",
     "async_current_scanners",
     "async_discovered_service_info",
     "async_get_advertisement_callback",

homeassistant/components/bluetooth/api.py

@@ -207,6 +207,19 @@ def async_clear_address_from_match_history(hass: HomeAssistant, address: str) ->
     _get_manager(hass).async_clear_address_from_match_history(address)
 
 
+@hass_callback
+def async_clear_advertisement_history(hass: HomeAssistant, address: str) -> None:
+    """Clear cached advertisement history for a device.
+
+    Causes the next advertisement from this address to be treated as new
+    data, bypassing the change-detection guard in the Bluetooth manager.
+    Intended for devices that emit static advertisements as a wake-up
+    signal, for example, devices that require an active GATT connection
+    to read sensor data and whose advertisement payload never changes.
+    """
+    _get_manager(hass).async_clear_advertisement_history(address)
+
+
 @hass_callback
 def async_register_scanner(
     hass: HomeAssistant,

homeassistant/components/bring/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["bring_api"],
   "quality_scale": "platinum",
-  "requirements": ["bring-api==1.1.1"]
+  "requirements": ["bring-api==1.1.2"]
 }

homeassistant/components/broadlink/const.py

@@ -6,6 +6,7 @@ DOMAIN = "broadlink"
 
 DOMAINS_AND_TYPES = {
     Platform.CLIMATE: {"HYS"},
+    Platform.INFRARED: {"RM4MINI", "RM4PRO", "RMMINI", "RMMINIB", "RMPRO"},
     Platform.LIGHT: {"LB1", "LB2"},
     Platform.RADIO_FREQUENCY: {"RM4PRO", "RMPRO"},
     Platform.REMOTE: {"RM4MINI", "RM4PRO", "RMMINI", "RMMINIB", "RMPRO"},

homeassistant/components/broadlink/infrared.py

@@ -0,0 +1,69 @@
+"""Infrared platform for Broadlink remotes."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from broadlink.exceptions import BroadlinkException
+from broadlink.remote import pulses_to_data as _bl_pulses_to_data
+
+from homeassistant.components.infrared import InfraredCommand, InfraredEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import DOMAIN
+from .entity import BroadlinkEntity
+
+if TYPE_CHECKING:
+    from .device import BroadlinkDevice
+
+PARALLEL_UPDATES = 1
+
+
+def _timings_to_broadlink_packet(timings: list[int]) -> bytes:
+    """Convert signed microsecond timings to a Broadlink IR packet.
+
+    Positive values are pulse (high) durations; negative values are space
+    (low) durations. The Broadlink library's encoder expects absolute
+    durations.
+    """
+    pulses = [abs(t) for t in timings]
+    return _bl_pulses_to_data(pulses)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Broadlink infrared entity."""
+    # Uses legacy hass.data[DOMAIN] pattern
+    # pylint: disable-next=hass-use-runtime-data
+    device = hass.data[DOMAIN].devices[config_entry.entry_id]
+    async_add_entities([BroadlinkInfraredEntity(device)])
+
+
+class BroadlinkInfraredEntity(BroadlinkEntity, InfraredEntity):
+    """Broadlink infrared transmitter entity."""
+
+    _attr_has_entity_name = True
+    _attr_translation_key = "infrared_emitter"
+
+    def __init__(self, device: BroadlinkDevice) -> None:
+        """Initialize the entity."""
+        super().__init__(device)
+        self._attr_unique_id = f"{device.unique_id}-emitter"
+
+    async def async_send_command(self, command: InfraredCommand) -> None:
+        """Send an IR command via the Broadlink device."""
+        packet = _timings_to_broadlink_packet(command.get_raw_timings())
+        try:
+            await self._device.async_request(self._device.api.send_data, packet)
+        except (BroadlinkException, OSError) as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="send_command_failed",
+                translation_placeholders={"error": str(err)},
+            ) from err

homeassistant/components/broadlink/strings.json

@@ -49,6 +49,11 @@
     }
   },
   "entity": {
+    "infrared": {
+      "infrared_emitter": {
+        "name": "IR emitter"
+      }
+    },
     "select": {
       "day_of_week": {
         "name": "Day of week",
@@ -82,6 +87,9 @@
     "frequency_not_supported": {
       "message": "Broadlink devices cannot transmit on {frequency} MHz"
     },
+    "send_command_failed": {
+      "message": "Failed to send IR command: {error}"
+    },
     "transmit_failed": {
       "message": "Failed to transmit RF command: {error}"
     }

homeassistant/components/brother/sensor.py

@@ -293,9 +293,8 @@ SENSOR_TYPES: tuple[BrotherSensorEntityDescription, ...] = (
     ),
     BrotherSensorEntityDescription(
         key="uptime",
-        translation_key="last_restart",
         entity_registry_enabled_default=False,
-        device_class=SensorDeviceClass.TIMESTAMP,
+        device_class=SensorDeviceClass.UPTIME,
         entity_category=EntityCategory.DIAGNOSTIC,
         value=lambda data: data.uptime,
     ),

homeassistant/components/brother/strings.json

@@ -151,9 +151,6 @@
       "laser_remaining_life": {
         "name": "Laser remaining lifetime"
       },
-      "last_restart": {
-        "name": "Last restart"
-      },
       "magenta_drum_page_counter": {
         "name": "Magenta drum page counter",
         "unit_of_measurement": "[%key:component::brother::entity::sensor::page_counter::unit_of_measurement%]"

homeassistant/components/bsblan/__init__.py

@@ -38,7 +38,14 @@ from homeassistant.helpers.device_registry import (
 )
 from homeassistant.helpers.typing import ConfigType
 
-from .const import CONF_HEATING_CIRCUITS, CONF_PASSKEY, DEFAULT_PORT, DOMAIN, LOGGER
+from .const import (
+    CONF_HEATING_CIRCUITS,
+    CONF_PASSKEY,
+    DEFAULT_HEATING_CIRCUITS,
+    DEFAULT_PORT,
+    DOMAIN,
+    LOGGER,
+)
 from .coordinator import BSBLanFastCoordinator, BSBLanSlowCoordinator
 from .services import async_setup_services
 
@@ -118,7 +125,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bo
 
         # Read available heating circuits from config entry data
         # (populated by config flow or migration)
-        circuits: list[int] = entry.data[CONF_HEATING_CIRCUITS]
+        circuits: list[int] = entry.data[CONF_HEATING_CIRCUITS] or list(
+            DEFAULT_HEATING_CIRCUITS
+        )
 
         # Fetch required device metadata in parallel for faster startup
         device, info = await asyncio.gather(
@@ -229,7 +238,7 @@ async def async_migrate_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) ->
     # heating circuits from the device; fall back to [1] (pre-multi-circuit
     # default) if the device is unreachable or the endpoint is unsupported.
     if entry.version == 1 and entry.minor_version < 2:
-        circuits: list[int] = [1]
+        circuits: list[int] = list(DEFAULT_HEATING_CIRCUITS)
         config = BSBLANConfig(
             host=entry.data[CONF_HOST],
             passkey=entry.data[CONF_PASSKEY],
@@ -245,11 +254,18 @@ async def async_migrate_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) ->
         except (BSBLANError, TimeoutError) as err:
             LOGGER.warning(
                 "Circuit discovery during migration failed for %s (%s); "
-                "defaulting to single circuit [1]. Use Reconfigure to "
+                "defaulting to a single circuit. Use Reconfigure to "
                 "rediscover additional circuits later",
                 entry.data[CONF_HOST],
                 err,
             )
+        if not circuits:
+            LOGGER.warning(
+                "Circuit discovery during migration returned no heating circuits "
+                "for %s; defaulting to a single circuit",
+                entry.data[CONF_HOST],
+            )
+            circuits = list(DEFAULT_HEATING_CIRCUITS)
 
         hass.config_entries.async_update_entry(
             entry,
@@ -263,4 +279,22 @@ async def async_migrate_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) ->
             circuits,
         )
 
+    # 1.2 -> 1.3: Repair entries that stored an empty circuit list during
+    # discovery. Every BSB-LAN setup has at least one heating circuit.
+    if entry.version == 1 and entry.minor_version < 3:
+        if not entry.data[CONF_HEATING_CIRCUITS]:
+            LOGGER.warning(
+                "Stored heating circuits for %s are empty; defaulting to a "
+                "single circuit",
+                entry.data[CONF_HOST],
+            )
+            data = {
+                **entry.data,
+                CONF_HEATING_CIRCUITS: list(DEFAULT_HEATING_CIRCUITS),
+            }
+        else:
+            data = {**entry.data}
+
+        hass.config_entries.async_update_entry(entry, data=data, minor_version=3)
+
     return True

homeassistant/components/bsblan/config_flow.py

@@ -15,21 +15,28 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
-from .const import CONF_HEATING_CIRCUITS, CONF_PASSKEY, DEFAULT_PORT, DOMAIN, LOGGER
+from .const import (
+    CONF_HEATING_CIRCUITS,
+    CONF_PASSKEY,
+    DEFAULT_HEATING_CIRCUITS,
+    DEFAULT_PORT,
+    DOMAIN,
+    LOGGER,
+)
 
 
 class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a BSBLAN config flow."""
 
     VERSION = 1
-    MINOR_VERSION = 2
+    MINOR_VERSION = 3
 
     def __init__(self) -> None:
         """Initialize BSBLan flow."""
         self.host: str = ""
         self.port: int = DEFAULT_PORT
         self.mac: str | None = None
-        self.circuits: list[int] = [1]
+        self.circuits: list[int] = list(DEFAULT_HEATING_CIRCUITS)
         self.passkey: str | None = None
         self.username: str | None = None
         self.password: str | None = None
@@ -386,6 +393,13 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
         try:
             await bsblan.initialize()
             self.circuits = await bsblan.get_available_circuits()
+            if not self.circuits:
+                LOGGER.debug(
+                    "Circuit discovery returned no heating circuits for %s, "
+                    "defaulting to single circuit",
+                    self.host,
+                )
+                self.circuits = list(DEFAULT_HEATING_CIRCUITS)
         except (
             BSBLANError,
             TimeoutError,
@@ -394,4 +408,4 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
                 "Circuit discovery not available for %s, defaulting to single circuit",
                 self.host,
             )
-            self.circuits = [1]
+            self.circuits = list(DEFAULT_HEATING_CIRCUITS)

homeassistant/components/bsblan/const.py

@@ -24,4 +24,5 @@ ATTR_OUTSIDE_TEMPERATURE: Final = "outside_temperature"
 CONF_PASSKEY: Final = "passkey"
 CONF_HEATING_CIRCUITS: Final = "heating_circuits"
 
+DEFAULT_HEATING_CIRCUITS: Final = (1,)
 DEFAULT_PORT: Final = 80

homeassistant/components/bsblan/manifest.json

@@ -8,7 +8,7 @@
   "iot_class": "local_polling",
   "loggers": ["bsblan"],
   "quality_scale": "silver",
-  "requirements": ["python-bsblan==5.2.0"],
+  "requirements": ["python-bsblan==5.2.1"],
   "zeroconf": [
     {
       "name": "bsb-lan*",

homeassistant/components/caldav/coordinator.py

@@ -81,6 +81,12 @@ class CalDavUpdateCoordinator(DataUpdateCoordinator[CalendarEvent | None]):
                     end=self.to_local(self.get_end_date(vevent)),
                     location=get_attr_value(vevent, "location"),
                     description=get_attr_value(vevent, "description"),
+                    uid=get_attr_value(vevent, "uid"),
+                    recurrence_id=(
+                        str(v)
+                        if (v := get_attr_value(vevent, "recurrence_id")) is not None
+                        else None
+                    ),
                 )
             )
 
@@ -176,6 +182,12 @@ class CalDavUpdateCoordinator(DataUpdateCoordinator[CalendarEvent | None]):
             end=self.to_local(self.get_end_date(vevent)),
             location=get_attr_value(vevent, "location"),
             description=get_attr_value(vevent, "description"),
+            uid=get_attr_value(vevent, "uid"),
+            recurrence_id=(
+                str(v)
+                if (v := get_attr_value(vevent, "recurrence_id")) is not None
+                else None
+            ),
         )
 
     @staticmethod

homeassistant/components/calendar/condition.py

@@ -7,9 +7,7 @@ from homeassistant.helpers.condition import Condition, make_entity_state_conditi
 from .const import DOMAIN
 
 CONDITIONS: dict[str, type[Condition]] = {
-    "is_event_active": make_entity_state_condition(
-        DOMAIN, STATE_ON, support_duration=True
-    ),
+    "is_event_active": make_entity_state_condition(DOMAIN, STATE_ON),
 }
 
 

homeassistant/components/calendar/conditions.yaml

@@ -7,11 +7,8 @@ is_event_active:
       required: true
       default: any
       selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
+        automation_behavior:
+          mode: condition
     for:
       required: true
       default: 00:00:00

homeassistant/components/calendar/strings.json

@@ -64,12 +64,6 @@
     }
   },
   "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
     "trigger_offset_type": {
       "options": {
         "after": "After",

homeassistant/components/climate/condition.py

@@ -13,8 +13,8 @@ from homeassistant.helpers.condition import (
     Condition,
     ConditionConfig,
     EntityConditionBase,
+    EntityNumericalConditionBase,
     EntityNumericalConditionWithUnitBase,
-    make_entity_numerical_condition,
     make_entity_state_condition,
 )
 from homeassistant.util.unit_conversion import TemperatureConverter
@@ -59,15 +59,36 @@ class ClimateTargetTemperatureCondition(EntityNumericalConditionWithUnitBase):
     _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_TEMPERATURE)}
     _unit_converter = TemperatureConverter
 
+    def _should_include(self, state: State) -> bool:
+        """Skip climate entities that do not expose a target temperature."""
+        return (
+            super()._should_include(state)
+            and state.attributes.get(ATTR_TEMPERATURE) is not None
+        )
+
     def _get_entity_unit(self, entity_state: State) -> str | None:
         """Get the temperature unit of a climate entity from its state."""
         # Climate entities convert temperatures to the system unit via show_temp
         return self._hass.config.units.temperature_unit
 
 
+class ClimateTargetHumidityCondition(EntityNumericalConditionBase):
+    """Condition for climate target humidity."""
+
+    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)}
+    _valid_unit = "%"
+
+    def _should_include(self, state: State) -> bool:
+        """Skip climate entities that do not expose a target humidity."""
+        return (
+            super()._should_include(state)
+            and state.attributes.get(ATTR_HUMIDITY) is not None
+        )
+
+
 CONDITIONS: dict[str, type[Condition]] = {
     "is_hvac_mode": ClimateHVACModeCondition,
-    "is_off": make_entity_state_condition(DOMAIN, HVACMode.OFF, support_duration=True),
+    "is_off": make_entity_state_condition(DOMAIN, HVACMode.OFF),
     "is_on": make_entity_state_condition(
         DOMAIN,
         {
@@ -88,10 +109,7 @@ CONDITIONS: dict[str, type[Condition]] = {
     "is_heating": make_entity_state_condition(
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.HEATING
     ),
-    "target_humidity": make_entity_numerical_condition(
-        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
-        valid_unit="%",
-    ),
+    "target_humidity": ClimateTargetHumidityCondition,
     "target_temperature": ClimateTargetTemperatureCondition,
 }
 

homeassistant/components/climate/conditions.yaml

@@ -7,11 +7,13 @@
       required: true
       default: any
       selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
+        automation_behavior:
+          mode: condition
+    for: &condition_for
+      required: true
+      default: 00:00:00
+      selector:
+        duration:
 
 .humidity_threshold_entity: &humidity_threshold_entity
   - domain: input_number
@@ -39,16 +41,7 @@
   - domain: number
     device_class: temperature
 
-is_off:
-  target: *condition_climate_target
-  fields:
-    behavior: *condition_behavior
-    for:
-      required: true
-      default: 00:00:00
-      selector:
-        duration:
-
+is_off: *condition_common
 is_on: *condition_common
 is_cooling: *condition_common
 is_drying: *condition_common
@@ -58,6 +51,7 @@ is_hvac_mode:
   target: *condition_climate_target
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     hvac_mode:
       context:
         filter_target: target
@@ -73,6 +67,7 @@ target_humidity:
   target: *condition_climate_target
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:
@@ -85,6 +80,7 @@ target_temperature:
   target: *condition_climate_target
   fields:
     behavior: *condition_behavior
+    for: *condition_for
     threshold:
       required: true
       selector:

homeassistant/components/climate/strings.json

@@ -13,6 +13,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::condition_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::condition_for_name%]"
         }
       },
       "name": "Thermostat is cooling"
@@ -22,6 +25,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::condition_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::condition_for_name%]"
         }
       },
       "name": "Thermostat is drying"
@@ -31,6 +37,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::condition_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::condition_for_name%]"
         }
       },
       "name": "Thermostat is heating"
@@ -41,6 +50,9 @@
         "behavior": {
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::climate::common::condition_for_name%]"
+        },
         "hvac_mode": {
           "description": "The HVAC modes to test for.",
           "name": "Modes"
@@ -65,6 +77,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::condition_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::condition_for_name%]"
         }
       },
       "name": "Thermostat is on"
@@ -75,6 +90,9 @@
         "behavior": {
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::climate::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::climate::common::condition_threshold_name%]"
         }
@@ -87,6 +105,9 @@
         "behavior": {
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::climate::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::climate::common::condition_threshold_name%]"
         }
@@ -271,21 +292,6 @@
       "message": "Provided temperature {check_temp} is not valid. Accepted range is {min_temp} to {max_temp}."
     }
   },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "set_fan_mode": {
       "description": "Sets the fan mode of a thermostat.",

homeassistant/components/climate/trigger.py

@@ -8,14 +8,15 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.trigger import (
     ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST,
+    EntityNumericalStateChangedTriggerBase,
     EntityNumericalStateChangedTriggerWithUnitBase,
+    EntityNumericalStateCrossedThresholdTriggerBase,
     EntityNumericalStateCrossedThresholdTriggerWithUnitBase,
+    EntityNumericalStateTriggerBase,
     EntityNumericalStateTriggerWithUnitBase,
     EntityTargetStateTriggerBase,
     Trigger,
     TriggerConfig,
-    make_entity_numerical_state_changed_trigger,
-    make_entity_numerical_state_crossed_threshold_trigger,
     make_entity_target_state_trigger,
     make_entity_transition_trigger,
 )
@@ -55,6 +56,13 @@ class _ClimateTargetTemperatureTriggerMixin(EntityNumericalStateTriggerWithUnitB
     _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_TEMPERATURE)}
     _unit_converter = TemperatureConverter
 
+    def _should_include(self, state: State) -> bool:
+        """Skip climate entities that do not expose a target temperature."""
+        return (
+            super()._should_include(state)
+            and state.attributes.get(ATTR_TEMPERATURE) is not None
+        )
+
     def _get_entity_unit(self, state: State) -> str | None:
         """Get the temperature unit of a climate entity from its state."""
         # Climate entities convert temperatures to the system unit via show_temp
@@ -75,6 +83,32 @@ class ClimateTargetTemperatureCrossedThresholdTrigger(
     """Trigger for climate target temperature value crossing a threshold."""
 
 
+class _ClimateTargetHumidityTriggerMixin(EntityNumericalStateTriggerBase):
+    """Mixin for climate target humidity triggers."""
+
+    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)}
+    _valid_unit = "%"
+
+    def _should_include(self, state: State) -> bool:
+        """Skip climate entities that do not expose a target humidity."""
+        return (
+            super()._should_include(state)
+            and state.attributes.get(ATTR_HUMIDITY) is not None
+        )
+
+
+class ClimateTargetHumidityChangedTrigger(
+    _ClimateTargetHumidityTriggerMixin, EntityNumericalStateChangedTriggerBase
+):
+    """Trigger for climate target humidity value changes."""
+
+
+class ClimateTargetHumidityCrossedThresholdTrigger(
+    _ClimateTargetHumidityTriggerMixin, EntityNumericalStateCrossedThresholdTriggerBase
+):
+    """Trigger for climate target humidity value crossing a threshold."""
+
+
 TRIGGERS: dict[str, type[Trigger]] = {
     "hvac_mode_changed": HVACModeChangedTrigger,
     "started_cooling": make_entity_target_state_trigger(
@@ -83,14 +117,8 @@ TRIGGERS: dict[str, type[Trigger]] = {
     "started_drying": make_entity_target_state_trigger(
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.DRYING
     ),
-    "target_humidity_changed": make_entity_numerical_state_changed_trigger(
-        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
-        valid_unit="%",
-    ),
-    "target_humidity_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
-        valid_unit="%",
-    ),
+    "target_humidity_changed": ClimateTargetHumidityChangedTrigger,
+    "target_humidity_crossed_threshold": ClimateTargetHumidityCrossedThresholdTrigger,
     "target_temperature_changed": ClimateTargetTemperatureChangedTrigger,
     "target_temperature_crossed_threshold": ClimateTargetTemperatureCrossedThresholdTrigger,
     "turned_off": make_entity_target_state_trigger(DOMAIN, HVACMode.OFF),

homeassistant/components/climate/triggers.yaml

@@ -7,12 +7,8 @@
       required: true
       default: any
       selector:
-        select:
-          translation_key: trigger_behavior
-          options:
-            - first
-            - last
-            - any
+        automation_behavior:
+          mode: trigger
     for: &trigger_for
       required: true
       default: 00:00:00

homeassistant/components/comelit/__init__.py

@@ -3,9 +3,10 @@
 from aiocomelit.const import BRIDGE
 
 from homeassistant.const import CONF_HOST, CONF_PIN, CONF_PORT, CONF_TYPE, Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from .const import CONF_VEDO_PIN, DEFAULT_PORT
+from .const import _LOGGER, CONF_VEDO_PIN, DEFAULT_PORT, DOMAIN
 from .coordinator import (
     ComelitBaseCoordinator,
     ComelitConfigEntry,
@@ -81,6 +82,56 @@ async def async_setup_entry(hass: HomeAssistant, entry: ComelitConfigEntry) -> b
     return True
 
 
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: ComelitConfigEntry
+) -> bool:
+    """Migrate old entry."""
+
+    if config_entry.version > 1:
+        # This means the user has downgraded from a future version
+        return False
+
+    if config_entry.version == 1 and config_entry.minor_version == 1:
+        device_registry = dr.async_get(hass)
+
+        @callback
+        def update_unique_id(entry: er.RegistryEntry) -> dict[str, str] | None:
+            if (
+                entry.domain != Platform.SENSOR
+                or entry.device_id is None
+                or not (device_entry := device_registry.async_get(entry.device_id))
+                or not any(
+                    platform == DOMAIN
+                    and identifier.startswith(f"{config_entry.entry_id}-zone-")
+                    for platform, identifier in device_entry.identifiers
+                )
+            ):
+                return None
+
+            _LOGGER.debug(
+                "Migrating from version %s.%s",
+                config_entry.version,
+                config_entry.minor_version,
+            )
+
+            zone_index = entry.unique_id.removeprefix(f"{config_entry.entry_id}-")
+            return {
+                "new_unique_id": f"{config_entry.entry_id}-human_status-{zone_index}"
+            }
+
+        await er.async_migrate_entries(hass, config_entry.entry_id, update_unique_id)
+
+        hass.config_entries.async_update_entry(config_entry, version=1, minor_version=2)
+
+        _LOGGER.info(
+            "Migration to version %s.%s successful",
+            config_entry.version,
+            config_entry.minor_version,
+        )
+
+    return True
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: ComelitConfigEntry) -> bool:
     """Unload a config entry."""
 

homeassistant/components/comelit/config_flow.py

@@ -94,6 +94,7 @@ class ComelitConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Comelit."""
 
     VERSION = 1
+    MINOR_VERSION = 2
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None

homeassistant/components/comelit/coordinator.py

@@ -18,7 +18,12 @@ from aiocomelit.const import (
     SCENARIO,
     VEDO,
 )
-from aiocomelit.exceptions import CannotAuthenticate, CannotConnect, CannotRetrieveData
+from aiocomelit.exceptions import (
+    CannotAuthenticate,
+    CannotConnect,
+    CannotRetrieveData,
+    DeviceStorageFailureError,
+)
 from aiohttp import ClientSession
 
 from homeassistant.config_entries import ConfigEntry
@@ -112,6 +117,11 @@ class ComelitBaseCoordinator(DataUpdateCoordinator[T]):
                 translation_domain=DOMAIN,
                 translation_key="cannot_authenticate",
             ) from err
+        except DeviceStorageFailureError as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="device_storage_failure",
+            ) from err
 
     @abstractmethod
     async def _async_update_system_data(self) -> T:

homeassistant/components/comelit/sensor.py

@@ -153,7 +153,7 @@ class ComelitVedoSensorEntity(
         super().__init__(coordinator)
         # Use config_entry.entry_id as base for unique_id
         # because no serial number or mac is available
-        self._attr_unique_id = f"{config_entry_entry_id}-{zone.index}"
+        self._attr_unique_id = f"{config_entry_entry_id}-{description.key}-{zone.index}"
         self._attr_device_info = coordinator.platform_device_info(zone, "zone")
 
         self.entity_description = description

homeassistant/components/comelit/strings.json

@@ -121,6 +121,9 @@
     "cannot_retrieve_data": {
       "message": "Error retrieving data: {error}"
     },
+    "device_storage_failure": {
+      "message": "Device SD card read failure. The card may be corrupted or failing; replacement is recommended."
+    },
     "humidity_while_off": {
       "message": "Cannot change humidity while off"
     },

homeassistant/components/comelit/utils.py

@@ -5,7 +5,12 @@ from functools import wraps
 from typing import TYPE_CHECKING, Any, Concatenate, Literal
 
 from aiocomelit.api import ComelitSerialBridgeObject
-from aiocomelit.exceptions import CannotAuthenticate, CannotConnect, CannotRetrieveData
+from aiocomelit.exceptions import (
+    CannotAuthenticate,
+    CannotConnect,
+    CannotRetrieveData,
+    DeviceStorageFailureError,
+)
 from aiohttp import ClientSession, CookieJar
 
 from homeassistant.config_entries import ConfigEntry
@@ -110,6 +115,12 @@ def bridge_api_call[_T: ComelitBridgeBaseEntity, **_P](
                 translation_key="cannot_retrieve_data",
                 translation_placeholders={"error": repr(err)},
             ) from err
+        except DeviceStorageFailureError as err:
+            self.coordinator.last_update_success = False
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="device_storage_failure",
+            ) from err
         except CannotAuthenticate:
             self.coordinator.last_update_success = False
             self.coordinator.config_entry.async_start_reauth(self.hass)

homeassistant/components/control4/climate.py

@@ -273,7 +273,10 @@ class Control4Climate(Control4Entity, ClimateEntity):
         if data is None:
             return None
         humidity = data.get(CONTROL4_HUMIDITY)
-        return int(humidity) if humidity is not None else None
+        try:
+            return int(humidity) if humidity is not None else None
+        except ValueError, TypeError:
+            return None
 
     @property
     def hvac_mode(self) -> HVACMode:

homeassistant/components/conversation/manifest.json

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

homeassistant/components/counter/conditions.yaml

@@ -7,11 +7,13 @@ is_value:
       required: true
       default: any
       selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
+        automation_behavior:
+          mode: condition
+    for:
+      required: true
+      default: 00:00:00
+      selector:
+        duration:
     threshold:
       required: true
       selector:

homeassistant/components/counter/strings.json

@@ -1,5 +1,6 @@
 {
   "common": {
+    "condition_for_name": "For at least",
     "trigger_behavior_name": "Trigger when",
     "trigger_for_name": "For at least"
   },
@@ -10,6 +11,9 @@
         "behavior": {
           "name": "Condition passes if"
         },
+        "for": {
+          "name": "[%key:component::counter::common::condition_for_name%]"
+        },
         "threshold": {
           "name": "Threshold type"
         }
@@ -43,21 +47,6 @@
       }
     }
   },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "decrement": {
       "description": "Decrements a counter by its step size.",

homeassistant/components/counter/triggers.yaml

@@ -7,12 +7,8 @@
       required: true
       default: any
       selector:
-        select:
-          translation_key: trigger_behavior
-          options:
-            - first
-            - last
-            - any
+        automation_behavior:
+          mode: trigger
     for:
       required: true
       default: 00:00:00

homeassistant/components/cover/condition.py

@@ -4,11 +4,7 @@ from collections.abc import Mapping
 
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.condition import (
-    ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL_FOR,
-    Condition,
-    EntityConditionBase,
-)
+from homeassistant.helpers.condition import Condition, EntityConditionBase
 
 from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
 from .models import CoverDomainSpec
@@ -18,7 +14,6 @@ class CoverConditionBase(EntityConditionBase):
     """Base condition for cover state checks."""
 
     _domain_specs: Mapping[str, CoverDomainSpec]
-    _schema = ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL_FOR
 
     def is_valid_state(self, entity_state: State) -> bool:
         """Check if the state matches the expected cover state."""

homeassistant/components/cover/conditions.yaml

@@ -3,11 +3,8 @@
     required: true
     default: any
     selector:
-      select:
-        translation_key: condition_behavior
-        options:
-          - all
-          - any
+      automation_behavior:
+        mode: condition
   for:
     required: true
     default: 00:00:00

homeassistant/components/cover/strings.json

@@ -210,21 +210,6 @@
       "name": "Window"
     }
   },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "close_cover": {
       "description": "Closes a cover.",

homeassistant/components/cover/triggers.yaml

@@ -3,12 +3,8 @@
     required: true
     default: any
     selector:
-      select:
-        translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
+      automation_behavior:
+        mode: trigger
   for:
     required: true
     default: 00:00:00

homeassistant/components/daikin/coordinator.py

@@ -4,10 +4,11 @@ from datetime import timedelta
 import logging
 
 from pydaikin.daikin_base import Appliance
+from pydaikin.exceptions import DaikinException
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, TIMEOUT_SEC
 
@@ -33,4 +34,11 @@ class DaikinCoordinator(DataUpdateCoordinator[None]):
         self.device = device
 
     async def _async_update_data(self) -> None:
-        await self.device.update_status()
+        try:
+            await self.device.update_status()
+        except DaikinException as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="error_communicating",
+                translation_placeholders={"error": str(err)},
+            ) from err

homeassistant/components/daikin/strings.json

@@ -59,6 +59,9 @@
     }
   },
   "exceptions": {
+    "error_communicating": {
+      "message": "Error communicating with Daikin device: {error}"
+    },
     "zone_hvac_mode_unsupported": {
       "message": "Zone temperature can only be changed when the main climate mode is heat or cool."
     },

homeassistant/components/devolo_home_network/__init__.py

@@ -7,6 +7,7 @@ from typing import Any
 
 from devolo_plc_api import Device
 from devolo_plc_api.exceptions.device import DeviceNotFound
+from yarl import URL
 
 from homeassistant.components import zeroconf
 from homeassistant.const import (
@@ -17,6 +18,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.httpx_client import get_async_client
 
 from .const import (
@@ -123,6 +125,25 @@ async def async_setup_entry(
 
     entry.runtime_data.coordinators = coordinators
 
+    # Ensure the device exists before forwarding to platforms, so that the
+    # device tracker (which looks up the device by wifi station MAC) is not
+    # racing the other platforms that create the device via DeviceInfo.
+    device_info = dr.DeviceInfo(
+        configuration_url=URL.build(scheme="http", host=device.ip),
+        identifiers={(DOMAIN, str(device.serial_number))},
+        manufacturer="devolo",
+        model=device.product,
+        model_id=device.mt_number,
+        serial_number=device.serial_number,
+        sw_version=device.firmware_version,
+    )
+    if device.mac:
+        device_info["connections"] = {(dr.CONNECTION_NETWORK_MAC, device.mac)}
+    dr.async_get(hass).async_get_or_create(
+        config_entry_id=entry.entry_id,
+        **device_info,
+    )
+
     await hass.config_entries.async_forward_entry_setups(entry, platforms(device))
 
     entry.async_on_unload(

homeassistant/components/devolo_home_network/sensor.py

@@ -117,7 +117,7 @@ SENSOR_TYPES: dict[str, DevoloSensorEntityDescription[Any, Any]] = {
         key=LAST_RESTART,
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
-        device_class=SensorDeviceClass.TIMESTAMP,
+        device_class=SensorDeviceClass.UPTIME,
         value_func=_last_restart,
     ),
 }

homeassistant/components/devolo_home_network/strings.json

@@ -75,9 +75,6 @@
       "connected_wifi_clients": {
         "name": "Connected Wi-Fi clients"
       },
-      "last_restart": {
-        "name": "Last restart of the device"
-      },
       "neighboring_wifi_networks": {
         "name": "Neighboring Wi-Fi networks"
       },

homeassistant/components/dnsip/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/dnsip",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["aiodns==4.0.0"]
+  "requirements": ["aiodns==4.0.3"]
 }

homeassistant/components/door/conditions.yaml

@@ -3,11 +3,8 @@
     required: true
     default: any
     selector:
-      select:
-        translation_key: condition_behavior
-        options:
-          - all
-          - any
+      automation_behavior:
+        mode: condition
   for:
     required: true
     default: 00:00:00

homeassistant/components/door/strings.json

@@ -31,21 +31,6 @@
       "name": "Door is open"
     }
   },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "title": "Door",
   "triggers": {
     "closed": {

homeassistant/components/door/triggers.yaml

@@ -3,12 +3,8 @@
     required: true
     default: any
     selector:
-      select:
-        translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
+      automation_behavior:
+        mode: trigger
   for:
     required: true
     default: 00:00:00

homeassistant/components/duco/__init__.py

@@ -1,24 +1,34 @@
 """The Duco integration."""
 
-from __future__ import annotations
+import re
 
-from duco import DucoClient, build_ssl_context
+from duco_connectivity import DucoClient
 
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import PLATFORMS
 from .coordinator import DucoConfigEntry, DucoCoordinator
 
+_REMOVED_SENSOR_RE = re.compile(r"_\d+_(box_)?temperature$")
+
 
 async def async_setup_entry(hass: HomeAssistant, entry: DucoConfigEntry) -> bool:
     """Set up Duco from a config entry."""
-    ssl_context = await hass.async_add_executor_job(build_ssl_context)
+    # Remove entity registry entries for the temperature and box_temperature
+    # sensors that were removed when migrating to python-duco-connectivity.
+    entity_registry = er.async_get(hass)
+    for entity_entry in er.async_entries_for_config_entry(
+        entity_registry, entry.entry_id
+    ):
+        if _REMOVED_SENSOR_RE.search(entity_entry.unique_id):
+            entity_registry.async_remove(entity_entry.entity_id)
+
     client = DucoClient(
         session=async_get_clientsession(hass),
         host=entry.data[CONF_HOST],
-        ssl_context=ssl_context,
     )
 
     coordinator = DucoCoordinator(hass, entry, client)

homeassistant/components/duco/config_flow.py

@@ -5,8 +5,8 @@ from __future__ import annotations
 import logging
 from typing import Any
 
-from duco import DucoClient, build_ssl_context
-from duco.exceptions import DucoConnectionError, DucoError
+from duco_connectivity import DucoClient
+from duco_connectivity.exceptions import DucoConnectionError, DucoError
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
@@ -160,11 +160,9 @@ class DucoConfigFlow(ConfigFlow, domain=DOMAIN):
 
         Returns a tuple of (box_name, mac_address).
         """
-        ssl_context = await self.hass.async_add_executor_job(build_ssl_context)
         client = DucoClient(
             session=async_get_clientsession(self.hass),
             host=host,
-            ssl_context=ssl_context,
         )
         board_info = await client.async_get_board_info()
         lan_info = await client.async_get_lan_info()

homeassistant/components/duco/const.py

@@ -6,4 +6,4 @@ from homeassistant.const import Platform
 
 DOMAIN = "duco"
 PLATFORMS = [Platform.FAN, Platform.SENSOR]
-SCAN_INTERVAL = timedelta(seconds=30)
+SCAN_INTERVAL = timedelta(seconds=10)

homeassistant/components/duco/coordinator.py

@@ -5,9 +5,9 @@ from __future__ import annotations
 from dataclasses import dataclass
 import logging
 
-from duco import DucoClient
-from duco.exceptions import DucoConnectionError, DucoError
-from duco.models import BoardInfo, Node
+from duco_connectivity import DucoClient
+from duco_connectivity.exceptions import DucoConnectionError, DucoError
+from duco_connectivity.models import BoardInfo, Node
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant

homeassistant/components/duco/diagnostics.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from dataclasses import asdict
 from typing import Any
 
-from duco.exceptions import DucoConnectionError
+from duco_connectivity.exceptions import DucoConnectionError
 
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_HOST
@@ -15,6 +15,9 @@ from homeassistant.exceptions import HomeAssistantError
 from .const import DOMAIN
 from .coordinator import DucoConfigEntry
 
+# MAC addresses and serial numbers are redacted because a Duco installer or
+# manufacturer could cross-reference them against an installation registry to
+# identify the physical location of the device.
 TO_REDACT = {
     CONF_HOST,
     "mac",
@@ -33,22 +36,33 @@ async def async_get_config_entry_diagnostics(
     coordinator = entry.runtime_data
 
     board = asdict(coordinator.board_info)
+    # `time` is a Unix epoch timestamp of the last board info fetch; not useful for support triage.
     board.pop("time")
+    if board["public_api_version"] is None:
+        board.pop("public_api_version")
+    if board["software_version"] is None:
+        board.pop("software_version")
 
     try:
+        api_info_obj = await coordinator.client.async_get_api_info()
         lan_info = await coordinator.client.async_get_lan_info()
         duco_diags = await coordinator.client.async_get_diagnostics()
-        write_remaining = await coordinator.client.async_get_write_req_remaining()
+        write_remaining = await coordinator.client.async_get_write_requests_remaining()
     except DucoConnectionError as err:
         raise HomeAssistantError(
             translation_domain=DOMAIN,
             translation_key="connection_error",
         ) from err
 
+    api_info: dict[str, Any] = {"public_api_version": api_info_obj.public_api_version}
+    if api_info_obj.reported_api_version is not None:
+        api_info["reported_api_version"] = api_info_obj.reported_api_version
+
     return async_redact_data(
         {
             "entry_data": entry.data,
             "board_info": board,
+            "api_info": api_info,
             "lan_info": asdict(lan_info),
             "nodes": {
                 str(node_id): asdict(node)

homeassistant/components/duco/entity.py

@@ -1,8 +1,6 @@
 """Base entity for the Duco integration."""
 
-from __future__ import annotations
-
-from duco.models import Node
+from duco_connectivity.models import Node
 
 from homeassistant.const import ATTR_VIA_DEVICE
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo

homeassistant/components/duco/fan.py

@@ -4,8 +4,8 @@ from __future__ import annotations
 
 import logging
 
-from duco.exceptions import DucoError, DucoRateLimitError
-from duco.models import Node, NodeType, VentilationState
+from duco_connectivity.exceptions import DucoError, DucoRateLimitError
+from duco_connectivity.models import Node, NodeType, VentilationState
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.core import HomeAssistant

homeassistant/components/duco/icons.json

@@ -7,6 +7,12 @@
       "iaq_rh": {
         "default": "mdi:water-percent"
       },
+      "target_flow_level": {
+        "default": "mdi:gauge"
+      },
+      "time_state_end": {
+        "default": "mdi:timer-outline"
+      },
       "ventilation_state": {
         "default": "mdi:tune-variant"
       }

homeassistant/components/duco/manifest.json

@@ -11,9 +11,9 @@
   "documentation": "https://www.home-assistant.io/integrations/duco",
   "integration_type": "hub",
   "iot_class": "local_polling",
-  "loggers": ["duco"],
+  "loggers": ["duco_connectivity"],
   "quality_scale": "platinum",
-  "requirements": ["python-duco-client==0.3.9"],
+  "requirements": ["python-duco-connectivity==0.4.0"],
   "zeroconf": [
     {
       "name": "duco [[][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][]].*",

homeassistant/components/duco/sensor.py

@@ -4,9 +4,10 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from datetime import datetime
 import logging
 
-from duco.models import Node, NodeType, VentilationState
+from duco_connectivity.models import Node, NodeType, VentilationState
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -19,11 +20,11 @@ from homeassistant.const import (
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
-    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
 from .coordinator import DucoConfigEntry, DucoCoordinator
@@ -38,7 +39,7 @@ PARALLEL_UPDATES = 0
 class DucoSensorEntityDescription(SensorEntityDescription):
     """Duco sensor entity description."""
 
-    value_fn: Callable[[Node], int | float | str | None]
+    value_fn: Callable[[Node], datetime | int | float | str | None]
     node_types: tuple[NodeType, ...]
 
 
@@ -54,29 +55,40 @@ SENSOR_DESCRIPTIONS: tuple[DucoSensorEntityDescription, ...] = (
         key="ventilation_state",
         translation_key="ventilation_state",
         device_class=SensorDeviceClass.ENUM,
-        options=[s.lower() for s in VentilationState],
+        options=[
+            state.lower()
+            for state in VentilationState
+            if state != VentilationState.UNKNOWN
+        ],
         value_fn=lambda node: (
-            node.ventilation.state.lower() if node.ventilation else None
+            node.ventilation.state.lower()
+            if node.ventilation and node.ventilation.state != VentilationState.UNKNOWN
+            else None
         ),
         node_types=(NodeType.BOX,),
     ),
     DucoSensorEntityDescription(
-        key="temperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
+        key="target_flow_level",
+        translation_key="target_flow_level",
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda node: node.sensor.temp if node.sensor else None,
-        node_types=(NodeType.UCCO2, NodeType.BSRH, NodeType.UCRH),
+        native_unit_of_measurement=PERCENTAGE,
+        suggested_display_precision=0,
+        value_fn=lambda node: (
+            node.ventilation.flow_lvl_tgt if node.ventilation else None
+        ),
+        node_types=(NodeType.BOX,),
     ),
     DucoSensorEntityDescription(
-        key="box_temperature",
-        translation_key="box_temperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-        value_fn=lambda node: node.sensor.temp if node.sensor else None,
+        key="time_state_end",
+        translation_key="time_state_end",
+        device_class=SensorDeviceClass.TIMESTAMP,
+        value_fn=lambda node: (
+            dt_util.utc_from_timestamp(node.ventilation.time_state_end).replace(
+                second=0, microsecond=0
+            )
+            if node.ventilation and node.ventilation.time_state_end != 0
+            else None
+        ),
         node_types=(NodeType.BOX,),
     ),
     DucoSensorEntityDescription(
@@ -143,6 +155,7 @@ async def async_setup_entry(
 
     @callback
     def _async_add_new_entities() -> None:
+        """Add new sensor entities and remove stale ones on coordinator updates."""
         # Remove devices whose nodes have disappeared from the API.
         # The firmware removes deregistered RF/wired nodes automatically.
         # BSRH box sensors that are physically unplugged from the PCB are
@@ -166,14 +179,19 @@ async def async_setup_entry(
         for node in coordinator.data.nodes.values():
             if node.node_id in known_nodes:
                 continue
-            known_nodes.add(node.node_id)
             if node.general.node_type == NodeType.UNKNOWN:
-                _LOGGER.warning(
-                    "Duco node %s (%s) has an unsupported device type and will be ignored",
+                # Do not add the node to known_nodes so that it is re-evaluated
+                # on every coordinator update. This allows entities to be
+                # created automatically once a firmware update or library
+                # update adds support for the device type.
+                _LOGGER.debug(
+                    "Duco node %s (%s) has an unsupported device type and will be "
+                    "retried on subsequent coordinator updates",
                     node.node_id,
                     node.general.name,
                 )
                 continue
+            known_nodes.add(node.node_id)
             new_entities.extend(
                 DucoSensorEntity(coordinator, node, description)
                 for description in SENSOR_DESCRIPTIONS
@@ -210,7 +228,7 @@ class DucoSensorEntity(DucoEntity, SensorEntity):
         )
 
     @property
-    def native_value(self) -> int | float | str | None:
+    def native_value(self) -> datetime | int | float | str | None:
         """Return the sensor value."""
         return self.entity_description.value_fn(self._node)
 

homeassistant/components/duco/strings.json

@@ -47,15 +47,18 @@
       }
     },
     "sensor": {
-      "box_temperature": {
-        "name": "Box temperature"
-      },
       "iaq_co2": {
         "name": "CO2 air quality index"
       },
       "iaq_rh": {
         "name": "Humidity air quality index"
       },
+      "target_flow_level": {
+        "name": "Target flow level"
+      },
+      "time_state_end": {
+        "name": "Mode end time"
+      },
       "ventilation_state": {
         "name": "Ventilation state",
         "state": {
@@ -96,5 +99,10 @@
     "rate_limit_exceeded": {
       "message": "The Duco device has reached its daily write limit. Try again tomorrow."
     }
+  },
+  "system_health": {
+    "info": {
+      "write_requests_remaining": "Remaining write requests today"
+    }
   }
 }

homeassistant/components/duco/system_health.py

@@ -0,0 +1,47 @@
+"""Provide info to system health."""
+
+from typing import Any
+
+from duco_connectivity.exceptions import DucoConnectionError
+
+from homeassistant.components import system_health
+from homeassistant.core import HomeAssistant, callback
+
+from .const import DOMAIN
+from .coordinator import DucoConfigEntry
+
+
+@callback
+def async_register(
+    hass: HomeAssistant, register: system_health.SystemHealthRegistration
+) -> None:
+    """Register system health callbacks."""
+    register.async_register_info(system_health_info)
+
+
+async def _async_get_write_requests_remaining(
+    config_entry: DucoConfigEntry,
+) -> int | dict[str, str]:
+    """Get the remaining write-request quota for system health."""
+    try:
+        return (
+            await config_entry.runtime_data.client.async_get_write_requests_remaining()
+        )
+    except DucoConnectionError:
+        return {"type": "failed", "error": "unreachable"}
+
+
+async def system_health_info(hass: HomeAssistant) -> dict[str, Any]:
+    """Get info for the info page."""
+    config_entries: list[DucoConfigEntry] = hass.config_entries.async_loaded_entries(
+        DOMAIN
+    )
+
+    if not config_entries:
+        return {}
+
+    return {
+        "write_requests_remaining": _async_get_write_requests_remaining(
+            config_entries[0]
+        )
+    }