2026.4.2 (#167939)

Co-authored-by: Joost Lekkerkerker <joostlek@outlook.com>

.github/workflows/builder.yml

@@ -49,7 +49,7 @@ jobs:
 
       - name: Get information
         id: info
-        uses: home-assistant/actions/helpers/info@master # zizmor: ignore[unpinned-uses]
+        uses: home-assistant/actions/helpers/info@5f5b077d63a1e4c53019231409a0c4d791fb74e5 # zizmor: ignore[unpinned-uses]
 
       - name: Get version
         id: version

.strict-typing

@@ -174,7 +174,6 @@ homeassistant.components.dnsip.*
 homeassistant.components.doorbird.*
 homeassistant.components.dormakaba_dkey.*
 homeassistant.components.downloader.*
-homeassistant.components.dropbox.*
 homeassistant.components.droplet.*
 homeassistant.components.dsmr.*
 homeassistant.components.duckdns.*

CODEOWNERS

@@ -401,8 +401,6 @@ build.json @home-assistant/supervisor
 /tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/drop_connect/ @ChandlerSystems @pfrazer
 /tests/components/drop_connect/ @ChandlerSystems @pfrazer
-/homeassistant/components/dropbox/ @bdr99
-/tests/components/dropbox/ @bdr99
 /homeassistant/components/droplet/ @sarahseidman
 /tests/components/droplet/ @sarahseidman
 /homeassistant/components/dsmr/ @Robbie1221

homeassistant/bootstrap.py

@@ -238,7 +238,9 @@ DEFAULT_INTEGRATIONS = {
     "timer",
     #
     # Base platforms:
-    *BASE_PLATFORMS,
+    # Note: Calendar and todo are not included to prevent them from registering
+    # their frontend panels when there are no calendar or todo integrations.
+    *(BASE_PLATFORMS - {"calendar", "todo"}),
     #
     # Integrations providing triggers and conditions for base platforms:
     "air_quality",
@@ -468,6 +470,7 @@ async def async_load_base_functionality(hass: core.HomeAssistant) -> bool:
     translation.async_setup(hass)
 
     recovery = hass.config.recovery_mode
+    device_registry.async_setup(hass)
     try:
         await asyncio.gather(
             create_eager_task(get_internal_store_manager(hass).async_initialize()),

homeassistant/brands/bega.json

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

homeassistant/components/air_quality/condition.py

@@ -13,7 +13,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.condition import (
     Condition,
     make_entity_numerical_condition,
@@ -59,18 +59,18 @@ CONDITIONS: dict[str, type[Condition]] = {
     "is_smoke_cleared": _make_cleared_condition(BinarySensorDeviceClass.SMOKE),
     # Numerical sensor conditions with unit conversion
     "is_co_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         CarbonMonoxideConcentrationConverter,
     ),
     "is_ozone_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.OZONE)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         OzoneConcentrationConverter,
     ),
     "is_voc_value": make_entity_numerical_condition_with_unit(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
             )
         },
@@ -79,7 +79,7 @@ CONDITIONS: dict[str, type[Condition]] = {
     ),
     "is_voc_ratio_value": make_entity_numerical_condition_with_unit(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
             )
         },
@@ -87,59 +87,43 @@ CONDITIONS: dict[str, type[Condition]] = {
         UnitlessRatioConverter,
     ),
     "is_no_value": make_entity_numerical_condition_with_unit(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_MONOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenMonoxideConcentrationConverter,
     ),
     "is_no2_value": make_entity_numerical_condition_with_unit(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenDioxideConcentrationConverter,
     ),
     "is_so2_value": make_entity_numerical_condition_with_unit(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.SULPHUR_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         SulphurDioxideConcentrationConverter,
     ),
     # Numerical sensor conditions without unit conversion (single-unit device classes)
     "is_co2_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO2)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
         valid_unit=CONCENTRATION_PARTS_PER_MILLION,
     ),
     "is_pm1_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM1)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "is_pm25_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM25)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "is_pm4_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM4)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "is_pm10_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM10)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "is_n2o_value": make_entity_numerical_condition(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROUS_OXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
 }

homeassistant/components/air_quality/conditions.yaml

@@ -10,366 +10,155 @@
         - all
         - any
 
-# --- Number or entity selectors ---
+# --- Unit lists for multi-unit pollutants ---
 
-.number_or_entity_co: &number_or_entity_co
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                    - "mg/m³"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: carbon_monoxide
-                - domain: number
-                  device_class: carbon_monoxide
-      translation_key: number_or_entity
+.co_units: &co_units
+  - "ppb"
+  - "ppm"
+  - "mg/m³"
+  - "μg/m³"
 
-.number_or_entity_co2: &number_or_entity_co2
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "ppm"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "ppm"
-                - domain: sensor
-                  device_class: carbon_dioxide
-                - domain: number
-                  device_class: carbon_dioxide
-      translation_key: number_or_entity
+.ozone_units: &ozone_units
+  - "ppb"
+  - "ppm"
+  - "μg/m³"
 
-.number_or_entity_pm1: &number_or_entity_pm1
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm1
-                - domain: number
-                  device_class: pm1
-      translation_key: number_or_entity
+.voc_units: &voc_units
+  - "μg/m³"
+  - "mg/m³"
 
-.number_or_entity_pm25: &number_or_entity_pm25
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm25
-                - domain: number
-                  device_class: pm25
-      translation_key: number_or_entity
+.voc_ratio_units: &voc_ratio_units
+  - "ppb"
+  - "ppm"
 
-.number_or_entity_pm4: &number_or_entity_pm4
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm4
-                - domain: number
-                  device_class: pm4
-      translation_key: number_or_entity
+.no_units: &no_units
+  - "ppb"
+  - "μg/m³"
 
-.number_or_entity_pm10: &number_or_entity_pm10
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm10
-                - domain: number
-                  device_class: pm10
-      translation_key: number_or_entity
+.no2_units: &no2_units
+  - "ppb"
+  - "ppm"
+  - "μg/m³"
 
-.number_or_entity_ozone: &number_or_entity_ozone
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: ozone
-                - domain: number
-                  device_class: ozone
-      translation_key: number_or_entity
+.so2_units: &so2_units
+  - "ppb"
+  - "μg/m³"
 
-.number_or_entity_voc: &number_or_entity_voc
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "μg/m³"
-                    - "mg/m³"
-                - domain: sensor
-                  device_class: volatile_organic_compounds
-                - domain: number
-                  device_class: volatile_organic_compounds
-      translation_key: number_or_entity
+# --- Entity filter anchors ---
 
-.number_or_entity_voc_ratio: &number_or_entity_voc_ratio
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                - domain: sensor
-                  device_class: volatile_organic_compounds_parts
-                - domain: number
-                  device_class: volatile_organic_compounds_parts
-      translation_key: number_or_entity
+.co_threshold_entity: &co_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *co_units
+  - domain: sensor
+    device_class: carbon_monoxide
+  - domain: number
+    device_class: carbon_monoxide
 
-.number_or_entity_no: &number_or_entity_no
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: nitrogen_monoxide
-                - domain: number
-                  device_class: nitrogen_monoxide
-      translation_key: number_or_entity
+.co2_threshold_entity: &co2_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "ppm"
+  - domain: sensor
+    device_class: carbon_dioxide
+  - domain: number
+    device_class: carbon_dioxide
 
-.number_or_entity_no2: &number_or_entity_no2
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: nitrogen_dioxide
-                - domain: number
-                  device_class: nitrogen_dioxide
-      translation_key: number_or_entity
+.pm1_threshold_entity: &pm1_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm1
+  - domain: number
+    device_class: pm1
 
-.number_or_entity_n2o: &number_or_entity_n2o
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: nitrous_oxide
-                - domain: number
-                  device_class: nitrous_oxide
-      translation_key: number_or_entity
+.pm25_threshold_entity: &pm25_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm25
+  - domain: number
+    device_class: pm25
 
-.number_or_entity_so2: &number_or_entity_so2
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: sulphur_dioxide
-                - domain: number
-                  device_class: sulphur_dioxide
-      translation_key: number_or_entity
+.pm4_threshold_entity: &pm4_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm4
+  - domain: number
+    device_class: pm4
 
-# --- Unit selectors ---
+.pm10_threshold_entity: &pm10_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm10
+  - domain: number
+    device_class: pm10
 
-.unit_co: &unit_co
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
-        - "mg/m³"
-        - "μg/m³"
+.ozone_threshold_entity: &ozone_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *ozone_units
+  - domain: sensor
+    device_class: ozone
+  - domain: number
+    device_class: ozone
 
-.unit_ozone: &unit_ozone
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
-        - "μg/m³"
+.voc_threshold_entity: &voc_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *voc_units
+  - domain: sensor
+    device_class: volatile_organic_compounds
+  - domain: number
+    device_class: volatile_organic_compounds
 
-.unit_no2: &unit_no2
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
-        - "μg/m³"
+.voc_ratio_threshold_entity: &voc_ratio_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *voc_ratio_units
+  - domain: sensor
+    device_class: volatile_organic_compounds_parts
+  - domain: number
+    device_class: volatile_organic_compounds_parts
 
-.unit_no: &unit_no
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "μg/m³"
+.no_threshold_entity: &no_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *no_units
+  - domain: sensor
+    device_class: nitrogen_monoxide
+  - domain: number
+    device_class: nitrogen_monoxide
 
-.unit_so2: &unit_so2
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "μg/m³"
+.no2_threshold_entity: &no2_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *no2_units
+  - domain: sensor
+    device_class: nitrogen_dioxide
+  - domain: number
+    device_class: nitrogen_dioxide
 
-.unit_voc: &unit_voc
-  required: false
-  selector:
-    select:
-      options:
-        - "μg/m³"
-        - "mg/m³"
+.n2o_threshold_entity: &n2o_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: nitrous_oxide
+  - domain: number
+    device_class: nitrous_oxide
 
-.unit_voc_ratio: &unit_voc_ratio
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
+.so2_threshold_entity: &so2_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *so2_units
+  - domain: sensor
+    device_class: sulphur_dioxide
+  - domain: number
+    device_class: sulphur_dioxide
+
+# --- Number anchors for single-unit pollutants ---
+
+.co2_threshold_number: &co2_threshold_number
+  mode: box
+  unit_of_measurement: "ppm"
+
+.ugm3_threshold_number: &ugm3_threshold_number
+  mode: box
+  unit_of_measurement: "μg/m³"
 
 # --- Binary sensor targets ---
 
@@ -491,57 +280,99 @@ is_co_value:
   target: *target_co_sensor
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_co
-    below: *number_or_entity_co
-    unit: *unit_co
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *co_units
 
 is_ozone_value:
   target: *target_ozone
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_ozone
-    below: *number_or_entity_ozone
-    unit: *unit_ozone
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *ozone_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *ozone_units
 
 is_voc_value:
   target: *target_voc
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_voc
-    below: *number_or_entity_voc
-    unit: *unit_voc
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *voc_units
 
 is_voc_ratio_value:
   target: *target_voc_ratio
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_voc_ratio
-    below: *number_or_entity_voc_ratio
-    unit: *unit_voc_ratio
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_ratio_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *voc_ratio_units
 
 is_no_value:
   target: *target_no
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_no
-    below: *number_or_entity_no
-    unit: *unit_no
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *no_units
 
 is_no2_value:
   target: *target_no2
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_no2
-    below: *number_or_entity_no2
-    unit: *unit_no2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no2_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *no2_units
 
 is_so2_value:
   target: *target_so2
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_so2
-    below: *number_or_entity_so2
-    unit: *unit_so2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *so2_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *so2_units
 
 # --- Numerical sensor conditions without unit conversion ---
 
@@ -549,40 +380,70 @@ is_co2_value:
   target: *target_co2
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_co2
-    below: *number_or_entity_co2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co2_threshold_entity
+          mode: is
+          number: *co2_threshold_number
 
 is_pm1_value:
   target: *target_pm1
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_pm1
-    below: *number_or_entity_pm1
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm1_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number
 
 is_pm25_value:
   target: *target_pm25
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_pm25
-    below: *number_or_entity_pm25
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm25_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number
 
 is_pm4_value:
   target: *target_pm4
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_pm4
-    below: *number_or_entity_pm4
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm4_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number
 
 is_pm10_value:
   target: *target_pm10
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_pm10
-    below: *number_or_entity_pm10
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm10_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number
 
 is_n2o_value:
   target: *target_n2o
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_n2o
-    below: *number_or_entity_n2o
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *n2o_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number

homeassistant/components/air_quality/strings.json

@@ -1,34 +1,19 @@
 {
   "common": {
-    "condition_above_description": "Require the value to be above this value.",
-    "condition_above_name": "Above",
-    "condition_behavior_description": "How the value should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "condition_below_description": "Require the value to be below this value.",
-    "condition_below_name": "Below",
-    "condition_unit_description": "All values will be converted to this unit when evaluating the condition.",
-    "condition_unit_name": "Unit of measurement",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_co2_value": {
       "description": "Tests the carbon dioxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Carbon dioxide value"
@@ -37,7 +22,6 @@
       "description": "Tests if one or more carbon monoxide sensors are cleared.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -47,7 +31,6 @@
       "description": "Tests if one or more carbon monoxide sensors are detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -56,21 +39,11 @@
     "is_co_value": {
       "description": "Tests the carbon monoxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Carbon monoxide value"
@@ -79,7 +52,6 @@
       "description": "Tests if one or more gas sensors are cleared.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -89,7 +61,6 @@
       "description": "Tests if one or more gas sensors are detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -98,17 +69,11 @@
     "is_n2o_value": {
       "description": "Tests the nitrous oxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Nitrous oxide value"
@@ -116,21 +81,11 @@
     "is_no2_value": {
       "description": "Tests the nitrogen dioxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Nitrogen dioxide value"
@@ -138,21 +93,11 @@
     "is_no_value": {
       "description": "Tests the nitrogen monoxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Nitrogen monoxide value"
@@ -160,21 +105,11 @@
     "is_ozone_value": {
       "description": "Tests the ozone level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Ozone value"
@@ -182,17 +117,11 @@
     "is_pm10_value": {
       "description": "Tests the PM10 level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "PM10 value"
@@ -200,17 +129,11 @@
     "is_pm1_value": {
       "description": "Tests the PM1 level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "PM1 value"
@@ -218,17 +141,11 @@
     "is_pm25_value": {
       "description": "Tests the PM2.5 level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "PM2.5 value"
@@ -236,17 +153,11 @@
     "is_pm4_value": {
       "description": "Tests the PM4 level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "PM4 value"
@@ -255,7 +166,6 @@
       "description": "Tests if one or more smoke sensors are cleared.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -265,7 +175,6 @@
       "description": "Tests if one or more smoke sensors are detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -274,21 +183,11 @@
     "is_so2_value": {
       "description": "Tests the sulphur dioxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Sulphur dioxide value"
@@ -296,21 +195,11 @@
     "is_voc_ratio_value": {
       "description": "Tests the volatile organic compounds ratio of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Volatile organic compounds ratio value"
@@ -318,21 +207,11 @@
     "is_voc_value": {
       "description": "Tests the volatile organic compounds level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Volatile organic compounds value"
@@ -345,12 +224,6 @@
         "any": "Any"
       }
     },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
@@ -365,7 +238,6 @@
       "description": "Triggers after one or more carbon dioxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -375,11 +247,9 @@
       "description": "Triggers after one or more carbon dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -389,7 +259,6 @@
       "description": "Triggers after one or more carbon monoxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -399,7 +268,6 @@
       "description": "Triggers after one or more carbon monoxide sensors stop detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -409,11 +277,9 @@
       "description": "Triggers after one or more carbon monoxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -423,7 +289,6 @@
       "description": "Triggers after one or more carbon monoxide sensors start detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -433,7 +298,6 @@
       "description": "Triggers after one or more gas sensors stop detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -443,7 +307,6 @@
       "description": "Triggers after one or more gas sensors start detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -453,7 +316,6 @@
       "description": "Triggers after one or more nitrous oxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -463,11 +325,9 @@
       "description": "Triggers after one or more nitrous oxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -477,7 +337,6 @@
       "description": "Triggers after one or more nitrogen dioxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -487,11 +346,9 @@
       "description": "Triggers after one or more nitrogen dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -501,7 +358,6 @@
       "description": "Triggers after one or more nitrogen monoxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -511,11 +367,9 @@
       "description": "Triggers after one or more nitrogen monoxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -525,7 +379,6 @@
       "description": "Triggers after one or more ozone levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -535,11 +388,9 @@
       "description": "Triggers after one or more ozone levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -549,7 +400,6 @@
       "description": "Triggers after one or more PM10 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -559,11 +409,9 @@
       "description": "Triggers after one or more PM10 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -573,7 +421,6 @@
       "description": "Triggers after one or more PM1 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -583,11 +430,9 @@
       "description": "Triggers after one or more PM1 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -597,7 +442,6 @@
       "description": "Triggers after one or more PM2.5 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -607,11 +451,9 @@
       "description": "Triggers after one or more PM2.5 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -621,7 +463,6 @@
       "description": "Triggers after one or more PM4 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -631,11 +472,9 @@
       "description": "Triggers after one or more PM4 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -645,7 +484,6 @@
       "description": "Triggers after one or more smoke sensors stop detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -655,7 +493,6 @@
       "description": "Triggers after one or more smoke sensors start detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -665,7 +502,6 @@
       "description": "Triggers after one or more sulphur dioxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -675,11 +511,9 @@
       "description": "Triggers after one or more sulphur dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -689,7 +523,6 @@
       "description": "Triggers after one or more volatile organic compound levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -699,11 +532,9 @@
       "description": "Triggers after one or more volatile organic compounds levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -713,7 +544,6 @@
       "description": "Triggers after one or more volatile organic compound ratios change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -723,11 +553,9 @@
       "description": "Triggers after one or more volatile organic compounds ratios cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },

homeassistant/components/air_quality/trigger.py

@@ -13,7 +13,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.trigger import (
     EntityTargetStateTriggerBase,
     Trigger,
@@ -64,28 +64,28 @@ TRIGGERS: dict[str, type[Trigger]] = {
     "smoke_cleared": _make_cleared_trigger(BinarySensorDeviceClass.SMOKE),
     # Numerical sensor triggers with unit conversion
     "co_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         CarbonMonoxideConcentrationConverter,
     ),
     "co_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         CarbonMonoxideConcentrationConverter,
     ),
     "ozone_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.OZONE)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         OzoneConcentrationConverter,
     ),
     "ozone_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.OZONE)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         OzoneConcentrationConverter,
     ),
     "voc_changed": make_entity_numerical_state_changed_with_unit_trigger(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
             )
         },
@@ -94,7 +94,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
     ),
     "voc_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
             )
         },
@@ -103,7 +103,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
     ),
     "voc_ratio_changed": make_entity_numerical_state_changed_with_unit_trigger(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
             )
         },
@@ -112,7 +112,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
     ),
     "voc_ratio_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
             )
         },
@@ -120,114 +120,82 @@ TRIGGERS: dict[str, type[Trigger]] = {
         UnitlessRatioConverter,
     ),
     "no_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_MONOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenMonoxideConcentrationConverter,
     ),
     "no_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_MONOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenMonoxideConcentrationConverter,
     ),
     "no2_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenDioxideConcentrationConverter,
     ),
     "no2_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenDioxideConcentrationConverter,
     ),
     "so2_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.SULPHUR_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         SulphurDioxideConcentrationConverter,
     ),
     "so2_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.SULPHUR_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         SulphurDioxideConcentrationConverter,
     ),
     # Numerical sensor triggers without unit conversion (single-unit device classes)
     "co2_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO2)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
         valid_unit=CONCENTRATION_PARTS_PER_MILLION,
     ),
     "co2_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO2)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
         valid_unit=CONCENTRATION_PARTS_PER_MILLION,
     ),
     "pm1_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM1)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm1_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM1)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm25_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM25)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm25_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM25)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm4_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM4)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm4_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM4)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm10_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM10)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm10_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM10)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "n2o_changed": make_entity_numerical_state_changed_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROUS_OXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "n2o_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROUS_OXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
 }

homeassistant/components/alarm_control_panel/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted alarms.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted alarms to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_armed": {
       "description": "Tests if one or more alarms are armed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more alarms are armed in away mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more alarms are armed in home mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more alarms are armed in night mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -50,7 +44,6 @@
       "description": "Tests if one or more alarms are armed in vacation mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -60,7 +53,6 @@
       "description": "Tests if one or more alarms are disarmed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -70,7 +62,6 @@
       "description": "Tests if one or more alarms are triggered.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -242,7 +233,6 @@
       "description": "Triggers after one or more alarms become armed, regardless of the mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -252,7 +242,6 @@
       "description": "Triggers after one or more alarms become armed in away mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -262,7 +251,6 @@
       "description": "Triggers after one or more alarms become armed in home mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -272,7 +260,6 @@
       "description": "Triggers after one or more alarms become armed in night mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -282,7 +269,6 @@
       "description": "Triggers after one or more alarms become armed in vacation mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -292,7 +278,6 @@
       "description": "Triggers after one or more alarms become disarmed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -302,7 +287,6 @@
       "description": "Triggers after one or more alarms become triggered.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/alexa_devices/coordinator.py

@@ -54,7 +54,16 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
             entry.data[CONF_PASSWORD],
             entry.data[CONF_LOGIN_DATA],
         )
-        self.previous_devices: set[str] = set()
+        device_registry = dr.async_get(hass)
+        self.previous_devices: set[str] = {
+            identifier
+            for device in device_registry.devices.get_devices_for_config_entry_id(
+                entry.entry_id
+            )
+            if device.entry_type != dr.DeviceEntryType.SERVICE
+            for identifier_domain, identifier in device.identifiers
+            if identifier_domain == DOMAIN
+        }
 
     async def _async_update_data(self) -> dict[str, AmazonDevice]:
         """Update device data."""

homeassistant/components/alexa_devices/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aioamazondevices"],
   "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==13.3.0"]
+  "requirements": ["aioamazondevices==13.3.2"]
 }

homeassistant/components/analytics_insights/__init__.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 
 from python_homeassistant_analytics import (
+    Environment,
     HomeassistantAnalyticsClient,
     HomeassistantAnalyticsConnectionError,
 )
@@ -38,7 +39,7 @@ async def async_setup_entry(
     client = HomeassistantAnalyticsClient(session=async_get_clientsession(hass))
 
     try:
-        integrations = await client.get_integrations()
+        integrations = await client.get_integrations(Environment.NEXT)
     except HomeassistantAnalyticsConnectionError as ex:
         raise ConfigEntryNotReady("Could not fetch integration list") from ex
 

homeassistant/components/anglian_water/coordinator.py

@@ -92,6 +92,7 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                 _LOGGER.debug("Updating statistics for the first time")
                 usage_sum = 0.0
                 last_stats_time = None
+                allow_update_last_stored_hour = False
             else:
                 if not meter.readings or len(meter.readings) == 0:
                     _LOGGER.debug("No recent usage statistics found, skipping update")
@@ -107,6 +108,7 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                     continue
                 start = dt_util.as_local(parsed_read_at) - timedelta(hours=1)
                 _LOGGER.debug("Getting statistics at %s", start)
+                stats: dict[str, list[Any]] = {}
                 for end in (start + timedelta(seconds=1), None):
                     stats = await get_instance(self.hass).async_add_executor_job(
                         statistics_during_period,
@@ -127,15 +129,28 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                             "Not found, trying to find oldest statistic after %s",
                             start,
                         )
-                assert stats
 
-                def _safe_get_sum(records: list[Any]) -> float:
-                    if records and "sum" in records[0]:
-                        return float(records[0]["sum"])
-                    return 0.0
+                if not stats or not stats.get(usage_statistic_id):
+                    _LOGGER.debug(
+                        "Could not find existing statistics during period lookup for %s, "
+                        "falling back to last stored statistic",
+                        usage_statistic_id,
+                    )
+                    allow_update_last_stored_hour = True
+                    last_records = last_stat[usage_statistic_id]
+                    usage_sum = float(last_records[0].get("sum") or 0.0)
+                    last_stats_time = last_records[0]["start"]
+                else:
+                    allow_update_last_stored_hour = False
+                    records = stats[usage_statistic_id]
 
-                usage_sum = _safe_get_sum(stats.get(usage_statistic_id, []))
-                last_stats_time = stats[usage_statistic_id][0]["start"]
+                    def _safe_get_sum(records: list[Any]) -> float:
+                        if records and "sum" in records[0]:
+                            return float(records[0]["sum"])
+                        return 0.0
+
+                    usage_sum = _safe_get_sum(records)
+                    last_stats_time = records[0]["start"]
 
             usage_statistics = []
 
@@ -148,7 +163,13 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                     )
                     continue
                 start = dt_util.as_local(parsed_read_at) - timedelta(hours=1)
-                if last_stats_time is not None and start.timestamp() <= last_stats_time:
+                if last_stats_time is not None and (
+                    start.timestamp() < last_stats_time
+                    or (
+                        start.timestamp() == last_stats_time
+                        and not allow_update_last_stored_hour
+                    )
+                ):
                     continue
                 usage_state = max(0, read["consumption"] / 1000)
                 usage_sum = max(0, read["read"])

homeassistant/components/anglian_water/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["pyanglianwater"],
   "quality_scale": "bronze",
-  "requirements": ["pyanglianwater==3.1.1"]
+  "requirements": ["pyanglianwater==3.1.2"]
 }

homeassistant/components/arcam_fmj/manifest.json

@@ -7,7 +7,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["arcam"],
-  "requirements": ["arcam-fmj==1.8.2"],
+  "requirements": ["arcam-fmj==1.8.3"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1",

homeassistant/components/arcam_fmj/sensor.py

@@ -91,6 +91,7 @@ SENSORS: tuple[ArcamFmjSensorEntityDescription, ...] = (
         value_fn=lambda state: (
             vp.colorspace.name.lower()
             if (vp := state.get_incoming_video_parameters()) is not None
+            and vp.colorspace is not None
             else None
         ),
     ),

homeassistant/components/assist_satellite/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted Assist satellites.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted Assist satellites to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_idle": {
       "description": "Tests if one or more Assist satellites are idle.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more Assist satellites are listening.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more Assist satellites are processing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more Assist satellites are responding.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -81,7 +75,7 @@
   },
   "services": {
     "announce": {
-      "description": "Lets a satellite announce a message.",
+      "description": "Lets an Assist satellite announce a message.",
       "fields": {
         "media_id": {
           "description": "The media ID to announce instead of using text-to-speech.",
@@ -100,10 +94,10 @@
           "name": "Preannounce media ID"
         }
       },
-      "name": "Announce"
+      "name": "Announce on satellite"
     },
     "ask_question": {
-      "description": "Asks a question and gets the user's response.",
+      "description": "Lets an Assist satellite ask a question and get the user's response.",
       "fields": {
         "answers": {
           "description": "Possible answers to the question.",
@@ -130,10 +124,10 @@
           "name": "Question media ID"
         }
       },
-      "name": "Ask question"
+      "name": "Ask question on satellite"
     },
     "start_conversation": {
-      "description": "Starts a conversation from a satellite.",
+      "description": "Starts a conversation from an Assist satellite.",
       "fields": {
         "extra_system_prompt": {
           "description": "Provide background information to the AI about the request.",
@@ -156,46 +150,42 @@
           "name": "Message"
         }
       },
-      "name": "Start conversation"
+      "name": "Start conversation on satellite"
     }
   },
   "title": "Assist satellite",
   "triggers": {
     "idle": {
-      "description": "Triggers after one or more voice assistant satellites become idle after having processed a command.",
+      "description": "Triggers after one or more Assist satellites become idle after having processed a command.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
       "name": "Satellite became idle"
     },
     "listening": {
-      "description": "Triggers after one or more voice assistant satellites start listening for a command from someone.",
+      "description": "Triggers after one or more Assist satellites start listening for a command from someone.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
       "name": "Satellite started listening"
     },
     "processing": {
-      "description": "Triggers after one or more voice assistant satellites start processing a command after having heard it.",
+      "description": "Triggers after one or more Assist satellites start processing a command after having heard it.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
       "name": "Satellite started processing"
     },
     "responding": {
-      "description": "Triggers after one or more voice assistant satellites start responding to a command after having processed it, or start announcing something.",
+      "description": "Triggers after one or more Assist satellites start responding to a command after having processed it, or start announcing something.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/automation/__init__.py

@@ -122,7 +122,9 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "alarm_control_panel",
     "assist_satellite",
     "battery",
+    "calendar",
     "climate",
+    "counter",
     "cover",
     "device_tracker",
     "door",
@@ -142,11 +144,14 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "person",
     "power",
     "schedule",
+    "select",
     "siren",
     "switch",
     "temperature",
     "text",
+    "timer",
     "vacuum",
+    "valve",
     "water_heater",
     "window",
 }
@@ -155,6 +160,7 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "air_quality",
     "alarm_control_panel",
     "assist_satellite",
+    "battery",
     "button",
     "climate",
     "counter",
@@ -185,8 +191,10 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "switch",
     "temperature",
     "text",
+    "todo",
     "update",
     "vacuum",
+    "valve",
     "water_heater",
     "window",
 }

homeassistant/components/automation/strings.json

@@ -78,11 +78,11 @@
   "services": {
     "reload": {
       "description": "Reloads the automation configuration.",
-      "name": "[%key:common::action::reload%]"
+      "name": "Reload automations"
     },
     "toggle": {
       "description": "Toggles (enable / disable) an automation.",
-      "name": "[%key:common::action::toggle%]"
+      "name": "Toggle automation"
     },
     "trigger": {
       "description": "Triggers the actions of an automation.",
@@ -92,7 +92,7 @@
           "name": "Skip conditions"
         }
       },
-      "name": "Trigger"
+      "name": "Trigger automation"
     },
     "turn_off": {
       "description": "Disables an automation.",
@@ -102,11 +102,11 @@
           "name": "Stop actions"
         }
       },
-      "name": "[%key:common::action::turn_off%]"
+      "name": "Turn off automation"
     },
     "turn_on": {
       "description": "Enables an automation.",
-      "name": "[%key:common::action::turn_on%]"
+      "name": "Turn on automation"
     }
   },
   "title": "Automation"

homeassistant/components/axis/manifest.json

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

homeassistant/components/backblaze_b2/__init__.py

@@ -74,6 +74,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: BackblazeConfigEntry) ->
             translation_domain=DOMAIN,
             translation_key="invalid_bucket_name",
         ) from err
+    except exception.BadRequest as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="bad_request",
+            translation_placeholders={"error_message": str(err)},
+        ) from err
     except (
         exception.B2ConnectionError,
         exception.B2RequestTimeout,

homeassistant/components/backblaze_b2/backup.py

@@ -101,8 +101,7 @@ def handle_b2_errors[T](
         try:
             return await func(*args, **kwargs)
         except B2Error as err:
-            error_msg = f"Failed during {func.__name__}"
-            raise BackupAgentError(error_msg) from err
+            raise BackupAgentError(f"Failed during {func.__name__}: {err}") from err
 
     return wrapper
 
@@ -170,8 +169,7 @@ class BackblazeBackupAgent(BackupAgent):
     async def _cleanup_failed_upload(self, filename: str) -> None:
         """Clean up a partially uploaded file after upload failure."""
         _LOGGER.warning(
-            "Attempting to delete partially uploaded main backup file %s "
-            "due to metadata upload failure",
+            "Attempting to delete partially uploaded backup file %s",
             filename,
         )
         try:
@@ -180,11 +178,10 @@ class BackblazeBackupAgent(BackupAgent):
             )
             await self._hass.async_add_executor_job(uploaded_main_file_info.delete)
         except B2Error:
-            _LOGGER.debug(
-                "Failed to clean up partially uploaded main backup file %s. "
-                "Manual intervention may be required to delete it from Backblaze B2",
+            _LOGGER.warning(
+                "Failed to clean up partially uploaded backup file %s;"
+                " manual deletion from Backblaze B2 may be required",
                 filename,
-                exc_info=True,
             )
         else:
             _LOGGER.debug(
@@ -256,9 +253,10 @@ class BackblazeBackupAgent(BackupAgent):
             prefixed_metadata_filename,
         )
 
-        upload_successful = False
+        tar_uploaded = False
         try:
             await self._upload_backup_file(prefixed_tar_filename, open_stream, {})
+            tar_uploaded = True
             _LOGGER.debug(
                 "Main backup file upload finished for %s", prefixed_tar_filename
             )
@@ -270,15 +268,14 @@ class BackblazeBackupAgent(BackupAgent):
             _LOGGER.debug(
                 "Metadata file upload finished for %s", prefixed_metadata_filename
             )
-            upload_successful = True
-        finally:
-            if upload_successful:
-                _LOGGER.debug("Backup upload complete: %s", prefixed_tar_filename)
-                self._invalidate_caches(
-                    backup.backup_id, prefixed_tar_filename, prefixed_metadata_filename
-                )
-            else:
+            _LOGGER.debug("Backup upload complete: %s", prefixed_tar_filename)
+            self._invalidate_caches(
+                backup.backup_id, prefixed_tar_filename, prefixed_metadata_filename
+            )
+        except B2Error:
+            if tar_uploaded:
                 await self._cleanup_failed_upload(prefixed_tar_filename)
+            raise
 
     def _upload_metadata_file_sync(
         self, metadata_content: bytes, filename: str

homeassistant/components/backblaze_b2/config_flow.py

@@ -174,6 +174,14 @@ class BackblazeConfigFlow(ConfigFlow, domain=DOMAIN):
                 "Backblaze B2 bucket '%s' does not exist", user_input[CONF_BUCKET]
             )
             errors[CONF_BUCKET] = "invalid_bucket_name"
+        except exception.BadRequest as err:
+            _LOGGER.error(
+                "Backblaze B2 API rejected the request for Key ID '%s': %s",
+                user_input[CONF_KEY_ID],
+                err,
+            )
+            errors["base"] = "bad_request"
+            placeholders["error_message"] = str(err)
         except (
             exception.B2ConnectionError,
             exception.B2RequestTimeout,

homeassistant/components/backblaze_b2/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_push",
   "loggers": ["b2sdk"],
   "quality_scale": "bronze",
-  "requirements": ["b2sdk==2.10.1"]
+  "requirements": ["b2sdk==2.10.4"]
 }

homeassistant/components/backblaze_b2/strings.json

@@ -6,6 +6,7 @@
       "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
     },
     "error": {
+      "bad_request": "The Backblaze B2 API rejected the request: {error_message}",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_bucket_name": "[%key:component::backblaze_b2::exceptions::invalid_bucket_name::message%]",
       "invalid_capability": "[%key:component::backblaze_b2::exceptions::invalid_capability::message%]",
@@ -60,6 +61,9 @@
     }
   },
   "exceptions": {
+    "bad_request": {
+      "message": "The Backblaze B2 API rejected the request: {error_message}"
+    },
     "cannot_connect": {
       "message": "Cannot connect to endpoint"
     },

homeassistant/components/backup/manager.py

@@ -12,7 +12,7 @@ import hashlib
 import io
 from itertools import chain
 import json
-from pathlib import Path, PurePath
+from pathlib import Path, PurePath, PureWindowsPath
 import shutil
 import sys
 import tarfile
@@ -1957,7 +1957,10 @@ class CoreBackupReaderWriter(BackupReaderWriter):
         suggested_filename: str,
     ) -> WrittenBackup:
         """Receive a backup."""
-        temp_file = Path(self.temp_backup_dir, suggested_filename)
+        safe_filename = PureWindowsPath(suggested_filename).name
+        if not safe_filename or safe_filename == "..":
+            safe_filename = "backup.tar"
+        temp_file = Path(self.temp_backup_dir, safe_filename)
 
         async_add_executor_job = self._hass.async_add_executor_job
         await async_add_executor_job(make_backup_dir, self.temp_backup_dir)

homeassistant/components/backup/manifest.json

@@ -8,6 +8,6 @@
   "integration_type": "service",
   "iot_class": "calculated",
   "quality_scale": "internal",
-  "requirements": ["cronsim==2.7", "securetar==2026.2.0"],
+  "requirements": ["cronsim==2.7", "securetar==2026.4.0"],
   "single_config_entry": true
 }

homeassistant/components/backup/util.py

@@ -22,6 +22,7 @@ from securetar import (
     SecureTarFile,
     SecureTarReadError,
     SecureTarRootKeyContext,
+    get_archive_max_ciphertext_size,
 )
 
 from homeassistant.core import HomeAssistant
@@ -431,7 +432,9 @@ class _CipherBackupStreamer:
 
     def size(self) -> int:
         """Return the maximum size of the decrypted or encrypted backup."""
-        return self._backup.size + self._num_tar_files() * tarfile.RECORDSIZE
+        return get_archive_max_ciphertext_size(  # type: ignore[no-any-return]
+            self._backup.size, SECURETAR_CREATE_VERSION, self._num_tar_files()
+        )
 
     def _num_tar_files(self) -> int:
         """Return the number of inner tar files."""

homeassistant/components/battery/__init__.py

@@ -1,4 +1,4 @@
-"""Integration for battery conditions."""
+"""Integration for battery triggers and conditions."""
 
 from __future__ import annotations
 

homeassistant/components/battery/condition.py

@@ -6,7 +6,6 @@ from homeassistant.components.binary_sensor import (
     DOMAIN as BINARY_SENSOR_DOMAIN,
     BinarySensorDeviceClass,
 )
-from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN, NumberDeviceClass
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
 from homeassistant.const import PERCENTAGE, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
@@ -27,7 +26,6 @@ BATTERY_CHARGING_DOMAIN_SPECS = {
 }
 BATTERY_PERCENTAGE_DOMAIN_SPECS = {
     SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.BATTERY),
-    NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.BATTERY),
 }
 
 CONDITIONS: dict[str, type[Condition]] = {

homeassistant/components/battery/conditions.yaml

@@ -14,24 +14,19 @@
             - all
             - any
 
-.number_or_entity: &number_or_entity
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              unit_of_measurement: "%"
-        entity:
-          selector:
-            entity:
-              filter:
-                domain:
-                  - input_number
-                  - number
-                  - sensor
-      translation_key: number_or_entity
+.battery_threshold_entity: &battery_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "%"
+  - domain: sensor
+    device_class: battery
+  - domain: number
+    device_class: battery
+
+.battery_threshold_number: &battery_threshold_number
+  min: 0
+  max: 100
+  mode: box
+  unit_of_measurement: "%"
 
 is_low: *condition_common
 
@@ -58,9 +53,12 @@ is_level:
     entity:
       - domain: sensor
         device_class: battery
-      - domain: number
-        device_class: battery
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity
-    below: *number_or_entity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *battery_threshold_entity
+          mode: is
+          number: *battery_threshold_number

homeassistant/components/battery/icons.json

@@ -15,5 +15,25 @@
     "is_not_low": {
       "condition": "mdi:battery"
     }
+  },
+  "triggers": {
+    "level_changed": {
+      "trigger": "mdi:battery-unknown"
+    },
+    "level_crossed_threshold": {
+      "trigger": "mdi:battery-alert"
+    },
+    "low": {
+      "trigger": "mdi:battery-alert"
+    },
+    "not_low": {
+      "trigger": "mdi:battery"
+    },
+    "started_charging": {
+      "trigger": "mdi:battery-charging"
+    },
+    "stopped_charging": {
+      "trigger": "mdi:battery"
+    }
   }
 }

homeassistant/components/battery/strings.json

@@ -1,14 +1,15 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted batteries.",
-    "condition_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_charging": {
       "description": "Tests if one or more batteries are charging.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -17,17 +18,11 @@
     "is_level": {
       "description": "Tests the battery level of one or more batteries.",
       "fields": {
-        "above": {
-          "description": "Require the battery percentage to be above this value.",
-          "name": "Above"
-        },
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "Require the battery percentage to be below this value.",
-          "name": "Below"
+        "threshold": {
+          "name": "[%key:component::battery::common::condition_threshold_name%]"
         }
       },
       "name": "Battery level"
@@ -36,7 +31,6 @@
       "description": "Tests if one or more batteries are low.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -46,7 +40,6 @@
       "description": "Tests if one or more batteries are not charging.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -56,7 +49,6 @@
       "description": "Tests if one or more batteries are not low.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -70,12 +62,72 @@
         "any": "Any"
       }
     },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
       }
     }
   },
-  "title": "Battery"
+  "title": "Battery",
+  "triggers": {
+    "level_changed": {
+      "description": "Triggers after the battery level of one or more batteries changes.",
+      "fields": {
+        "threshold": {
+          "name": "[%key:component::battery::common::trigger_threshold_name%]"
+        }
+      },
+      "name": "Battery level changed"
+    },
+    "level_crossed_threshold": {
+      "description": "Triggers after the battery level of one or more batteries crosses a threshold.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::battery::common::trigger_threshold_name%]"
+        }
+      },
+      "name": "Battery level crossed threshold"
+    },
+    "low": {
+      "description": "Triggers after one or more batteries become low.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Battery low"
+    },
+    "not_low": {
+      "description": "Triggers after one or more batteries are no longer low.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Battery not low"
+    },
+    "started_charging": {
+      "description": "Triggers after one or more batteries start charging.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Battery started charging"
+    },
+    "stopped_charging": {
+      "description": "Triggers after one or more batteries stop charging.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Battery stopped charging"
+    }
+  }
 }

homeassistant/components/battery/trigger.py

@@ -0,0 +1,54 @@
+"""Provides triggers for batteries."""
+
+from __future__ import annotations
+
+from homeassistant.components.binary_sensor import (
+    DOMAIN as BINARY_SENSOR_DOMAIN,
+    BinarySensorDeviceClass,
+)
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
+from homeassistant.const import STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.trigger import (
+    Trigger,
+    make_entity_numerical_state_changed_trigger,
+    make_entity_numerical_state_crossed_threshold_trigger,
+    make_entity_target_state_trigger,
+)
+
+BATTERY_LOW_DOMAIN_SPECS: dict[str, DomainSpec] = {
+    BINARY_SENSOR_DOMAIN: DomainSpec(device_class=BinarySensorDeviceClass.BATTERY),
+}
+
+BATTERY_CHARGING_DOMAIN_SPECS: dict[str, DomainSpec] = {
+    BINARY_SENSOR_DOMAIN: DomainSpec(
+        device_class=BinarySensorDeviceClass.BATTERY_CHARGING
+    ),
+}
+
+BATTERY_PERCENTAGE_DOMAIN_SPECS: dict[str, DomainSpec] = {
+    SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.BATTERY),
+}
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    "low": make_entity_target_state_trigger(BATTERY_LOW_DOMAIN_SPECS, STATE_ON),
+    "not_low": make_entity_target_state_trigger(BATTERY_LOW_DOMAIN_SPECS, STATE_OFF),
+    "started_charging": make_entity_target_state_trigger(
+        BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON
+    ),
+    "stopped_charging": make_entity_target_state_trigger(
+        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF
+    ),
+    "level_changed": make_entity_numerical_state_changed_trigger(
+        BATTERY_PERCENTAGE_DOMAIN_SPECS, valid_unit="%"
+    ),
+    "level_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        BATTERY_PERCENTAGE_DOMAIN_SPECS, valid_unit="%"
+    ),
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for batteries."""
+    return TRIGGERS

homeassistant/components/battery/triggers.yaml

@@ -0,0 +1,83 @@
+.trigger_common_fields:
+  behavior: &trigger_behavior
+    required: true
+    default: any
+    selector:
+      select:
+        translation_key: trigger_behavior
+        options:
+          - first
+          - last
+          - any
+
+.battery_threshold_entity: &battery_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "%"
+  - domain: number
+    device_class: battery
+  - domain: sensor
+    device_class: battery
+
+.battery_threshold_number: &battery_threshold_number
+  min: 0
+  max: 100
+  mode: box
+  unit_of_measurement: "%"
+
+.trigger_target_battery: &trigger_target_battery
+  entity:
+    - domain: binary_sensor
+      device_class: battery
+
+.trigger_target_charging: &trigger_target_charging
+  entity:
+    - domain: binary_sensor
+      device_class: battery_charging
+
+.trigger_target_percentage: &trigger_target_percentage
+  entity:
+    - domain: sensor
+      device_class: battery
+
+low:
+  fields:
+    behavior: *trigger_behavior
+  target: *trigger_target_battery
+
+not_low:
+  fields:
+    behavior: *trigger_behavior
+  target: *trigger_target_battery
+
+started_charging:
+  fields:
+    behavior: *trigger_behavior
+  target: *trigger_target_charging
+
+stopped_charging:
+  fields:
+    behavior: *trigger_behavior
+  target: *trigger_target_charging
+
+level_changed:
+  target: *trigger_target_percentage
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *battery_threshold_entity
+          mode: changed
+          number: *battery_threshold_number
+
+level_crossed_threshold:
+  target: *trigger_target_percentage
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *battery_threshold_entity
+          mode: crossed
+          number: *battery_threshold_number

homeassistant/components/bluesound/manifest.json

@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/bluesound",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["pyblu==2.0.5"],
+  "requirements": ["pyblu==2.0.6"],
   "zeroconf": [
     {
       "type": "_musc._tcp.local."

homeassistant/components/bmw_connected_drive/__init__.py

@@ -0,0 +1,41 @@
+"""The BMW Connected Drive integration."""
+
+from __future__ import annotations
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
+
+DOMAIN = "bmw_connected_drive"
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up BMW Connected Drive from a config entry."""
+    ir.async_create_issue(
+        hass,
+        DOMAIN,
+        DOMAIN,
+        is_fixable=False,
+        severity=ir.IssueSeverity.ERROR,
+        translation_key="integration_removed",
+        translation_placeholders={
+            "entries": "/config/integrations/integration/bmw_connected_drive",
+            "custom_component_url": "https://github.com/kvanbiesen/bmw-cardata-ha",
+        },
+    )
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    return True
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Remove a config entry."""
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+        # Remove any remaining disabled or ignored entries
+        for _entry in hass.config_entries.async_entries(DOMAIN):
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))

homeassistant/components/bmw_connected_drive/config_flow.py

@@ -0,0 +1,9 @@
+"""The BMW Connected Drive integration config flow."""
+
+from homeassistant.config_entries import ConfigFlow
+
+from . import DOMAIN
+
+
+class BMWConnectedDriveConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for BMW Connected Drive."""

homeassistant/components/bmw_connected_drive/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "bmw_connected_drive",
+  "name": "BMW Connected Drive",
+  "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/bmw_connected_drive",
+  "integration_type": "system",
+  "iot_class": "cloud_polling",
+  "quality_scale": "legacy",
+  "requirements": []
+}

homeassistant/components/bmw_connected_drive/strings.json

@@ -0,0 +1,8 @@
+{
+  "issues": {
+    "integration_removed": {
+      "description": "The BMW Connected Drive integration has been removed from Home Assistant.\n\nIn September 2025, BMW blocked third-party access to their servers by adding additional security measures. For EU-registered cars, a community-developed [custom component]({custom_component_url}) using BMW's CarData API is available as an alternative.\n\nTo resolve this issue, please remove the (now defunct) integration entries from your Home Assistant setup. [Click here to see your existing BMW Connected Drive integration entries]({entries}).",
+      "title": "The BMW Connected Drive integration has been removed"
+    }
+  }
+}

homeassistant/components/bsblan/coordinator.py

@@ -10,6 +10,7 @@ from bsblan import (
     BSBLAN,
     BSBLANAuthError,
     BSBLANConnectionError,
+    BSBLANError,
     HotWaterConfig,
     HotWaterSchedule,
     HotWaterState,
@@ -50,7 +51,7 @@ class BSBLanFastData:
 
     state: State
     sensor: Sensor
-    dhw: HotWaterState
+    dhw: HotWaterState | None = None
 
 
 @dataclass
@@ -111,7 +112,6 @@ class BSBLanFastCoordinator(BSBLanCoordinator[BSBLanFastData]):
             # This reduces response time significantly (~0.2s per parameter)
             state = await self.client.state(include=STATE_INCLUDE)
             sensor = await self.client.sensor(include=SENSOR_INCLUDE)
-            dhw = await self.client.hot_water_state(include=DHW_STATE_INCLUDE)
 
         except BSBLANAuthError as err:
             raise ConfigEntryAuthFailed(
@@ -126,6 +126,19 @@ class BSBLanFastCoordinator(BSBLanCoordinator[BSBLanFastData]):
                 translation_placeholders={"host": host},
             ) from err
 
+        # Fetch DHW state separately - device may not support hot water
+        dhw: HotWaterState | None = None
+        try:
+            dhw = await self.client.hot_water_state(include=DHW_STATE_INCLUDE)
+        except BSBLANError:
+            # Preserve last known DHW state if available (entity may depend on it)
+            if self.data:
+                dhw = self.data.dhw
+            LOGGER.debug(
+                "DHW (Domestic Hot Water) state not available on device at %s",
+                self.config_entry.data[CONF_HOST],
+            )
+
         return BSBLanFastData(
             state=state,
             sensor=sensor,
@@ -159,13 +172,6 @@ class BSBLanSlowCoordinator(BSBLanCoordinator[BSBLanSlowData]):
             dhw_config = await self.client.hot_water_config(include=DHW_CONFIG_INCLUDE)
             dhw_schedule = await self.client.hot_water_schedule()
 
-        except AttributeError:
-            # Device does not support DHW functionality
-            LOGGER.debug(
-                "DHW (Domestic Hot Water) not available on device at %s",
-                self.config_entry.data[CONF_HOST],
-            )
-            return BSBLanSlowData()
         except (BSBLANConnectionError, BSBLANAuthError) as err:
             # If config update fails, keep existing data
             LOGGER.debug(
@@ -177,6 +183,13 @@ class BSBLanSlowCoordinator(BSBLanCoordinator[BSBLanSlowData]):
                 return self.data
             # First fetch failed, return empty data
             return BSBLanSlowData()
+        except BSBLANError, AttributeError:
+            # Device does not support DHW functionality
+            LOGGER.debug(
+                "DHW (Domestic Hot Water) not available on device at %s",
+                self.config_entry.data[CONF_HOST],
+            )
+            return BSBLanSlowData()
 
         return BSBLanSlowData(
             dhw_config=dhw_config,

homeassistant/components/bsblan/diagnostics.py

@@ -22,7 +22,9 @@ async def async_get_config_entry_diagnostics(
         "fast_coordinator_data": {
             "state": data.fast_coordinator.data.state.model_dump(),
             "sensor": data.fast_coordinator.data.sensor.model_dump(),
-            "dhw": data.fast_coordinator.data.dhw.model_dump(),
+            "dhw": data.fast_coordinator.data.dhw.model_dump()
+            if data.fast_coordinator.data.dhw
+            else None,
         },
         "static": data.static.model_dump() if data.static is not None else None,
     }

homeassistant/components/bsblan/entity.py

@@ -2,6 +2,9 @@
 
 from __future__ import annotations
 
+from yarl import URL
+
+from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.helpers.device_registry import (
     CONNECTION_NETWORK_MAC,
     DeviceInfo,
@@ -10,7 +13,7 @@ from homeassistant.helpers.device_registry import (
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import BSBLanData
-from .const import DOMAIN
+from .const import DEFAULT_PORT, DOMAIN
 from .coordinator import BSBLanCoordinator, BSBLanFastCoordinator, BSBLanSlowCoordinator
 
 
@@ -22,7 +25,8 @@ class BSBLanEntityBase[_T: BSBLanCoordinator](CoordinatorEntity[_T]):
     def __init__(self, coordinator: _T, data: BSBLanData) -> None:
         """Initialize BSBLan entity with device info."""
         super().__init__(coordinator)
-        host = coordinator.config_entry.data["host"]
+        host = coordinator.config_entry.data[CONF_HOST]
+        port = coordinator.config_entry.data.get(CONF_PORT, DEFAULT_PORT)
         mac = data.device.MAC
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, mac)},
@@ -44,7 +48,7 @@ class BSBLanEntityBase[_T: BSBLanCoordinator](CoordinatorEntity[_T]):
                 else None
             ),
             sw_version=data.device.version,
-            configuration_url=f"http://{host}",
+            configuration_url=str(URL.build(scheme="http", host=host, port=port)),
         )
 
 

homeassistant/components/bsblan/manifest.json

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

homeassistant/components/bsblan/water_heater.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from bsblan import BSBLANError, SetHotWaterParam
+from bsblan import BSBLANError, HotWaterState, SetHotWaterParam
 
 from homeassistant.components.water_heater import (
     STATE_ECO,
@@ -46,8 +46,10 @@ async def async_setup_entry(
     data = entry.runtime_data
 
     # Only create water heater entity if DHW (Domestic Hot Water) is available
-    # Check if we have any DHW-related data indicating water heater support
     dhw_data = data.fast_coordinator.data.dhw
+    if dhw_data is None:
+        # Device does not support DHW, skip water heater setup
+        return
     if (
         dhw_data.operating_mode is None
         and dhw_data.nominal_setpoint is None
@@ -107,11 +109,21 @@ class BSBLANWaterHeater(BSBLanDualCoordinatorEntity, WaterHeaterEntity):
         else:
             self._attr_max_temp = 65.0  # Default maximum
 
+    @property
+    def _dhw(self) -> HotWaterState:
+        """Return DHW state data.
+
+        This entity is only created when DHW data is available.
+        """
+        dhw = self.coordinator.data.dhw
+        assert dhw is not None
+        return dhw
+
     @property
     def current_operation(self) -> str | None:
         """Return current operation."""
         if (
-            operating_mode := self.coordinator.data.dhw.operating_mode
+            operating_mode := self._dhw.operating_mode
         ) is None or operating_mode.value is None:
             return None
         return BSBLAN_TO_HA_OPERATION_MODE.get(operating_mode.value)
@@ -119,16 +131,14 @@ class BSBLANWaterHeater(BSBLanDualCoordinatorEntity, WaterHeaterEntity):
     @property
     def current_temperature(self) -> float | None:
         """Return the current temperature."""
-        if (
-            current_temp := self.coordinator.data.dhw.dhw_actual_value_top_temperature
-        ) is None:
+        if (current_temp := self._dhw.dhw_actual_value_top_temperature) is None:
             return None
         return current_temp.value
 
     @property
     def target_temperature(self) -> float | None:
         """Return the temperature we try to reach."""
-        if (target_temp := self.coordinator.data.dhw.nominal_setpoint) is None:
+        if (target_temp := self._dhw.nominal_setpoint) is None:
             return None
         return target_temp.value
 

homeassistant/components/calendar/condition.py

@@ -0,0 +1,16 @@
+"""Provides conditions for calendars."""
+
+from homeassistant.const import STATE_ON
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.condition import Condition, make_entity_state_condition
+
+from .const import DOMAIN
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_event_active": make_entity_state_condition(DOMAIN, STATE_ON),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the calendar conditions."""
+    return CONDITIONS

homeassistant/components/calendar/conditions.yaml

@@ -0,0 +1,14 @@
+is_event_active:
+  target:
+    entity:
+      - domain: calendar
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any

homeassistant/components/calendar/icons.json

@@ -1,4 +1,9 @@
 {
+  "conditions": {
+    "is_event_active": {
+      "condition": "mdi:calendar-check"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:calendar",

homeassistant/components/calendar/strings.json

@@ -1,4 +1,18 @@
 {
+  "common": {
+    "condition_behavior_name": "Condition passes if"
+  },
+  "conditions": {
+    "is_event_active": {
+      "description": "Tests if one or more calendars have an active event.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::calendar::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Calendar event is active"
+    }
+  },
   "entity_component": {
     "_": {
       "name": "[%key:component::calendar::title%]",
@@ -46,6 +60,12 @@
     }
   },
   "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_offset_type": {
       "options": {
         "after": "After",

homeassistant/components/chess_com/config_flow.py

@@ -30,6 +30,7 @@ class ChessConfigFlow(ConfigFlow, domain=DOMAIN):
             client = ChessComClient(session=session)
             try:
                 user = await client.get_player(user_input[CONF_USERNAME])
+                await client.get_player_stats(user_input[CONF_USERNAME])
             except NotFoundError:
                 errors["base"] = "player_not_found"
             except Exception:
@@ -38,7 +39,9 @@ class ChessConfigFlow(ConfigFlow, domain=DOMAIN):
             else:
                 await self.async_set_unique_id(str(user.player_id))
                 self._abort_if_unique_id_configured()
-                return self.async_create_entry(title=user.name, data=user_input)
+                return self.async_create_entry(
+                    title=user.name or user.username, data=user_input
+                )
 
         return self.async_show_form(
             step_id="user",

homeassistant/components/climate/condition.py

@@ -1,10 +1,18 @@
 """Provides conditions for climates."""
 
-from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from typing import TYPE_CHECKING
+
+import voluptuous as vol
+
+from homeassistant.const import ATTR_TEMPERATURE, CONF_OPTIONS, UnitOfTemperature
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.condition import (
+    ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL,
     Condition,
+    ConditionConfig,
+    EntityConditionBase,
     EntityNumericalConditionWithUnitBase,
     make_entity_numerical_condition,
     make_entity_state_condition,
@@ -13,12 +21,42 @@ from homeassistant.util.unit_conversion import TemperatureConverter
 
 from .const import ATTR_HUMIDITY, ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
 
+CONF_HVAC_MODE = "hvac_mode"
+
+_HVAC_MODE_CONDITION_SCHEMA = ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL.extend(
+    {
+        vol.Required(CONF_OPTIONS): {
+            vol.Required(CONF_HVAC_MODE): vol.All(
+                cv.ensure_list, vol.Length(min=1), [vol.Coerce(HVACMode)]
+            ),
+        },
+    }
+)
+
+
+class ClimateHVACModeCondition(EntityConditionBase):
+    """Condition for climate HVAC mode."""
+
+    _domain_specs = {DOMAIN: DomainSpec()}
+    _schema = _HVAC_MODE_CONDITION_SCHEMA
+
+    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
+        """Initialize the HVAC mode condition."""
+        super().__init__(hass, config)
+        if TYPE_CHECKING:
+            assert config.options is not None
+        self._hvac_modes: set[str] = set(config.options[CONF_HVAC_MODE])
+
+    def is_valid_state(self, entity_state: State) -> bool:
+        """Check if the state matches any of the expected HVAC modes."""
+        return entity_state.state in self._hvac_modes
+
 
 class ClimateTargetTemperatureCondition(EntityNumericalConditionWithUnitBase):
     """Mixin for climate target temperature conditions with unit conversion."""
 
     _base_unit = UnitOfTemperature.CELSIUS
-    _domain_specs = {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
+    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_TEMPERATURE)}
     _unit_converter = TemperatureConverter
 
     def _get_entity_unit(self, entity_state: State) -> str | None:
@@ -28,6 +66,7 @@ class ClimateTargetTemperatureCondition(EntityNumericalConditionWithUnitBase):
 
 
 CONDITIONS: dict[str, type[Condition]] = {
+    "is_hvac_mode": ClimateHVACModeCondition,
     "is_off": make_entity_state_condition(DOMAIN, HVACMode.OFF),
     "is_on": make_entity_state_condition(
         DOMAIN,
@@ -50,7 +89,7 @@ CONDITIONS: dict[str, type[Condition]] = {
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.HEATING
     ),
     "target_humidity": make_entity_numerical_condition(
-        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
         valid_unit="%",
     ),
     "target_temperature": ClimateTargetTemperatureCondition,

homeassistant/components/climate/conditions.yaml

@@ -13,58 +13,31 @@
             - all
             - any
 
-.number_or_entity_humidity: &number_or_entity_humidity
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "%"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "%"
-                - domain: sensor
-                  device_class: humidity
-                - domain: number
-                  device_class: humidity
-      translation_key: number_or_entity
+.humidity_threshold_entity: &humidity_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "%"
+  - domain: sensor
+    device_class: humidity
+  - domain: number
+    device_class: humidity
 
-.number_or_entity_temperature: &number_or_entity_temperature
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "°C"
-                    - "°F"
-                - domain: sensor
-                  device_class: temperature
-                - domain: number
-                  device_class: temperature
-      translation_key: number_or_entity
+.humidity_threshold_number: &humidity_threshold_number
+  min: 0
+  max: 100
+  mode: box
+  unit_of_measurement: "%"
 
-.condition_unit_temperature: &condition_unit_temperature
-  required: false
-  selector:
-    select:
-      options:
-        - "°C"
-        - "°F"
+.temperature_units: &temperature_units
+  - "°C"
+  - "°F"
+
+.temperature_threshold_entity: &temperature_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *temperature_units
+  - domain: sensor
+    device_class: temperature
+  - domain: number
+    device_class: temperature
 
 is_off: *condition_common
 is_on: *condition_common
@@ -72,17 +45,43 @@ is_cooling: *condition_common
 is_drying: *condition_common
 is_heating: *condition_common
 
+is_hvac_mode:
+  target: *condition_climate_target
+  fields:
+    behavior: *condition_behavior
+    hvac_mode:
+      context:
+        filter_target: target
+      required: true
+      selector:
+        state:
+          hide_states:
+            - unavailable
+            - unknown
+          multiple: true
+
 target_humidity:
   target: *condition_climate_target
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_humidity
-    below: *number_or_entity_humidity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *humidity_threshold_entity
+          mode: is
+          number: *humidity_threshold_number
 
 target_temperature:
   target: *condition_climate_target
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_temperature
-    below: *number_or_entity_temperature
-    unit: *condition_unit_temperature
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *temperature_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *temperature_units

homeassistant/components/climate/icons.json

@@ -9,6 +9,9 @@
     "is_heating": {
       "condition": "mdi:fire"
     },
+    "is_hvac_mode": {
+      "condition": "mdi:thermostat"
+    },
     "is_off": {
       "condition": "mdi:power-off"
     },

homeassistant/components/climate/strings.json

@@ -1,19 +1,15 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted climate-control devices.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted climates to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_cooling": {
       "description": "Tests if one or more climate-control devices are cooling.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -23,7 +19,6 @@
       "description": "Tests if one or more climate-control devices are drying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -33,17 +28,28 @@
       "description": "Tests if one or more climate-control devices are heating.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
       "name": "Climate-control device is heating"
     },
+    "is_hvac_mode": {
+      "description": "Tests if one or more climate-control devices are set to a specific HVAC mode.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::climate::common::condition_behavior_name%]"
+        },
+        "hvac_mode": {
+          "description": "The HVAC modes to test for.",
+          "name": "Modes"
+        }
+      },
+      "name": "Climate-control device HVAC mode"
+    },
     "is_off": {
       "description": "Tests if one or more climate-control devices are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -53,7 +59,6 @@
       "description": "Tests if one or more climate-control devices are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -62,17 +67,11 @@
     "target_humidity": {
       "description": "Tests the humidity setpoint of one or more climate-control devices.",
       "fields": {
-        "above": {
-          "description": "Require the target humidity to be above this value.",
-          "name": "Above"
-        },
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "Require the target humidity to be below this value.",
-          "name": "Below"
+        "threshold": {
+          "name": "[%key:component::climate::common::condition_threshold_name%]"
         }
       },
       "name": "Climate-control device target humidity"
@@ -80,21 +79,11 @@
     "target_temperature": {
       "description": "Tests the temperature setpoint of one or more climate-control devices.",
       "fields": {
-        "above": {
-          "description": "Require the target temperature to be above this value.",
-          "name": "Above"
-        },
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "Require the target temperature to be below this value.",
-          "name": "Below"
-        },
-        "unit": {
-          "description": "All values will be converted to this unit when evaluating the condition.",
-          "name": "Unit of measurement"
+        "threshold": {
+          "name": "[%key:component::climate::common::condition_threshold_name%]"
         }
       },
       "name": "Climate-control device target temperature"
@@ -284,12 +273,6 @@
         "any": "Any"
       }
     },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
@@ -400,7 +383,6 @@
       "description": "Triggers after the mode of one or more climate-control devices changes.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
         "hvac_mode": {
@@ -414,7 +396,6 @@
       "description": "Triggers after one or more climate-control devices start cooling.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -424,7 +405,6 @@
       "description": "Triggers after one or more climate-control devices start drying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -434,7 +414,6 @@
       "description": "Triggers after one or more climate-control devices start heating.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -444,7 +423,6 @@
       "description": "Triggers after the humidity setpoint of one or more climate-control devices changes.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -454,11 +432,9 @@
       "description": "Triggers after the humidity setpoint of one or more climate-control devices crosses a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -468,7 +444,6 @@
       "description": "Triggers after the temperature setpoint of one or more climate-control devices changes.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -478,11 +453,9 @@
       "description": "Triggers after the temperature setpoint of one or more climate-control devices crosses a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -492,7 +465,6 @@
       "description": "Triggers after one or more climate-control devices turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -502,7 +474,6 @@
       "description": "Triggers after one or more climate-control devices turn on, regardless of the mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/climate/trigger.py

@@ -5,7 +5,7 @@ import voluptuous as vol
 from homeassistant.const import ATTR_TEMPERATURE, CONF_OPTIONS, UnitOfTemperature
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.trigger import (
     ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST,
     EntityNumericalStateChangedTriggerWithUnitBase,
@@ -52,7 +52,7 @@ class _ClimateTargetTemperatureTriggerMixin(EntityNumericalStateTriggerWithUnitB
     """Mixin for climate target temperature triggers with unit conversion."""
 
     _base_unit = UnitOfTemperature.CELSIUS
-    _domain_specs = {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
+    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_TEMPERATURE)}
     _unit_converter = TemperatureConverter
 
     def _get_entity_unit(self, state: State) -> str | None:
@@ -84,11 +84,11 @@ TRIGGERS: dict[str, type[Trigger]] = {
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.DRYING
     ),
     "target_humidity_changed": make_entity_numerical_state_changed_trigger(
-        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
         valid_unit="%",
     ),
     "target_humidity_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
         valid_unit="%",
     ),
     "target_temperature_changed": ClimateTargetTemperatureChangedTrigger,

homeassistant/components/cloud/strings.json

@@ -75,11 +75,11 @@
   "services": {
     "remote_connect": {
       "description": "Makes the instance UI accessible from outside of the local network by enabling your Home Assistant Cloud connection.",
-      "name": "Enable remote access"
+      "name": "Enable Home Assistant Cloud remote access"
     },
     "remote_disconnect": {
       "description": "Disconnects the instance UI from Home Assistant Cloud. This disables access to it from outside your local network.",
-      "name": "Disable remote access"
+      "name": "Disable Home Assistant Cloud remote access"
     }
   },
   "system_health": {

homeassistant/components/comelit/alarm_control_panel.py

@@ -112,7 +112,7 @@ class ComelitAlarmEntity(
     @property
     def available(self) -> bool:
         """Return True if alarm is available."""
-        if self._area.human_status in [AlarmAreaState.ANOMALY, AlarmAreaState.UNKNOWN]:
+        if self._area.human_status == AlarmAreaState.UNKNOWN:
             return False
         return super().available
 
@@ -151,7 +151,7 @@ class ComelitAlarmEntity(
         if code != str(self.coordinator.api.device_pin):
             return
         await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[DISABLE]
+            self._area.index, ALARM_ACTIONS[DISABLE], self._area.anomaly
         )
         await self._async_update_state(
             AlarmAreaState.DISARMED, ALARM_AREA_ARMED_STATUS[DISABLE]
@@ -160,7 +160,7 @@ class ComelitAlarmEntity(
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
         await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[AWAY]
+            self._area.index, ALARM_ACTIONS[AWAY], self._area.anomaly
         )
         await self._async_update_state(
             AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[AWAY]
@@ -169,7 +169,7 @@ class ComelitAlarmEntity(
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
         await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[HOME]
+            self._area.index, ALARM_ACTIONS[HOME], self._area.anomaly
         )
         await self._async_update_state(
             AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[HOME_P1]
@@ -178,7 +178,7 @@ class ComelitAlarmEntity(
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Send arm night command."""
         await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[NIGHT]
+            self._area.index, ALARM_ACTIONS[NIGHT], self._area.anomaly
         )
         await self._async_update_state(
             AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[NIGHT]

homeassistant/components/comelit/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["aiocomelit"],
   "quality_scale": "platinum",
-  "requirements": ["aiocomelit==2.0.1"]
+  "requirements": ["aiocomelit==2.0.2"]
 }

homeassistant/components/conversation/strings.json

@@ -6,7 +6,7 @@
   },
   "services": {
     "process": {
-      "description": "Launches a conversation from a transcribed text.",
+      "description": "Sends text to a conversation agent for processing.",
       "fields": {
         "agent_id": {
           "description": "Conversation agent to process your request. The conversation agent is the brains of your assistant. It processes the incoming text commands.",
@@ -25,10 +25,10 @@
           "name": "Text"
         }
       },
-      "name": "Process"
+      "name": "Process conversation"
     },
     "reload": {
-      "description": "Reloads the intent configuration.",
+      "description": "Reloads the intent configuration of conversation agents.",
       "fields": {
         "agent_id": {
           "description": "Conversation agent to reload.",
@@ -39,7 +39,7 @@
           "name": "[%key:common::config_flow::data::language%]"
         }
       },
-      "name": "[%key:common::action::reload%]"
+      "name": "Reload conversation agents"
     }
   },
   "title": "Conversation"

homeassistant/components/counter/condition.py

@@ -0,0 +1,15 @@
+"""Provides conditions for counters."""
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.condition import Condition, make_entity_numerical_condition
+
+DOMAIN = "counter"
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_value": make_entity_numerical_condition(DOMAIN),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the conditions for counters."""
+    return CONDITIONS

homeassistant/components/counter/conditions.yaml

@@ -0,0 +1,25 @@
+is_value:
+  target:
+    entity:
+      - domain: counter
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity:
+            - domain: counter
+            - domain: input_number
+            - domain: number
+          mode: is
+          number:
+            mode: box

homeassistant/components/counter/icons.json

@@ -1,4 +1,9 @@
 {
+  "conditions": {
+    "is_value": {
+      "condition": "mdi:counter"
+    }
+  },
   "services": {
     "decrement": {
       "service": "mdi:numeric-negative-1"

homeassistant/components/counter/strings.json

@@ -1,7 +1,20 @@
 {
   "common": {
-    "trigger_behavior_description": "The behavior of the targeted counters to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "trigger_behavior_name": "Trigger when"
+  },
+  "conditions": {
+    "is_value": {
+      "description": "Tests the value of one or more counters.",
+      "fields": {
+        "behavior": {
+          "name": "Condition passes if"
+        },
+        "threshold": {
+          "name": "Threshold type"
+        }
+      },
+      "name": "Counter value"
+    }
   },
   "entity_component": {
     "_": {
@@ -30,6 +43,12 @@
     }
   },
   "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
@@ -41,25 +60,25 @@
   "services": {
     "decrement": {
       "description": "Decrements a counter by its step size.",
-      "name": "Decrement"
+      "name": "Decrement counter"
     },
     "increment": {
       "description": "Increments a counter by its step size.",
-      "name": "Increment"
+      "name": "Increment counter"
     },
     "reset": {
       "description": "Resets a counter to its initial value.",
-      "name": "Reset"
+      "name": "Reset counter"
     },
     "set_value": {
-      "description": "Sets the counter to a specific value.",
+      "description": "Sets a counter to a specific value.",
       "fields": {
         "value": {
           "description": "The new counter value the entity should be set to.",
           "name": "Value"
         }
       },
-      "name": "Set"
+      "name": "Set counter value"
     }
   },
   "title": "Counter",
@@ -76,7 +95,6 @@
       "description": "Triggers after one or more counters reach their maximum value.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
         }
       },
@@ -86,7 +104,6 @@
       "description": "Triggers after one or more counters reach their minimum value.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
         }
       },
@@ -96,7 +113,6 @@
       "description": "Triggers after one or more counters are reset.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/cover/condition.py

@@ -1,5 +1,7 @@
 """Provides conditions for covers."""
 
+from collections.abc import Mapping
+
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.condition import Condition, EntityConditionBase
@@ -8,9 +10,11 @@ from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
 from .models import CoverDomainSpec
 
 
-class CoverConditionBase(EntityConditionBase[CoverDomainSpec]):
+class CoverConditionBase(EntityConditionBase):
     """Base condition for cover state checks."""
 
+    _domain_specs: Mapping[str, CoverDomainSpec]
+
     def is_valid_state(self, entity_state: State) -> bool:
         """Check if the state matches the expected cover state."""
         domain_spec = self._domain_specs[entity_state.domain]

homeassistant/components/cover/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted covers.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted covers to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "awning_is_closed": {
       "description": "Tests if one or more awnings are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more awnings are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more blinds are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more blinds are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -50,7 +44,6 @@
       "description": "Tests if one or more curtains are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -60,7 +53,6 @@
       "description": "Tests if one or more curtains are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -70,7 +62,6 @@
       "description": "Tests if one or more shades are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -80,7 +71,6 @@
       "description": "Tests if one or more shades are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -90,7 +80,6 @@
       "description": "Tests if one or more shutters are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -100,7 +89,6 @@
       "description": "Tests if one or more shutters are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -265,7 +253,6 @@
       "description": "Triggers after one or more awnings close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -275,7 +262,6 @@
       "description": "Triggers after one or more awnings open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -285,7 +271,6 @@
       "description": "Triggers after one or more blinds close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -295,7 +280,6 @@
       "description": "Triggers after one or more blinds open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -305,7 +289,6 @@
       "description": "Triggers after one or more curtains close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -315,7 +298,6 @@
       "description": "Triggers after one or more curtains open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -325,7 +307,6 @@
       "description": "Triggers after one or more shades close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -335,7 +316,6 @@
       "description": "Triggers after one or more shades open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -345,7 +325,6 @@
       "description": "Triggers after one or more shutters close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -355,7 +334,6 @@
       "description": "Triggers after one or more shutters open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/cover/trigger.py

@@ -1,5 +1,7 @@
 """Provides triggers for covers."""
 
+from collections.abc import Mapping
+
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.trigger import EntityTriggerBase, Trigger
@@ -8,9 +10,11 @@ from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
 from .models import CoverDomainSpec
 
 
-class CoverTriggerBase(EntityTriggerBase[CoverDomainSpec]):
+class CoverTriggerBase(EntityTriggerBase):
     """Base trigger for cover state changes."""
 
+    _domain_specs: Mapping[str, CoverDomainSpec]
+
     def _get_value(self, state: State) -> str | bool | None:
         """Extract the relevant value from state based on domain spec."""
         domain_spec = self._domain_specs[state.domain]

homeassistant/components/date/strings.json

@@ -6,7 +6,7 @@
   },
   "services": {
     "set_value": {
-      "description": "Sets the date.",
+      "description": "Sets the value of a date.",
       "fields": {
         "date": {
           "description": "The date to set.",

homeassistant/components/datetime/strings.json

@@ -6,7 +6,7 @@
   },
   "services": {
     "set_value": {
-      "description": "Sets the date/time for a datetime entity.",
+      "description": "Sets the value of a date/time.",
       "fields": {
         "datetime": {
           "description": "The date/time to set. The time zone of the Home Assistant instance is assumed.",

homeassistant/components/device_tracker/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted device trackers.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted device trackers to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_home": {
       "description": "Tests if one or more device trackers are home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::condition_behavior_description%]",
           "name": "[%key:component::device_tracker::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more device trackers are not home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::condition_behavior_description%]",
           "name": "[%key:component::device_tracker::common::condition_behavior_name%]"
         }
       },
@@ -120,7 +116,7 @@
           "name": "MAC address"
         }
       },
-      "name": "See"
+      "name": "See device tracker"
     }
   },
   "title": "Device tracker",
@@ -129,7 +125,6 @@
       "description": "Triggers when one or more device trackers enter home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::trigger_behavior_description%]",
           "name": "[%key:component::device_tracker::common::trigger_behavior_name%]"
         }
       },
@@ -139,7 +134,6 @@
       "description": "Triggers when one or more device trackers leave home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::trigger_behavior_description%]",
           "name": "[%key:component::device_tracker::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/diagnostics/util.py

@@ -51,7 +51,6 @@ def _entity_entry_filter(a: attr.Attribute, _: Any) -> bool:
     return a.name not in (
         "_cache",
         "compat_aliases",
-        "compat_name",
         "original_name_unprefixed",
     )
 

homeassistant/components/door/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted doors.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted doors to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_closed": {
       "description": "Tests if one or more doors are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::condition_behavior_description%]",
           "name": "[%key:component::door::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more doors are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::condition_behavior_description%]",
           "name": "[%key:component::door::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more doors close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::trigger_behavior_description%]",
           "name": "[%key:component::door::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more doors open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::trigger_behavior_description%]",
           "name": "[%key:component::door::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/dropbox/__init__.py

@@ -1,64 +0,0 @@
-"""The Dropbox integration."""
-
-from __future__ import annotations
-
-from python_dropbox_api import (
-    DropboxAPIClient,
-    DropboxAuthException,
-    DropboxUnknownException,
-)
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.config_entry_oauth2_flow import (
-    ImplementationUnavailableError,
-    OAuth2Session,
-    async_get_config_entry_implementation,
-)
-
-from .auth import DropboxConfigEntryAuth
-from .const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
-
-type DropboxConfigEntry = ConfigEntry[DropboxAPIClient]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: DropboxConfigEntry) -> bool:
-    """Set up Dropbox from a config entry."""
-    try:
-        oauth2_implementation = await async_get_config_entry_implementation(hass, entry)
-    except ImplementationUnavailableError as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="oauth2_implementation_unavailable",
-        ) from err
-    oauth2_session = OAuth2Session(hass, entry, oauth2_implementation)
-
-    auth = DropboxConfigEntryAuth(
-        aiohttp_client.async_get_clientsession(hass), oauth2_session
-    )
-
-    client = DropboxAPIClient(auth)
-
-    try:
-        await client.get_account_info()
-    except DropboxAuthException as err:
-        raise ConfigEntryAuthFailed from err
-    except (DropboxUnknownException, TimeoutError) as err:
-        raise ConfigEntryNotReady from err
-
-    entry.runtime_data = client
-
-    def async_notify_backup_listeners() -> None:
-        for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
-            listener()
-
-    entry.async_on_unload(entry.async_on_state_change(async_notify_backup_listeners))
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: DropboxConfigEntry) -> bool:
-    """Unload a config entry."""
-    return True

homeassistant/components/dropbox/application_credentials.py

@@ -1,38 +0,0 @@
-"""Application credentials platform for the Dropbox integration."""
-
-from homeassistant.components.application_credentials import ClientCredential
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.config_entry_oauth2_flow import (
-    AbstractOAuth2Implementation,
-    LocalOAuth2ImplementationWithPkce,
-)
-
-from .const import OAUTH2_AUTHORIZE, OAUTH2_SCOPES, OAUTH2_TOKEN
-
-
-async def async_get_auth_implementation(
-    hass: HomeAssistant, auth_domain: str, credential: ClientCredential
-) -> AbstractOAuth2Implementation:
-    """Return custom auth implementation."""
-    return DropboxOAuth2Implementation(
-        hass,
-        auth_domain,
-        credential.client_id,
-        OAUTH2_AUTHORIZE,
-        OAUTH2_TOKEN,
-        credential.client_secret,
-    )
-
-
-class DropboxOAuth2Implementation(LocalOAuth2ImplementationWithPkce):
-    """Custom Dropbox OAuth2 implementation to add the necessary authorize url parameters."""
-
-    @property
-    def extra_authorize_data(self) -> dict:
-        """Extra data that needs to be appended to the authorize url."""
-        data: dict = {
-            "token_access_type": "offline",
-            "scope": " ".join(OAUTH2_SCOPES),
-        }
-        data.update(super().extra_authorize_data)
-        return data

homeassistant/components/dropbox/auth.py

@@ -1,44 +0,0 @@
-"""Authentication for Dropbox."""
-
-from typing import cast
-
-from aiohttp import ClientSession
-from python_dropbox_api import Auth
-
-from homeassistant.helpers.config_entry_oauth2_flow import OAuth2Session
-
-
-class DropboxConfigEntryAuth(Auth):
-    """Provide Dropbox authentication tied to an OAuth2 based config entry."""
-
-    def __init__(
-        self,
-        websession: ClientSession,
-        oauth_session: OAuth2Session,
-    ) -> None:
-        """Initialize DropboxConfigEntryAuth."""
-        super().__init__(websession)
-        self._oauth_session = oauth_session
-
-    async def async_get_access_token(self) -> str:
-        """Return a valid access token."""
-        await self._oauth_session.async_ensure_token_valid()
-
-        return cast(str, self._oauth_session.token["access_token"])
-
-
-class DropboxConfigFlowAuth(Auth):
-    """Provide authentication tied to a fixed token for the config flow."""
-
-    def __init__(
-        self,
-        websession: ClientSession,
-        token: str,
-    ) -> None:
-        """Initialize DropboxConfigFlowAuth."""
-        super().__init__(websession)
-        self._token = token
-
-    async def async_get_access_token(self) -> str:
-        """Return the fixed access token."""
-        return self._token

homeassistant/components/dropbox/backup.py

@@ -1,230 +0,0 @@
-"""Backup platform for the Dropbox integration."""
-
-from collections.abc import AsyncIterator, Callable, Coroutine
-from functools import wraps
-import json
-import logging
-from typing import Any, Concatenate
-
-from python_dropbox_api import (
-    DropboxAPIClient,
-    DropboxAuthException,
-    DropboxFileOrFolderNotFoundException,
-    DropboxUnknownException,
-)
-
-from homeassistant.components.backup import (
-    AgentBackup,
-    BackupAgent,
-    BackupAgentError,
-    BackupNotFound,
-    suggested_filename,
-)
-from homeassistant.core import HomeAssistant, callback
-
-from . import DropboxConfigEntry
-from .const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def _suggested_filenames(backup: AgentBackup) -> tuple[str, str]:
-    """Return the suggested filenames for the backup and metadata."""
-    base_name = suggested_filename(backup).rsplit(".", 1)[0]
-    return f"{base_name}.tar", f"{base_name}.metadata.json"
-
-
-async def _async_string_iterator(content: str) -> AsyncIterator[bytes]:
-    """Yield a string as a single bytes chunk."""
-    yield content.encode()
-
-
-def handle_backup_errors[_R, **P](
-    func: Callable[Concatenate[DropboxBackupAgent, P], Coroutine[Any, Any, _R]],
-) -> Callable[Concatenate[DropboxBackupAgent, P], Coroutine[Any, Any, _R]]:
-    """Handle backup errors."""
-
-    @wraps(func)
-    async def wrapper(
-        self: DropboxBackupAgent, *args: P.args, **kwargs: P.kwargs
-    ) -> _R:
-        try:
-            return await func(self, *args, **kwargs)
-        except DropboxFileOrFolderNotFoundException as err:
-            raise BackupNotFound(
-                f"Failed to {func.__name__.removeprefix('async_').replace('_', ' ')}"
-            ) from err
-        except DropboxAuthException as err:
-            self._entry.async_start_reauth(self._hass)
-            raise BackupAgentError("Authentication error") from err
-        except DropboxUnknownException as err:
-            _LOGGER.error(
-                "Error during %s: %s",
-                func.__name__,
-                err,
-            )
-            _LOGGER.debug("Full error: %s", err, exc_info=True)
-            raise BackupAgentError(
-                f"Failed to {func.__name__.removeprefix('async_').replace('_', ' ')}"
-            ) from err
-
-    return wrapper
-
-
-async def async_get_backup_agents(
-    hass: HomeAssistant,
-    **kwargs: Any,
-) -> list[BackupAgent]:
-    """Return a list of backup agents."""
-    entries = hass.config_entries.async_loaded_entries(DOMAIN)
-    return [DropboxBackupAgent(hass, entry) for entry in entries]
-
-
-@callback
-def async_register_backup_agents_listener(
-    hass: HomeAssistant,
-    *,
-    listener: Callable[[], None],
-    **kwargs: Any,
-) -> Callable[[], None]:
-    """Register a listener to be called when agents are added or removed.
-
-    :return: A function to unregister the listener.
-    """
-    hass.data.setdefault(DATA_BACKUP_AGENT_LISTENERS, []).append(listener)
-
-    @callback
-    def remove_listener() -> None:
-        """Remove the listener."""
-        hass.data[DATA_BACKUP_AGENT_LISTENERS].remove(listener)
-        if not hass.data[DATA_BACKUP_AGENT_LISTENERS]:
-            del hass.data[DATA_BACKUP_AGENT_LISTENERS]
-
-    return remove_listener
-
-
-class DropboxBackupAgent(BackupAgent):
-    """Backup agent for the Dropbox integration."""
-
-    domain = DOMAIN
-
-    def __init__(self, hass: HomeAssistant, entry: DropboxConfigEntry) -> None:
-        """Initialize the backup agent."""
-        super().__init__()
-        self._hass = hass
-        self._entry = entry
-        self.name = entry.title
-        assert entry.unique_id
-        self.unique_id = entry.unique_id
-        self._api: DropboxAPIClient = entry.runtime_data
-
-    async def _async_get_backups(self) -> list[tuple[AgentBackup, str]]:
-        """Get backups and their corresponding file names."""
-        files = await self._api.list_folder("")
-
-        tar_files = {f.name for f in files if f.name.endswith(".tar")}
-        metadata_files = [f for f in files if f.name.endswith(".metadata.json")]
-
-        backups: list[tuple[AgentBackup, str]] = []
-        for metadata_file in metadata_files:
-            tar_name = metadata_file.name.removesuffix(".metadata.json") + ".tar"
-            if tar_name not in tar_files:
-                _LOGGER.warning(
-                    "Found metadata file '%s' without matching backup file",
-                    metadata_file.name,
-                )
-                continue
-
-            metadata_stream = self._api.download_file(f"/{metadata_file.name}")
-            raw = b"".join([chunk async for chunk in metadata_stream])
-            try:
-                data = json.loads(raw)
-                backup = AgentBackup.from_dict(data)
-            except (json.JSONDecodeError, ValueError, TypeError, KeyError) as err:
-                _LOGGER.warning(
-                    "Skipping invalid metadata file '%s': %s",
-                    metadata_file.name,
-                    err,
-                )
-                continue
-            backups.append((backup, tar_name))
-
-        return backups
-
-    @handle_backup_errors
-    async def async_upload_backup(
-        self,
-        *,
-        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-        backup: AgentBackup,
-        **kwargs: Any,
-    ) -> None:
-        """Upload a backup."""
-        backup_filename, metadata_filename = _suggested_filenames(backup)
-        backup_path = f"/{backup_filename}"
-        metadata_path = f"/{metadata_filename}"
-
-        file_stream = await open_stream()
-        await self._api.upload_file(backup_path, file_stream)
-
-        metadata_stream = _async_string_iterator(json.dumps(backup.as_dict()))
-
-        try:
-            await self._api.upload_file(metadata_path, metadata_stream)
-        except (
-            DropboxAuthException,
-            DropboxUnknownException,
-        ):
-            await self._api.delete_file(backup_path)
-            raise
-
-    @handle_backup_errors
-    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
-        """List backups."""
-        return [backup for backup, _ in await self._async_get_backups()]
-
-    @handle_backup_errors
-    async def async_download_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> AsyncIterator[bytes]:
-        """Download a backup file."""
-        backups = await self._async_get_backups()
-        for backup, filename in backups:
-            if backup.backup_id == backup_id:
-                return self._api.download_file(f"/{filename}")
-
-        raise BackupNotFound(f"Backup {backup_id} not found")
-
-    @handle_backup_errors
-    async def async_get_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> AgentBackup:
-        """Return a backup."""
-        backups = await self._async_get_backups()
-
-        for backup, _ in backups:
-            if backup.backup_id == backup_id:
-                return backup
-
-        raise BackupNotFound(f"Backup {backup_id} not found")
-
-    @handle_backup_errors
-    async def async_delete_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> None:
-        """Delete a backup file."""
-        backups = await self._async_get_backups()
-        for backup, tar_filename in backups:
-            if backup.backup_id == backup_id:
-                metadata_filename = tar_filename.removesuffix(".tar") + ".metadata.json"
-                await self._api.delete_file(f"/{tar_filename}")
-                await self._api.delete_file(f"/{metadata_filename}")
-                return
-
-        raise BackupNotFound(f"Backup {backup_id} not found")

homeassistant/components/dropbox/config_flow.py

@@ -1,60 +0,0 @@
-"""Config flow for Dropbox."""
-
-from collections.abc import Mapping
-import logging
-from typing import Any
-
-from python_dropbox_api import DropboxAPIClient
-
-from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHandler
-
-from .auth import DropboxConfigFlowAuth
-from .const import DOMAIN
-
-
-class DropboxConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
-    """Config flow to handle Dropbox OAuth2 authentication."""
-
-    DOMAIN = DOMAIN
-
-    @property
-    def logger(self) -> logging.Logger:
-        """Return logger."""
-        return logging.getLogger(__name__)
-
-    async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:
-        """Create an entry for the flow, or update existing entry."""
-        access_token = data[CONF_TOKEN][CONF_ACCESS_TOKEN]
-
-        auth = DropboxConfigFlowAuth(async_get_clientsession(self.hass), access_token)
-
-        client = DropboxAPIClient(auth)
-        account_info = await client.get_account_info()
-
-        await self.async_set_unique_id(account_info.account_id)
-        if self.source == SOURCE_REAUTH:
-            self._abort_if_unique_id_mismatch(reason="wrong_account")
-            return self.async_update_reload_and_abort(
-                self._get_reauth_entry(), data=data
-            )
-
-        self._abort_if_unique_id_configured()
-
-        return self.async_create_entry(title=account_info.email, data=data)
-
-    async def async_step_reauth(
-        self, entry_data: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Perform reauth upon an API authentication error."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Dialog that informs the user that reauth is required."""
-        if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
-        return await self.async_step_user()

homeassistant/components/dropbox/const.py

@@ -1,19 +0,0 @@
-"""Constants for the Dropbox integration."""
-
-from collections.abc import Callable
-
-from homeassistant.util.hass_dict import HassKey
-
-DOMAIN = "dropbox"
-
-OAUTH2_AUTHORIZE = "https://www.dropbox.com/oauth2/authorize"
-OAUTH2_TOKEN = "https://api.dropboxapi.com/oauth2/token"
-OAUTH2_SCOPES = [
-    "account_info.read",
-    "files.content.read",
-    "files.content.write",
-]
-
-DATA_BACKUP_AGENT_LISTENERS: HassKey[list[Callable[[], None]]] = HassKey(
-    f"{DOMAIN}.backup_agent_listeners"
-)

homeassistant/components/dropbox/manifest.json

@@ -1,13 +0,0 @@
-{
-  "domain": "dropbox",
-  "name": "Dropbox",
-  "after_dependencies": ["backup"],
-  "codeowners": ["@bdr99"],
-  "config_flow": true,
-  "dependencies": ["application_credentials"],
-  "documentation": "https://www.home-assistant.io/integrations/dropbox",
-  "integration_type": "service",
-  "iot_class": "cloud_polling",
-  "quality_scale": "bronze",
-  "requirements": ["python-dropbox-api==0.1.3"]
-}

homeassistant/components/dropbox/quality_scale.yaml

@@ -1,112 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: Integration does not register any actions.
-  appropriate-polling:
-    status: exempt
-    comment: Integration does not poll.
-  brands: done
-  common-modules:
-    status: exempt
-    comment: Integration does not have any entities or coordinators.
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: Integration does not register any actions.
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: Integration does not have any entities.
-  entity-unique-id:
-    status: exempt
-    comment: Integration does not have any entities.
-  has-entity-name:
-    status: exempt
-    comment: Integration does not have any entities.
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions:
-    status: exempt
-    comment: Integration does not register any actions.
-  config-entry-unloading: done
-  docs-configuration-parameters:
-    status: exempt
-    comment: Integration does not have any configuration parameters.
-  docs-installation-parameters: done
-  entity-unavailable:
-    status: exempt
-    comment: Integration does not have any entities.
-  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates:
-    status: exempt
-    comment: Integration does not make any entity updates.
-  reauthentication-flow: done
-  test-coverage: done
-
-  # Gold
-  devices:
-    status: exempt
-    comment: Integration does not have any entities.
-  diagnostics:
-    status: exempt
-    comment: Integration does not have any data to diagnose.
-  discovery-update-info:
-    status: exempt
-    comment: Integration is a service.
-  discovery:
-    status: exempt
-    comment: Integration is a service.
-  docs-data-update:
-    status: exempt
-    comment: Integration does not update any data.
-  docs-examples:
-    status: exempt
-    comment: Integration only provides backup functionality.
-  docs-known-limitations: todo
-  docs-supported-devices:
-    status: exempt
-    comment: Integration does not support any devices.
-  docs-supported-functions: done
-  docs-troubleshooting: todo
-  docs-use-cases: done
-  dynamic-devices:
-    status: exempt
-    comment: Integration does not use any devices.
-  entity-category:
-    status: exempt
-    comment: Integration does not have any entities.
-  entity-device-class:
-    status: exempt
-    comment: Integration does not have any entities.
-  entity-disabled-by-default:
-    status: exempt
-    comment: Integration does not have any entities.
-  entity-translations:
-    status: exempt
-    comment: Integration does not have any entities.
-  exception-translations: todo
-  icon-translations:
-    status: exempt
-    comment: Integration does not have any entities.
-  reconfiguration-flow: todo
-  repair-issues:
-    status: exempt
-    comment: Integration does not have any repairs.
-  stale-devices:
-    status: exempt
-    comment: Integration does not have any devices.
-
-  # Platinum
-  async-dependency: done
-  inject-websession: done
-  strict-typing: done

homeassistant/components/dropbox/strings.json

@@ -1,35 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
-      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
-      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
-      "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
-      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
-      "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
-      "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
-      "wrong_account": "Wrong account: Please authenticate with the correct account."
-    },
-    "create_entry": {
-      "default": "[%key:common::config_flow::create_entry::authenticated%]"
-    },
-    "step": {
-      "pick_implementation": {
-        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
-      },
-      "reauth_confirm": {
-        "description": "The Dropbox integration needs to re-authenticate your account.",
-        "title": "[%key:common::config_flow::title::reauth%]"
-      }
-    }
-  },
-  "exceptions": {
-    "oauth2_implementation_unavailable": {
-      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
-    }
-  }
-}

homeassistant/components/econet/water_heater.py

@@ -45,6 +45,13 @@ SUPPORT_FLAGS_HEATER = (
 )
 
 
+def _operation_mode_to_ha(mode: WaterHeaterOperationMode | None) -> str:
+    """Translate an EcoNet operation mode to a Home Assistant state."""
+    if mode in (None, WaterHeaterOperationMode.VACATION):
+        return STATE_OFF
+    return ECONET_STATE_TO_HA[mode]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: EconetConfigEntry,
@@ -80,26 +87,22 @@ class EcoNetWaterHeater(EcoNetEntity[WaterHeater], WaterHeaterEntity):
     @property
     def current_operation(self) -> str:
         """Return current operation."""
-        econet_mode = self.water_heater.mode
-        _current_op = STATE_OFF
-        if econet_mode is not None:
-            _current_op = ECONET_STATE_TO_HA[econet_mode]
-
-        return _current_op
+        return _operation_mode_to_ha(self.water_heater.mode)
 
     @property
     def operation_list(self) -> list[str]:
         """List of available operation modes."""
-        econet_modes = self.water_heater.modes
-        operation_modes = set()
-        for mode in econet_modes:
-            if (
-                mode is not WaterHeaterOperationMode.UNKNOWN
-                and mode is not WaterHeaterOperationMode.VACATION
-            ):
-                ha_mode = ECONET_STATE_TO_HA[mode]
-                operation_modes.add(ha_mode)
-        return list(operation_modes)
+        return list(
+            dict.fromkeys(
+                ECONET_STATE_TO_HA[mode]
+                for mode in self.water_heater.modes
+                if mode
+                not in (
+                    WaterHeaterOperationMode.UNKNOWN,
+                    WaterHeaterOperationMode.VACATION,
+                )
+            )
+        )
 
     @property
     def supported_features(self) -> WaterHeaterEntityFeature:

homeassistant/components/emulated_kasa/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "local_push",
   "loggers": ["sense_energy"],
   "quality_scale": "internal",
-  "requirements": ["sense-energy==0.13.8"]
+  "requirements": ["sense-energy==0.14.0"]
 }

homeassistant/components/fan/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted fans.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted fans to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_off": {
       "description": "Tests if one or more fans are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::condition_behavior_description%]",
           "name": "[%key:component::fan::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more fans are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::condition_behavior_description%]",
           "name": "[%key:component::fan::common::condition_behavior_name%]"
         }
       },
@@ -199,7 +195,6 @@
       "description": "Triggers after one or more fans turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::trigger_behavior_description%]",
           "name": "[%key:component::fan::common::trigger_behavior_name%]"
         }
       },
@@ -209,7 +204,6 @@
       "description": "Triggers after one or more fans turn on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::trigger_behavior_description%]",
           "name": "[%key:component::fan::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/fing/config_flow.py

@@ -10,6 +10,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY, CONF_IP_ADDRESS, CONF_PORT
+from homeassistant.helpers.httpx_client import get_async_client
 
 from .const import DOMAIN, UPNP_AVAILABLE
 
@@ -40,6 +41,7 @@ class FingConfigFlow(ConfigFlow, domain=DOMAIN):
                 ip=user_input[CONF_IP_ADDRESS],
                 port=int(user_input[CONF_PORT]),
                 key=user_input[CONF_API_KEY],
+                client=get_async_client(self.hass),
             )
 
             try:

homeassistant/components/fing/coordinator.py

@@ -11,6 +11,7 @@ import httpx
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_IP_ADDRESS, CONF_PORT
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, UPNP_AVAILABLE
@@ -38,6 +39,7 @@ class FingDataUpdateCoordinator(DataUpdateCoordinator[FingDataObject]):
             ip=config_entry.data[CONF_IP_ADDRESS],
             port=int(config_entry.data[CONF_PORT]),
             key=config_entry.data[CONF_API_KEY],
+            client=get_async_client(hass),
         )
         self._upnp_available = config_entry.data[UPNP_AVAILABLE]
         update_interval = timedelta(seconds=30)

homeassistant/components/fing/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["fing_agent_api==1.0.3"]
+  "requirements": ["fing_agent_api==1.1.0"]
 }

homeassistant/components/fing/quality_scale.yaml

@@ -68,5 +68,5 @@ rules:
 
   # Platinum
   async-dependency: todo
-  inject-websession: todo
+  inject-websession: done
   strict-typing: todo

homeassistant/components/fritz/coordinator.py

@@ -448,10 +448,13 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
                 if not attributes.get("MACAddress"):
                     continue
 
+                wan_access_result = None
                 if (wan_access := attributes.get("X_AVM-DE_WANAccess")) is not None:
-                    wan_access_result = "granted" in wan_access
-                else:
-                    wan_access_result = None
+                    # wan_access can be "granted", "denied", "unknown" or "error"
+                    if "granted" in wan_access:
+                        wan_access_result = True
+                    elif "denied" in wan_access:
+                        wan_access_result = False
 
                 hosts[attributes["MACAddress"]] = Device(
                     name=attributes["HostName"],

homeassistant/components/fritz/image.py

@@ -10,9 +10,11 @@ from requests.exceptions import RequestException
 from homeassistant.components.image import ImageEntity
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util, slugify
 
+from .const import DOMAIN, Platform
 from .coordinator import AvmWrapper, FritzConfigEntry
 from .entity import FritzBoxBaseEntity
 
@@ -22,6 +24,32 @@ _LOGGER = logging.getLogger(__name__)
 PARALLEL_UPDATES = 0
 
 
+async def _migrate_to_new_unique_id(
+    hass: HomeAssistant, avm_wrapper: AvmWrapper, ssid: str
+) -> None:
+    """Migrate old unique id to new unique id."""
+
+    old_unique_id = slugify(f"{avm_wrapper.unique_id}-{ssid}-qr-code")
+    new_unique_id = f"{avm_wrapper.unique_id}-guest_wifi_qr_code"
+
+    entity_registry = er.async_get(hass)
+    entity_id = entity_registry.async_get_entity_id(
+        Platform.IMAGE,
+        DOMAIN,
+        old_unique_id,
+    )
+
+    if entity_id is None:
+        return
+
+    entity_registry.async_update_entity(entity_id, new_unique_id=new_unique_id)
+    _LOGGER.debug(
+        "Migrating guest Wi-Fi image unique_id from [%s] to [%s]",
+        old_unique_id,
+        new_unique_id,
+    )
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FritzConfigEntry,
@@ -34,6 +62,8 @@ async def async_setup_entry(
         avm_wrapper.fritz_guest_wifi.get_info
     )
 
+    await _migrate_to_new_unique_id(hass, avm_wrapper, guest_wifi_info["NewSSID"])
+
     async_add_entities(
         [
             FritzGuestWifiQRImage(
@@ -60,7 +90,7 @@ class FritzGuestWifiQRImage(FritzBoxBaseEntity, ImageEntity):
     ) -> None:
         """Initialize the image entity."""
         self._attr_name = ssid
-        self._attr_unique_id = slugify(f"{avm_wrapper.unique_id}-{ssid}-qr-code")
+        self._attr_unique_id = f"{avm_wrapper.unique_id}-guest_wifi_qr_code"
         self._current_qr_bytes: bytes | None = None
         super().__init__(avm_wrapper, device_friendly_name)
         ImageEntity.__init__(self, hass)

homeassistant/components/frontend/manifest.json

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

homeassistant/components/frontier_silicon/manifest.json

@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/frontier_silicon",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["afsapi==0.2.7"],
+  "requirements": ["afsapi==0.3.1"],
   "ssdp": [
     {
       "st": "urn:schemas-frontier-silicon-com:undok:fsapi:1"

homeassistant/components/garage_door/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted garage doors.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted garage doors to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_closed": {
       "description": "Tests if one or more garage doors are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::condition_behavior_description%]",
           "name": "[%key:component::garage_door::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more garage doors are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::condition_behavior_description%]",
           "name": "[%key:component::garage_door::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more garage doors close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::trigger_behavior_description%]",
           "name": "[%key:component::garage_door::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more garage doors open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::trigger_behavior_description%]",
           "name": "[%key:component::garage_door::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/gate/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted gates.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted gates to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_closed": {
       "description": "Tests if one or more gates are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::condition_behavior_description%]",
           "name": "[%key:component::gate::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more gates are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::condition_behavior_description%]",
           "name": "[%key:component::gate::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more gates close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::trigger_behavior_description%]",
           "name": "[%key:component::gate::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more gates open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::trigger_behavior_description%]",
           "name": "[%key:component::gate::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/gentex_homelink/__init__.py

@@ -7,7 +7,7 @@ from homelink.mqtt_provider import MQTTProvider
 
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
 
 from . import oauth2
@@ -29,11 +29,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeLinkConfigEntry) ->
         hass, DOMAIN, auth_implementation
     )
 
-    implementation = (
-        await config_entry_oauth2_flow.async_get_config_entry_implementation(
-            hass, entry
+    try:
+        implementation = (
+            await config_entry_oauth2_flow.async_get_config_entry_implementation(
+                hass, entry
+            )
         )
-    )
+    except config_entry_oauth2_flow.ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
 
     session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
     authenticated_session = oauth2.AsyncConfigEntryAuth(

homeassistant/components/gentex_homelink/strings.json

@@ -49,5 +49,10 @@
         }
       }
     }
+  },
+  "exceptions": {
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    }
   }
 }

homeassistant/components/geocaching/__init__.py

@@ -2,11 +2,14 @@
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
     OAuth2Session,
     async_get_config_entry_implementation,
 )
 
+from .const import DOMAIN
 from .coordinator import GeocachingConfigEntry, GeocachingDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
@@ -14,7 +17,13 @@ PLATFORMS = [Platform.SENSOR]
 
 async def async_setup_entry(hass: HomeAssistant, entry: GeocachingConfigEntry) -> bool:
     """Set up Geocaching from a config entry."""
-    implementation = await async_get_config_entry_implementation(hass, entry)
+    try:
+        implementation = await async_get_config_entry_implementation(hass, entry)
+    except ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
 
     oauth_session = OAuth2Session(hass, entry, implementation)
     coordinator = GeocachingDataUpdateCoordinator(

homeassistant/components/geocaching/strings.json

@@ -65,5 +65,10 @@
         "unit_of_measurement": "souvenirs"
       }
     }
+  },
+  "exceptions": {
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    }
   }
 }

homeassistant/components/google_assistant_sdk/__init__.py

@@ -12,6 +12,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv, discovery, intent
 from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
     OAuth2Session,
     async_get_config_entry_implementation,
 )
@@ -47,7 +48,13 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: GoogleAssistantSDKConfigEntry
 ) -> bool:
     """Set up Google Assistant SDK from a config entry."""
-    implementation = await async_get_config_entry_implementation(hass, entry)
+    try:
+        implementation = await async_get_config_entry_implementation(hass, entry)
+    except ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
     session = OAuth2Session(hass, entry, implementation)
     try:
         await session.async_ensure_token_valid()

homeassistant/components/google_assistant_sdk/strings.json

@@ -48,6 +48,9 @@
     "grpc_error": {
       "message": "Failed to communicate with Google Assistant"
     },
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    },
     "reauth_required": {
       "message": "Credentials are invalid, re-authentication required"
     }