Bump version to 2026.4.0b1

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

.github/copilot-instructions.md

@@ -1,6 +1,12 @@
 <!-- Automatically generated by gen_copilot_instructions.py, do not edit -->
 
 
+
+# Copilot code review instructions
+
+- Start review comments with a short, one-sentence summary of the suggested fix.
+- Do not add comments about code style, formatting or linting issues.
+
 # GitHub Copilot & Claude Code Instructions
 
 This repository contains the core of Home Assistant, a Python 3 based home automation application.

.github/workflows/builder.yml

@@ -224,7 +224,6 @@ jobs:
       matrix:
         machine:
           - generic-x86-64
-          - intel-nuc
           - khadas-vim3
           - odroid-c2
           - odroid-c4
@@ -248,10 +247,6 @@ jobs:
           - machine: qemux86-64
             arch: amd64
             runs-on: ubuntu-24.04
-          # TODO: remove, intel-nuc is a legacy name for x86-64, renamed in 2021
-          - machine: intel-nuc
-            arch: amd64
-            runs-on: ubuntu-24.04
     steps:
       - name: Checkout the repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/ci.yaml

@@ -120,7 +120,7 @@ jobs:
         run: |
           echo "key=$(lsb_release -rs)-apt-${CACHE_VERSION}-${HA_SHORT_VERSION}" >> $GITHUB_OUTPUT
       - name: Filter for core changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
         id: core
         with:
           filters: .core_files.yaml
@@ -135,7 +135,7 @@ jobs:
           echo "Result:"
           cat .integration_paths.yaml
       - name: Filter for integration changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
         id: integrations
         with:
           filters: .integration_paths.yaml

.strict-typing

@@ -137,6 +137,7 @@ homeassistant.components.calendar.*
 homeassistant.components.cambridge_audio.*
 homeassistant.components.camera.*
 homeassistant.components.canary.*
+homeassistant.components.casper_glow.*
 homeassistant.components.cert_expiry.*
 homeassistant.components.clickatell.*
 homeassistant.components.clicksend.*
@@ -273,10 +274,12 @@ homeassistant.components.homekit_controller.storage
 homeassistant.components.homekit_controller.utils
 homeassistant.components.homewizard.*
 homeassistant.components.homeworks.*
+homeassistant.components.hr_energy_qube.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
 homeassistant.components.humidifier.*
 homeassistant.components.husqvarna_automower.*
+homeassistant.components.huum.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.hypontech.*
@@ -326,6 +329,7 @@ homeassistant.components.ld2410_ble.*
 homeassistant.components.led_ble.*
 homeassistant.components.lektrico.*
 homeassistant.components.letpot.*
+homeassistant.components.lg_infrared.*
 homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*

CODEOWNERS

@@ -214,6 +214,8 @@ build.json @home-assistant/supervisor
 /tests/components/balboa/ @garbled1 @natekspencer
 /homeassistant/components/bang_olufsen/ @mj23000
 /tests/components/bang_olufsen/ @mj23000
+/homeassistant/components/battery/ @home-assistant/core
+/tests/components/battery/ @home-assistant/core
 /homeassistant/components/bayesian/ @HarvsG
 /tests/components/bayesian/ @HarvsG
 /homeassistant/components/beewi_smartclim/ @alemuro
@@ -273,6 +275,8 @@ build.json @home-assistant/supervisor
 /tests/components/cambridge_audio/ @noahhusby
 /homeassistant/components/camera/ @home-assistant/core
 /tests/components/camera/ @home-assistant/core
+/homeassistant/components/casper_glow/ @mikeodr
+/tests/components/casper_glow/ @mikeodr
 /homeassistant/components/cast/ @emontnemery
 /tests/components/cast/ @emontnemery
 /homeassistant/components/ccm15/ @ocalvo
@@ -735,6 +739,8 @@ build.json @home-assistant/supervisor
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
 /tests/components/honeywell/ @rdfurman @mkmer
+/homeassistant/components/hr_energy_qube/ @MattieGit
+/tests/components/hr_energy_qube/ @MattieGit
 /homeassistant/components/html5/ @alexyao2015
 /tests/components/html5/ @alexyao2015
 /homeassistant/components/http/ @home-assistant/core
@@ -782,6 +788,8 @@ build.json @home-assistant/supervisor
 /tests/components/igloohome/ @keithle888
 /homeassistant/components/ign_sismologia/ @exxamalte
 /tests/components/ign_sismologia/ @exxamalte
+/homeassistant/components/illuminance/ @home-assistant/core
+/tests/components/illuminance/ @home-assistant/core
 /homeassistant/components/image/ @home-assistant/core
 /tests/components/image/ @home-assistant/core
 /homeassistant/components/image_processing/ @home-assistant/core
@@ -941,12 +949,16 @@ build.json @home-assistant/supervisor
 /tests/components/lektrico/ @lektrico
 /homeassistant/components/letpot/ @jpelgrom
 /tests/components/letpot/ @jpelgrom
+/homeassistant/components/lg_infrared/ @home-assistant/core
+/tests/components/lg_infrared/ @home-assistant/core
 /homeassistant/components/lg_netcast/ @Drafteed @splinter98
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
 /tests/components/lg_thinq/ @LG-ThinQ-Integration
 /homeassistant/components/libre_hardware_monitor/ @Sab44
 /tests/components/libre_hardware_monitor/ @Sab44
+/homeassistant/components/lichess/ @aryanhasgithub
+/tests/components/lichess/ @aryanhasgithub
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/liebherr/ @mettolen
@@ -1067,6 +1079,8 @@ build.json @home-assistant/supervisor
 /tests/components/modern_forms/ @wonderslug
 /homeassistant/components/moehlenhoff_alpha2/ @j-a-n
 /tests/components/moehlenhoff_alpha2/ @j-a-n
+/homeassistant/components/moisture/ @home-assistant/core
+/tests/components/moisture/ @home-assistant/core
 /homeassistant/components/monarch_money/ @jeeftor
 /tests/components/monarch_money/ @jeeftor
 /homeassistant/components/monoprice/ @etsinko @OnFreund
@@ -1305,6 +1319,8 @@ build.json @home-assistant/supervisor
 /tests/components/poolsense/ @haemishkyd
 /homeassistant/components/portainer/ @erwindouna
 /tests/components/portainer/ @erwindouna
+/homeassistant/components/power/ @home-assistant/core
+/tests/components/power/ @home-assistant/core
 /homeassistant/components/powerfox/ @klaasnicolaas
 /tests/components/powerfox/ @klaasnicolaas
 /homeassistant/components/powerfox_local/ @klaasnicolaas
@@ -1590,6 +1606,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/solaredge_local/ @drobtravels @scheric
 /homeassistant/components/solarlog/ @Ernst79 @dontinelli
 /tests/components/solarlog/ @Ernst79 @dontinelli
+/homeassistant/components/solarman/ @solarmanpv
+/tests/components/solarman/ @solarmanpv
 /homeassistant/components/solax/ @squishykid @Darsstar
 /tests/components/solax/ @squishykid @Darsstar
 /homeassistant/components/soma/ @ratsept
@@ -1699,6 +1717,8 @@ build.json @home-assistant/supervisor
 /tests/components/tellduslive/ @fredrike
 /homeassistant/components/teltonika/ @karlbeecken
 /tests/components/teltonika/ @karlbeecken
+/homeassistant/components/temperature/ @home-assistant/core
+/tests/components/temperature/ @home-assistant/core
 /homeassistant/components/template/ @Petro31 @home-assistant/core
 /tests/components/template/ @Petro31 @home-assistant/core
 /homeassistant/components/tesla_fleet/ @Bre77
@@ -1744,6 +1764,8 @@ build.json @home-assistant/supervisor
 /tests/components/tomorrowio/ @raman325 @lymanepp
 /homeassistant/components/totalconnect/ @austinmroczek
 /tests/components/totalconnect/ @austinmroczek
+/homeassistant/components/touchline/ @mnordseth
+/tests/components/touchline/ @mnordseth
 /homeassistant/components/touchline_sl/ @jnsgruk
 /tests/components/touchline_sl/ @jnsgruk
 /homeassistant/components/tplink/ @rytilahti @bdraco @sdb9696

Dockerfile

@@ -29,7 +29,7 @@ RUN \
     # Verify go2rtc can be executed
     go2rtc --version \
     # Install uv
-    && pip3 install uv==0.10.6
+    && pip3 install uv==0.11.1
 
 WORKDIR /usr/src
 

homeassistant/bootstrap.py

@@ -241,12 +241,18 @@ DEFAULT_INTEGRATIONS = {
     *BASE_PLATFORMS,
     #
     # Integrations providing triggers and conditions for base platforms:
+    "air_quality",
+    "battery",
     "door",
     "garage_door",
     "gate",
     "humidity",
+    "illuminance",
+    "moisture",
     "motion",
     "occupancy",
+    "power",
+    "temperature",
     "window",
 }
 DEFAULT_INTEGRATIONS_RECOVERY_MODE = {

homeassistant/brands/lg.json

@@ -1,5 +1,11 @@
 {
   "domain": "lg",
   "name": "LG",
-  "integrations": ["lg_netcast", "lg_soundbar", "lg_thinq", "webostv"]
+  "integrations": [
+    "lg_infrared",
+    "lg_netcast",
+    "lg_soundbar",
+    "lg_thinq",
+    "webostv"
+  ]
 }

homeassistant/components/abode/manifest.json

@@ -9,6 +9,6 @@
   },
   "iot_class": "cloud_push",
   "loggers": ["jaraco.abode", "lomond"],
-  "requirements": ["jaraco.abode==6.2.1"],
+  "requirements": ["jaraco.abode==6.4.0"],
   "single_config_entry": true
 }

homeassistant/components/abode/sensor.py

@@ -12,6 +12,7 @@ from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
+    SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
@@ -40,6 +41,7 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
     AbodeSensorDescription(
         key="temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement_fn=lambda device: ABODE_TEMPERATURE_UNIT_HA_UNIT[
             device.temp_unit
         ],
@@ -48,12 +50,14 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
     AbodeSensorDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
+        state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement_fn=lambda _: PERCENTAGE,
         value_fn=lambda device: cast(float, device.humidity),
     ),
     AbodeSensorDescription(
         key="lux",
         device_class=SensorDeviceClass.ILLUMINANCE,
+        state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement_fn=lambda _: LIGHT_LUX,
         value_fn=lambda device: cast(float, device.lux),
     ),

homeassistant/components/air_quality/condition.py

@@ -0,0 +1,150 @@
+"""Provides conditions for air quality."""
+
+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 (
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    CONCENTRATION_PARTS_PER_BILLION,
+    CONCENTRATION_PARTS_PER_MILLION,
+    STATE_OFF,
+    STATE_ON,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.condition import (
+    Condition,
+    make_entity_numerical_condition,
+    make_entity_numerical_condition_with_unit,
+    make_entity_state_condition,
+)
+from homeassistant.util.unit_conversion import (
+    CarbonMonoxideConcentrationConverter,
+    MassVolumeConcentrationConverter,
+    NitrogenDioxideConcentrationConverter,
+    NitrogenMonoxideConcentrationConverter,
+    OzoneConcentrationConverter,
+    SulphurDioxideConcentrationConverter,
+    UnitlessRatioConverter,
+)
+
+
+def _make_detected_condition(
+    device_class: BinarySensorDeviceClass,
+) -> type[Condition]:
+    """Create a detected condition for a binary sensor device class."""
+    return make_entity_state_condition(
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_ON
+    )
+
+
+def _make_cleared_condition(
+    device_class: BinarySensorDeviceClass,
+) -> type[Condition]:
+    """Create a cleared condition for a binary sensor device class."""
+    return make_entity_state_condition(
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_OFF
+    )
+
+
+CONDITIONS: dict[str, type[Condition]] = {
+    # Binary sensor conditions (detected/cleared)
+    "is_gas_detected": _make_detected_condition(BinarySensorDeviceClass.GAS),
+    "is_gas_cleared": _make_cleared_condition(BinarySensorDeviceClass.GAS),
+    "is_co_detected": _make_detected_condition(BinarySensorDeviceClass.CO),
+    "is_co_cleared": _make_cleared_condition(BinarySensorDeviceClass.CO),
+    "is_smoke_detected": _make_detected_condition(BinarySensorDeviceClass.SMOKE),
+    "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)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        CarbonMonoxideConcentrationConverter,
+    ),
+    "is_ozone_value": make_entity_numerical_condition_with_unit(
+        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.OZONE)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        OzoneConcentrationConverter,
+    ),
+    "is_voc_value": make_entity_numerical_condition_with_unit(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        MassVolumeConcentrationConverter,
+    ),
+    "is_voc_ratio_value": make_entity_numerical_condition_with_unit(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
+            )
+        },
+        CONCENTRATION_PARTS_PER_BILLION,
+        UnitlessRatioConverter,
+    ),
+    "is_no_value": make_entity_numerical_condition_with_unit(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                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
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        NitrogenDioxideConcentrationConverter,
+    ),
+    "is_so2_value": make_entity_numerical_condition_with_unit(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                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)},
+        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+    "is_pm1_value": make_entity_numerical_condition(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "is_pm4_value": make_entity_numerical_condition(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "is_n2o_value": make_entity_numerical_condition(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.NITROUS_OXIDE
+            )
+        },
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the air quality conditions."""
+    return CONDITIONS

homeassistant/components/air_quality/conditions.yaml

@@ -0,0 +1,449 @@
+# --- Common condition fields ---
+
+.condition_behavior: &condition_behavior
+  required: true
+  default: any
+  selector:
+    select:
+      translation_key: condition_behavior
+      options:
+        - all
+        - any
+
+# --- Unit lists for multi-unit pollutants ---
+
+.co_units: &co_units
+  - "ppb"
+  - "ppm"
+  - "mg/m³"
+  - "μg/m³"
+
+.ozone_units: &ozone_units
+  - "ppb"
+  - "ppm"
+  - "μg/m³"
+
+.voc_units: &voc_units
+  - "μg/m³"
+  - "mg/m³"
+
+.voc_ratio_units: &voc_ratio_units
+  - "ppb"
+  - "ppm"
+
+.no_units: &no_units
+  - "ppb"
+  - "μg/m³"
+
+.no2_units: &no2_units
+  - "ppb"
+  - "ppm"
+  - "μg/m³"
+
+.so2_units: &so2_units
+  - "ppb"
+  - "μg/m³"
+
+# --- Entity filter anchors ---
+
+.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
+
+.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
+
+.pm1_threshold_entity: &pm1_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm1
+  - domain: number
+    device_class: pm1
+
+.pm25_threshold_entity: &pm25_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm25
+  - domain: number
+    device_class: pm25
+
+.pm4_threshold_entity: &pm4_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm4
+  - domain: number
+    device_class: pm4
+
+.pm10_threshold_entity: &pm10_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm10
+  - domain: number
+    device_class: pm10
+
+.ozone_threshold_entity: &ozone_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *ozone_units
+  - domain: sensor
+    device_class: ozone
+  - domain: number
+    device_class: ozone
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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 ---
+
+.target_gas: &target_gas
+  entity:
+    - domain: binary_sensor
+      device_class: gas
+
+.target_co_binary: &target_co_binary
+  entity:
+    - domain: binary_sensor
+      device_class: carbon_monoxide
+
+.target_smoke: &target_smoke
+  entity:
+    - domain: binary_sensor
+      device_class: smoke
+
+# --- Sensor targets ---
+
+.target_co_sensor: &target_co_sensor
+  entity:
+    - domain: sensor
+      device_class: carbon_monoxide
+
+.target_co2: &target_co2
+  entity:
+    - domain: sensor
+      device_class: carbon_dioxide
+
+.target_pm1: &target_pm1
+  entity:
+    - domain: sensor
+      device_class: pm1
+
+.target_pm25: &target_pm25
+  entity:
+    - domain: sensor
+      device_class: pm25
+
+.target_pm4: &target_pm4
+  entity:
+    - domain: sensor
+      device_class: pm4
+
+.target_pm10: &target_pm10
+  entity:
+    - domain: sensor
+      device_class: pm10
+
+.target_ozone: &target_ozone
+  entity:
+    - domain: sensor
+      device_class: ozone
+
+.target_voc: &target_voc
+  entity:
+    - domain: sensor
+      device_class: volatile_organic_compounds
+
+.target_voc_ratio: &target_voc_ratio
+  entity:
+    - domain: sensor
+      device_class: volatile_organic_compounds_parts
+
+.target_no: &target_no
+  entity:
+    - domain: sensor
+      device_class: nitrogen_monoxide
+
+.target_no2: &target_no2
+  entity:
+    - domain: sensor
+      device_class: nitrogen_dioxide
+
+.target_n2o: &target_n2o
+  entity:
+    - domain: sensor
+      device_class: nitrous_oxide
+
+.target_so2: &target_so2
+  entity:
+    - domain: sensor
+      device_class: sulphur_dioxide
+
+# --- Binary sensor conditions ---
+
+.condition_binary_common: &condition_binary_common
+  fields:
+    behavior: *condition_behavior
+
+is_gas_detected:
+  <<: *condition_binary_common
+  target: *target_gas
+
+is_gas_cleared:
+  <<: *condition_binary_common
+  target: *target_gas
+
+is_co_detected:
+  <<: *condition_binary_common
+  target: *target_co_binary
+
+is_co_cleared:
+  <<: *condition_binary_common
+  target: *target_co_binary
+
+is_smoke_detected:
+  <<: *condition_binary_common
+  target: *target_smoke
+
+is_smoke_cleared:
+  <<: *condition_binary_common
+  target: *target_smoke
+
+# --- Numerical sensor conditions with unit conversion ---
+
+is_co_value:
+  target: *target_co_sensor
+  fields:
+    behavior: *condition_behavior
+    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
+    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
+    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
+    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
+    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
+    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
+    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 ---
+
+is_co2_value:
+  target: *target_co2
+  fields:
+    behavior: *condition_behavior
+    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
+    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
+    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
+    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
+    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
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *n2o_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number

homeassistant/components/air_quality/icons.json

@@ -1,7 +1,164 @@
 {
+  "conditions": {
+    "is_co2_value": {
+      "condition": "mdi:molecule-co2"
+    },
+    "is_co_cleared": {
+      "condition": "mdi:check-circle"
+    },
+    "is_co_detected": {
+      "condition": "mdi:molecule-co"
+    },
+    "is_co_value": {
+      "condition": "mdi:molecule-co"
+    },
+    "is_gas_cleared": {
+      "condition": "mdi:check-circle"
+    },
+    "is_gas_detected": {
+      "condition": "mdi:gas-cylinder"
+    },
+    "is_n2o_value": {
+      "condition": "mdi:factory"
+    },
+    "is_no2_value": {
+      "condition": "mdi:factory"
+    },
+    "is_no_value": {
+      "condition": "mdi:factory"
+    },
+    "is_ozone_value": {
+      "condition": "mdi:weather-sunny-alert"
+    },
+    "is_pm10_value": {
+      "condition": "mdi:blur"
+    },
+    "is_pm1_value": {
+      "condition": "mdi:blur"
+    },
+    "is_pm25_value": {
+      "condition": "mdi:blur"
+    },
+    "is_pm4_value": {
+      "condition": "mdi:blur"
+    },
+    "is_smoke_cleared": {
+      "condition": "mdi:check-circle"
+    },
+    "is_smoke_detected": {
+      "condition": "mdi:smoke-detector-variant"
+    },
+    "is_so2_value": {
+      "condition": "mdi:factory"
+    },
+    "is_voc_ratio_value": {
+      "condition": "mdi:air-filter"
+    },
+    "is_voc_value": {
+      "condition": "mdi:air-filter"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:air-filter"
     }
+  },
+  "triggers": {
+    "co2_changed": {
+      "trigger": "mdi:molecule-co2"
+    },
+    "co2_crossed_threshold": {
+      "trigger": "mdi:molecule-co2"
+    },
+    "co_changed": {
+      "trigger": "mdi:molecule-co"
+    },
+    "co_cleared": {
+      "trigger": "mdi:check-circle"
+    },
+    "co_crossed_threshold": {
+      "trigger": "mdi:molecule-co"
+    },
+    "co_detected": {
+      "trigger": "mdi:molecule-co"
+    },
+    "gas_cleared": {
+      "trigger": "mdi:check-circle"
+    },
+    "gas_detected": {
+      "trigger": "mdi:gas-cylinder"
+    },
+    "n2o_changed": {
+      "trigger": "mdi:factory"
+    },
+    "n2o_crossed_threshold": {
+      "trigger": "mdi:factory"
+    },
+    "no2_changed": {
+      "trigger": "mdi:factory"
+    },
+    "no2_crossed_threshold": {
+      "trigger": "mdi:factory"
+    },
+    "no_changed": {
+      "trigger": "mdi:factory"
+    },
+    "no_crossed_threshold": {
+      "trigger": "mdi:factory"
+    },
+    "ozone_changed": {
+      "trigger": "mdi:weather-sunny-alert"
+    },
+    "ozone_crossed_threshold": {
+      "trigger": "mdi:weather-sunny-alert"
+    },
+    "pm10_changed": {
+      "trigger": "mdi:blur"
+    },
+    "pm10_crossed_threshold": {
+      "trigger": "mdi:blur"
+    },
+    "pm1_changed": {
+      "trigger": "mdi:blur"
+    },
+    "pm1_crossed_threshold": {
+      "trigger": "mdi:blur"
+    },
+    "pm25_changed": {
+      "trigger": "mdi:blur"
+    },
+    "pm25_crossed_threshold": {
+      "trigger": "mdi:blur"
+    },
+    "pm4_changed": {
+      "trigger": "mdi:blur"
+    },
+    "pm4_crossed_threshold": {
+      "trigger": "mdi:blur"
+    },
+    "smoke_cleared": {
+      "trigger": "mdi:check-circle"
+    },
+    "smoke_detected": {
+      "trigger": "mdi:smoke-detector-variant"
+    },
+    "so2_changed": {
+      "trigger": "mdi:factory"
+    },
+    "so2_crossed_threshold": {
+      "trigger": "mdi:factory"
+    },
+    "voc_changed": {
+      "trigger": "mdi:air-filter"
+    },
+    "voc_crossed_threshold": {
+      "trigger": "mdi:air-filter"
+    },
+    "voc_ratio_changed": {
+      "trigger": "mdi:air-filter"
+    },
+    "voc_ratio_crossed_threshold": {
+      "trigger": "mdi:air-filter"
+    }
   }
 }

homeassistant/components/air_quality/strings.json

@@ -0,0 +1,647 @@
+{
+  "common": {
+    "condition_behavior_description": "How the value should match on the targeted entities.",
+    "condition_behavior_name": "Behavior",
+    "condition_threshold_description": "What to test for and threshold values.",
+    "condition_threshold_name": "Threshold configuration",
+    "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"
+  },
+  "conditions": {
+    "is_co2_value": {
+      "description": "Tests the carbon dioxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Carbon dioxide value"
+    },
+    "is_co_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Carbon monoxide cleared"
+    },
+    "is_co_detected": {
+      "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%]"
+        }
+      },
+      "name": "Carbon monoxide detected"
+    },
+    "is_co_value": {
+      "description": "Tests the carbon monoxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Carbon monoxide value"
+    },
+    "is_gas_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Gas cleared"
+    },
+    "is_gas_detected": {
+      "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%]"
+        }
+      },
+      "name": "Gas detected"
+    },
+    "is_n2o_value": {
+      "description": "Tests the nitrous oxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Nitrous oxide value"
+    },
+    "is_no2_value": {
+      "description": "Tests the nitrogen dioxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Nitrogen dioxide value"
+    },
+    "is_no_value": {
+      "description": "Tests the nitrogen monoxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Nitrogen monoxide value"
+    },
+    "is_ozone_value": {
+      "description": "Tests the ozone level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Ozone value"
+    },
+    "is_pm10_value": {
+      "description": "Tests the PM10 level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "PM10 value"
+    },
+    "is_pm1_value": {
+      "description": "Tests the PM1 level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "PM1 value"
+    },
+    "is_pm25_value": {
+      "description": "Tests the PM2.5 level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "PM2.5 value"
+    },
+    "is_pm4_value": {
+      "description": "Tests the PM4 level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "PM4 value"
+    },
+    "is_smoke_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Smoke cleared"
+    },
+    "is_smoke_detected": {
+      "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%]"
+        }
+      },
+      "name": "Smoke detected"
+    },
+    "is_so2_value": {
+      "description": "Tests the sulphur dioxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Sulphur dioxide value"
+    },
+    "is_voc_ratio_value": {
+      "description": "Tests the volatile organic compounds ratio of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Volatile organic compounds ratio value"
+    },
+    "is_voc_value": {
+      "description": "Tests the volatile organic compounds level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Volatile organic compounds value"
+    }
+  },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
+  "title": "Air Quality",
+  "triggers": {
+    "co2_changed": {
+      "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%]"
+        }
+      },
+      "name": "Carbon dioxide level changed"
+    },
+    "co2_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "Carbon dioxide level crossed threshold"
+    },
+    "co_changed": {
+      "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%]"
+        }
+      },
+      "name": "Carbon monoxide level changed"
+    },
+    "co_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Carbon monoxide cleared"
+    },
+    "co_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "Carbon monoxide level crossed threshold"
+    },
+    "co_detected": {
+      "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%]"
+        }
+      },
+      "name": "Carbon monoxide detected"
+    },
+    "gas_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Gas cleared"
+    },
+    "gas_detected": {
+      "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%]"
+        }
+      },
+      "name": "Gas detected"
+    },
+    "n2o_changed": {
+      "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%]"
+        }
+      },
+      "name": "Nitrous oxide level changed"
+    },
+    "n2o_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "Nitrous oxide level crossed threshold"
+    },
+    "no2_changed": {
+      "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%]"
+        }
+      },
+      "name": "Nitrogen dioxide level changed"
+    },
+    "no2_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "Nitrogen dioxide level crossed threshold"
+    },
+    "no_changed": {
+      "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%]"
+        }
+      },
+      "name": "Nitrogen monoxide level changed"
+    },
+    "no_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "Nitrogen monoxide level crossed threshold"
+    },
+    "ozone_changed": {
+      "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%]"
+        }
+      },
+      "name": "Ozone level changed"
+    },
+    "ozone_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "Ozone level crossed threshold"
+    },
+    "pm10_changed": {
+      "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%]"
+        }
+      },
+      "name": "PM10 level changed"
+    },
+    "pm10_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "PM10 level crossed threshold"
+    },
+    "pm1_changed": {
+      "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%]"
+        }
+      },
+      "name": "PM1 level changed"
+    },
+    "pm1_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "PM1 level crossed threshold"
+    },
+    "pm25_changed": {
+      "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%]"
+        }
+      },
+      "name": "PM2.5 level changed"
+    },
+    "pm25_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "PM2.5 level crossed threshold"
+    },
+    "pm4_changed": {
+      "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%]"
+        }
+      },
+      "name": "PM4 level changed"
+    },
+    "pm4_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "PM4 level crossed threshold"
+    },
+    "smoke_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Smoke cleared"
+    },
+    "smoke_detected": {
+      "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%]"
+        }
+      },
+      "name": "Smoke detected"
+    },
+    "so2_changed": {
+      "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%]"
+        }
+      },
+      "name": "Sulphur dioxide level changed"
+    },
+    "so2_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "Sulphur dioxide level crossed threshold"
+    },
+    "voc_changed": {
+      "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%]"
+        }
+      },
+      "name": "Volatile organic compounds level changed"
+    },
+    "voc_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "Volatile organic compounds level crossed threshold"
+    },
+    "voc_ratio_changed": {
+      "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%]"
+        }
+      },
+      "name": "Volatile organic compounds ratio changed"
+    },
+    "voc_ratio_crossed_threshold": {
+      "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%]"
+        }
+      },
+      "name": "Volatile organic compounds ratio crossed threshold"
+    }
+  }
+}

homeassistant/components/air_quality/trigger.py

@@ -0,0 +1,238 @@
+"""Provides triggers for air quality."""
+
+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 (
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    CONCENTRATION_PARTS_PER_BILLION,
+    CONCENTRATION_PARTS_PER_MILLION,
+    STATE_OFF,
+    STATE_ON,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.trigger import (
+    EntityTargetStateTriggerBase,
+    Trigger,
+    make_entity_numerical_state_changed_trigger,
+    make_entity_numerical_state_changed_with_unit_trigger,
+    make_entity_numerical_state_crossed_threshold_trigger,
+    make_entity_numerical_state_crossed_threshold_with_unit_trigger,
+    make_entity_target_state_trigger,
+)
+from homeassistant.util.unit_conversion import (
+    CarbonMonoxideConcentrationConverter,
+    MassVolumeConcentrationConverter,
+    NitrogenDioxideConcentrationConverter,
+    NitrogenMonoxideConcentrationConverter,
+    OzoneConcentrationConverter,
+    SulphurDioxideConcentrationConverter,
+    UnitlessRatioConverter,
+)
+
+
+def _make_detected_trigger(
+    device_class: BinarySensorDeviceClass,
+) -> type[EntityTargetStateTriggerBase]:
+    """Create a detected trigger for a binary sensor device class."""
+
+    return make_entity_target_state_trigger(
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_ON
+    )
+
+
+def _make_cleared_trigger(
+    device_class: BinarySensorDeviceClass,
+) -> type[EntityTargetStateTriggerBase]:
+    """Create a cleared trigger for a binary sensor device class."""
+
+    return make_entity_target_state_trigger(
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_OFF
+    )
+
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    # Binary sensor triggers (detected/cleared)
+    "gas_detected": _make_detected_trigger(BinarySensorDeviceClass.GAS),
+    "gas_cleared": _make_cleared_trigger(BinarySensorDeviceClass.GAS),
+    "co_detected": _make_detected_trigger(BinarySensorDeviceClass.CO),
+    "co_cleared": _make_cleared_trigger(BinarySensorDeviceClass.CO),
+    "smoke_detected": _make_detected_trigger(BinarySensorDeviceClass.SMOKE),
+    "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)},
+        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)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        CarbonMonoxideConcentrationConverter,
+    ),
+    "ozone_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        OzoneConcentrationConverter,
+    ),
+    "voc_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        MassVolumeConcentrationConverter,
+    ),
+    "voc_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        MassVolumeConcentrationConverter,
+    ),
+    "voc_ratio_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
+            )
+        },
+        CONCENTRATION_PARTS_PER_BILLION,
+        UnitlessRatioConverter,
+    ),
+    "voc_ratio_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
+            )
+        },
+        CONCENTRATION_PARTS_PER_BILLION,
+        UnitlessRatioConverter,
+    ),
+    "no_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                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
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        NitrogenMonoxideConcentrationConverter,
+    ),
+    "no2_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                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
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        NitrogenDioxideConcentrationConverter,
+    ),
+    "so2_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                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
+            )
+        },
+        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)},
+        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+    "co2_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "pm1_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "pm25_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "pm4_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "pm10_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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
+            )
+        },
+        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
+            )
+        },
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for air quality."""
+    return TRIGGERS

homeassistant/components/air_quality/triggers.yaml

@@ -0,0 +1,617 @@
+.trigger_common_fields:
+  behavior: &trigger_behavior
+    required: true
+    default: any
+    selector:
+      select:
+        translation_key: trigger_behavior
+        options:
+          - first
+          - last
+          - any
+
+# --- Unit lists for multi-unit pollutants ---
+
+.co_units: &co_units
+  - "ppb"
+  - "ppm"
+  - "mg/m³"
+  - "μg/m³"
+
+.ozone_units: &ozone_units
+  - "ppb"
+  - "ppm"
+  - "μg/m³"
+
+.voc_units: &voc_units
+  - "μg/m³"
+  - "mg/m³"
+
+.voc_ratio_units: &voc_ratio_units
+  - "ppb"
+  - "ppm"
+
+.no_units: &no_units
+  - "ppb"
+  - "μg/m³"
+
+.no2_units: &no2_units
+  - "ppb"
+  - "ppm"
+  - "μg/m³"
+
+.so2_units: &so2_units
+  - "ppb"
+  - "μg/m³"
+
+# --- Entity filter anchors ---
+
+.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
+
+.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
+
+.pm1_threshold_entity: &pm1_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm1
+  - domain: number
+    device_class: pm1
+
+.pm25_threshold_entity: &pm25_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm25
+  - domain: number
+    device_class: pm25
+
+.pm4_threshold_entity: &pm4_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm4
+  - domain: number
+    device_class: pm4
+
+.pm10_threshold_entity: &pm10_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm10
+  - domain: number
+    device_class: pm10
+
+.ozone_threshold_entity: &ozone_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *ozone_units
+  - domain: sensor
+    device_class: ozone
+  - domain: number
+    device_class: ozone
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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 detected/cleared trigger fields
+.trigger_binary_fields: &trigger_binary_fields
+  behavior: *trigger_behavior
+
+# --- Binary sensor targets ---
+
+.target_gas: &target_gas
+  entity:
+    - domain: binary_sensor
+      device_class: gas
+
+.target_co_binary: &target_co_binary
+  entity:
+    - domain: binary_sensor
+      device_class: carbon_monoxide
+
+.target_smoke: &target_smoke
+  entity:
+    - domain: binary_sensor
+      device_class: smoke
+
+# --- Sensor targets ---
+
+.target_co_sensor: &target_co_sensor
+  entity:
+    - domain: sensor
+      device_class: carbon_monoxide
+
+.target_co2: &target_co2
+  entity:
+    - domain: sensor
+      device_class: carbon_dioxide
+
+.target_pm1: &target_pm1
+  entity:
+    - domain: sensor
+      device_class: pm1
+
+.target_pm25: &target_pm25
+  entity:
+    - domain: sensor
+      device_class: pm25
+
+.target_pm4: &target_pm4
+  entity:
+    - domain: sensor
+      device_class: pm4
+
+.target_pm10: &target_pm10
+  entity:
+    - domain: sensor
+      device_class: pm10
+
+.target_ozone: &target_ozone
+  entity:
+    - domain: sensor
+      device_class: ozone
+
+.target_voc: &target_voc
+  entity:
+    - domain: sensor
+      device_class: volatile_organic_compounds
+
+.target_voc_ratio: &target_voc_ratio
+  entity:
+    - domain: sensor
+      device_class: volatile_organic_compounds_parts
+
+.target_no: &target_no
+  entity:
+    - domain: sensor
+      device_class: nitrogen_monoxide
+
+.target_no2: &target_no2
+  entity:
+    - domain: sensor
+      device_class: nitrogen_dioxide
+
+.target_n2o: &target_n2o
+  entity:
+    - domain: sensor
+      device_class: nitrous_oxide
+
+.target_so2: &target_so2
+  entity:
+    - domain: sensor
+      device_class: sulphur_dioxide
+
+# --- Binary sensor triggers ---
+
+gas_detected:
+  fields: *trigger_binary_fields
+  target: *target_gas
+
+gas_cleared:
+  fields: *trigger_binary_fields
+  target: *target_gas
+
+co_detected:
+  fields: *trigger_binary_fields
+  target: *target_co_binary
+
+co_cleared:
+  fields: *trigger_binary_fields
+  target: *target_co_binary
+
+smoke_detected:
+  fields: *trigger_binary_fields
+  target: *target_smoke
+
+smoke_cleared:
+  fields: *trigger_binary_fields
+  target: *target_smoke
+
+# --- Numerical sensor triggers ---
+
+# CO (multi-unit)
+co_changed:
+  target: *target_co_sensor
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *co_units
+
+co_crossed_threshold:
+  target: *target_co_sensor
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *co_units
+
+# CO2 (single-unit: ppm)
+co2_changed:
+  target: *target_co2
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co2_threshold_entity
+          mode: changed
+          number: *co2_threshold_number
+
+co2_crossed_threshold:
+  target: *target_co2
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co2_threshold_entity
+          mode: crossed
+          number: *co2_threshold_number
+
+# PM1 (single-unit: μg/m³)
+pm1_changed:
+  target: *target_pm1
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm1_threshold_entity
+          mode: changed
+          number: *ugm3_threshold_number
+
+pm1_crossed_threshold:
+  target: *target_pm1
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm1_threshold_entity
+          mode: crossed
+          number: *ugm3_threshold_number
+
+# PM2.5 (single-unit: μg/m³)
+pm25_changed:
+  target: *target_pm25
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm25_threshold_entity
+          mode: changed
+          number: *ugm3_threshold_number
+
+pm25_crossed_threshold:
+  target: *target_pm25
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm25_threshold_entity
+          mode: crossed
+          number: *ugm3_threshold_number
+
+# PM4 (single-unit: μg/m³)
+pm4_changed:
+  target: *target_pm4
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm4_threshold_entity
+          mode: changed
+          number: *ugm3_threshold_number
+
+pm4_crossed_threshold:
+  target: *target_pm4
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm4_threshold_entity
+          mode: crossed
+          number: *ugm3_threshold_number
+
+# PM10 (single-unit: μg/m³)
+pm10_changed:
+  target: *target_pm10
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm10_threshold_entity
+          mode: changed
+          number: *ugm3_threshold_number
+
+pm10_crossed_threshold:
+  target: *target_pm10
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm10_threshold_entity
+          mode: crossed
+          number: *ugm3_threshold_number
+
+# Ozone (multi-unit)
+ozone_changed:
+  target: *target_ozone
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *ozone_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *ozone_units
+
+ozone_crossed_threshold:
+  target: *target_ozone
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *ozone_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *ozone_units
+
+# VOC (multi-unit)
+voc_changed:
+  target: *target_voc
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *voc_units
+
+voc_crossed_threshold:
+  target: *target_voc
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *voc_units
+
+# VOC ratio (multi-unit)
+voc_ratio_changed:
+  target: *target_voc_ratio
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_ratio_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *voc_ratio_units
+
+voc_ratio_crossed_threshold:
+  target: *target_voc_ratio
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_ratio_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *voc_ratio_units
+
+# NO (multi-unit)
+no_changed:
+  target: *target_no
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *no_units
+
+no_crossed_threshold:
+  target: *target_no
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *no_units
+
+# NO2 (multi-unit)
+no2_changed:
+  target: *target_no2
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no2_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *no2_units
+
+no2_crossed_threshold:
+  target: *target_no2
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no2_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *no2_units
+
+# N2O (single-unit: μg/m³)
+n2o_changed:
+  target: *target_n2o
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *n2o_threshold_entity
+          mode: changed
+          number: *ugm3_threshold_number
+
+n2o_crossed_threshold:
+  target: *target_n2o
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *n2o_threshold_entity
+          mode: crossed
+          number: *ugm3_threshold_number
+
+# SO2 (multi-unit)
+so2_changed:
+  target: *target_so2
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *so2_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *so2_units
+
+so2_crossed_threshold:
+  target: *target_so2
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *so2_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *so2_units

homeassistant/components/airq/config_flow.py

@@ -87,7 +87,7 @@ class AirQConfigFlow(ConfigFlow, domain=DOMAIN):
             _LOGGER.debug("Successfully connected to %s", user_input[CONF_IP_ADDRESS])
 
             device_info = await airq.fetch_device_info()
-            await self.async_set_unique_id(device_info["id"])
+            await self.async_set_unique_id(device_info["id"], raise_on_progress=False)
             self._abort_if_unique_id_configured()
 
             _LOGGER.debug("Creating an entry for %s", device_info["name"])

homeassistant/components/airq/diagnostics.py

@@ -0,0 +1,36 @@
+"""Diagnostics support for air-Q."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, CONF_UNIQUE_ID
+from homeassistant.core import HomeAssistant
+
+from . import AirQConfigEntry
+
+REDACT_CONFIG = {CONF_PASSWORD, CONF_UNIQUE_ID, CONF_IP_ADDRESS, "title"}
+REDACT_DEVICE_INFO = {"identifiers", "name"}
+REDACT_COORDINATOR_DATA = {"DeviceID"}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: AirQConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinator = entry.runtime_data
+
+    return {
+        "config_entry": async_redact_data(entry.as_dict(), REDACT_CONFIG),
+        "device_info": async_redact_data(
+            dict(coordinator.device_info), REDACT_DEVICE_INFO
+        ),
+        "coordinator_data": async_redact_data(
+            coordinator.data, REDACT_COORDINATOR_DATA
+        ),
+        "options": {
+            "clip_negative": coordinator.clip_negative,
+            "return_average": coordinator.return_average,
+        },
+    }

homeassistant/components/airq/strings.json

@@ -2,6 +2,7 @@
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "incomplete_discovery": "The discovered air-Q device did not provide a device ID. Ensure the firmware is up to date."
     },
     "error": {

homeassistant/components/alarm_control_panel/strings.json

@@ -173,7 +173,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm away"
+      "name": "Arm alarm away"
     },
     "alarm_arm_custom_bypass": {
       "description": "Arms an alarm while allowing to bypass a custom area.",
@@ -183,7 +183,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm with custom bypass"
+      "name": "Arm alarm with custom bypass"
     },
     "alarm_arm_home": {
       "description": "Arms an alarm in the home mode.",
@@ -193,7 +193,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm home"
+      "name": "Arm alarm home"
     },
     "alarm_arm_night": {
       "description": "Arms an alarm in the night mode.",
@@ -203,7 +203,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm night"
+      "name": "Arm alarm night"
     },
     "alarm_arm_vacation": {
       "description": "Arms an alarm in the vacation mode.",
@@ -213,7 +213,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm vacation"
+      "name": "Arm alarm vacation"
     },
     "alarm_disarm": {
       "description": "Disarms an alarm.",
@@ -223,7 +223,7 @@
           "name": "Code"
         }
       },
-      "name": "Disarm"
+      "name": "Disarm alarm"
     },
     "alarm_trigger": {
       "description": "Triggers an alarm manually.",
@@ -233,7 +233,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Trigger"
+      "name": "Trigger alarm"
     }
   },
   "title": "Alarm control panel",

homeassistant/components/alexa_devices/manifest.json

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

homeassistant/components/androidtv_remote/manifest.json

@@ -8,6 +8,6 @@
   "iot_class": "local_push",
   "loggers": ["androidtvremote2"],
   "quality_scale": "platinum",
-  "requirements": ["androidtvremote2==0.2.3"],
+  "requirements": ["androidtvremote2==0.3.1"],
   "zeroconf": ["_androidtvremote2._tcp.local."]
 }

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/assist_pipeline/__init__.py

@@ -137,5 +137,4 @@ async def async_pipeline_from_audio_stream(
                 audio_settings=audio_settings or AudioSettings(),
             ),
         )
-        await pipeline_input.validate()
-        await pipeline_input.execute()
+        await pipeline_input.execute(validate=True)

homeassistant/components/assist_pipeline/error.py

@@ -1,7 +1,14 @@
 """Assist pipeline errors."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from homeassistant.exceptions import HomeAssistantError
 
+if TYPE_CHECKING:
+    from .pipeline import PipelineStage
+
 
 class PipelineError(HomeAssistantError):
     """Base class for pipeline errors."""
@@ -55,3 +62,25 @@ class IntentRecognitionError(PipelineError):
 
 class TextToSpeechError(PipelineError):
     """Error in text-to-speech portion of pipeline."""
+
+
+class PipelineRunValidationError(PipelineError):
+    """Error when a pipeline run is not valid."""
+
+    def __init__(self, message: str) -> None:
+        """Set error message."""
+        super().__init__("validation-error", message)
+
+
+class InvalidPipelineStagesError(PipelineRunValidationError):
+    """Error when given an invalid combination of start/end stages."""
+
+    def __init__(
+        self,
+        start_stage: PipelineStage,
+        end_stage: PipelineStage,
+    ) -> None:
+        """Set error message."""
+        super().__init__(
+            f"Invalid stage combination: start={start_stage}, end={end_stage}"
+        )

homeassistant/components/assist_pipeline/pipeline.py

@@ -73,8 +73,10 @@ from .const import (
 from .error import (
     DuplicateWakeUpDetectedError,
     IntentRecognitionError,
+    InvalidPipelineStagesError,
     PipelineError,
     PipelineNotFound,
+    PipelineRunValidationError,
     SpeechToTextError,
     TextToSpeechError,
     WakeWordDetectionAborted,
@@ -492,24 +494,6 @@ PIPELINE_STAGE_ORDER = [
 ]
 
 
-class PipelineRunValidationError(Exception):
-    """Error when a pipeline run is not valid."""
-
-
-class InvalidPipelineStagesError(PipelineRunValidationError):
-    """Error when given an invalid combination of start/end stages."""
-
-    def __init__(
-        self,
-        start_stage: PipelineStage,
-        end_stage: PipelineStage,
-    ) -> None:
-        """Set error message."""
-        super().__init__(
-            f"Invalid stage combination: start={start_stage}, end={end_stage}"
-        )
-
-
 @dataclass(frozen=True)
 class WakeWordSettings:
     """Settings for wake word detection."""
@@ -662,7 +646,8 @@ class PipelineRun:
         """Emit run start event."""
         self._device_id = device_id
         self._satellite_id = satellite_id
-        self._start_debug_recording_thread()
+        if self.start_stage in (PipelineStage.WAKE_WORD, PipelineStage.STT):
+            self._start_debug_recording_thread()
 
         data: dict[str, Any] = {
             "pipeline": self.pipeline.id,
@@ -1504,9 +1489,7 @@ class PipelineRun:
 
     def _start_debug_recording_thread(self) -> None:
         """Start thread to record wake/stt audio if debug_recording_dir is set."""
-        if self.debug_recording_thread is not None:
-            # Already started
-            return
+        assert self.debug_recording_thread is None
 
         # Directory to save audio for each pipeline run.
         # Configured in YAML for assist_pipeline.
@@ -1681,26 +1664,39 @@ class PipelineInput:
     satellite_id: str | None = None
     """Identifier of the satellite that is processing the input/output of the pipeline."""
 
-    async def execute(self) -> None:
+    async def execute(self, validate: bool = False) -> None:
         """Run pipeline."""
+        validation_error: PipelineError | None = None
+        if validate:
+            try:
+                await self.validate()
+            except PipelineError as err:
+                validation_error = err
+
         self.run.start(
             conversation_id=self.session.conversation_id,
             device_id=self.device_id,
             satellite_id=self.satellite_id,
         )
         current_stage: PipelineStage | None = self.run.start_stage
-        stt_audio_buffer: list[EnhancedAudioChunk] = []
-        stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
-
-        if self.stt_stream is not None:
-            if self.run.audio_settings.needs_processor:
-                # VAD/noise suppression/auto gain/volume
-                stt_processed_stream = self.run.process_enhance_audio(self.stt_stream)
-            else:
-                # Volume multiplier only
-                stt_processed_stream = self.run.process_volume_only(self.stt_stream)
 
         try:
+            if validation_error is not None:
+                raise validation_error
+
+            stt_audio_buffer: list[EnhancedAudioChunk] = []
+            stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
+
+            if self.stt_stream is not None:
+                if self.run.audio_settings.needs_processor:
+                    # VAD/noise suppression/auto gain/volume
+                    stt_processed_stream = self.run.process_enhance_audio(
+                        self.stt_stream
+                    )
+                else:
+                    # Volume multiplier only
+                    stt_processed_stream = self.run.process_volume_only(self.stt_stream)
+
             if current_stage == PipelineStage.WAKE_WORD:
                 # wake-word-detection
                 assert stt_processed_stream is not None

homeassistant/components/auth/__init__.py

@@ -626,7 +626,7 @@ def websocket_delete_all_refresh_tokens(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Handle delete all refresh tokens request."""
-    current_refresh_token: RefreshToken
+    current_refresh_token: RefreshToken | None = None
     remove_failed = False
     token_type = msg.get("token_type")
     delete_current_token = msg.get("delete_current_token")
@@ -654,7 +654,7 @@ def websocket_delete_all_refresh_tokens(
     else:
         connection.send_result(msg["id"], {})
 
-    async def _delete_current_token_soon() -> None:
+    async def _delete_current_token_soon(current_refresh_token: RefreshToken) -> None:
         """Delete the current token after a delay.
 
         We do not want to delete the current token immediately as it will
@@ -675,13 +675,15 @@ def websocket_delete_all_refresh_tokens(
             # the token right away.
             hass.auth.async_remove_refresh_token(current_refresh_token)
 
-    if delete_current_token and (
-        not limit_token_types or current_refresh_token.token_type == token_type
+    if (
+        delete_current_token
+        and current_refresh_token
+        and (not limit_token_types or current_refresh_token.token_type == token_type)
     ):
         # Deleting the token will close the connection so we need
         # to do it with a delay in a tracked task to ensure it still
         # happens if Home Assistant is shutting down.
-        hass.async_create_task(_delete_current_token_soon())
+        hass.async_create_task(_delete_current_token_soon(current_refresh_token))
 
 
 @websocket_api.websocket_command(

homeassistant/components/auth/login_flow.py

@@ -115,6 +115,7 @@ def async_setup(
 ) -> None:
     """Component to allow users to login."""
     hass.http.register_view(WellKnownOAuthInfoView)
+    hass.http.register_view(WellKnownProtectedResourceView)
     hass.http.register_view(AuthProvidersView)
     hass.http.register_view(LoginFlowIndexView(hass.auth.login_flow, store_result))
     hass.http.register_view(LoginFlowResourceView(hass.auth.login_flow, store_result))
@@ -154,6 +155,32 @@ class WellKnownOAuthInfoView(HomeAssistantView):
         return self.json(metadata)
 
 
+class WellKnownProtectedResourceView(HomeAssistantView):
+    """View to host the OAuth2 Protected Resource Metadata per RFC9728."""
+
+    requires_auth = False
+    url = "/.well-known/oauth-protected-resource"
+    name = "well-known/oauth-protected-resource"
+
+    async def get(self, request: web.Request) -> web.Response:
+        """Return the protected resource metadata."""
+        hass = request.app[KEY_HASS]
+        try:
+            url_prefix = get_url(hass, require_current_request=True)
+        except NoURLAvailableError:
+            return self.json_message("No URL available", HTTPStatus.NOT_FOUND)
+
+        return self.json(
+            {
+                "resource": url_prefix,
+                "authorization_servers": [url_prefix],
+                "resource_documentation": (
+                    "https://developers.home-assistant.io/docs/auth_api"
+                ),
+            }
+        )
+
+
 class AuthProvidersView(HomeAssistantView):
     """View to get available auth providers."""
 

homeassistant/components/automation/__init__.py

@@ -118,34 +118,10 @@ SERVICE_TRIGGER = "trigger"
 NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG = "new_triggers_conditions"
 
 _EXPERIMENTAL_CONDITION_PLATFORMS = {
+    "air_quality",
     "alarm_control_panel",
     "assist_satellite",
-    "climate",
-    "cover",
-    "device_tracker",
-    "door",
-    "fan",
-    "garage_door",
-    "gate",
-    "humidifier",
-    "lawn_mower",
-    "light",
-    "lock",
-    "media_player",
-    "motion",
-    "occupancy",
-    "person",
-    "schedule",
-    "siren",
-    "switch",
-    "vacuum",
-    "window",
-}
-
-_EXPERIMENTAL_TRIGGER_PLATFORMS = {
-    "alarm_control_panel",
-    "assist_satellite",
-    "button",
+    "battery",
     "climate",
     "cover",
     "device_tracker",
@@ -155,23 +131,63 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "gate",
     "humidifier",
     "humidity",
-    "input_boolean",
+    "illuminance",
     "lawn_mower",
     "light",
     "lock",
     "media_player",
+    "moisture",
     "motion",
     "occupancy",
     "person",
+    "power",
+    "schedule",
+    "siren",
+    "switch",
+    "temperature",
+    "text",
+    "vacuum",
+    "water_heater",
+    "window",
+}
+
+_EXPERIMENTAL_TRIGGER_PLATFORMS = {
+    "air_quality",
+    "alarm_control_panel",
+    "assist_satellite",
+    "button",
+    "climate",
+    "counter",
+    "cover",
+    "device_tracker",
+    "door",
+    "event",
+    "fan",
+    "garage_door",
+    "gate",
+    "humidifier",
+    "humidity",
+    "illuminance",
+    "lawn_mower",
+    "light",
+    "lock",
+    "media_player",
+    "moisture",
+    "motion",
+    "occupancy",
+    "person",
+    "power",
     "remote",
     "scene",
     "schedule",
     "select",
     "siren",
     "switch",
+    "temperature",
     "text",
     "update",
     "vacuum",
+    "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/aws_s3/backup.py

@@ -147,7 +147,7 @@ class S3BackupAgent(BackupAgent):
             if backup.size < MULTIPART_MIN_PART_SIZE_BYTES:
                 await self._upload_simple(tar_filename, open_stream)
             else:
-                await self._upload_multipart(tar_filename, open_stream)
+                await self._upload_multipart(tar_filename, open_stream, on_progress)
 
             # Upload the metadata file
             metadata_content = json.dumps(backup.as_dict())
@@ -188,11 +188,13 @@ class S3BackupAgent(BackupAgent):
         self,
         tar_filename: str,
         open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-    ):
+        on_progress: OnProgressCallback,
+    ) -> None:
         """Upload a large file using multipart upload.
 
         :param tar_filename: The target filename for the backup.
         :param open_stream: A function returning an async iterator that yields bytes.
+        :param on_progress: A callback to report the number of uploaded bytes.
         """
         _LOGGER.debug("Starting multipart upload for %s", tar_filename)
         multipart_upload = await self._client.create_multipart_upload(
@@ -205,6 +207,7 @@ class S3BackupAgent(BackupAgent):
             part_number = 1
             buffer = bytearray()  # bytes buffer to store the data
             offset = 0  # start index of unread data inside buffer
+            bytes_uploaded = 0
 
             stream = await open_stream()
             async for chunk in stream:
@@ -233,6 +236,8 @@ class S3BackupAgent(BackupAgent):
                             Body=part_data.tobytes(),
                         )
                         parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
+                        bytes_uploaded += len(part_data)
+                        on_progress(bytes_uploaded=bytes_uploaded)
                         part_number += 1
                 finally:
                     view.release()
@@ -261,6 +266,8 @@ class S3BackupAgent(BackupAgent):
                     Body=remaining_data.tobytes(),
                 )
                 parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
+                bytes_uploaded += len(remaining_data)
+                on_progress(bytes_uploaded=bytes_uploaded)
 
             await cast(Any, self._client).complete_multipart_upload(
                 Bucket=self._bucket,

homeassistant/components/backup/const.py

@@ -34,4 +34,4 @@ EXCLUDE_DATABASE_FROM_BACKUP = [
     "home-assistant_v2.db-wal",
 ]
 
-SECURETAR_CREATE_VERSION = 2
+SECURETAR_CREATE_VERSION = 3

homeassistant/components/battery/__init__.py

@@ -0,0 +1,17 @@
+"""Integration for battery conditions."""
+
+from __future__ import annotations
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.typing import ConfigType
+
+DOMAIN = "battery"
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
+__all__ = []
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the component."""
+    return True

homeassistant/components/battery/condition.py

@@ -0,0 +1,48 @@
+"""Provides conditions for batteries."""
+
+from __future__ import annotations
+
+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
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.condition import (
+    Condition,
+    make_entity_numerical_condition,
+    make_entity_state_condition,
+)
+
+BATTERY_DOMAIN_SPECS = {
+    BINARY_SENSOR_DOMAIN: DomainSpec(device_class=BinarySensorDeviceClass.BATTERY)
+}
+BATTERY_CHARGING_DOMAIN_SPECS = {
+    BINARY_SENSOR_DOMAIN: DomainSpec(
+        device_class=BinarySensorDeviceClass.BATTERY_CHARGING
+    )
+}
+BATTERY_PERCENTAGE_DOMAIN_SPECS = {
+    SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.BATTERY),
+    NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.BATTERY),
+}
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_low": make_entity_state_condition(BATTERY_DOMAIN_SPECS, STATE_ON),
+    "is_not_low": make_entity_state_condition(BATTERY_DOMAIN_SPECS, STATE_OFF),
+    "is_charging": make_entity_state_condition(BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON),
+    "is_not_charging": make_entity_state_condition(
+        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF
+    ),
+    "is_level": make_entity_numerical_condition(
+        BATTERY_PERCENTAGE_DOMAIN_SPECS, PERCENTAGE
+    ),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the conditions for batteries."""
+    return CONDITIONS

homeassistant/components/battery/conditions.yaml

@@ -0,0 +1,66 @@
+.condition_common: &condition_common
+  target: &target_battery_binary_sensor
+    entity:
+      - domain: binary_sensor
+        device_class: battery
+  fields:
+    behavior: &condition_behavior
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+
+.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
+
+is_not_low: *condition_common
+
+is_charging:
+  target:
+    entity:
+      - domain: binary_sensor
+        device_class: battery_charging
+  fields:
+    behavior: *condition_behavior
+
+is_not_charging:
+  target:
+    entity:
+      - domain: binary_sensor
+        device_class: battery_charging
+  fields:
+    behavior: *condition_behavior
+
+is_level:
+  target:
+    entity:
+      - domain: sensor
+        device_class: battery
+      - domain: number
+        device_class: battery
+  fields:
+    behavior: *condition_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *battery_threshold_entity
+          mode: is
+          number: *battery_threshold_number

homeassistant/components/battery/icons.json

@@ -0,0 +1,19 @@
+{
+  "conditions": {
+    "is_charging": {
+      "condition": "mdi:battery-charging"
+    },
+    "is_level": {
+      "condition": "mdi:battery-unknown"
+    },
+    "is_low": {
+      "condition": "mdi:battery-alert"
+    },
+    "is_not_charging": {
+      "condition": "mdi:battery"
+    },
+    "is_not_low": {
+      "condition": "mdi:battery"
+    }
+  }
+}

homeassistant/components/battery/manifest.json

@@ -0,0 +1,8 @@
+{
+  "domain": "battery",
+  "name": "Battery",
+  "codeowners": ["@home-assistant/core"],
+  "documentation": "https://www.home-assistant.io/integrations/battery",
+  "integration_type": "system",
+  "quality_scale": "internal"
+}

homeassistant/components/battery/strings.json

@@ -0,0 +1,73 @@
+{
+  "common": {
+    "condition_behavior_description": "How the state should match on the targeted batteries.",
+    "condition_behavior_name": "Behavior",
+    "condition_threshold_description": "What to test for and threshold values.",
+    "condition_threshold_name": "Threshold configuration"
+  },
+  "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%]"
+        }
+      },
+      "name": "Battery is charging"
+    },
+    "is_level": {
+      "description": "Tests the battery level of one or more batteries.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::battery::common::condition_behavior_description%]",
+          "name": "[%key:component::battery::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::battery::common::condition_threshold_description%]",
+          "name": "[%key:component::battery::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Battery level"
+    },
+    "is_low": {
+      "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%]"
+        }
+      },
+      "name": "Battery is low"
+    },
+    "is_not_charging": {
+      "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%]"
+        }
+      },
+      "name": "Battery is not charging"
+    },
+    "is_not_low": {
+      "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%]"
+        }
+      },
+      "name": "Battery is not low"
+    }
+  },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    }
+  },
+  "title": "Battery"
+}

homeassistant/components/bluetooth/manifest.json

@@ -21,6 +21,6 @@
     "bluetooth-auto-recovery==1.5.3",
     "bluetooth-data-tools==1.28.4",
     "dbus-fast==3.1.2",
-    "habluetooth==5.10.2"
+    "habluetooth==5.11.1"
   ]
 }

homeassistant/components/bsblan/manifest.json

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

homeassistant/components/button/strings.json

@@ -23,8 +23,8 @@
   },
   "services": {
     "press": {
-      "description": "Presses a button entity.",
-      "name": "Press"
+      "description": "Presses a button.",
+      "name": "Press button"
     }
   },
   "title": "Button",

homeassistant/components/calendar/strings.json

@@ -90,7 +90,7 @@
           "name": "Summary"
         }
       },
-      "name": "Create event"
+      "name": "Create calendar event"
     },
     "get_events": {
       "description": "Retrieves events on a calendar within a time range.",
@@ -108,7 +108,7 @@
           "name": "Start time"
         }
       },
-      "name": "Get events"
+      "name": "Get calendar events"
     }
   },
   "title": "Calendar",

homeassistant/components/camera/__init__.py

@@ -432,6 +432,7 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
     )
 
     # Entity Properties
+    entity_description: CameraEntityDescription
     _attr_brand: str | None = None
     _attr_frame_interval: float = MIN_STREAM_INTERVAL
     _attr_is_on: bool = True

homeassistant/components/camera/strings.json

@@ -51,11 +51,11 @@
   "services": {
     "disable_motion_detection": {
       "description": "Disables the motion detection of a camera.",
-      "name": "Disable motion detection"
+      "name": "Disable camera motion detection"
     },
     "enable_motion_detection": {
       "description": "Enables the motion detection of a camera.",
-      "name": "Enable motion detection"
+      "name": "Enable camera motion detection"
     },
     "play_stream": {
       "description": "Plays a camera stream on a supported media player.",
@@ -69,7 +69,7 @@
           "name": "Media player"
         }
       },
-      "name": "Play stream"
+      "name": "Play camera stream"
     },
     "record": {
       "description": "Creates a recording of a live camera feed.",
@@ -87,7 +87,7 @@
           "name": "Lookback"
         }
       },
-      "name": "Record"
+      "name": "Record camera feed"
     },
     "snapshot": {
       "description": "Takes a snapshot from a camera.",
@@ -97,15 +97,15 @@
           "name": "Filename"
         }
       },
-      "name": "Take snapshot"
+      "name": "Take camera snapshot"
     },
     "turn_off": {
       "description": "Turns off a camera.",
-      "name": "[%key:common::action::turn_off%]"
+      "name": "Turn off camera"
     },
     "turn_on": {
       "description": "Turns on a camera.",
-      "name": "[%key:common::action::turn_on%]"
+      "name": "Turn on camera"
     }
   },
   "title": "Camera"

homeassistant/components/casper_glow/__init__.py

@@ -0,0 +1,39 @@
+"""The Casper Glow integration."""
+
+from __future__ import annotations
+
+from pycasperglow import CasperGlow
+
+from homeassistant.components import bluetooth
+from homeassistant.const import CONF_ADDRESS, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+
+from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
+
+PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.BUTTON, Platform.LIGHT]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: CasperGlowConfigEntry) -> bool:
+    """Set up Casper Glow from a config entry."""
+    address: str = entry.data[CONF_ADDRESS]
+    ble_device = bluetooth.async_ble_device_from_address(hass, address.upper(), True)
+    if not ble_device:
+        raise ConfigEntryNotReady(
+            f"Could not find Casper Glow device with address {address}"
+        )
+
+    glow = CasperGlow(ble_device)
+    coordinator = CasperGlowCoordinator(hass, glow, entry.title)
+    entry.runtime_data = coordinator
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    entry.async_on_unload(coordinator.async_start())
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: CasperGlowConfigEntry) -> bool:
+    """Unload a config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/casper_glow/binary_sensor.py

@@ -0,0 +1,51 @@
+"""Casper Glow integration binary sensor platform."""
+
+from __future__ import annotations
+
+from pycasperglow import GlowState
+
+from homeassistant.components.binary_sensor import BinarySensorEntity
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
+from .entity import CasperGlowEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: CasperGlowConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the binary sensor platform for Casper Glow."""
+    async_add_entities([CasperGlowPausedBinarySensor(entry.runtime_data)])
+
+
+class CasperGlowPausedBinarySensor(CasperGlowEntity, BinarySensorEntity):
+    """Binary sensor indicating whether the Casper Glow dimming is paused."""
+
+    _attr_translation_key = "paused"
+
+    def __init__(self, coordinator: CasperGlowCoordinator) -> None:
+        """Initialize the paused binary sensor."""
+        super().__init__(coordinator)
+        self._attr_unique_id = f"{format_mac(coordinator.device.address)}_paused"
+        if coordinator.device.state.is_paused is not None:
+            self._attr_is_on = coordinator.device.state.is_paused
+
+    async def async_added_to_hass(self) -> None:
+        """Register state update callback when entity is added."""
+        await super().async_added_to_hass()
+        self.async_on_remove(
+            self._device.register_callback(self._async_handle_state_update)
+        )
+
+    @callback
+    def _async_handle_state_update(self, state: GlowState) -> None:
+        """Handle a state update from the device."""
+        if state.is_paused is not None:
+            self._attr_is_on = state.is_paused
+        self.async_write_ha_state()

homeassistant/components/casper_glow/button.py

@@ -0,0 +1,73 @@
+"""Casper Glow integration button platform."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+
+from pycasperglow import CasperGlow
+
+from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
+from .entity import CasperGlowEntity
+
+PARALLEL_UPDATES = 1
+
+
+@dataclass(frozen=True, kw_only=True)
+class CasperGlowButtonEntityDescription(ButtonEntityDescription):
+    """Describe a Casper Glow button entity."""
+
+    press_fn: Callable[[CasperGlow], Awaitable[None]]
+
+
+BUTTON_DESCRIPTIONS: tuple[CasperGlowButtonEntityDescription, ...] = (
+    CasperGlowButtonEntityDescription(
+        key="pause",
+        translation_key="pause",
+        press_fn=lambda device: device.pause(),
+    ),
+    CasperGlowButtonEntityDescription(
+        key="resume",
+        translation_key="resume",
+        press_fn=lambda device: device.resume(),
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: CasperGlowConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the button platform for Casper Glow."""
+    async_add_entities(
+        CasperGlowButton(entry.runtime_data, description)
+        for description in BUTTON_DESCRIPTIONS
+    )
+
+
+class CasperGlowButton(CasperGlowEntity, ButtonEntity):
+    """A Casper Glow button entity."""
+
+    entity_description: CasperGlowButtonEntityDescription
+
+    def __init__(
+        self,
+        coordinator: CasperGlowCoordinator,
+        description: CasperGlowButtonEntityDescription,
+    ) -> None:
+        """Initialize a Casper Glow button."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = (
+            f"{format_mac(coordinator.device.address)}_{description.key}"
+        )
+
+    async def async_press(self) -> None:
+        """Press the button."""
+        await self._async_command(self.entity_description.press_fn(self._device))

homeassistant/components/casper_glow/config_flow.py

@@ -0,0 +1,151 @@
+"""Config flow for Casper Glow integration."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from bluetooth_data_tools import human_readable_name
+from pycasperglow import CasperGlow, CasperGlowError
+import voluptuous as vol
+
+from homeassistant.components.bluetooth import (
+    BluetoothServiceInfoBleak,
+    async_discovered_service_info,
+)
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_ADDRESS
+from homeassistant.helpers.device_registry import format_mac
+
+from .const import DOMAIN, LOCAL_NAMES
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class CasperGlowConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Casper Glow."""
+
+    VERSION = 1
+    MINOR_VERSION = 1
+
+    def __init__(self) -> None:
+        """Initialize the config flow."""
+        self._discovery_info: BluetoothServiceInfoBleak | None = None
+        self._discovered_devices: dict[str, BluetoothServiceInfoBleak] = {}
+
+    async def async_step_bluetooth(
+        self, discovery_info: BluetoothServiceInfoBleak
+    ) -> ConfigFlowResult:
+        """Handle the bluetooth discovery step."""
+        await self.async_set_unique_id(format_mac(discovery_info.address))
+        self._abort_if_unique_id_configured()
+        self._discovery_info = discovery_info
+        self.context["title_placeholders"] = {
+            "name": human_readable_name(
+                None, discovery_info.name, discovery_info.address
+            )
+        }
+        return await self.async_step_bluetooth_confirm()
+
+    async def async_step_bluetooth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm a discovered Casper Glow device."""
+        assert self._discovery_info is not None
+        if user_input is not None:
+            return self.async_create_entry(
+                title=self.context["title_placeholders"]["name"],
+                data={CONF_ADDRESS: self._discovery_info.address},
+            )
+        glow = CasperGlow(self._discovery_info.device)
+        try:
+            await glow.handshake()
+        except CasperGlowError:
+            return self.async_abort(reason="cannot_connect")
+        except Exception:
+            _LOGGER.exception(
+                "Unexpected error during Casper Glow config flow "
+                "(step=bluetooth_confirm, address=%s)",
+                self._discovery_info.address,
+            )
+            return self.async_abort(reason="unknown")
+        self._set_confirm_only()
+        return self.async_show_form(
+            step_id="bluetooth_confirm",
+            description_placeholders=self.context["title_placeholders"],
+        )
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the user step to pick discovered device."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            address = user_input[CONF_ADDRESS]
+            discovery_info = self._discovered_devices[address]
+            await self.async_set_unique_id(
+                format_mac(discovery_info.address), raise_on_progress=False
+            )
+            self._abort_if_unique_id_configured()
+            glow = CasperGlow(discovery_info.device)
+            try:
+                await glow.handshake()
+            except CasperGlowError:
+                errors["base"] = "cannot_connect"
+            except Exception:
+                _LOGGER.exception(
+                    "Unexpected error during Casper Glow config flow "
+                    "(step=user, address=%s)",
+                    discovery_info.address,
+                )
+                errors["base"] = "unknown"
+            else:
+                return self.async_create_entry(
+                    title=human_readable_name(
+                        None, discovery_info.name, discovery_info.address
+                    ),
+                    data={
+                        CONF_ADDRESS: discovery_info.address,
+                    },
+                )
+
+        if discovery := self._discovery_info:
+            self._discovered_devices[discovery.address] = discovery
+        else:
+            current_addresses = self._async_current_ids(include_ignore=False)
+            for discovery in async_discovered_service_info(self.hass):
+                if (
+                    format_mac(discovery.address) in current_addresses
+                    or discovery.address in self._discovered_devices
+                    or not (
+                        discovery.name
+                        and any(
+                            discovery.name.startswith(local_name)
+                            for local_name in LOCAL_NAMES
+                        )
+                    )
+                ):
+                    continue
+                self._discovered_devices[discovery.address] = discovery
+
+        if not self._discovered_devices:
+            return self.async_abort(reason="no_devices_found")
+
+        data_schema = vol.Schema(
+            {
+                vol.Required(CONF_ADDRESS): vol.In(
+                    {
+                        service_info.address: human_readable_name(
+                            None, service_info.name, service_info.address
+                        )
+                        for service_info in self._discovered_devices.values()
+                    }
+                ),
+            }
+        )
+        return self.async_show_form(
+            step_id="user",
+            data_schema=data_schema,
+            errors=errors,
+        )

homeassistant/components/casper_glow/const.py

@@ -0,0 +1,16 @@
+"""Constants for the Casper Glow integration."""
+
+from datetime import timedelta
+
+from pycasperglow import BRIGHTNESS_LEVELS, DEVICE_NAME_PREFIX, DIMMING_TIME_MINUTES
+
+DOMAIN = "casper_glow"
+
+LOCAL_NAMES = {DEVICE_NAME_PREFIX}
+
+SORTED_BRIGHTNESS_LEVELS = sorted(BRIGHTNESS_LEVELS)
+
+DEFAULT_DIMMING_TIME_MINUTES: int = DIMMING_TIME_MINUTES[0]
+
+# Interval between periodic state polls to catch externally-triggered changes.
+STATE_POLL_INTERVAL = timedelta(seconds=30)

homeassistant/components/casper_glow/coordinator.py

@@ -0,0 +1,103 @@
+"""Coordinator for the Casper Glow integration."""
+
+from __future__ import annotations
+
+import logging
+
+from bleak import BleakError
+from bluetooth_data_tools import monotonic_time_coarse
+from pycasperglow import CasperGlow
+
+from homeassistant.components.bluetooth import (
+    BluetoothChange,
+    BluetoothScanningMode,
+    BluetoothServiceInfoBleak,
+)
+from homeassistant.components.bluetooth.active_update_coordinator import (
+    ActiveBluetoothDataUpdateCoordinator,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+
+from .const import STATE_POLL_INTERVAL
+
+_LOGGER = logging.getLogger(__name__)
+
+type CasperGlowConfigEntry = ConfigEntry[CasperGlowCoordinator]
+
+
+class CasperGlowCoordinator(ActiveBluetoothDataUpdateCoordinator[None]):
+    """Coordinator for Casper Glow BLE devices."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        device: CasperGlow,
+        title: str,
+    ) -> None:
+        """Initialize the coordinator."""
+        super().__init__(
+            hass=hass,
+            logger=_LOGGER,
+            address=device.address,
+            mode=BluetoothScanningMode.PASSIVE,
+            needs_poll_method=self._needs_poll,
+            poll_method=self._async_update,
+            connectable=True,
+        )
+        self.device = device
+        self.last_dimming_time_minutes: int | None = (
+            device.state.configured_dimming_time_minutes
+        )
+        self.title = title
+
+    @callback
+    def _needs_poll(
+        self,
+        service_info: BluetoothServiceInfoBleak,
+        seconds_since_last_poll: float | None,
+    ) -> bool:
+        """Return True if a poll is needed."""
+        return (
+            seconds_since_last_poll is None
+            or seconds_since_last_poll >= STATE_POLL_INTERVAL.total_seconds()
+        )
+
+    async def _async_update(self, service_info: BluetoothServiceInfoBleak) -> None:
+        """Poll device state."""
+        await self.device.query_state()
+
+    async def _async_poll(self) -> None:
+        """Poll the device and log availability changes."""
+        assert self._last_service_info
+
+        try:
+            await self._async_poll_data(self._last_service_info)
+        except BleakError as exc:
+            if self.last_poll_successful:
+                _LOGGER.info("%s is unavailable: %s", self.title, exc)
+                self.last_poll_successful = False
+            return
+        except Exception:
+            if self.last_poll_successful:
+                _LOGGER.exception("%s: unexpected error while polling", self.title)
+                self.last_poll_successful = False
+            return
+        finally:
+            self._last_poll = monotonic_time_coarse()
+
+        if not self.last_poll_successful:
+            _LOGGER.info("%s is back online", self.title)
+            self.last_poll_successful = True
+
+        self._async_handle_bluetooth_poll()
+
+    @callback
+    def _async_handle_bluetooth_event(
+        self,
+        service_info: BluetoothServiceInfoBleak,
+        change: BluetoothChange,
+    ) -> None:
+        """Update BLE device reference on each advertisement."""
+        self.device.set_ble_device(service_info.device)
+        super()._async_handle_bluetooth_event(service_info, change)

homeassistant/components/casper_glow/entity.py

@@ -0,0 +1,47 @@
+"""Base entity for the Casper Glow integration."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable
+
+from pycasperglow import CasperGlowError
+
+from homeassistant.components.bluetooth.passive_update_coordinator import (
+    PassiveBluetoothCoordinatorEntity,
+)
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.device_registry import DeviceInfo, format_mac
+
+from .const import DOMAIN
+from .coordinator import CasperGlowCoordinator
+
+
+class CasperGlowEntity(PassiveBluetoothCoordinatorEntity[CasperGlowCoordinator]):
+    """Base class for Casper Glow entities."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: CasperGlowCoordinator) -> None:
+        """Initialize a Casper Glow entity."""
+        super().__init__(coordinator)
+        self._device = coordinator.device
+        self._attr_device_info = DeviceInfo(
+            manufacturer="Casper",
+            model="Glow",
+            model_id="G01",
+            connections={
+                (dr.CONNECTION_BLUETOOTH, format_mac(coordinator.device.address))
+            },
+        )
+
+    async def _async_command(self, coro: Awaitable[None]) -> None:
+        """Execute a device command."""
+        try:
+            await coro
+        except CasperGlowError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="communication_error",
+                translation_placeholders={"error": str(err)},
+            ) from err

homeassistant/components/casper_glow/icons.json

@@ -0,0 +1,17 @@
+{
+  "entity": {
+    "binary_sensor": {
+      "paused": {
+        "default": "mdi:timer-pause"
+      }
+    },
+    "button": {
+      "pause": {
+        "default": "mdi:pause"
+      },
+      "resume": {
+        "default": "mdi:play"
+      }
+    }
+  }
+}

homeassistant/components/casper_glow/light.py

@@ -0,0 +1,104 @@
+"""Casper Glow integration light platform."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from pycasperglow import GlowState
+
+from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util.percentage import (
+    ordered_list_item_to_percentage,
+    percentage_to_ordered_list_item,
+)
+
+from .const import DEFAULT_DIMMING_TIME_MINUTES, SORTED_BRIGHTNESS_LEVELS
+from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
+from .entity import CasperGlowEntity
+
+PARALLEL_UPDATES = 1
+
+
+def _ha_brightness_to_device_pct(brightness: int) -> int:
+    """Convert HA brightness (1-255) to device percentage by snapping to nearest."""
+    return percentage_to_ordered_list_item(
+        SORTED_BRIGHTNESS_LEVELS, round(brightness * 100 / 255)
+    )
+
+
+def _device_pct_to_ha_brightness(pct: int) -> int:
+    """Convert device brightness percentage (60-100) to HA brightness (1-255)."""
+    percent = ordered_list_item_to_percentage(SORTED_BRIGHTNESS_LEVELS, pct)
+    return round(percent * 255 / 100)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: CasperGlowConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the light platform for Casper Glow."""
+    async_add_entities([CasperGlowLight(entry.runtime_data)])
+
+
+class CasperGlowLight(CasperGlowEntity, LightEntity):
+    """Representation of a Casper Glow light."""
+
+    _attr_supported_color_modes = {ColorMode.BRIGHTNESS}
+    _attr_name = None
+
+    def __init__(self, coordinator: CasperGlowCoordinator) -> None:
+        """Initialize a Casper Glow light."""
+        super().__init__(coordinator)
+        self._attr_unique_id = format_mac(coordinator.device.address)
+        self._update_from_state(coordinator.device.state)
+
+    async def async_added_to_hass(self) -> None:
+        """Register state update callback when entity is added."""
+        await super().async_added_to_hass()
+        self.async_on_remove(
+            self._device.register_callback(self._async_handle_state_update)
+        )
+
+    @callback
+    def _update_from_state(self, state: GlowState) -> None:
+        """Update entity attributes from device state."""
+        if state.is_on is not None:
+            self._attr_is_on = state.is_on
+            self._attr_color_mode = ColorMode.BRIGHTNESS
+        if state.brightness_level is not None:
+            self._attr_brightness = _device_pct_to_ha_brightness(state.brightness_level)
+
+    @callback
+    def _async_handle_state_update(self, state: GlowState) -> None:
+        """Handle a state update from the device."""
+        self._update_from_state(state)
+        self.async_write_ha_state()
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the light on."""
+        brightness_pct: int | None = None
+        if ATTR_BRIGHTNESS in kwargs:
+            brightness_pct = _ha_brightness_to_device_pct(kwargs[ATTR_BRIGHTNESS])
+
+        await self._async_command(self._device.turn_on())
+        self._attr_is_on = True
+        self._attr_color_mode = ColorMode.BRIGHTNESS
+        if brightness_pct is not None:
+            await self._async_command(
+                self._device.set_brightness_and_dimming_time(
+                    brightness_pct,
+                    self.coordinator.last_dimming_time_minutes
+                    if self.coordinator.last_dimming_time_minutes is not None
+                    else DEFAULT_DIMMING_TIME_MINUTES,
+                )
+            )
+            self._attr_brightness = _device_pct_to_ha_brightness(brightness_pct)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the light off."""
+        await self._async_command(self._device.turn_off())
+        self._attr_is_on = False

homeassistant/components/casper_glow/manifest.json

@@ -0,0 +1,19 @@
+{
+  "domain": "casper_glow",
+  "name": "Casper Glow",
+  "bluetooth": [
+    {
+      "connectable": true,
+      "local_name": "Jar*"
+    }
+  ],
+  "codeowners": ["@mikeodr"],
+  "config_flow": true,
+  "dependencies": ["bluetooth_adapters"],
+  "documentation": "https://www.home-assistant.io/integrations/casper_glow",
+  "integration_type": "device",
+  "iot_class": "local_polling",
+  "loggers": ["pycasperglow"],
+  "quality_scale": "silver",
+  "requirements": ["pycasperglow==1.1.0"]
+}

homeassistant/components/casper_glow/quality_scale.yaml

@@ -0,0 +1,70 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: No custom services.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: No custom actions/services.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup: done
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions: done
+  config-entry-unloading: done
+  docs-configuration-parameters: done
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow:
+    status: exempt
+    comment: Bluetooth device with no authentication credentials.
+  test-coverage: done
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info:
+    status: exempt
+    comment: No network discovery.
+  discovery: done
+  docs-data-update: done
+  docs-examples: todo
+  docs-known-limitations: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: todo
+  dynamic-devices: todo
+  entity-category: todo
+  entity-device-class: todo
+  entity-disabled-by-default: todo
+  entity-translations: done
+  exception-translations: done
+  icon-translations: done
+  reconfiguration-flow: todo
+  repair-issues: todo
+  stale-devices: todo
+
+  # Platinum
+  async-dependency: done
+  inject-websession:
+    status: exempt
+    comment: No web session is used by this integration.
+  strict-typing: done

homeassistant/components/casper_glow/strings.json

@@ -0,0 +1,49 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "flow_title": "{name}",
+    "step": {
+      "bluetooth_confirm": {
+        "description": "Do you want to set up {name}?"
+      },
+      "user": {
+        "data": {
+          "address": "Bluetooth address"
+        },
+        "data_description": {
+          "address": "The Bluetooth address of the Casper Glow light"
+        }
+      }
+    }
+  },
+  "entity": {
+    "binary_sensor": {
+      "paused": {
+        "name": "Dimming paused"
+      }
+    },
+    "button": {
+      "pause": {
+        "name": "Pause dimming"
+      },
+      "resume": {
+        "name": "Resume dimming"
+      }
+    }
+  },
+  "exceptions": {
+    "communication_error": {
+      "message": "An error occurred while communicating with the Casper Glow: {error}"
+    }
+  }
+}

homeassistant/components/chess_com/icons.json

@@ -1,20 +1,68 @@
 {
   "entity": {
     "sensor": {
+      "chess960_daily_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess960_daily_lost": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess960_daily_rating": {
+        "default": "mdi:chart-line"
+      },
+      "chess960_daily_won": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_blitz_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_blitz_lost": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_blitz_rating": {
+        "default": "mdi:chart-line"
+      },
+      "chess_blitz_won": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_bullet_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_bullet_lost": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_bullet_rating": {
+        "default": "mdi:chart-line"
+      },
+      "chess_bullet_won": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_daily_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_daily_lost": {
+        "default": "mdi:chess-pawn"
+      },
       "chess_daily_rating": {
         "default": "mdi:chart-line"
       },
+      "chess_daily_won": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_rapid_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_rapid_lost": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_rapid_rating": {
+        "default": "mdi:chart-line"
+      },
+      "chess_rapid_won": {
+        "default": "mdi:chess-pawn"
+      },
       "followers": {
         "default": "mdi:account-multiple"
-      },
-      "total_daily_draw": {
-        "default": "mdi:chess-pawn"
-      },
-      "total_daily_lost": {
-        "default": "mdi:chess-pawn"
-      },
-      "total_daily_won": {
-        "default": "mdi:chess-pawn"
       }
     }
   }

homeassistant/components/chess_com/sensor.py

@@ -2,6 +2,9 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any
+
+from chess_com_api import PlayerStats
 
 from homeassistant.components.sensor import (
     SensorEntity,
@@ -24,7 +27,14 @@ class ChessEntityDescription(SensorEntityDescription):
     value_fn: Callable[[ChessData], float]
 
 
-SENSORS: tuple[ChessEntityDescription, ...] = (
+@dataclass(kw_only=True, frozen=True)
+class ChessModeEntityDescription(SensorEntityDescription):
+    """Sensor description for a Chess.com game mode."""
+
+    value_fn: Callable[[dict[str, Any]], float]
+
+
+PLAYER_SENSORS: tuple[ChessEntityDescription, ...] = (
     ChessEntityDescription(
         key="followers",
         translation_key="followers",
@@ -33,35 +43,46 @@ SENSORS: tuple[ChessEntityDescription, ...] = (
         value_fn=lambda state: state.player.followers,
         entity_registry_enabled_default=False,
     ),
-    ChessEntityDescription(
-        key="chess_daily_rating",
-        translation_key="chess_daily_rating",
+)
+
+GAME_MODE_SENSORS: tuple[ChessModeEntityDescription, ...] = (
+    ChessModeEntityDescription(
+        key="rating",
+        translation_key="rating",
         state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda state: state.stats.chess_daily["last"]["rating"],
+        value_fn=lambda mode: mode["last"]["rating"],
     ),
-    ChessEntityDescription(
-        key="total_daily_won",
-        translation_key="total_daily_won",
+    ChessModeEntityDescription(
+        key="won",
+        translation_key="won",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda state: state.stats.chess_daily["record"]["win"],
+        value_fn=lambda mode: mode["record"]["win"],
     ),
-    ChessEntityDescription(
-        key="total_daily_lost",
-        translation_key="total_daily_lost",
+    ChessModeEntityDescription(
+        key="lost",
+        translation_key="lost",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda state: state.stats.chess_daily["record"]["loss"],
+        value_fn=lambda mode: mode["record"]["loss"],
     ),
-    ChessEntityDescription(
-        key="total_daily_draw",
-        translation_key="total_daily_draw",
+    ChessModeEntityDescription(
+        key="draw",
+        translation_key="draw",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda state: state.stats.chess_daily["record"]["draw"],
+        value_fn=lambda mode: mode["record"]["draw"],
     ),
 )
 
+GAME_MODES: dict[str, Callable[[PlayerStats], dict[str, Any] | None]] = {
+    "chess_daily": lambda stats: stats.chess_daily,
+    "chess_rapid": lambda stats: stats.chess_rapid,
+    "chess_bullet": lambda stats: stats.chess_bullet,
+    "chess_blitz": lambda stats: stats.chess_blitz,
+    "chess960_daily": lambda stats: stats.chess960_daily,
+}
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -71,13 +92,22 @@ async def async_setup_entry(
     """Initialize the entries."""
     coordinator = entry.runtime_data
 
-    async_add_entities(
-        ChessPlayerSensor(coordinator, description) for description in SENSORS
-    )
+    entities: list[SensorEntity] = [
+        ChessPlayerSensor(coordinator, description) for description in PLAYER_SENSORS
+    ]
+
+    for game_mode, stats_fn in GAME_MODES.items():
+        if stats_fn(coordinator.data.stats) is not None:
+            entities.extend(
+                ChessGameModeSensor(coordinator, description, game_mode, stats_fn)
+                for description in GAME_MODE_SENSORS
+            )
+
+    async_add_entities(entities)
 
 
 class ChessPlayerSensor(ChessEntity, SensorEntity):
-    """Chess.com sensor."""
+    """Chess.com player sensor."""
 
     entity_description: ChessEntityDescription
 
@@ -95,3 +125,33 @@ class ChessPlayerSensor(ChessEntity, SensorEntity):
     def native_value(self) -> float:
         """Return the state of the sensor."""
         return self.entity_description.value_fn(self.coordinator.data)
+
+
+class ChessGameModeSensor(ChessEntity, SensorEntity):
+    """Chess.com game mode sensor."""
+
+    entity_description: ChessModeEntityDescription
+
+    def __init__(
+        self,
+        coordinator: ChessCoordinator,
+        description: ChessModeEntityDescription,
+        game_mode: str,
+        stats_fn: Callable[[PlayerStats], dict[str, Any] | None],
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._stats_fn = stats_fn
+        self._attr_unique_id = (
+            f"{coordinator.config_entry.unique_id}.{game_mode}.{description.key}"
+        )
+        self._attr_translation_key = f"{game_mode}_{description.translation_key}"
+
+    @property
+    def native_value(self) -> float:
+        """Return the state of the sensor."""
+        mode_data = self._stats_fn(self.coordinator.data.stats)
+        if TYPE_CHECKING:
+            assert mode_data is not None
+        return self.entity_description.value_fn(mode_data)

homeassistant/components/chess_com/strings.json

@@ -23,24 +23,84 @@
   },
   "entity": {
     "sensor": {
+      "chess960_daily_draw": {
+        "name": "Total daily Chess960 games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess960_daily_lost": {
+        "name": "Total daily Chess960 games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess960_daily_rating": {
+        "name": "Daily Chess960 rating"
+      },
+      "chess960_daily_won": {
+        "name": "Total daily Chess960 games won",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_blitz_draw": {
+        "name": "Total blitz chess games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_blitz_lost": {
+        "name": "Total blitz chess games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_blitz_rating": {
+        "name": "Blitz chess rating"
+      },
+      "chess_blitz_won": {
+        "name": "Total blitz chess games won",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_bullet_draw": {
+        "name": "Total bullet chess games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_bullet_lost": {
+        "name": "Total bullet chess games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_bullet_rating": {
+        "name": "Bullet chess rating"
+      },
+      "chess_bullet_won": {
+        "name": "Total bullet chess games won",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_daily_draw": {
+        "name": "Total daily chess games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_daily_lost": {
+        "name": "Total daily chess games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
       "chess_daily_rating": {
         "name": "Daily chess rating"
       },
+      "chess_daily_won": {
+        "name": "Total daily chess games won",
+        "unit_of_measurement": "games"
+      },
+      "chess_rapid_draw": {
+        "name": "Total rapid chess games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_rapid_lost": {
+        "name": "Total rapid chess games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_rapid_rating": {
+        "name": "Rapid chess rating"
+      },
+      "chess_rapid_won": {
+        "name": "Total rapid chess games won",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
       "followers": {
         "name": "Followers",
         "unit_of_measurement": "followers"
-      },
-      "total_daily_draw": {
-        "name": "Total chess games drawn",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::total_daily_won::unit_of_measurement%]"
-      },
-      "total_daily_lost": {
-        "name": "Total chess games lost",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::total_daily_won::unit_of_measurement%]"
-      },
-      "total_daily_won": {
-        "name": "Total chess games won",
-        "unit_of_measurement": "games"
       }
     }
   }

homeassistant/components/climate/condition.py

@@ -1,10 +1,31 @@
 """Provides conditions for climates."""
 
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.condition import Condition, make_entity_state_condition
+from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.condition import (
+    Condition,
+    EntityNumericalConditionWithUnitBase,
+    make_entity_numerical_condition,
+    make_entity_state_condition,
+)
+from homeassistant.util.unit_conversion import TemperatureConverter
+
+from .const import ATTR_HUMIDITY, ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
+
+
+class ClimateTargetTemperatureCondition(EntityNumericalConditionWithUnitBase):
+    """Mixin for climate target temperature conditions with unit conversion."""
+
+    _base_unit = UnitOfTemperature.CELSIUS
+    _domain_specs = {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
+    _unit_converter = TemperatureConverter
+
+    def _get_entity_unit(self, entity_state: State) -> str | None:
+        """Get the temperature unit of a climate entity from its state."""
+        # Climate entities convert temperatures to the system unit via show_temp
+        return self._hass.config.units.temperature_unit
 
-from .const import ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
 
 CONDITIONS: dict[str, type[Condition]] = {
     "is_off": make_entity_state_condition(DOMAIN, HVACMode.OFF),
@@ -28,6 +49,11 @@ CONDITIONS: dict[str, type[Condition]] = {
     "is_heating": make_entity_state_condition(
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.HEATING
     ),
+    "target_humidity": make_entity_numerical_condition(
+        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        valid_unit="%",
+    ),
+    "target_temperature": ClimateTargetTemperatureCondition,
 }
 
 

homeassistant/components/climate/conditions.yaml

@@ -1,9 +1,9 @@
 .condition_common: &condition_common
-  target:
+  target: &condition_climate_target
     entity:
       domain: climate
   fields:
-    behavior:
+    behavior: &condition_behavior
       required: true
       default: any
       selector:
@@ -13,8 +13,60 @@
             - all
             - any
 
+.humidity_threshold_entity: &humidity_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "%"
+  - domain: sensor
+    device_class: humidity
+  - domain: number
+    device_class: humidity
+
+.humidity_threshold_number: &humidity_threshold_number
+  min: 0
+  max: 100
+  mode: box
+  unit_of_measurement: "%"
+
+.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
 is_cooling: *condition_common
 is_drying: *condition_common
 is_heating: *condition_common
+
+target_humidity:
+  target: *condition_climate_target
+  fields:
+    behavior: *condition_behavior
+    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
+    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

@@ -14,6 +14,12 @@
     },
     "is_on": {
       "condition": "mdi:power-on"
+    },
+    "target_humidity": {
+      "condition": "mdi:water-percent"
+    },
+    "target_temperature": {
+      "condition": "mdi:thermometer"
     }
   },
   "entity_component": {

homeassistant/components/climate/services.yaml

@@ -11,7 +11,8 @@ set_preset_mode:
       required: true
       example: "away"
       selector:
-        text:
+        state:
+          attribute: preset_mode
 
 set_temperature:
   target:
@@ -55,16 +56,10 @@ set_temperature:
           mode: box
     hvac_mode:
       selector:
-        select:
-          options:
-            - "off"
-            - "auto"
-            - "cool"
-            - "dry"
-            - "fan_only"
-            - "heat_cool"
-            - "heat"
-          translation_key: hvac_mode
+        state:
+          hide_states:
+            - unavailable
+            - unknown
 set_humidity:
   target:
     entity:
@@ -91,7 +86,8 @@ set_fan_mode:
       required: true
       example: "low"
       selector:
-        text:
+        state:
+          attribute: fan_mode
 
 set_hvac_mode:
   target:
@@ -115,7 +111,8 @@ set_swing_mode:
       required: true
       example: "on"
       selector:
-        text:
+        state:
+          attribute: swing_mode
 
 set_swing_horizontal_mode:
   target:
@@ -128,7 +125,8 @@ set_swing_horizontal_mode:
       required: true
       example: "on"
       selector:
-        text:
+        state:
+          attribute: swing_horizontal_mode
 
 turn_on:
   target:

homeassistant/components/climate/strings.json

@@ -2,8 +2,13 @@
   "common": {
     "condition_behavior_description": "How the state should match on the targeted climate-control devices.",
     "condition_behavior_name": "Behavior",
+    "condition_threshold_description": "What to test for and threshold values.",
+    "condition_threshold_name": "Threshold configuration",
     "trigger_behavior_description": "The behavior of the targeted climates to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "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"
   },
   "conditions": {
     "is_cooling": {
@@ -55,6 +60,34 @@
         }
       },
       "name": "Climate-control device is on"
+    },
+    "target_humidity": {
+      "description": "Tests the humidity setpoint of one or more climate-control devices.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::climate::common::condition_behavior_description%]",
+          "name": "[%key:component::climate::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::climate::common::condition_threshold_description%]",
+          "name": "[%key:component::climate::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Climate-control device target humidity"
+    },
+    "target_temperature": {
+      "description": "Tests the temperature setpoint of one or more climate-control devices.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::climate::common::condition_behavior_description%]",
+          "name": "[%key:component::climate::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "description": "[%key:component::climate::common::condition_threshold_description%]",
+          "name": "[%key:component::climate::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Climate-control device target temperature"
     }
   },
   "device_automation": {
@@ -241,102 +274,77 @@
         "any": "Any"
       }
     },
-    "hvac_mode": {
-      "options": {
-        "auto": "[%key:common::state::auto%]",
-        "cool": "Cool",
-        "dry": "Dry",
-        "fan_only": "Fan only",
-        "heat": "Heat",
-        "heat_cool": "Heat/cool",
-        "off": "[%key:common::state::off%]"
-      }
-    },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
         "first": "First",
         "last": "Last"
       }
-    },
-    "trigger_threshold_type": {
-      "options": {
-        "above": "Above a value",
-        "below": "Below a value",
-        "between": "In a range",
-        "outside": "Outside a range"
-      }
     }
   },
   "services": {
     "set_fan_mode": {
-      "description": "Sets fan operation mode.",
+      "description": "Sets the fan mode of a climate-control device.",
       "fields": {
         "fan_mode": {
           "description": "Fan operation mode.",
           "name": "Fan mode"
         }
       },
-      "name": "Set fan mode"
+      "name": "Set climate-control device fan mode"
     },
     "set_humidity": {
-      "description": "Sets target humidity.",
+      "description": "Sets the target humidity of a climate-control device.",
       "fields": {
         "humidity": {
           "description": "Target humidity.",
           "name": "Humidity"
         }
       },
-      "name": "Set target humidity"
+      "name": "Set climate-control device target humidity"
     },
     "set_hvac_mode": {
-      "description": "Sets HVAC operation mode.",
+      "description": "Sets the HVAC mode of a climate-control device.",
       "fields": {
         "hvac_mode": {
           "description": "HVAC operation mode.",
           "name": "HVAC mode"
         }
       },
-      "name": "Set HVAC mode"
+      "name": "Set climate-control device HVAC mode"
     },
     "set_preset_mode": {
-      "description": "Sets preset mode.",
+      "description": "Sets the preset mode of a climate-control device.",
       "fields": {
         "preset_mode": {
           "description": "Preset mode.",
           "name": "Preset mode"
         }
       },
-      "name": "Set preset mode"
+      "name": "Set climate-control device preset mode"
     },
     "set_swing_horizontal_mode": {
-      "description": "Sets horizontal swing operation mode.",
+      "description": "Sets the horizontal swing mode of a climate-control device.",
       "fields": {
         "swing_horizontal_mode": {
           "description": "Horizontal swing operation mode.",
           "name": "Horizontal swing mode"
         }
       },
-      "name": "Set horizontal swing mode"
+      "name": "Set climate-control device horizontal swing mode"
     },
     "set_swing_mode": {
-      "description": "Sets swing operation mode.",
+      "description": "Sets the swing mode of a climate-control device.",
       "fields": {
         "swing_mode": {
           "description": "Swing operation mode.",
           "name": "Swing mode"
         }
       },
-      "name": "Set swing mode"
+      "name": "Set climate-control device swing mode"
     },
     "set_temperature": {
-      "description": "Sets the temperature setpoint.",
+      "description": "Sets the target temperature of a climate-control device.",
       "fields": {
         "hvac_mode": {
           "description": "HVAC operation mode.",
@@ -355,19 +363,19 @@
           "name": "Target temperature"
         }
       },
-      "name": "Set target temperature"
+      "name": "Set climate-control device target temperature"
     },
     "toggle": {
-      "description": "Toggles climate device, from on to off, or off to on.",
-      "name": "[%key:common::action::toggle%]"
+      "description": "Toggles a climate-control device on/off.",
+      "name": "Toggle climate-control device"
     },
     "turn_off": {
-      "description": "Turns climate device off.",
-      "name": "[%key:common::action::turn_off%]"
+      "description": "Turns off a climate-control device.",
+      "name": "Turn off climate-control device"
     },
     "turn_on": {
-      "description": "Turns climate device on.",
-      "name": "[%key:common::action::turn_on%]"
+      "description": "Turns on a climate-control device.",
+      "name": "Turn on climate-control device"
     }
   },
   "title": "Climate",
@@ -419,13 +427,9 @@
     "target_humidity_changed": {
       "description": "Triggers after the humidity setpoint of one or more climate-control devices changes.",
       "fields": {
-        "above": {
-          "description": "Trigger when the target humidity is above this value.",
-          "name": "Above"
-        },
-        "below": {
-          "description": "Trigger when the target humidity is below this value.",
-          "name": "Below"
+        "threshold": {
+          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
+          "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
       "name": "Climate-control device target humidity changed"
@@ -437,17 +441,9 @@
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "Lower threshold limit.",
-          "name": "Lower threshold"
-        },
-        "threshold_type": {
-          "description": "Type of threshold crossing to trigger on.",
-          "name": "Threshold type"
-        },
-        "upper_limit": {
-          "description": "Upper threshold limit.",
-          "name": "Upper threshold"
+        "threshold": {
+          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
+          "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
       "name": "Climate-control device target humidity crossed threshold"
@@ -455,13 +451,9 @@
     "target_temperature_changed": {
       "description": "Triggers after the temperature setpoint of one or more climate-control devices changes.",
       "fields": {
-        "above": {
-          "description": "Trigger when the target temperature is above this value.",
-          "name": "Above"
-        },
-        "below": {
-          "description": "Trigger when the target temperature is below this value.",
-          "name": "Below"
+        "threshold": {
+          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
+          "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
       "name": "Climate-control device target temperature changed"
@@ -473,17 +465,9 @@
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "Lower threshold limit.",
-          "name": "Lower threshold"
-        },
-        "threshold_type": {
-          "description": "Type of threshold crossing to trigger on.",
-          "name": "Threshold type"
-        },
-        "upper_limit": {
-          "description": "Upper threshold limit.",
-          "name": "Upper threshold"
+        "threshold": {
+          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
+          "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
       "name": "Climate-control device target temperature crossed threshold"

homeassistant/components/climate/trigger.py

@@ -2,12 +2,15 @@
 
 import voluptuous as vol
 
-from homeassistant.const import ATTR_TEMPERATURE, CONF_OPTIONS
-from homeassistant.core import HomeAssistant
+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.trigger import (
     ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST,
+    EntityNumericalStateChangedTriggerWithUnitBase,
+    EntityNumericalStateCrossedThresholdTriggerWithUnitBase,
+    EntityNumericalStateTriggerWithUnitBase,
     EntityTargetStateTriggerBase,
     Trigger,
     TriggerConfig,
@@ -16,6 +19,7 @@ from homeassistant.helpers.trigger import (
     make_entity_target_state_trigger,
     make_entity_transition_trigger,
 )
+from homeassistant.util.unit_conversion import TemperatureConverter
 
 from .const import ATTR_HUMIDITY, ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
 
@@ -44,6 +48,33 @@ class HVACModeChangedTrigger(EntityTargetStateTriggerBase):
         self._to_states = set(self._options[CONF_HVAC_MODE])
 
 
+class _ClimateTargetTemperatureTriggerMixin(EntityNumericalStateTriggerWithUnitBase):
+    """Mixin for climate target temperature triggers with unit conversion."""
+
+    _base_unit = UnitOfTemperature.CELSIUS
+    _domain_specs = {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
+    _unit_converter = TemperatureConverter
+
+    def _get_entity_unit(self, state: State) -> str | None:
+        """Get the temperature unit of a climate entity from its state."""
+        # Climate entities convert temperatures to the system unit via show_temp
+        return self._hass.config.units.temperature_unit
+
+
+class ClimateTargetTemperatureChangedTrigger(
+    _ClimateTargetTemperatureTriggerMixin,
+    EntityNumericalStateChangedTriggerWithUnitBase,
+):
+    """Trigger for climate target temperature value changes."""
+
+
+class ClimateTargetTemperatureCrossedThresholdTrigger(
+    _ClimateTargetTemperatureTriggerMixin,
+    EntityNumericalStateCrossedThresholdTriggerWithUnitBase,
+):
+    """Trigger for climate target temperature value crossing a threshold."""
+
+
 TRIGGERS: dict[str, type[Trigger]] = {
     "hvac_mode_changed": HVACModeChangedTrigger,
     "started_cooling": make_entity_target_state_trigger(
@@ -53,17 +84,15 @@ 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: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        valid_unit="%",
     ),
     "target_humidity_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)}
-    ),
-    "target_temperature_changed": make_entity_numerical_state_changed_trigger(
-        {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
-    ),
-    "target_temperature_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
+        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        valid_unit="%",
     ),
+    "target_temperature_changed": ClimateTargetTemperatureChangedTrigger,
+    "target_temperature_crossed_threshold": ClimateTargetTemperatureCrossedThresholdTrigger,
     "turned_off": make_entity_target_state_trigger(DOMAIN, HVACMode.OFF),
     "turned_on": make_entity_transition_trigger(
         DOMAIN,

homeassistant/components/climate/triggers.yaml

@@ -14,36 +14,31 @@
             - last
             - any
 
-.number_or_entity: &number_or_entity
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                domain:
-                  - input_number
-                  - number
-                  - sensor
-      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
 
-.trigger_threshold_type: &trigger_threshold_type
-  required: true
-  default: above
-  selector:
-    select:
-      options:
-        - above
-        - below
-        - between
-        - outside
-      translation_key: trigger_threshold_type
+.humidity_threshold_number: &humidity_threshold_number
+  min: 0
+  max: 100
+  mode: box
+  unit_of_measurement: "%"
+
+.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
 
 started_cooling: *trigger_common
 started_drying: *trigger_common
@@ -69,27 +64,49 @@ hvac_mode_changed:
 target_humidity_changed:
   target: *trigger_climate_target
   fields:
-    above: *number_or_entity
-    below: *number_or_entity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *humidity_threshold_entity
+          mode: changed
+          number: *humidity_threshold_number
 
 target_humidity_crossed_threshold:
   target: *trigger_climate_target
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity
-    upper_limit: *number_or_entity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *humidity_threshold_entity
+          mode: crossed
+          number: *humidity_threshold_number
 
 target_temperature_changed:
   target: *trigger_climate_target
   fields:
-    above: *number_or_entity
-    below: *number_or_entity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *temperature_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *temperature_units
 
 target_temperature_crossed_threshold:
   target: *trigger_climate_target
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity
-    upper_limit: *number_or_entity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *temperature_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *temperature_units

homeassistant/components/cloud/backup.py

@@ -138,6 +138,7 @@ class CloudBackupAgent(BackupAgent):
                     base64md5hash=base64md5hash,
                     metadata=metadata,
                     size=size,
+                    on_progress=on_progress,
                 )
                 break
             except CloudApiNonRetryableError as err:

homeassistant/components/cloud/manifest.json

@@ -13,6 +13,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==2.0.0", "openai==2.21.0"],
+  "requirements": ["hass-nabucasa==2.2.0", "openai==2.21.0"],
   "single_config_entry": true
 }

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/cloudflare_r2/backup.py

@@ -144,7 +144,7 @@ class R2BackupAgent(BackupAgent):
             if backup.size < MULTIPART_MIN_PART_SIZE_BYTES:
                 await self._upload_simple(tar_filename, open_stream)
             else:
-                await self._upload_multipart(tar_filename, open_stream)
+                await self._upload_multipart(tar_filename, open_stream, on_progress)
 
             # Upload the metadata file
             metadata_content = json.dumps(backup.as_dict())
@@ -185,11 +185,13 @@ class R2BackupAgent(BackupAgent):
         self,
         tar_filename: str,
         open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-    ):
+        on_progress: OnProgressCallback,
+    ) -> None:
         """Upload a large file using multipart upload.
 
         :param tar_filename: The target filename for the backup.
         :param open_stream: A function returning an async iterator that yields bytes.
+        :param on_progress: A callback to report the number of uploaded bytes.
         """
         _LOGGER.debug("Starting multipart upload for %s", tar_filename)
         key = self._with_prefix(tar_filename)
@@ -203,6 +205,7 @@ class R2BackupAgent(BackupAgent):
             part_number = 1
             buffer = bytearray()  # bytes buffer to store the data
             offset = 0  # start index of unread data inside buffer
+            bytes_uploaded = 0
 
             stream = await open_stream()
             async for chunk in stream:
@@ -231,6 +234,8 @@ class R2BackupAgent(BackupAgent):
                             Body=part_data.tobytes(),
                         )
                         parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
+                        bytes_uploaded += len(part_data)
+                        on_progress(bytes_uploaded=bytes_uploaded)
                         part_number += 1
                 finally:
                     view.release()
@@ -259,6 +264,8 @@ class R2BackupAgent(BackupAgent):
                     Body=remaining_data.tobytes(),
                 )
                 parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
+                bytes_uploaded += len(remaining_data)
+                on_progress(bytes_uploaded=bytes_uploaded)
 
             await cast(Any, self._client).complete_multipart_upload(
                 Bucket=self._bucket,

homeassistant/components/conversation/manifest.json

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

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/icons.json

@@ -12,5 +12,22 @@
     "set_value": {
       "service": "mdi:counter"
     }
+  },
+  "triggers": {
+    "decremented": {
+      "trigger": "mdi:numeric-negative-1"
+    },
+    "incremented": {
+      "trigger": "mdi:numeric-positive-1"
+    },
+    "maximum_reached": {
+      "trigger": "mdi:sort-numeric-ascending-variant"
+    },
+    "minimum_reached": {
+      "trigger": "mdi:sort-numeric-descending-variant"
+    },
+    "reset": {
+      "trigger": "mdi:refresh"
+    }
   }
 }

homeassistant/components/counter/strings.json

@@ -1,4 +1,8 @@
 {
+  "common": {
+    "trigger_behavior_description": "The behavior of the targeted counters to trigger on.",
+    "trigger_behavior_name": "Behavior"
+  },
   "entity_component": {
     "_": {
       "name": "[%key:component::counter::title%]",
@@ -25,29 +29,78 @@
       }
     }
   },
+  "selector": {
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "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"
+  "title": "Counter",
+  "triggers": {
+    "decremented": {
+      "description": "Triggers after one or more counters decrement.",
+      "name": "Counter decremented"
+    },
+    "incremented": {
+      "description": "Triggers after one or more counters increment.",
+      "name": "Counter incremented"
+    },
+    "maximum_reached": {
+      "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%]"
+        }
+      },
+      "name": "Counter reached maximum"
+    },
+    "minimum_reached": {
+      "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%]"
+        }
+      },
+      "name": "Counter reached minimum"
+    },
+    "reset": {
+      "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%]"
+        }
+      },
+      "name": "Counter reset"
+    }
+  }
 }

homeassistant/components/counter/trigger.py

@@ -0,0 +1,113 @@
+"""Provides triggers for counters."""
+
+from homeassistant.const import (
+    CONF_MAXIMUM,
+    CONF_MINIMUM,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+)
+from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.trigger import (
+    ENTITY_STATE_TRIGGER_SCHEMA,
+    EntityTriggerBase,
+    Trigger,
+)
+
+from . import CONF_INITIAL, DOMAIN
+
+
+def _is_integer_state(state: State) -> bool:
+    """Return True if the state's value can be interpreted as an integer."""
+    try:
+        int(state.state)
+    except TypeError, ValueError:
+        return False
+    return True
+
+
+class CounterBaseIntegerTrigger(EntityTriggerBase):
+    """Base trigger for valid counter integer states."""
+
+    _domain_specs = {DOMAIN: DomainSpec()}
+    _schema = ENTITY_STATE_TRIGGER_SCHEMA
+
+    def is_valid_state(self, state: State) -> bool:
+        """Check if the new state is valid."""
+        return _is_integer_state(state)
+
+
+class CounterDecrementedTrigger(CounterBaseIntegerTrigger):
+    """Trigger for when a counter is decremented."""
+
+    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
+        """Check if the origin state is valid and the state has changed."""
+        if from_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
+            return False
+        return int(from_state.state) > int(to_state.state)
+
+
+class CounterIncrementedTrigger(CounterBaseIntegerTrigger):
+    """Trigger for when a counter is incremented."""
+
+    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
+        """Check if the origin state is valid and the state has changed."""
+        if from_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
+            return False
+        return int(from_state.state) < int(to_state.state)
+
+
+class CounterValueBaseTrigger(EntityTriggerBase):
+    """Base trigger for counter value changes."""
+
+    _domain_specs = {DOMAIN: DomainSpec()}
+
+    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
+        """Check if the origin state is valid and the state has changed."""
+        if from_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
+            return False
+        return from_state.state != to_state.state
+
+
+class CounterMaxReachedTrigger(CounterValueBaseTrigger):
+    """Trigger for when a counter reaches its maximum value."""
+
+    def is_valid_state(self, state: State) -> bool:
+        """Check if the new state matches the expected state(s)."""
+        if (max_value := state.attributes.get(CONF_MAXIMUM)) is None:
+            return False
+        return state.state == str(max_value)
+
+
+class CounterMinReachedTrigger(CounterValueBaseTrigger):
+    """Trigger for when a counter reaches its minimum value."""
+
+    def is_valid_state(self, state: State) -> bool:
+        """Check if the new state matches the expected state(s)."""
+        if (min_value := state.attributes.get(CONF_MINIMUM)) is None:
+            return False
+        return state.state == str(min_value)
+
+
+class CounterResetTrigger(CounterValueBaseTrigger):
+    """Trigger for reset of counter entities."""
+
+    def is_valid_state(self, state: State) -> bool:
+        """Check if the new state matches the expected state(s)."""
+        if (init_state := state.attributes.get(CONF_INITIAL)) is None:
+            return False
+        return state.state == str(init_state)
+
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    "decremented": CounterDecrementedTrigger,
+    "incremented": CounterIncrementedTrigger,
+    "maximum_reached": CounterMaxReachedTrigger,
+    "minimum_reached": CounterMinReachedTrigger,
+    "reset": CounterResetTrigger,
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for counters."""
+    return TRIGGERS

homeassistant/components/counter/triggers.yaml

@@ -1,18 +1,27 @@
 .trigger_common: &trigger_common
   target:
     entity:
-      domain: input_boolean
+      domain: counter
   fields:
     behavior:
       required: true
       default: any
       selector:
         select:
+          translation_key: trigger_behavior
           options:
             - first
             - last
             - any
-          translation_key: trigger_behavior
 
-turned_off: *trigger_common
-turned_on: *trigger_common
+incremented:
+  target:
+    entity:
+      domain: counter
+decremented:
+  target:
+    entity:
+      domain: counter
+maximum_reached: *trigger_common
+minimum_reached: *trigger_common
+reset: *trigger_common

homeassistant/components/cover/condition.py

@@ -1,7 +1,7 @@
 """Provides conditions for covers."""
 
 from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant, State, split_entity_id
+from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.condition import Condition, EntityConditionBase
 
 from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
@@ -13,7 +13,7 @@ class CoverConditionBase(EntityConditionBase[CoverDomainSpec]):
 
     def is_valid_state(self, entity_state: State) -> bool:
         """Check if the state matches the expected cover state."""
-        domain_spec = self._domain_specs[split_entity_id(entity_state.entity_id)[0]]
+        domain_spec = self._domain_specs[entity_state.domain]
         if domain_spec.value_source is not None:
             return (
                 entity_state.attributes.get(domain_spec.value_source)

homeassistant/components/cover/strings.json

@@ -208,19 +208,19 @@
   "services": {
     "close_cover": {
       "description": "Closes a cover.",
-      "name": "[%key:common::action::close%]"
+      "name": "Close cover"
     },
     "close_cover_tilt": {
       "description": "Tilts a cover to close.",
-      "name": "Close tilt"
+      "name": "Close cover tilt"
     },
     "open_cover": {
       "description": "Opens a cover.",
-      "name": "[%key:common::action::open%]"
+      "name": "Open cover"
     },
     "open_cover_tilt": {
       "description": "Tilts a cover open.",
-      "name": "Open tilt"
+      "name": "Open cover tilt"
     },
     "set_cover_position": {
       "description": "Moves a cover to a specific position.",
@@ -230,7 +230,7 @@
           "name": "Position"
         }
       },
-      "name": "Set position"
+      "name": "Set cover position"
     },
     "set_cover_tilt_position": {
       "description": "Moves a cover tilt to a specific position.",
@@ -240,23 +240,23 @@
           "name": "Tilt position"
         }
       },
-      "name": "Set tilt position"
+      "name": "Set cover tilt position"
     },
     "stop_cover": {
-      "description": "Stops the cover movement.",
-      "name": "[%key:common::action::stop%]"
+      "description": "Stops a cover's movement.",
+      "name": "Stop cover"
     },
     "stop_cover_tilt": {
       "description": "Stops a tilting cover movement.",
-      "name": "Stop tilt"
+      "name": "Stop cover tilt"
     },
     "toggle": {
       "description": "Toggles a cover open/closed.",
-      "name": "[%key:common::action::toggle%]"
+      "name": "Toggle cover"
     },
     "toggle_cover_tilt": {
       "description": "Toggles a cover tilt open/closed.",
-      "name": "Toggle tilt"
+      "name": "Toggle cover tilt"
     }
   },
   "title": "Cover",

homeassistant/components/cover/trigger.py

@@ -1,7 +1,7 @@
 """Provides triggers for covers."""
 
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, STATE_UNKNOWN
-from homeassistant.core import HomeAssistant, State, split_entity_id
+from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.trigger import EntityTriggerBase, Trigger
 
 from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
@@ -13,14 +13,14 @@ class CoverTriggerBase(EntityTriggerBase[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[split_entity_id(state.entity_id)[0]]
+        domain_spec = self._domain_specs[state.domain]
         if domain_spec.value_source is not None:
             return state.attributes.get(domain_spec.value_source)
         return state.state
 
     def is_valid_state(self, state: State) -> bool:
         """Check if the state matches the target cover state."""
-        domain_spec = self._domain_specs[split_entity_id(state.entity_id)[0]]
+        domain_spec = self._domain_specs[state.domain]
         return self._get_value(state) == domain_spec.target_value
 
     def is_valid_transition(self, from_state: State, to_state: State) -> bool:

homeassistant/components/decora_wifi/__init__.py

@@ -1 +1,91 @@
-"""The decora_wifi component."""
+"""The Leviton Decora Wi-Fi integration."""
+
+from __future__ import annotations
+
+from contextlib import suppress
+from dataclasses import dataclass
+
+from decora_wifi import DecoraWiFiSession
+from decora_wifi.models.iot_switch import IotSwitch
+from decora_wifi.models.person import Person
+from decora_wifi.models.residence import Residence
+from decora_wifi.models.residential_account import ResidentialAccount
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    CONF_PASSWORD,
+    CONF_USERNAME,
+    EVENT_HOMEASSISTANT_STOP,
+    Platform,
+)
+from homeassistant.core import Event, HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+
+PLATFORMS = [Platform.LIGHT]
+
+type DecoraWifiConfigEntry = ConfigEntry[DecoraWifiData]
+
+
+@dataclass
+class DecoraWifiData:
+    """Runtime data for the Decora Wi-Fi integration."""
+
+    session: DecoraWiFiSession
+    switches: list[IotSwitch]
+
+
+def _login_and_get_switches(email: str, password: str) -> DecoraWifiData:
+    """Log in and fetch all IoT switches. Runs in executor."""
+    session = DecoraWiFiSession()
+    success = session.login(email, password)
+
+    if success is None:
+        raise ConfigEntryAuthFailed("Invalid credentials for myLeviton account")
+
+    perms = session.user.get_residential_permissions()
+    all_switches: list[IotSwitch] = []
+    for permission in perms:
+        if permission.residentialAccountId is not None:
+            acct = ResidentialAccount(session, permission.residentialAccountId)
+            all_switches.extend(
+                switch
+                for residence in acct.get_residences()
+                for switch in residence.get_iot_switches()
+            )
+        elif permission.residenceId is not None:
+            residence = Residence(session, permission.residenceId)
+            all_switches.extend(residence.get_iot_switches())
+
+    return DecoraWifiData(session, all_switches)
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: DecoraWifiConfigEntry) -> bool:
+    """Set up Leviton Decora Wi-Fi from a config entry."""
+    try:
+        data = await hass.async_add_executor_job(
+            _login_and_get_switches,
+            entry.data[CONF_USERNAME],
+            entry.data[CONF_PASSWORD],
+        )
+    except ValueError as err:
+        raise ConfigEntryNotReady(
+            "Failed to communicate with myLeviton service"
+        ) from err
+
+    entry.runtime_data = data
+
+    async def _logout(_: Event | None = None) -> None:
+        with suppress(ValueError):
+            await hass.async_add_executor_job(Person.logout, data.session)
+
+    entry.async_on_unload(hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _logout))
+    entry.async_on_unload(_logout)
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: DecoraWifiConfigEntry) -> bool:
+    """Unload a Decora Wi-Fi config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/decora_wifi/config_flow.py

@@ -0,0 +1,104 @@
+"""Config flow for Leviton Decora Wi-Fi integration."""
+
+from __future__ import annotations
+
+import contextlib
+from typing import Any
+
+from decora_wifi import DecoraWiFiSession
+from decora_wifi.models.person import Person
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.helpers.selector import (
+    TextSelector,
+    TextSelectorConfig,
+    TextSelectorType,
+)
+
+from .const import DOMAIN
+
+USER_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_USERNAME): TextSelector(),
+        vol.Required(CONF_PASSWORD): TextSelector(
+            TextSelectorConfig(type=TextSelectorType.PASSWORD)
+        ),
+    }
+)
+
+
+def _try_login(email: str, password: str) -> str | None:
+    """Attempt to log in, return the user ID, or None on auth failure."""
+    session = DecoraWiFiSession()
+    if session.login(email, password) is None:
+        return None
+    user_id = str(session.user._id)  # noqa: SLF001
+    with contextlib.suppress(ValueError):
+        Person.logout(session)
+    return user_id
+
+
+class DecoraWifiConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Leviton Decora Wi-Fi config flow."""
+
+    VERSION = 1
+    MINOR_VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            try:
+                user_id = await self.hass.async_add_executor_job(
+                    _try_login,
+                    user_input[CONF_USERNAME],
+                    user_input[CONF_PASSWORD],
+                )
+            except ValueError:
+                errors["base"] = "cannot_connect"
+            else:
+                if user_id is None:
+                    errors["base"] = "invalid_auth"
+                else:
+                    await self.async_set_unique_id(user_id)
+                    self._abort_if_unique_id_configured()
+
+                    return self.async_create_entry(
+                        title=user_input[CONF_USERNAME],
+                        data=user_input,
+                    )
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=self.add_suggested_values_to_schema(USER_SCHEMA, user_input),
+            errors=errors,
+        )
+
+    async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
+        """Handle import from YAML configuration."""
+        self._async_abort_entries_match({CONF_USERNAME: import_data[CONF_USERNAME]})
+
+        try:
+            user_id = await self.hass.async_add_executor_job(
+                _try_login,
+                import_data[CONF_USERNAME],
+                import_data[CONF_PASSWORD],
+            )
+        except ValueError:
+            return self.async_abort(reason="cannot_connect")
+
+        if user_id is None:
+            return self.async_abort(reason="invalid_auth")
+
+        await self.async_set_unique_id(user_id)
+        self._abort_if_unique_id_configured()
+
+        return self.async_create_entry(
+            title=import_data[CONF_USERNAME],
+            data=import_data,
+        )

homeassistant/components/decora_wifi/const.py

@@ -0,0 +1,4 @@
+"""Constants for the Leviton Decora Wi-Fi integration."""
+
+DOMAIN = "decora_wifi"
+INTEGRATION_TITLE = "Leviton Decora Wi-Fi"

homeassistant/components/decora_wifi/light.py

@@ -6,13 +6,8 @@ from datetime import timedelta
 import logging
 from typing import Any
 
-from decora_wifi import DecoraWiFiSession
-from decora_wifi.models.person import Person
-from decora_wifi.models.residence import Residence
-from decora_wifi.models.residential_account import ResidentialAccount
 import voluptuous as vol
 
-from homeassistant.components import persistent_notification
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
     ATTR_TRANSITION,
@@ -21,13 +16,21 @@ from homeassistant.components.light import (
     LightEntity,
     LightEntityFeature,
 )
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, EVENT_HOMEASSISTANT_STOP
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.config_entries import SOURCE_IMPORT
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.helpers import config_validation as cv, issue_registry as ir
+from homeassistant.helpers.entity_platform import (
+    AddConfigEntryEntitiesCallback,
+    AddEntitiesCallback,
+)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
 
+from . import DecoraWifiConfigEntry
+from .const import DOMAIN, INTEGRATION_TITLE
+
 _LOGGER = logging.getLogger(__name__)
 
 # Validation of the user's configuration
@@ -35,63 +38,65 @@ PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
     {vol.Required(CONF_USERNAME): cv.string, vol.Required(CONF_PASSWORD): cv.string}
 )
 
-NOTIFICATION_ID = "leviton_notification"
-NOTIFICATION_TITLE = "myLeviton Decora Setup"
 
-
-def setup_platform(
+async def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
-    add_entities: AddEntitiesCallback,
+    async_add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Decora WiFi platform."""
+    """Set up the Decora WiFi platform from YAML (deprecated)."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN,
+        context={"source": SOURCE_IMPORT},
+        data=config,
+    )
 
-    email = config[CONF_USERNAME]
-    password = config[CONF_PASSWORD]
-    session = DecoraWiFiSession()
+    if (
+        result.get("type") is FlowResultType.ABORT
+        and (reason := result.get("reason")) != "already_configured"
+    ):
+        ir.async_create_issue(
+            hass,
+            DOMAIN,
+            f"deprecated_yaml_import_issue_{reason}",
+            breaks_in_ha_version="2026.10.0",
+            is_fixable=False,
+            issue_domain=DOMAIN,
+            severity=ir.IssueSeverity.WARNING,
+            translation_key=f"deprecated_yaml_import_issue_{reason}",
+            translation_placeholders={
+                "domain": DOMAIN,
+                "integration_title": INTEGRATION_TITLE,
+            },
+        )
+        return
 
-    try:
-        success = session.login(email, password)
+    ir.async_create_issue(
+        hass,
+        HOMEASSISTANT_DOMAIN,
+        f"deprecated_yaml_{DOMAIN}",
+        breaks_in_ha_version="2026.10.0",
+        is_fixable=False,
+        issue_domain=DOMAIN,
+        severity=ir.IssueSeverity.WARNING,
+        translation_key="deprecated_yaml",
+        translation_placeholders={
+            "domain": DOMAIN,
+            "integration_title": INTEGRATION_TITLE,
+        },
+    )
 
-        # If login failed, notify user.
-        if success is None:
-            msg = "Failed to log into myLeviton Services. Check credentials."
-            _LOGGER.error(msg)
-            persistent_notification.create(
-                hass, msg, title=NOTIFICATION_TITLE, notification_id=NOTIFICATION_ID
-            )
-            return
 
-        # Gather all the available devices...
-        perms = session.user.get_residential_permissions()
-        all_switches: list = []
-        for permission in perms:
-            if permission.residentialAccountId is not None:
-                acct = ResidentialAccount(session, permission.residentialAccountId)
-                all_switches.extend(
-                    switch
-                    for residence in acct.get_residences()
-                    for switch in residence.get_iot_switches()
-                )
-            elif permission.residenceId is not None:
-                residence = Residence(session, permission.residenceId)
-                all_switches.extend(residence.get_iot_switches())
-
-        add_entities(DecoraWifiLight(sw) for sw in all_switches)
-    except ValueError:
-        _LOGGER.error("Failed to communicate with myLeviton Service")
-
-    # Listen for the stop event and log out.
-    def logout(event):
-        """Log out..."""
-        try:
-            if session is not None:
-                Person.logout(session)
-        except ValueError:
-            _LOGGER.error("Failed to log out of myLeviton Service")
-
-    hass.bus.listen(EVENT_HOMEASSISTANT_STOP, logout)
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: DecoraWifiConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up Decora WiFi lights from a config entry."""
+    async_add_entities(
+        DecoraWifiLight(switch) for switch in entry.runtime_data.switches
+    )
 
 
 class DecoraWifiLight(LightEntity):

homeassistant/components/decora_wifi/manifest.json

@@ -2,7 +2,9 @@
   "domain": "decora_wifi",
   "name": "Leviton Decora Wi-Fi",
   "codeowners": [],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/decora_wifi",
+  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["decora_wifi"],
   "quality_scale": "legacy",

homeassistant/components/decora_wifi/strings.json

@@ -0,0 +1,35 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]",
+          "username": "[%key:common::config_flow::data::username%]"
+        },
+        "data_description": {
+          "password": "The password of your myLeviton account.",
+          "username": "The email address of your myLeviton account."
+        }
+      }
+    }
+  },
+  "issues": {
+    "deprecated_yaml_import_issue_cannot_connect": {
+      "description": "Importing the YAML configuration for {integration_title} failed because the myLeviton service could not be reached. Please check your network connectivity and then remove the `decora_wifi` YAML configuration from your `configuration.yaml` file and set up the integration again using the UI.",
+      "title": "The {integration_title} YAML configuration import failed"
+    },
+    "deprecated_yaml_import_issue_invalid_auth": {
+      "description": "Importing the YAML configuration for {integration_title} failed because the provided credentials are invalid. Please remove the `decora_wifi` YAML configuration from your `configuration.yaml` file and set up the integration again using the UI with correct credentials.",
+      "title": "The {integration_title} YAML configuration import failed"
+    }
+  }
+}

homeassistant/components/derivative/strings.json

@@ -61,7 +61,7 @@
   "services": {
     "reload": {
       "description": "Reloads derivative sensors from the YAML-configuration.",
-      "name": "[%key:common::action::reload%]"
+      "name": "Reload derivative sensors"
     }
   },
   "title": "Derivative sensor"

homeassistant/components/device_tracker/strings.json

@@ -120,7 +120,7 @@
           "name": "MAC address"
         }
       },
-      "name": "See"
+      "name": "See device tracker"
     }
   },
   "title": "Device tracker",

homeassistant/components/diagnostics/util.py

@@ -48,7 +48,12 @@ def async_redact_data[_T](data: _T, to_redact: Iterable[Any]) -> _T:
 
 
 def _entity_entry_filter(a: attr.Attribute, _: Any) -> bool:
-    return a.name not in ("_cache", "compat_aliases", "compat_name")
+    return a.name not in (
+        "_cache",
+        "compat_aliases",
+        "compat_name",
+        "original_name_unprefixed",
+    )
 
 
 @callback

homeassistant/components/ecovacs/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["sleekxmppfs", "sucks", "deebot_client"],
-  "requirements": ["py-sucks==0.9.11", "deebot-client==18.0.0"]
+  "requirements": ["py-sucks==0.9.11", "deebot-client==18.1.0"]
 }

homeassistant/components/energy/data.py

@@ -9,7 +9,7 @@ from typing import Any, Literal, NotRequired, TypedDict
 
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant, callback, valid_entity_id
 from homeassistant.helpers import config_validation as cv, singleton, storage
 
 from .const import DOMAIN
@@ -244,6 +244,38 @@ class EnergyPreferencesUpdate(EnergyPreferences, total=False):
     """all types optional."""
 
 
+def _reject_price_for_external_stat(
+    *,
+    stat_key: str,
+    entity_price_key: str = "entity_energy_price",
+    number_price_key: str = "number_energy_price",
+    cost_stat_key: str = "stat_cost",
+) -> Callable[[dict[str, Any]], dict[str, Any]]:
+    """Return a validator that rejects entity/number price for external statistics.
+
+    Only rejects when the cost/compensation stat is not already set, since
+    price fields are ignored when a cost stat is provided.
+    """
+
+    def validate(val: dict[str, Any]) -> dict[str, Any]:
+        stat_id = val.get(stat_key)
+        if stat_id is not None and not valid_entity_id(stat_id):
+            if val.get(cost_stat_key) is not None:
+                # Cost stat is already set; price fields are ignored, so allow.
+                return val
+            if (
+                val.get(entity_price_key) is not None
+                or val.get(number_price_key) is not None
+            ):
+                raise vol.Invalid(
+                    "Entity or number price is not supported for external"
+                    f" statistics. Use {cost_stat_key} instead"
+                )
+        return val
+
+    return validate
+
+
 def _flow_from_ensure_single_price(
     val: FlowFromGridSourceType,
 ) -> FlowFromGridSourceType:
@@ -268,19 +300,25 @@ FLOW_FROM_GRID_SOURCE_SCHEMA = vol.All(
             vol.Optional("number_energy_price"): vol.Any(vol.Coerce(float), None),
         }
     ),
+    _reject_price_for_external_stat(stat_key="stat_energy_from"),
     _flow_from_ensure_single_price,
 )
 
 
-FLOW_TO_GRID_SOURCE_SCHEMA = vol.Schema(
-    {
-        vol.Required("stat_energy_to"): str,
-        vol.Optional("stat_compensation"): vol.Any(str, None),
-        # entity_energy_to was removed in HA Core 2022.10
-        vol.Remove("entity_energy_to"): vol.Any(str, None),
-        vol.Optional("entity_energy_price"): vol.Any(str, None),
-        vol.Optional("number_energy_price"): vol.Any(vol.Coerce(float), None),
-    }
+FLOW_TO_GRID_SOURCE_SCHEMA = vol.All(
+    vol.Schema(
+        {
+            vol.Required("stat_energy_to"): str,
+            vol.Optional("stat_compensation"): vol.Any(str, None),
+            # entity_energy_to was removed in HA Core 2022.10
+            vol.Remove("entity_energy_to"): vol.Any(str, None),
+            vol.Optional("entity_energy_price"): vol.Any(str, None),
+            vol.Optional("number_energy_price"): vol.Any(vol.Coerce(float), None),
+        }
+    ),
+    _reject_price_for_external_stat(
+        stat_key="stat_energy_to", cost_stat_key="stat_compensation"
+    ),
 )
 
 
@@ -419,6 +457,13 @@ GRID_SOURCE_SCHEMA = vol.All(
             vol.Required("cost_adjustment_day"): vol.Coerce(float),
         }
     ),
+    _reject_price_for_external_stat(stat_key="stat_energy_from"),
+    _reject_price_for_external_stat(
+        stat_key="stat_energy_to",
+        entity_price_key="entity_energy_price_export",
+        number_price_key="number_energy_price_export",
+        cost_stat_key="stat_compensation",
+    ),
     _grid_ensure_single_price_import,
     _grid_ensure_single_price_export,
     _grid_ensure_at_least_one_stat,
@@ -442,27 +487,35 @@ BATTERY_SOURCE_SCHEMA = vol.Schema(
         vol.Optional("power_config"): POWER_CONFIG_SCHEMA,
     }
 )
-GAS_SOURCE_SCHEMA = vol.Schema(
-    {
-        vol.Required("type"): "gas",
-        vol.Required("stat_energy_from"): str,
-        vol.Optional("stat_rate"): str,
-        vol.Optional("stat_cost"): vol.Any(str, None),
-        # entity_energy_from was removed in HA Core 2022.10
-        vol.Remove("entity_energy_from"): vol.Any(str, None),
-        vol.Optional("entity_energy_price"): vol.Any(str, None),
-        vol.Optional("number_energy_price"): vol.Any(vol.Coerce(float), None),
-    }
+
+
+GAS_SOURCE_SCHEMA = vol.All(
+    vol.Schema(
+        {
+            vol.Required("type"): "gas",
+            vol.Required("stat_energy_from"): str,
+            vol.Optional("stat_rate"): str,
+            vol.Optional("stat_cost"): vol.Any(str, None),
+            # entity_energy_from was removed in HA Core 2022.10
+            vol.Remove("entity_energy_from"): vol.Any(str, None),
+            vol.Optional("entity_energy_price"): vol.Any(str, None),
+            vol.Optional("number_energy_price"): vol.Any(vol.Coerce(float), None),
+        }
+    ),
+    _reject_price_for_external_stat(stat_key="stat_energy_from"),
 )
-WATER_SOURCE_SCHEMA = vol.Schema(
-    {
-        vol.Required("type"): "water",
-        vol.Required("stat_energy_from"): str,
-        vol.Optional("stat_rate"): str,
-        vol.Optional("stat_cost"): vol.Any(str, None),
-        vol.Optional("entity_energy_price"): vol.Any(str, None),
-        vol.Optional("number_energy_price"): vol.Any(vol.Coerce(float), None),
-    }
+WATER_SOURCE_SCHEMA = vol.All(
+    vol.Schema(
+        {
+            vol.Required("type"): "water",
+            vol.Required("stat_energy_from"): str,
+            vol.Optional("stat_rate"): str,
+            vol.Optional("stat_cost"): vol.Any(str, None),
+            vol.Optional("entity_energy_price"): vol.Any(str, None),
+            vol.Optional("number_energy_price"): vol.Any(vol.Coerce(float), None),
+        }
+    ),
+    _reject_price_for_external_stat(stat_key="stat_energy_from"),
 )
 
 

homeassistant/components/esphome/config_flow.py

@@ -28,6 +28,7 @@ from homeassistant.config_entries import (
     SOURCE_REAUTH,
     SOURCE_RECONFIGURE,
     ConfigEntry,
+    ConfigEntryState,
     ConfigFlow,
     ConfigFlowResult,
     FlowType,
@@ -363,6 +364,11 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
             # Don't probe to verify the mac is correct since
             # the host matches (and port matches if provided).
             raise AbortFlow("already_configured")
+        # If the entry is loaded and the device is currently connected,
+        # don't update the host. This prevents transient mDNS announcements
+        # (e.g., during WiFi mesh roaming) from overwriting a working connection.
+        if entry.state is ConfigEntryState.LOADED and entry.runtime_data.available:
+            raise AbortFlow("already_configured")
         configured_psk: str | None = entry.data.get(CONF_NOISE_PSK)
         await self._fetch_device_info(host, port or configured_port, configured_psk)
         updates: dict[str, Any] = {}

homeassistant/components/esphome/ffmpeg_proxy.py

@@ -1,10 +1,12 @@
 """HTTP view that converts audio from a URL to a preferred format."""
 
 import asyncio
-from collections import defaultdict
+from collections import defaultdict, deque
+import contextlib
 from dataclasses import dataclass, field
 from http import HTTPStatus
 import logging
+import re
 import secrets
 from typing import Final
 
@@ -22,6 +24,12 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 
 _MAX_CONVERSIONS_PER_DEVICE: Final[int] = 2
+_MAX_STDERR_LINES: Final[int] = 64
+_PROC_WAIT_TIMEOUT: Final[int] = 5
+_STDERR_DRAIN_TIMEOUT: Final[int] = 1
+_SENSITIVE_QUERY_PARAMS: Final[re.Pattern[str]] = re.compile(
+    r"(?<=[?&])(authSig|token|key|password|secret)=[^&\s]+", re.IGNORECASE
+)
 
 
 @callback
@@ -215,8 +223,10 @@ class FFmpegConvertResponse(web.StreamResponse):
         assert proc.stdout is not None
         assert proc.stderr is not None
 
+        stderr_lines: deque[str] = deque(maxlen=_MAX_STDERR_LINES)
         stderr_task = self.hass.async_create_background_task(
-            self._dump_ffmpeg_stderr(proc), "ESPHome media proxy dump stderr"
+            self._collect_ffmpeg_stderr(proc, stderr_lines),
+            "ESPHome media proxy dump stderr",
         )
 
         try:
@@ -235,33 +245,80 @@ class FFmpegConvertResponse(web.StreamResponse):
             if request.transport:
                 request.transport.abort()
             raise  # don't log error
-        except:
+        except Exception:
             _LOGGER.exception("Unexpected error during ffmpeg conversion")
             raise
         finally:
             # Allow conversion info to be removed
             self.convert_info.is_finished = True
 
-            # stop dumping ffmpeg stderr task
-            stderr_task.cancel()
+            # Ensure subprocess and stderr cleanup run even if this task
+            # is cancelled (e.g., during shutdown)
+            try:
+                # Terminate hangs, so kill is used
+                if proc.returncode is None:
+                    proc.kill()
 
-            # Terminate hangs, so kill is used
-            if proc.returncode is None:
-                proc.kill()
+                # Wait for process to exit so returncode is set
+                await asyncio.wait_for(proc.wait(), timeout=_PROC_WAIT_TIMEOUT)
+
+                # Let stderr collector finish draining
+                if not stderr_task.done():
+                    try:
+                        await asyncio.wait_for(
+                            stderr_task, timeout=_STDERR_DRAIN_TIMEOUT
+                        )
+                    except TimeoutError:
+                        stderr_task.cancel()
+                        with contextlib.suppress(asyncio.CancelledError):
+                            await stderr_task
+            except TimeoutError:
+                _LOGGER.warning(
+                    "Timed out waiting for ffmpeg process to exit for device %s",
+                    self.device_id,
+                )
+                stderr_task.cancel()
+                with contextlib.suppress(asyncio.CancelledError):
+                    await stderr_task
+            except asyncio.CancelledError:
+                # Kill the process if we were interrupted
+                if proc.returncode is None:
+                    proc.kill()
+                stderr_task.cancel()
+                raise
+
+            if proc.returncode is not None and proc.returncode > 0:
+                _LOGGER.error(
+                    "FFmpeg conversion failed for device %s (return code %s):\n%s",
+                    self.device_id,
+                    proc.returncode,
+                    "\n".join(
+                        _SENSITIVE_QUERY_PARAMS.sub(r"\1=REDACTED", line)
+                        for line in stderr_lines
+                    ),
+                )
 
             # Close connection by writing EOF unless already closing
             if request.transport and not request.transport.is_closing():
-                await writer.write_eof()
+                with contextlib.suppress(ConnectionResetError, RuntimeError, OSError):
+                    await writer.write_eof()
 
-    async def _dump_ffmpeg_stderr(
+    async def _collect_ffmpeg_stderr(
         self,
         proc: asyncio.subprocess.Process,
+        stderr_lines: deque[str],
     ) -> None:
-        assert proc.stdout is not None
+        """Collect stderr output from ffmpeg for error reporting."""
         assert proc.stderr is not None
 
         while self.hass.is_running and (chunk := await proc.stderr.readline()):
-            _LOGGER.debug("ffmpeg[%s] output: %s", proc.pid, chunk.decode().rstrip())
+            line = chunk.decode(errors="replace").rstrip()
+            stderr_lines.append(line)
+            _LOGGER.debug(
+                "ffmpeg[%s] output: %s",
+                proc.pid,
+                _SENSITIVE_QUERY_PARAMS.sub(r"\1=REDACTED", line),
+            )
 
 
 class FFmpegProxyView(HomeAssistantView):

homeassistant/components/esphome/manifest.json

@@ -17,7 +17,7 @@
   "mqtt": ["esphome/discover/#"],
   "quality_scale": "platinum",
   "requirements": [
-    "aioesphomeapi==44.5.2",
+    "aioesphomeapi==44.6.2",
     "esphome-dashboard-api==1.3.0",
     "bleak-esphome==3.7.1"
   ],

homeassistant/components/event/icons.json

@@ -12,5 +12,10 @@
     "motion": {
       "default": "mdi:motion-sensor"
     }
+  },
+  "triggers": {
+    "received": {
+      "trigger": "mdi:eye-check"
+    }
   }
 }

homeassistant/components/event/strings.json

@@ -21,5 +21,17 @@
       "name": "Motion"
     }
   },
-  "title": "Event"
+  "title": "Event",
+  "triggers": {
+    "received": {
+      "description": "Triggers after one or more event entities receive a matching event.",
+      "fields": {
+        "event_type": {
+          "description": "The event types to trigger on.",
+          "name": "Event type"
+        }
+      },
+      "name": "Event received"
+    }
+  }
 }

homeassistant/components/event/trigger.py

@@ -0,0 +1,67 @@
+"""Provides triggers for events."""
+
+import voluptuous as vol
+
+from homeassistant.const import CONF_OPTIONS, STATE_UNAVAILABLE, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.trigger import (
+    ENTITY_STATE_TRIGGER_SCHEMA,
+    EntityTriggerBase,
+    Trigger,
+    TriggerConfig,
+)
+
+from .const import ATTR_EVENT_TYPE, DOMAIN
+
+CONF_EVENT_TYPE = "event_type"
+
+EVENT_RECEIVED_TRIGGER_SCHEMA = ENTITY_STATE_TRIGGER_SCHEMA.extend(
+    {
+        vol.Required(CONF_OPTIONS): {
+            vol.Required(CONF_EVENT_TYPE): vol.All(
+                cv.ensure_list, vol.Length(min=1), [cv.string]
+            ),
+        },
+    }
+)
+
+
+class EventReceivedTrigger(EntityTriggerBase):
+    """Trigger for event entity when it receives a matching event."""
+
+    _domain_specs = {DOMAIN: DomainSpec()}
+    _schema = EVENT_RECEIVED_TRIGGER_SCHEMA
+
+    def __init__(self, hass: HomeAssistant, config: TriggerConfig) -> None:
+        """Initialize the event received trigger."""
+        super().__init__(hass, config)
+        self._event_types = set(self._options[CONF_EVENT_TYPE])
+
+    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
+        """Check if the origin state is valid and different from the current state."""
+
+        # UNKNOWN is a valid from_state, otherwise the first time the event is received
+        # would not trigger
+        if from_state.state == STATE_UNAVAILABLE:
+            return False
+
+        return from_state.state != to_state.state
+
+    def is_valid_state(self, state: State) -> bool:
+        """Check if the event type is valid and matches one of the configured types."""
+        return (
+            state.state not in (STATE_UNAVAILABLE, STATE_UNKNOWN)
+            and state.attributes.get(ATTR_EVENT_TYPE) in self._event_types
+        )
+
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    "received": EventReceivedTrigger,
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for events."""
+    return TRIGGERS

homeassistant/components/event/triggers.yaml

@@ -0,0 +1,16 @@
+received:
+  target:
+    entity:
+      domain: event
+  fields:
+    event_type:
+      context:
+        filter_target: target
+      required: true
+      selector:
+        state:
+          attribute: event_type
+          hide_states:
+            - unavailable
+            - unknown
+          multiple: true

homeassistant/components/evohome/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["evohomeasync", "evohomeasync2"],
   "quality_scale": "legacy",
-  "requirements": ["evohome-async==1.1.3"]
+  "requirements": ["evohome-async==1.2.0"]
 }

homeassistant/components/evohome/water_heater.py

@@ -124,15 +124,17 @@ class EvoDHW(EvoChild, WaterHeaterEntity):
             until = dt_util.as_utc(until) if until else None
 
             if operation_mode == STATE_ON:
-                await self.coordinator.call_client_api(self._evo_device.on(until=until))
+                await self.coordinator.call_client_api(
+                    self._evo_device.set_on(until=until)
+                )
             else:  # STATE_OFF
                 await self.coordinator.call_client_api(
-                    self._evo_device.off(until=until)
+                    self._evo_device.set_off(until=until)
                 )
 
     async def async_turn_away_mode_on(self) -> None:
         """Turn away mode on."""
-        await self.coordinator.call_client_api(self._evo_device.off())
+        await self.coordinator.call_client_api(self._evo_device.set_off())
 
     async def async_turn_away_mode_off(self) -> None:
         """Turn away mode off."""
@@ -140,8 +142,8 @@ class EvoDHW(EvoChild, WaterHeaterEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on."""
-        await self.coordinator.call_client_api(self._evo_device.on())
+        await self.coordinator.call_client_api(self._evo_device.set_on())
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off."""
-        await self.coordinator.call_client_api(self._evo_device.off())
+        await self.coordinator.call_client_api(self._evo_device.set_off())

homeassistant/components/fan/services.yaml

@@ -10,7 +10,8 @@ set_preset_mode:
       required: true
       example: "auto"
       selector:
-        text:
+        state:
+          attribute: preset_mode
 
 set_percentage:
   target:
@@ -49,7 +50,8 @@ turn_on:
         supported_features:
           - fan.FanEntityFeature.PRESET_MODE
       selector:
-        text:
+        state:
+          attribute: preset_mode
 
 turn_off:
   target: