use mode instead

.claude/skills/integrations/SKILL.md

@@ -3,27 +3,54 @@ name: Home Assistant Integration knowledge
 description: Everything you need to know to build, test and review Home Assistant Integrations. If you're looking at an integration, you must use this as your primary reference.
 ---
 
-## File Locations
+### File Locations
 - **Integration code**: `./homeassistant/components/<integration_domain>/`
 - **Integration tests**: `./tests/components/<integration_domain>/`
 
-## General guidelines
+## Integration Templates
 
-- When looking for examples, prefer integrations with the platinum or gold quality scale level first.
-- Polling intervals are NOT user-configurable. Never add scan_interval, update_interval, or polling frequency options to config flows or config entries.
-- Do NOT allow users to set config entry names in config flows. Names are automatically generated or can be customized later in UI. Exception: helper integrations may allow custom names.
+### Standard Integration Structure
+```
+homeassistant/components/my_integration/
+├── __init__.py          # Entry point with async_setup_entry
+├── manifest.json        # Integration metadata and dependencies
+├── const.py            # Domain and constants
+├── config_flow.py      # UI configuration flow
+├── coordinator.py      # Data update coordinator (if needed)
+├── entity.py          # Base entity class (if shared patterns)
+├── sensor.py          # Sensor platform
+├── strings.json        # User-facing text and translations
+├── services.yaml       # Service definitions (if applicable)
+└── quality_scale.yaml  # Quality scale rule status
+```
 
-The following platforms have extra guidelines:
+An integration can have platforms as needed (e.g., `sensor.py`, `switch.py`, etc.). The following platforms have extra guidelines:
 - **Diagnostics**: [`platform-diagnostics.md`](platform-diagnostics.md) for diagnostic data collection
 - **Repairs**: [`platform-repairs.md`](platform-repairs.md) for user-actionable repair issues
 
+### Minimal Integration Checklist
+- [ ] `manifest.json` with required fields (domain, name, codeowners, etc.)
+- [ ] `__init__.py` with `async_setup_entry` and `async_unload_entry`
+- [ ] `config_flow.py` with UI configuration support
+- [ ] `const.py` with `DOMAIN` constant
+- [ ] `strings.json` with at least config flow text
+- [ ] Platform files (`sensor.py`, etc.) as needed
+- [ ] `quality_scale.yaml` with rule status tracking
 
 ## Integration Quality Scale
 
-- When validating the quality scale rules, check them at https://developers.home-assistant.io/docs/core/integration-quality-scale/rules
-- When implementing or reviewing an integration, always consider the quality scale rules, since they promote best practices.
+Home Assistant uses an Integration Quality Scale to ensure code quality and consistency. The quality level determines which rules apply:
 
-Template scale file: `./script/scaffold/templates/integration/integration/quality_scale.yaml`
+### Quality Scale Levels
+- **Bronze**: Basic requirements (ALL Bronze rules are mandatory)
+- **Silver**: Enhanced functionality
+- **Gold**: Advanced features
+- **Platinum**: Highest quality standards
+
+### Quality Scale Progression
+- **Bronze → Silver**: Add entity unavailability, parallel updates, auth flows
+- **Silver → Gold**: Add device management, diagnostics, translations
+- **Gold → Platinum**: Add strict typing, async dependencies, websession injection
 
 ### How Rules Apply
 1. **Check `manifest.json`**: Look for `"quality_scale"` key to determine integration level
@@ -34,7 +61,726 @@ Template scale file: `./script/scaffold/templates/integration/integration/qualit
    - `exempt`: Rule doesn't apply (with reason in comment)
    - `todo`: Rule needs implementation
 
+### Example `quality_scale.yaml` Structure
+```yaml
+rules:
+  # Bronze (mandatory)
+  config-flow: done
+  entity-unique-id: done
+  action-setup:
+    status: exempt
+    comment: Integration does not register custom actions.
+
+  # Silver (if targeting Silver+)
+  entity-unavailable: done
+  parallel-updates: done
+
+  # Gold (if targeting Gold+)
+  devices: done
+  diagnostics: done
+
+  # Platinum (if targeting Platinum)
+  strict-typing: done
+```
+
+**When Reviewing/Creating Code**: Always check the integration's quality scale level and exemption status before applying rules.
+
+## Code Organization
+
+### Core Locations
+- Shared constants: `homeassistant/const.py` (use these instead of hardcoding)
+- Integration structure:
+  - `homeassistant/components/{domain}/const.py` - Constants
+  - `homeassistant/components/{domain}/models.py` - Data models
+  - `homeassistant/components/{domain}/coordinator.py` - Update coordinator
+  - `homeassistant/components/{domain}/config_flow.py` - Configuration flow
+  - `homeassistant/components/{domain}/{platform}.py` - Platform implementations
+
+### Common Modules
+- **coordinator.py**: Centralize data fetching logic
+  ```python
+  class MyCoordinator(DataUpdateCoordinator[MyData]):
+      def __init__(self, hass: HomeAssistant, client: MyClient, config_entry: ConfigEntry) -> None:
+          super().__init__(
+              hass,
+              logger=LOGGER,
+              name=DOMAIN,
+              update_interval=timedelta(minutes=1),
+              config_entry=config_entry,  # ✅ Pass config_entry - it's accepted and recommended
+          )
+  ```
+- **entity.py**: Base entity definitions to reduce duplication
+  ```python
+  class MyEntity(CoordinatorEntity[MyCoordinator]):
+      _attr_has_entity_name = True
+  ```
+
+### Runtime Data Storage
+- **Use ConfigEntry.runtime_data**: Store non-persistent runtime data
+  ```python
+  type MyIntegrationConfigEntry = ConfigEntry[MyClient]
+
+  async def async_setup_entry(hass: HomeAssistant, entry: MyIntegrationConfigEntry) -> bool:
+      client = MyClient(entry.data[CONF_HOST])
+      entry.runtime_data = client
+  ```
+
+### Manifest Requirements
+- **Required Fields**: `domain`, `name`, `codeowners`, `integration_type`, `documentation`, `requirements`
+- **Integration Types**: `device`, `hub`, `service`, `system`, `helper`
+- **IoT Class**: Always specify connectivity method (e.g., `cloud_polling`, `local_polling`, `local_push`)
+- **Discovery Methods**: Add when applicable: `zeroconf`, `dhcp`, `bluetooth`, `ssdp`, `usb`
+- **Dependencies**: Include platform dependencies (e.g., `application_credentials`, `bluetooth_adapters`)
+
+### Config Flow Patterns
+- **Version Control**: Always set `VERSION = 1` and `MINOR_VERSION = 1`
+- **Unique ID Management**:
+  ```python
+  await self.async_set_unique_id(device_unique_id)
+  self._abort_if_unique_id_configured()
+  ```
+- **Error Handling**: Define errors in `strings.json` under `config.error`
+- **Step Methods**: Use standard naming (`async_step_user`, `async_step_discovery`, etc.)
+
+### Integration Ownership
+- **manifest.json**: Add GitHub usernames to `codeowners`:
+  ```json
+  {
+    "domain": "my_integration",
+    "name": "My Integration",
+    "codeowners": ["@me"]
+  }
+  ```
+
+### Async Dependencies (Platinum)
+- **Requirement**: All dependencies must use asyncio
+- Ensures efficient task handling without thread context switching
+
+### WebSession Injection (Platinum)
+- **Pass WebSession**: Support passing web sessions to dependencies
+  ```python
+  async def async_setup_entry(hass: HomeAssistant, entry: MyConfigEntry) -> bool:
+      """Set up integration from config entry."""
+      client = MyClient(entry.data[CONF_HOST], async_get_clientsession(hass))
+  ```
+- For cookies: Use `async_create_clientsession` (aiohttp) or `create_async_httpx_client` (httpx)
+
+### Data Update Coordinator
+- **Standard Pattern**: Use for efficient data management
+  ```python
+  class MyCoordinator(DataUpdateCoordinator):
+      def __init__(self, hass: HomeAssistant, client: MyClient, config_entry: ConfigEntry) -> None:
+          super().__init__(
+              hass,
+              logger=LOGGER,
+              name=DOMAIN,
+              update_interval=timedelta(minutes=5),
+              config_entry=config_entry,  # ✅ Pass config_entry - it's accepted and recommended
+          )
+          self.client = client
+
+      async def _async_update_data(self):
+          try:
+              return await self.client.fetch_data()
+          except ApiError as err:
+              raise UpdateFailed(f"API communication error: {err}")
+  ```
+- **Error Types**: Use `UpdateFailed` for API errors, `ConfigEntryAuthFailed` for auth issues
+- **Config Entry**: Always pass `config_entry` parameter to coordinator - it's accepted and recommended
+
+## Integration Guidelines
+
+### Configuration Flow
+- **UI Setup Required**: All integrations must support configuration via UI
+- **Manifest**: Set `"config_flow": true` in `manifest.json`
+- **Data Storage**:
+  - Connection-critical config: Store in `ConfigEntry.data`
+  - Non-critical settings: Store in `ConfigEntry.options`
+- **Validation**: Always validate user input before creating entries
+- **Config Entry Naming**:
+  - ❌ Do NOT allow users to set config entry names in config flows
+  - Names are automatically generated or can be customized later in UI
+  - ✅ Exception: Helper integrations MAY allow custom names in config flow
+- **Connection Testing**: Test device/service connection during config flow:
+  ```python
+  try:
+      await client.get_data()
+  except MyException:
+      errors["base"] = "cannot_connect"
+  ```
+- **Duplicate Prevention**: Prevent duplicate configurations:
+  ```python
+  # Using unique ID
+  await self.async_set_unique_id(identifier)
+  self._abort_if_unique_id_configured()
+
+  # Using unique data
+  self._async_abort_entries_match({CONF_HOST: user_input[CONF_HOST]})
+  ```
+
+### Reauthentication Support
+- **Required Method**: Implement `async_step_reauth` in config flow
+- **Credential Updates**: Allow users to update credentials without re-adding
+- **Validation**: Verify account matches existing unique ID:
+  ```python
+  await self.async_set_unique_id(user_id)
+  self._abort_if_unique_id_mismatch(reason="wrong_account")
+  return self.async_update_reload_and_abort(
+      self._get_reauth_entry(),
+      data_updates={CONF_API_TOKEN: user_input[CONF_API_TOKEN]}
+  )
+  ```
+
+### Reconfiguration Flow
+- **Purpose**: Allow configuration updates without removing device
+- **Implementation**: Add `async_step_reconfigure` method
+- **Validation**: Prevent changing underlying account with `_abort_if_unique_id_mismatch`
+
+### Device Discovery
+- **Manifest Configuration**: Add discovery method (zeroconf, dhcp, etc.)
+  ```json
+  {
+    "zeroconf": ["_mydevice._tcp.local."]
+  }
+  ```
+- **Discovery Handler**: Implement appropriate `async_step_*` method:
+  ```python
+  async def async_step_zeroconf(self, discovery_info):
+      """Handle zeroconf discovery."""
+      await self.async_set_unique_id(discovery_info.properties["serialno"])
+      self._abort_if_unique_id_configured(updates={CONF_HOST: discovery_info.host})
+  ```
+- **Network Updates**: Use discovery to update dynamic IP addresses
+
+### Network Discovery Implementation
+- **Zeroconf/mDNS**: Use async instances
+  ```python
+  aiozc = await zeroconf.async_get_async_instance(hass)
+  ```
+- **SSDP Discovery**: Register callbacks with cleanup
+  ```python
+  entry.async_on_unload(
+      ssdp.async_register_callback(
+          hass, _async_discovered_device,
+          {"st": "urn:schemas-upnp-org:device:ZonePlayer:1"}
+      )
+  )
+  ```
+
+### Bluetooth Integration
+- **Manifest Dependencies**: Add `bluetooth_adapters` to dependencies
+- **Connectable**: Set `"connectable": true` for connection-required devices
+- **Scanner Usage**: Always use shared scanner instance
+  ```python
+  scanner = bluetooth.async_get_scanner()
+  entry.async_on_unload(
+      bluetooth.async_register_callback(
+          hass, _async_discovered_device,
+          {"service_uuid": "example_uuid"},
+          bluetooth.BluetoothScanningMode.ACTIVE
+      )
+  )
+  ```
+- **Connection Handling**: Never reuse `BleakClient` instances, use 10+ second timeouts
+
+### Setup Validation
+- **Test Before Setup**: Verify integration can be set up in `async_setup_entry`
+- **Exception Handling**:
+  - `ConfigEntryNotReady`: Device offline or temporary failure
+  - `ConfigEntryAuthFailed`: Authentication issues
+  - `ConfigEntryError`: Unresolvable setup problems
+
+### Config Entry Unloading
+- **Required**: Implement `async_unload_entry` for runtime removal/reload
+- **Platform Unloading**: Use `hass.config_entries.async_unload_platforms`
+- **Cleanup**: Register callbacks with `entry.async_on_unload`:
+  ```python
+  async def async_unload_entry(hass: HomeAssistant, entry: MyConfigEntry) -> bool:
+      """Unload a config entry."""
+      if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+          entry.runtime_data.listener()  # Clean up resources
+      return unload_ok
+  ```
+
+### Service Actions
+- **Registration**: Register all service actions in `async_setup`, NOT in `async_setup_entry`
+- **Validation**: Check config entry existence and loaded state:
+  ```python
+  async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+      async def service_action(call: ServiceCall) -> ServiceResponse:
+          if not (entry := hass.config_entries.async_get_entry(call.data[ATTR_CONFIG_ENTRY_ID])):
+              raise ServiceValidationError("Entry not found")
+          if entry.state is not ConfigEntryState.LOADED:
+              raise ServiceValidationError("Entry not loaded")
+  ```
+- **Exception Handling**: Raise appropriate exceptions:
+  ```python
+  # For invalid input
+  if end_date < start_date:
+      raise ServiceValidationError("End date must be after start date")
+
+  # For service errors
+  try:
+      await client.set_schedule(start_date, end_date)
+  except MyConnectionError as err:
+      raise HomeAssistantError("Could not connect to the schedule") from err
+  ```
+
+### Service Registration Patterns
+- **Entity Services**: Register on platform setup
+  ```python
+  platform.async_register_entity_service(
+      "my_entity_service",
+      {vol.Required("parameter"): cv.string},
+      "handle_service_method"
+  )
+  ```
+- **Service Schema**: Always validate input
+  ```python
+  SERVICE_SCHEMA = vol.Schema({
+      vol.Required("entity_id"): cv.entity_ids,
+      vol.Required("parameter"): cv.string,
+      vol.Optional("timeout", default=30): cv.positive_int,
+  })
+  ```
+- **Services File**: Create `services.yaml` with descriptions and field definitions
+
+### Polling
+- Use update coordinator pattern when possible
+- **Polling intervals are NOT user-configurable**: Never add scan_interval, update_interval, or polling frequency options to config flows or config entries
+- **Integration determines intervals**: Set `update_interval` programmatically based on integration logic, not user input
+- **Minimum Intervals**:
+  - Local network: 5 seconds
+  - Cloud services: 60 seconds
+- **Parallel Updates**: Specify number of concurrent updates:
+  ```python
+  PARALLEL_UPDATES = 1  # Serialize updates to prevent overwhelming device
+  # OR
+  PARALLEL_UPDATES = 0  # Unlimited (for coordinator-based or read-only)
+  ```
+
+## Entity Development
+
+### Unique IDs
+- **Required**: Every entity must have a unique ID for registry tracking
+- Must be unique per platform (not per integration)
+- Don't include integration domain or platform in ID
+- **Implementation**:
+  ```python
+  class MySensor(SensorEntity):
+      def __init__(self, device_id: str) -> None:
+          self._attr_unique_id = f"{device_id}_temperature"
+  ```
+
+**Acceptable ID Sources**:
+- Device serial numbers
+- MAC addresses (formatted using `format_mac` from device registry)
+- Physical identifiers (printed/EEPROM)
+- Config entry ID as last resort: `f"{entry.entry_id}-battery"`
+
+**Never Use**:
+- IP addresses, hostnames, URLs
+- Device names
+- Email addresses, usernames
+
+### Entity Descriptions
+- **Lambda/Anonymous Functions**: Often used in EntityDescription for value transformation
+- **Multiline Lambdas**: When lambdas exceed line length, wrap in parentheses for readability
+- **Bad pattern**:
+  ```python
+  SensorEntityDescription(
+      key="temperature",
+      name="Temperature",
+      value_fn=lambda data: round(data["temp_value"] * 1.8 + 32, 1) if data.get("temp_value") is not None else None,  # ❌ Too long
+  )
+  ```
+- **Good pattern**:
+  ```python
+  SensorEntityDescription(
+      key="temperature",
+      name="Temperature",
+      value_fn=lambda data: (  # ✅ Parenthesis on same line as lambda
+          round(data["temp_value"] * 1.8 + 32, 1)
+          if data.get("temp_value") is not None
+          else None
+      ),
+  )
+  ```
+
+### Entity Naming
+- **Use has_entity_name**: Set `_attr_has_entity_name = True`
+- **For specific fields**:
+  ```python
+  class MySensor(SensorEntity):
+      _attr_has_entity_name = True
+      def __init__(self, device: Device, field: str) -> None:
+          self._attr_device_info = DeviceInfo(
+              identifiers={(DOMAIN, device.id)},
+              name=device.name,
+          )
+          self._attr_name = field  # e.g., "temperature", "humidity"
+  ```
+- **For device itself**: Set `_attr_name = None`
+
+### Event Lifecycle Management
+- **Subscribe in `async_added_to_hass`**:
+  ```python
+  async def async_added_to_hass(self) -> None:
+      """Subscribe to events."""
+      self.async_on_remove(
+          self.client.events.subscribe("my_event", self._handle_event)
+      )
+  ```
+- **Unsubscribe in `async_will_remove_from_hass`** if not using `async_on_remove`
+- Never subscribe in `__init__` or other methods
+
+### State Handling
+- Unknown values: Use `None` (not "unknown" or "unavailable")
+- Availability: Implement `available()` property instead of using "unavailable" state
+
+### Entity Availability
+- **Mark Unavailable**: When data cannot be fetched from device/service
+- **Coordinator Pattern**:
+  ```python
+  @property
+  def available(self) -> bool:
+      """Return if entity is available."""
+      return super().available and self.identifier in self.coordinator.data
+  ```
+- **Direct Update Pattern**:
+  ```python
+  async def async_update(self) -> None:
+      """Update entity."""
+      try:
+          data = await self.client.get_data()
+      except MyException:
+          self._attr_available = False
+      else:
+          self._attr_available = True
+          self._attr_native_value = data.value
+  ```
+
+### Extra State Attributes
+- All attribute keys must always be present
+- Unknown values: Use `None`
+- Provide descriptive attributes
+
+## Device Management
+
+### Device Registry
+- **Create Devices**: Group related entities under devices
+- **Device Info**: Provide comprehensive metadata:
+  ```python
+  _attr_device_info = DeviceInfo(
+      connections={(CONNECTION_NETWORK_MAC, device.mac)},
+      identifiers={(DOMAIN, device.id)},
+      name=device.name,
+      manufacturer="My Company",
+      model="My Sensor",
+      sw_version=device.version,
+  )
+  ```
+- For services: Add `entry_type=DeviceEntryType.SERVICE`
+
+### Dynamic Device Addition
+- **Auto-detect New Devices**: After initial setup
+- **Implementation Pattern**:
+  ```python
+  def _check_device() -> None:
+      current_devices = set(coordinator.data)
+      new_devices = current_devices - known_devices
+      if new_devices:
+          known_devices.update(new_devices)
+          async_add_entities([MySensor(coordinator, device_id) for device_id in new_devices])
+
+  entry.async_on_unload(coordinator.async_add_listener(_check_device))
+  ```
+
+### Stale Device Removal
+- **Auto-remove**: When devices disappear from hub/account
+- **Device Registry Update**:
+  ```python
+  device_registry.async_update_device(
+      device_id=device.id,
+      remove_config_entry_id=self.config_entry.entry_id,
+  )
+  ```
+- **Manual Deletion**: Implement `async_remove_config_entry_device` when needed
+
+### Entity Categories
+- **Required**: Assign appropriate category to entities
+- **Implementation**: Set `_attr_entity_category`
+  ```python
+  class MySensor(SensorEntity):
+      _attr_entity_category = EntityCategory.DIAGNOSTIC
+  ```
+- Categories include: `DIAGNOSTIC` for system/technical information
+
+### Device Classes
+- **Use When Available**: Set appropriate device class for entity type
+  ```python
+  class MyTemperatureSensor(SensorEntity):
+      _attr_device_class = SensorDeviceClass.TEMPERATURE
+  ```
+- Provides context for: unit conversion, voice control, UI representation
+
+### Disabled by Default
+- **Disable Noisy/Less Popular Entities**: Reduce resource usage
+  ```python
+  class MySignalStrengthSensor(SensorEntity):
+      _attr_entity_registry_enabled_default = False
+  ```
+- Target: frequently changing states, technical diagnostics
+
+### Entity Translations
+- **Required with has_entity_name**: Support international users
+- **Implementation**:
+  ```python
+  class MySensor(SensorEntity):
+      _attr_has_entity_name = True
+      _attr_translation_key = "phase_voltage"
+  ```
+- Create `strings.json` with translations:
+  ```json
+  {
+    "entity": {
+      "sensor": {
+        "phase_voltage": {
+          "name": "Phase voltage"
+        }
+      }
+    }
+  }
+  ```
+
+### Exception Translations (Gold)
+- **Translatable Errors**: Use translation keys for user-facing exceptions
+- **Implementation**:
+  ```python
+  raise ServiceValidationError(
+      translation_domain=DOMAIN,
+      translation_key="end_date_before_start_date",
+  )
+  ```
+- Add to `strings.json`:
+  ```json
+  {
+    "exceptions": {
+      "end_date_before_start_date": {
+        "message": "The end date cannot be before the start date."
+      }
+    }
+  }
+  ```
+
+### Icon Translations (Gold)
+- **Dynamic Icons**: Support state and range-based icon selection
+- **State-based Icons**:
+  ```json
+  {
+    "entity": {
+      "sensor": {
+        "tree_pollen": {
+          "default": "mdi:tree",
+          "state": {
+            "high": "mdi:tree-outline"
+          }
+        }
+      }
+    }
+  }
+  ```
+- **Range-based Icons** (for numeric values):
+  ```json
+  {
+    "entity": {
+      "sensor": {
+        "battery_level": {
+          "default": "mdi:battery-unknown",
+          "range": {
+            "0": "mdi:battery-outline",
+            "90": "mdi:battery-90",
+            "100": "mdi:battery"
+          }
+        }
+      }
+    }
+  }
+  ```
 
 ## Testing Requirements
 
-- Tests should avoid interacting or mocking internal integration details. For more info, see https://developers.home-assistant.io/docs/development_testing/#writing-tests-for-integrations
+- **Location**: `tests/components/{domain}/`
+- **Coverage Requirement**: Above 95% test coverage for all modules
+- **Best Practices**:
+  - Use pytest fixtures from `tests.common`
+  - Mock all external dependencies
+  - Use snapshots for complex data structures
+  - Follow existing test patterns
+
+### Config Flow Testing
+- **100% Coverage Required**: All config flow paths must be tested
+- **Patch Boundaries**: Only patch library or client methods when testing config flows. Do not patch methods defined in `config_flow.py`; exercise the flow logic end-to-end.
+- **Test Scenarios**:
+  - All flow initiation methods (user, discovery, import)
+  - Successful configuration paths
+  - Error recovery scenarios
+  - Prevention of duplicate entries
+  - Flow completion after errors
+  - Reauthentication/reconfigure flows
+
+### Testing
+- **Integration-specific tests** (recommended):
+  ```bash
+  pytest ./tests/components/<integration_domain> \
+    --cov=homeassistant.components.<integration_domain> \
+    --cov-report term-missing \
+    --durations-min=1 \
+    --durations=0 \
+    --numprocesses=auto
+  ```
+
+### Testing Best Practices
+- **Never access `hass.data` directly** - Use fixtures and proper integration setup instead
+- **Use snapshot testing** - For verifying entity states and attributes
+- **Test through integration setup** - Don't test entities in isolation
+- **Mock external APIs** - Use fixtures with realistic JSON data
+- **Verify registries** - Ensure entities are properly registered with devices
+
+### Config Flow Testing Template
+```python
+async def test_user_flow_success(hass, mock_api):
+    """Test successful user flow."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    # Test form submission
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input=TEST_USER_INPUT
+    )
+    assert result["type"] == FlowResultType.CREATE_ENTRY
+    assert result["title"] == "My Device"
+    assert result["data"] == TEST_USER_INPUT
+
+async def test_flow_connection_error(hass, mock_api_error):
+    """Test connection error handling."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": config_entries.SOURCE_USER}
+    )
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], user_input=TEST_USER_INPUT
+    )
+    assert result["type"] == FlowResultType.FORM
+    assert result["errors"] == {"base": "cannot_connect"}
+```
+
+### Entity Testing Patterns
+```python
+@pytest.fixture
+def platforms() -> list[Platform]:
+    """Overridden fixture to specify platforms to test."""
+    return [Platform.SENSOR]  # Or another specific platform as needed.
+
+@pytest.mark.usefixtures("entity_registry_enabled_by_default", "init_integration")
+async def test_entities(
+    hass: HomeAssistant,
+    snapshot: SnapshotAssertion,
+    entity_registry: er.EntityRegistry,
+    device_registry: dr.DeviceRegistry,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test the sensor entities."""
+    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
+
+    # Ensure entities are correctly assigned to device
+    device_entry = device_registry.async_get_device(
+        identifiers={(DOMAIN, "device_unique_id")}
+    )
+    assert device_entry
+    entity_entries = er.async_entries_for_config_entry(
+        entity_registry, mock_config_entry.entry_id
+    )
+    for entity_entry in entity_entries:
+        assert entity_entry.device_id == device_entry.id
+```
+
+### Mock Patterns
+```python
+# Modern integration fixture setup
+@pytest.fixture
+def mock_config_entry() -> MockConfigEntry:
+    """Return the default mocked config entry."""
+    return MockConfigEntry(
+        title="My Integration",
+        domain=DOMAIN,
+        data={CONF_HOST: "127.0.0.1", CONF_API_KEY: "test_key"},
+        unique_id="device_unique_id",
+    )
+
+@pytest.fixture
+def mock_device_api() -> Generator[MagicMock]:
+    """Return a mocked device API."""
+    with patch("homeassistant.components.my_integration.MyDeviceAPI", autospec=True) as api_mock:
+        api = api_mock.return_value
+        api.get_data.return_value = MyDeviceData.from_json(
+            load_fixture("device_data.json", DOMAIN)
+        )
+        yield api
+
+@pytest.fixture
+def platforms() -> list[Platform]:
+    """Fixture to specify platforms to test."""
+    return PLATFORMS
+
+@pytest.fixture
+async def init_integration(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_device_api: MagicMock,
+    platforms: list[Platform],
+) -> MockConfigEntry:
+    """Set up the integration for testing."""
+    mock_config_entry.add_to_hass(hass)
+
+    with patch("homeassistant.components.my_integration.PLATFORMS", platforms):
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+
+    return mock_config_entry
+```
+
+## Debugging & Troubleshooting
+
+### Common Issues & Solutions
+- **Integration won't load**: Check `manifest.json` syntax and required fields
+- **Entities not appearing**: Verify `unique_id` and `has_entity_name` implementation
+- **Config flow errors**: Check `strings.json` entries and error handling
+- **Discovery not working**: Verify manifest discovery configuration and callbacks
+- **Tests failing**: Check mock setup and async context
+
+### Debug Logging Setup
+```python
+# Enable debug logging in tests
+caplog.set_level(logging.DEBUG, logger="my_integration")
+
+# In integration code - use proper logging
+_LOGGER = logging.getLogger(__name__)
+_LOGGER.debug("Processing data: %s", data)  # Use lazy logging
+```
+
+### Validation Commands
+```bash
+# Check specific integration
+python -m script.hassfest --integration-path homeassistant/components/my_integration
+
+# Validate quality scale
+# Check quality_scale.yaml against current rules
+
+# Run integration tests with coverage
+pytest ./tests/components/my_integration \
+  --cov=homeassistant.components.my_integration \
+  --cov-report term-missing
+```

.claude/skills/integrations/platform-diagnostics.md

@@ -3,4 +3,17 @@
 Platform exists as `homeassistant/components/<domain>/diagnostics.py`.
 
 - **Required**: Implement diagnostic data collection
+- **Implementation**:
+  ```python
+  TO_REDACT = [CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE]
+
+  async def async_get_config_entry_diagnostics(
+      hass: HomeAssistant, entry: MyConfigEntry
+  ) -> dict[str, Any]:
+      """Return diagnostics for a config entry."""
+      return {
+          "entry_data": async_redact_data(entry.data, TO_REDACT),
+          "data": entry.runtime_data.data,
+      }
+  ```
 - **Security**: Never expose passwords, tokens, or sensitive coordinates

.claude/skills/integrations/platform-repairs.md

@@ -8,10 +8,48 @@ Platform exists as `homeassistant/components/<domain>/repairs.py`.
   - Provide specific steps users need to take to resolve the issue
   - Use friendly, helpful language
   - Include relevant context (device names, error details, etc.)
+- **Implementation**:
+  ```python
+  ir.async_create_issue(
+      hass,
+      DOMAIN,
+      "outdated_version",
+      is_fixable=False,
+      issue_domain=DOMAIN,
+      severity=ir.IssueSeverity.ERROR,
+      translation_key="outdated_version",
+  )
+  ```
+- **Translation Strings Requirements**: Must contain user-actionable text in `strings.json`:
+  ```json
+  {
+    "issues": {
+      "outdated_version": {
+        "title": "Device firmware is outdated",
+        "description": "Your device firmware version {current_version} is below the minimum required version {min_version}. To fix this issue: 1) Open the manufacturer's mobile app, 2) Navigate to device settings, 3) Select 'Update Firmware', 4) Wait for the update to complete, then 5) Restart Home Assistant."
+      }
+    }
+  }
+  ```
 - **String Content Must Include**:
   - What the problem is
   - Why it matters
   - Exact steps to resolve (numbered list when multiple steps)
   - What to expect after following the steps
 - **Avoid Vague Instructions**: Don't just say "update firmware" - provide specific steps
+- **Severity Guidelines**:
+  - `CRITICAL`: Reserved for extreme scenarios only
+  - `ERROR`: Requires immediate user attention
+  - `WARNING`: Indicates future potential breakage
+- **Additional Attributes**:
+  ```python
+  ir.async_create_issue(
+      hass, DOMAIN, "issue_id",
+      breaks_in_ha_version="2024.1.0",
+      is_fixable=True,
+      is_persistent=True,
+      severity=ir.IssueSeverity.ERROR,
+      translation_key="issue_description",
+  )
+  ```
 - Only create issues for problems users can potentially resolve

.github/workflows/builder.yml

@@ -112,7 +112,7 @@ jobs:
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+        uses: dawidd6/action-download-artifact@2536c51d3d126276eb39f74d6bc9c72ac6ef30d3 # v16
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/frontend
@@ -123,7 +123,7 @@ jobs:
 
       - name: Download nightly wheels of intents
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+        uses: dawidd6/action-download-artifact@2536c51d3d126276eb39f74d6bc9c72ac6ef30d3 # v16
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: OHF-Voice/intents-package

.github/workflows/ci.yaml

@@ -40,7 +40,7 @@ env:
   CACHE_VERSION: 3
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.5"
+  HA_SHORT_VERSION: "2026.4"
   ADDITIONAL_PYTHON_VERSIONS: "[]"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
@@ -280,7 +280,7 @@ jobs:
           echo "::add-matcher::.github/workflows/matchers/check-executables-have-shebangs.json"
           echo "::add-matcher::.github/workflows/matchers/codespell.json"
       - name: Run prek
-        uses: j178/prek-action@79f765515bd648eb4d6bb1b17277b7cb22cb6468 # v2.0.0
+        uses: j178/prek-action@0bb87d7f00b0c99306c8bcb8b8beba1eb581c037 # v1.1.1
         env:
           PREK_SKIP: no-commit-to-branch,mypy,pylint,gen_requirements_all,hassfest,hassfest-metadata,hassfest-mypy-config,zizmor
           RUFF_OUTPUT_FORMAT: github
@@ -301,7 +301,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Run zizmor
-        uses: j178/prek-action@79f765515bd648eb4d6bb1b17277b7cb22cb6468 # v2.0.0
+        uses: j178/prek-action@0bb87d7f00b0c99306c8bcb8b8beba1eb581c037 # v1.1.1
         with:
           extra-args: --all-files zizmor
 
@@ -364,7 +364,7 @@ jobs:
           echo "key=uv-${UV_CACHE_VERSION}-${uv_version}-${HA_SHORT_VERSION}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           key: >-
@@ -372,7 +372,7 @@ jobs:
             needs.info.outputs.python_cache_key }}
       - name: Restore uv wheel cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ${{ env.UV_CACHE_DIR }}
           key: >-
@@ -384,7 +384,7 @@ jobs:
             env.HA_SHORT_VERSION }}-
       - name: Check if apt cache exists
         id: cache-apt-check
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           lookup-only: ${{ steps.cache-venv.outputs.cache-hit == 'true' }}
           path: |
@@ -430,7 +430,7 @@ jobs:
           fi
       - name: Save apt cache
         if: steps.cache-apt-check.outputs.cache-hit != 'true'
-        uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -484,7 +484,7 @@ jobs:
       && github.event.inputs.audit-licenses-only != 'true'
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -515,7 +515,7 @@ jobs:
           check-latest: true
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -552,7 +552,7 @@ jobs:
           check-latest: true
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -643,7 +643,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -694,7 +694,7 @@ jobs:
           check-latest: true
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -747,7 +747,7 @@ jobs:
           check-latest: true
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -804,7 +804,7 @@ jobs:
           echo "key=mypy-${MYPY_CACHE_VERSION}-${mypy_version}-${HA_SHORT_VERSION}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -812,7 +812,7 @@ jobs:
             ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Restore mypy cache
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: .mypy_cache
           key: >-
@@ -854,7 +854,7 @@ jobs:
       - base
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -887,7 +887,7 @@ jobs:
           check-latest: true
       - name: Restore full Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -930,7 +930,7 @@ jobs:
         group: ${{ fromJson(needs.info.outputs.test_groups) }}
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -964,7 +964,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1080,7 +1080,7 @@ jobs:
         mariadb-group: ${{ fromJson(needs.info.outputs.mariadb_groups) }}
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -1115,7 +1115,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1238,7 +1238,7 @@ jobs:
         postgresql-group: ${{ fromJson(needs.info.outputs.postgresql_groups) }}
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -1275,7 +1275,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1392,7 +1392,7 @@ jobs:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           fail_ci_if_error: true
           flags: full-suite
@@ -1421,7 +1421,7 @@ jobs:
         group: ${{ fromJson(needs.info.outputs.test_groups) }}
     steps:
       - name: Restore apt cache
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ${{ env.APT_CACHE_DIR }}
@@ -1455,7 +1455,7 @@ jobs:
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1563,7 +1563,7 @@ jobs:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }} # zizmor: ignore[secrets-outside-env]
@@ -1591,7 +1591,7 @@ jobs:
         with:
           pattern: test-results-*
       - name: Upload test results to Codecov
-        uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           report_type: test_results
           fail_ci_if_error: true

CODEOWNERS

@@ -1228,8 +1228,8 @@ build.json @home-assistant/supervisor
 /tests/components/onewire/ @garbled1 @epenet
 /homeassistant/components/onkyo/ @arturpragacz @eclair4151
 /tests/components/onkyo/ @arturpragacz @eclair4151
-/homeassistant/components/onvif/ @jterrace
-/tests/components/onvif/ @jterrace
+/homeassistant/components/onvif/ @hunterjm @jterrace
+/tests/components/onvif/ @hunterjm @jterrace
 /homeassistant/components/open_meteo/ @frenck
 /tests/components/open_meteo/ @frenck
 /homeassistant/components/open_router/ @joostlek

homeassistant/bootstrap.py

@@ -468,7 +468,6 @@ async def async_load_base_functionality(hass: core.HomeAssistant) -> bool:
     translation.async_setup(hass)
 
     recovery = hass.config.recovery_mode
-    device_registry.async_setup(hass)
     try:
         await asyncio.gather(
             create_eager_task(get_internal_store_manager(hass).async_initialize()),

homeassistant/components/abode/sensor.py

@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
-    SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
@@ -41,7 +40,6 @@ 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
         ],
@@ -50,14 +48,12 @@ 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

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

homeassistant/components/air_quality/conditions.yaml

@@ -4,161 +4,370 @@
   required: true
   default: any
   selector:
-    select:
+    automation_behavior:
       translation_key: condition_behavior
+      mode: condition
+
+# --- Number or entity selectors ---
+
+.number_or_entity_co: &number_or_entity_co
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "ppm"
+                    - "mg/m³"
+                    - "μg/m³"
+                - domain: sensor
+                  device_class: carbon_monoxide
+                - domain: number
+                  device_class: carbon_monoxide
+      translation_key: number_or_entity
+
+.number_or_entity_co2: &number_or_entity_co2
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "ppm"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "ppm"
+                - domain: sensor
+                  device_class: carbon_dioxide
+                - domain: number
+                  device_class: carbon_dioxide
+      translation_key: number_or_entity
+
+.number_or_entity_pm1: &number_or_entity_pm1
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "μg/m³"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "μg/m³"
+                - domain: sensor
+                  device_class: pm1
+                - domain: number
+                  device_class: pm1
+      translation_key: number_or_entity
+
+.number_or_entity_pm25: &number_or_entity_pm25
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "μg/m³"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "μg/m³"
+                - domain: sensor
+                  device_class: pm25
+                - domain: number
+                  device_class: pm25
+      translation_key: number_or_entity
+
+.number_or_entity_pm4: &number_or_entity_pm4
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "μg/m³"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "μg/m³"
+                - domain: sensor
+                  device_class: pm4
+                - domain: number
+                  device_class: pm4
+      translation_key: number_or_entity
+
+.number_or_entity_pm10: &number_or_entity_pm10
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "μg/m³"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "μg/m³"
+                - domain: sensor
+                  device_class: pm10
+                - domain: number
+                  device_class: pm10
+      translation_key: number_or_entity
+
+.number_or_entity_ozone: &number_or_entity_ozone
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "ppm"
+                    - "μg/m³"
+                - domain: sensor
+                  device_class: ozone
+                - domain: number
+                  device_class: ozone
+      translation_key: number_or_entity
+
+.number_or_entity_voc: &number_or_entity_voc
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "μg/m³"
+                    - "mg/m³"
+                - domain: sensor
+                  device_class: volatile_organic_compounds
+                - domain: number
+                  device_class: volatile_organic_compounds
+      translation_key: number_or_entity
+
+.number_or_entity_voc_ratio: &number_or_entity_voc_ratio
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "ppm"
+                - domain: sensor
+                  device_class: volatile_organic_compounds_parts
+                - domain: number
+                  device_class: volatile_organic_compounds_parts
+      translation_key: number_or_entity
+
+.number_or_entity_no: &number_or_entity_no
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "μg/m³"
+                - domain: sensor
+                  device_class: nitrogen_monoxide
+                - domain: number
+                  device_class: nitrogen_monoxide
+      translation_key: number_or_entity
+
+.number_or_entity_no2: &number_or_entity_no2
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "ppm"
+                    - "μg/m³"
+                - domain: sensor
+                  device_class: nitrogen_dioxide
+                - domain: number
+                  device_class: nitrogen_dioxide
+      translation_key: number_or_entity
+
+.number_or_entity_n2o: &number_or_entity_n2o
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "μg/m³"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "μg/m³"
+                - domain: sensor
+                  device_class: nitrous_oxide
+                - domain: number
+                  device_class: nitrous_oxide
+      translation_key: number_or_entity
+
+.number_or_entity_so2: &number_or_entity_so2
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "μg/m³"
+                - domain: sensor
+                  device_class: sulphur_dioxide
+                - domain: number
+                  device_class: sulphur_dioxide
+      translation_key: number_or_entity
+
+# --- Unit selectors ---
+
+.unit_co: &unit_co
+  required: false
+  selector:
+    select:
       options:
-        - all
-        - any
+        - "ppb"
+        - "ppm"
+        - "mg/m³"
+        - "μg/m³"
 
-# --- Unit lists for multi-unit pollutants ---
+.unit_ozone: &unit_ozone
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "μg/m³"
 
-.co_units: &co_units
-  - "ppb"
-  - "ppm"
-  - "mg/m³"
-  - "μg/m³"
+.unit_no2: &unit_no2
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "μg/m³"
 
-.ozone_units: &ozone_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
+.unit_no: &unit_no
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "μg/m³"
 
-.voc_units: &voc_units
-  - "μg/m³"
-  - "mg/m³"
+.unit_so2: &unit_so2
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "μg/m³"
 
-.voc_ratio_units: &voc_ratio_units
-  - "ppb"
-  - "ppm"
+.unit_voc: &unit_voc
+  required: false
+  selector:
+    select:
+      options:
+        - "μg/m³"
+        - "mg/m³"
 
-.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³"
+.unit_voc_ratio: &unit_voc_ratio
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
 
 # --- Binary sensor targets ---
 
@@ -280,99 +489,57 @@ 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
+    above: *number_or_entity_co
+    below: *number_or_entity_co
+    unit: *unit_co
 
 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
+    above: *number_or_entity_ozone
+    below: *number_or_entity_ozone
+    unit: *unit_ozone
 
 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
+    above: *number_or_entity_voc
+    below: *number_or_entity_voc
+    unit: *unit_voc
 
 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
+    above: *number_or_entity_voc_ratio
+    below: *number_or_entity_voc_ratio
+    unit: *unit_voc_ratio
 
 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
+    above: *number_or_entity_no
+    below: *number_or_entity_no
+    unit: *unit_no
 
 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
+    above: *number_or_entity_no2
+    below: *number_or_entity_no2
+    unit: *unit_no2
 
 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
+    above: *number_or_entity_so2
+    below: *number_or_entity_so2
+    unit: *unit_so2
 
 # --- Numerical sensor conditions without unit conversion ---
 
@@ -380,70 +547,40 @@ 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
+    above: *number_or_entity_co2
+    below: *number_or_entity_co2
 
 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
+    above: *number_or_entity_pm1
+    below: *number_or_entity_pm1
 
 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
+    above: *number_or_entity_pm25
+    below: *number_or_entity_pm25
 
 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
+    above: *number_or_entity_pm4
+    below: *number_or_entity_pm4
 
 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
+    above: *number_or_entity_pm10
+    below: *number_or_entity_pm10
 
 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
+    above: *number_or_entity_n2o
+    below: *number_or_entity_n2o

homeassistant/components/air_quality/strings.json

@@ -1,26 +1,41 @@
 {
   "common": {
+    "condition_above_description": "Require the value to be above this value.",
+    "condition_above_name": "Above",
     "condition_behavior_description": "How the value should match on the targeted entities.",
     "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
+    "condition_below_description": "Require the value to be below this value.",
+    "condition_below_name": "Below",
+    "condition_unit_description": "All values will be converted to this unit when evaluating the condition.",
+    "condition_unit_name": "Unit of measurement",
     "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
     "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "trigger_changed_above_name": "Above",
+    "trigger_changed_below_name": "Below",
+    "trigger_threshold_lower_limit_description": "The lower limit of the threshold.",
+    "trigger_threshold_lower_limit_name": "Lower limit",
+    "trigger_threshold_type_description": "The type of threshold to use.",
+    "trigger_threshold_type_name": "Threshold type",
+    "trigger_threshold_upper_limit_description": "The upper limit of the threshold.",
+    "trigger_threshold_upper_limit_name": "Upper limit",
+    "trigger_unit_description": "All values will be converted to this unit when evaluating the trigger.",
+    "trigger_unit_name": "Unit of measurement"
   },
   "conditions": {
     "is_co2_value": {
       "description": "Tests the carbon dioxide level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
         }
       },
       "name": "Carbon dioxide value"
@@ -48,13 +63,21 @@
     "is_co_value": {
       "description": "Tests the carbon monoxide level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::condition_unit_description%]",
+          "name": "[%key:component::air_quality::common::condition_unit_name%]"
         }
       },
       "name": "Carbon monoxide value"
@@ -82,13 +105,17 @@
     "is_n2o_value": {
       "description": "Tests the nitrous oxide level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
         }
       },
       "name": "Nitrous oxide value"
@@ -96,13 +123,21 @@
     "is_no2_value": {
       "description": "Tests the nitrogen dioxide level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::condition_unit_description%]",
+          "name": "[%key:component::air_quality::common::condition_unit_name%]"
         }
       },
       "name": "Nitrogen dioxide value"
@@ -110,13 +145,21 @@
     "is_no_value": {
       "description": "Tests the nitrogen monoxide level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::condition_unit_description%]",
+          "name": "[%key:component::air_quality::common::condition_unit_name%]"
         }
       },
       "name": "Nitrogen monoxide value"
@@ -124,13 +167,21 @@
     "is_ozone_value": {
       "description": "Tests the ozone level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::condition_unit_description%]",
+          "name": "[%key:component::air_quality::common::condition_unit_name%]"
         }
       },
       "name": "Ozone value"
@@ -138,13 +189,17 @@
     "is_pm10_value": {
       "description": "Tests the PM10 level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
         }
       },
       "name": "PM10 value"
@@ -152,13 +207,17 @@
     "is_pm1_value": {
       "description": "Tests the PM1 level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
         }
       },
       "name": "PM1 value"
@@ -166,13 +225,17 @@
     "is_pm25_value": {
       "description": "Tests the PM2.5 level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
         }
       },
       "name": "PM2.5 value"
@@ -180,13 +243,17 @@
     "is_pm4_value": {
       "description": "Tests the PM4 level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
         }
       },
       "name": "PM4 value"
@@ -214,13 +281,21 @@
     "is_so2_value": {
       "description": "Tests the sulphur dioxide level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::condition_unit_description%]",
+          "name": "[%key:component::air_quality::common::condition_unit_name%]"
         }
       },
       "name": "Sulphur dioxide value"
@@ -228,13 +303,21 @@
     "is_voc_ratio_value": {
       "description": "Tests the volatile organic compounds ratio of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::condition_unit_description%]",
+          "name": "[%key:component::air_quality::common::condition_unit_name%]"
         }
       },
       "name": "Volatile organic compounds ratio value"
@@ -242,13 +325,21 @@
     "is_voc_value": {
       "description": "Tests the volatile organic compounds level of one or more entities.",
       "fields": {
+        "above": {
+          "description": "[%key:component::air_quality::common::condition_above_description%]",
+          "name": "[%key:component::air_quality::common::condition_above_name%]"
+        },
         "behavior": {
           "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        "below": {
+          "description": "[%key:component::air_quality::common::condition_below_description%]",
+          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::condition_unit_description%]",
+          "name": "[%key:component::air_quality::common::condition_unit_name%]"
         }
       },
       "name": "Volatile organic compounds value"
@@ -261,12 +352,26 @@
         "any": "Any"
       }
     },
+    "number_or_entity": {
+      "choices": {
+        "entity": "Entity",
+        "number": "Number"
+      }
+    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
         "first": "First",
         "last": "Last"
       }
+    },
+    "trigger_threshold_type": {
+      "options": {
+        "above": "Above",
+        "below": "Below",
+        "between": "Between",
+        "outside": "Outside"
+      }
     }
   },
   "title": "Air Quality",
@@ -274,9 +379,13 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when carbon dioxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when carbon dioxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
         }
       },
       "name": "Carbon dioxide level changed"
@@ -288,9 +397,17 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "Carbon dioxide level crossed threshold"
@@ -298,9 +415,17 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when carbon monoxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when carbon monoxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
         }
       },
       "name": "Carbon monoxide level changed"
@@ -322,9 +447,21 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "Carbon monoxide level crossed threshold"
@@ -362,9 +499,13 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when nitrous oxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when nitrous oxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
         }
       },
       "name": "Nitrous oxide level changed"
@@ -376,9 +517,17 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "Nitrous oxide level crossed threshold"
@@ -386,9 +535,17 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when nitrogen dioxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when nitrogen dioxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
         }
       },
       "name": "Nitrogen dioxide level changed"
@@ -400,9 +557,21 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "Nitrogen dioxide level crossed threshold"
@@ -410,9 +579,17 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when nitrogen monoxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when nitrogen monoxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
         }
       },
       "name": "Nitrogen monoxide level changed"
@@ -424,9 +601,21 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "Nitrogen monoxide level crossed threshold"
@@ -434,9 +623,17 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when ozone level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when ozone level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
         }
       },
       "name": "Ozone level changed"
@@ -448,9 +645,21 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "Ozone level crossed threshold"
@@ -458,9 +667,13 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when PM10 level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when PM10 level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
         }
       },
       "name": "PM10 level changed"
@@ -472,9 +685,17 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "PM10 level crossed threshold"
@@ -482,9 +703,13 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when PM1 level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when PM1 level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
         }
       },
       "name": "PM1 level changed"
@@ -496,9 +721,17 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "PM1 level crossed threshold"
@@ -506,9 +739,13 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when PM2.5 level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when PM2.5 level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
         }
       },
       "name": "PM2.5 level changed"
@@ -520,9 +757,17 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "PM2.5 level crossed threshold"
@@ -530,9 +775,13 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when PM4 level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when PM4 level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
         }
       },
       "name": "PM4 level changed"
@@ -544,9 +793,17 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "PM4 level crossed threshold"
@@ -574,9 +831,17 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when sulphur dioxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when sulphur dioxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
         }
       },
       "name": "Sulphur dioxide level changed"
@@ -588,9 +853,21 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "Sulphur dioxide level crossed threshold"
@@ -598,9 +875,17 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when volatile organic compounds level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when volatile organic compounds level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
         }
       },
       "name": "Volatile organic compounds level changed"
@@ -612,9 +897,21 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "Volatile organic compounds level crossed threshold"
@@ -622,9 +919,17 @@
     "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%]"
+        "above": {
+          "description": "Only trigger when volatile organic compounds ratio is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when volatile organic compounds ratio is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
         }
       },
       "name": "Volatile organic compounds ratio changed"
@@ -636,9 +941,21 @@
           "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%]"
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
         }
       },
       "name": "Volatile organic compounds ratio crossed threshold"

homeassistant/components/air_quality/trigger.py

@@ -13,7 +13,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
 from homeassistant.helpers.trigger import (
     EntityTargetStateTriggerBase,
     Trigger,
@@ -64,28 +64,28 @@ TRIGGERS: dict[str, type[Trigger]] = {
     "smoke_cleared": _make_cleared_trigger(BinarySensorDeviceClass.SMOKE),
     # Numerical sensor triggers with unit conversion
     "co_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
+        {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: DomainSpec(device_class=SensorDeviceClass.CO)},
+        {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: DomainSpec(device_class=SensorDeviceClass.OZONE)},
+        {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: DomainSpec(device_class=SensorDeviceClass.OZONE)},
+        {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: DomainSpec(
+            SENSOR_DOMAIN: NumericalDomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
             )
         },
@@ -94,7 +94,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
     ),
     "voc_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
         {
-            SENSOR_DOMAIN: DomainSpec(
+            SENSOR_DOMAIN: NumericalDomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
             )
         },
@@ -103,7 +103,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
     ),
     "voc_ratio_changed": make_entity_numerical_state_changed_with_unit_trigger(
         {
-            SENSOR_DOMAIN: DomainSpec(
+            SENSOR_DOMAIN: NumericalDomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
             )
         },
@@ -112,7 +112,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
     ),
     "voc_ratio_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
         {
-            SENSOR_DOMAIN: DomainSpec(
+            SENSOR_DOMAIN: NumericalDomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
             )
         },
@@ -120,82 +120,114 @@ TRIGGERS: dict[str, type[Trigger]] = {
         UnitlessRatioConverter,
     ),
     "no_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
+        {
+            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: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
+        {
+            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: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
+        {
+            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: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
+        {
+            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: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
+        {
+            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: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
+        {
+            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: DomainSpec(device_class=SensorDeviceClass.CO2)},
+        {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: DomainSpec(device_class=SensorDeviceClass.CO2)},
+        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO2)},
         valid_unit=CONCENTRATION_PARTS_PER_MILLION,
     ),
     "pm1_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
+        {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: DomainSpec(device_class=SensorDeviceClass.PM1)},
+        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM1)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm25_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
+        {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: DomainSpec(device_class=SensorDeviceClass.PM25)},
+        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM25)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm4_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
+        {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: DomainSpec(device_class=SensorDeviceClass.PM4)},
+        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM4)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm10_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
+        {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: DomainSpec(device_class=SensorDeviceClass.PM10)},
+        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM10)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "n2o_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
+        {
+            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: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.NITROUS_OXIDE
+            )
+        },
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
 }

homeassistant/components/air_quality/triggers.yaml

@@ -3,162 +3,378 @@
     required: true
     default: any
     selector:
-      select:
+      automation_behavior:
         translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
+        mode: trigger
 
-# --- Unit lists for multi-unit pollutants ---
+.number_or_entity_co: &number_or_entity_co
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "ppm"
+                    - "mg/m³"
+                    - "μg/m³"
+                - domain: sensor
+                  device_class: carbon_monoxide
+                - domain: number
+                  device_class: carbon_monoxide
+      translation_key: number_or_entity
 
-.co_units: &co_units
-  - "ppb"
-  - "ppm"
-  - "mg/m³"
-  - "μg/m³"
+.number_or_entity_co2: &number_or_entity_co2
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "ppm"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "ppm"
+                - domain: sensor
+                  device_class: carbon_dioxide
+                - domain: number
+                  device_class: carbon_dioxide
+      translation_key: number_or_entity
 
-.ozone_units: &ozone_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
+.number_or_entity_pm1: &number_or_entity_pm1
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "μg/m³"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "μg/m³"
+                - domain: sensor
+                  device_class: pm1
+                - domain: number
+                  device_class: pm1
+      translation_key: number_or_entity
 
-.voc_units: &voc_units
-  - "μg/m³"
-  - "mg/m³"
+.number_or_entity_pm25: &number_or_entity_pm25
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "μg/m³"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "μg/m³"
+                - domain: sensor
+                  device_class: pm25
+                - domain: number
+                  device_class: pm25
+      translation_key: number_or_entity
 
-.voc_ratio_units: &voc_ratio_units
-  - "ppb"
-  - "ppm"
+.number_or_entity_pm4: &number_or_entity_pm4
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "μg/m³"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "μg/m³"
+                - domain: sensor
+                  device_class: pm4
+                - domain: number
+                  device_class: pm4
+      translation_key: number_or_entity
 
-.no_units: &no_units
-  - "ppb"
-  - "μg/m³"
+.number_or_entity_pm10: &number_or_entity_pm10
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "μg/m³"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "μg/m³"
+                - domain: sensor
+                  device_class: pm10
+                - domain: number
+                  device_class: pm10
+      translation_key: number_or_entity
 
-.no2_units: &no2_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
+.number_or_entity_ozone: &number_or_entity_ozone
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "ppm"
+                    - "μg/m³"
+                - domain: sensor
+                  device_class: ozone
+                - domain: number
+                  device_class: ozone
+      translation_key: number_or_entity
 
-.so2_units: &so2_units
-  - "ppb"
-  - "μg/m³"
+.number_or_entity_voc: &number_or_entity_voc
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "μg/m³"
+                    - "mg/m³"
+                - domain: sensor
+                  device_class: volatile_organic_compounds
+                - domain: number
+                  device_class: volatile_organic_compounds
+      translation_key: number_or_entity
 
-# --- Entity filter anchors ---
+.number_or_entity_voc_ratio: &number_or_entity_voc_ratio
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "ppm"
+                - domain: sensor
+                  device_class: volatile_organic_compounds_parts
+                - domain: number
+                  device_class: volatile_organic_compounds_parts
+      translation_key: number_or_entity
 
-.co_threshold_entity: &co_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *co_units
-  - domain: sensor
-    device_class: carbon_monoxide
-  - domain: number
-    device_class: carbon_monoxide
+.number_or_entity_no: &number_or_entity_no
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "μg/m³"
+                - domain: sensor
+                  device_class: nitrogen_monoxide
+                - domain: number
+                  device_class: nitrogen_monoxide
+      translation_key: number_or_entity
 
-.co2_threshold_entity: &co2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "ppm"
-  - domain: sensor
-    device_class: carbon_dioxide
-  - domain: number
-    device_class: carbon_dioxide
+.number_or_entity_no2: &number_or_entity_no2
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "ppm"
+                    - "μg/m³"
+                - domain: sensor
+                  device_class: nitrogen_dioxide
+                - domain: number
+                  device_class: nitrogen_dioxide
+      translation_key: number_or_entity
 
-.pm1_threshold_entity: &pm1_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm1
-  - domain: number
-    device_class: pm1
+.number_or_entity_n2o: &number_or_entity_n2o
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "μg/m³"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "μg/m³"
+                - domain: sensor
+                  device_class: nitrous_oxide
+                - domain: number
+                  device_class: nitrous_oxide
+      translation_key: number_or_entity
 
-.pm25_threshold_entity: &pm25_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm25
-  - domain: number
-    device_class: pm25
+.number_or_entity_so2: &number_or_entity_so2
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "ppb"
+                    - "μg/m³"
+                - domain: sensor
+                  device_class: sulphur_dioxide
+                - domain: number
+                  device_class: sulphur_dioxide
+      translation_key: number_or_entity
 
-.pm4_threshold_entity: &pm4_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm4
-  - domain: number
-    device_class: pm4
+.unit_co: &unit_co
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "mg/m³"
+        - "μg/m³"
 
-.pm10_threshold_entity: &pm10_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm10
-  - domain: number
-    device_class: pm10
+.unit_ozone: &unit_ozone
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "μg/m³"
 
-.ozone_threshold_entity: &ozone_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *ozone_units
-  - domain: sensor
-    device_class: ozone
-  - domain: number
-    device_class: ozone
+.unit_no2: &unit_no2
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "μg/m³"
 
-.voc_threshold_entity: &voc_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *voc_units
-  - domain: sensor
-    device_class: volatile_organic_compounds
-  - domain: number
-    device_class: volatile_organic_compounds
+.unit_no: &unit_no
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "μg/m³"
 
-.voc_ratio_threshold_entity: &voc_ratio_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *voc_ratio_units
-  - domain: sensor
-    device_class: volatile_organic_compounds_parts
-  - domain: number
-    device_class: volatile_organic_compounds_parts
+.unit_so2: &unit_so2
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "μg/m³"
 
-.no_threshold_entity: &no_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *no_units
-  - domain: sensor
-    device_class: nitrogen_monoxide
-  - domain: number
-    device_class: nitrogen_monoxide
+.unit_voc: &unit_voc
+  required: false
+  selector:
+    select:
+      options:
+        - "μg/m³"
+        - "mg/m³"
 
-.no2_threshold_entity: &no2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *no2_units
-  - domain: sensor
-    device_class: nitrogen_dioxide
-  - domain: number
-    device_class: nitrogen_dioxide
+.unit_voc_ratio: &unit_voc_ratio
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
 
-.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³"
+.trigger_threshold_type: &trigger_threshold_type
+  required: true
+  default: above
+  selector:
+    select:
+      options:
+        - above
+        - below
+        - between
+        - outside
+      translation_key: trigger_threshold_type
 
 # Binary sensor detected/cleared trigger fields
 .trigger_binary_fields: &trigger_binary_fields
@@ -276,342 +492,198 @@ smoke_cleared:
 
 # --- 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
+    above: *number_or_entity_co
+    below: *number_or_entity_co
+    unit: *unit_co
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_co
+    upper_limit: *number_or_entity_co
+    unit: *unit_co
 
-# 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
+    above: *number_or_entity_co2
+    below: *number_or_entity_co2
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_co2
+    upper_limit: *number_or_entity_co2
 
-# 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
+    above: *number_or_entity_pm1
+    below: *number_or_entity_pm1
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_pm1
+    upper_limit: *number_or_entity_pm1
 
-# 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
+    above: *number_or_entity_pm25
+    below: *number_or_entity_pm25
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_pm25
+    upper_limit: *number_or_entity_pm25
 
-# 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
+    above: *number_or_entity_pm4
+    below: *number_or_entity_pm4
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_pm4
+    upper_limit: *number_or_entity_pm4
 
-# 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
+    above: *number_or_entity_pm10
+    below: *number_or_entity_pm10
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_pm10
+    upper_limit: *number_or_entity_pm10
 
-# 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
+    above: *number_or_entity_ozone
+    below: *number_or_entity_ozone
+    unit: *unit_ozone
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_ozone
+    upper_limit: *number_or_entity_ozone
+    unit: *unit_ozone
 
-# 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
+    above: *number_or_entity_voc
+    below: *number_or_entity_voc
+    unit: *unit_voc
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_voc
+    upper_limit: *number_or_entity_voc
+    unit: *unit_voc
 
-# 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
+    above: *number_or_entity_voc_ratio
+    below: *number_or_entity_voc_ratio
+    unit: *unit_voc_ratio
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_voc_ratio
+    upper_limit: *number_or_entity_voc_ratio
+    unit: *unit_voc_ratio
 
-# 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
+    above: *number_or_entity_no
+    below: *number_or_entity_no
+    unit: *unit_no
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_no
+    upper_limit: *number_or_entity_no
+    unit: *unit_no
 
-# 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
+    above: *number_or_entity_no2
+    below: *number_or_entity_no2
+    unit: *unit_no2
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_no2
+    upper_limit: *number_or_entity_no2
+    unit: *unit_no2
 
-# 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
+    above: *number_or_entity_n2o
+    below: *number_or_entity_n2o
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_n2o
+    upper_limit: *number_or_entity_n2o
 
-# 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
+    above: *number_or_entity_so2
+    below: *number_or_entity_so2
+    unit: *unit_so2
 
 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
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_so2
+    upper_limit: *number_or_entity_so2
+    unit: *unit_so2

homeassistant/components/airq/strings.json

@@ -2,7 +2,6 @@
   "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/aladdin_connect/__init__.py

@@ -13,9 +13,6 @@ from homeassistant.helpers import (
     config_entry_oauth2_flow,
     device_registry as dr,
 )
-from homeassistant.helpers.config_entry_oauth2_flow import (
-    ImplementationUnavailableError,
-)
 
 from . import api
 from .const import CONFIG_FLOW_MINOR_VERSION, CONFIG_FLOW_VERSION, DOMAIN
@@ -28,17 +25,11 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: AladdinConnectConfigEntry
 ) -> bool:
     """Set up Aladdin Connect Genie from a config entry."""
-    try:
-        implementation = (
-            await config_entry_oauth2_flow.async_get_config_entry_implementation(
-                hass, entry
-            )
+    implementation = (
+        await config_entry_oauth2_flow.async_get_config_entry_implementation(
+            hass, entry
         )
-    except ImplementationUnavailableError as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="oauth2_implementation_unavailable",
-        ) from err
+    )
 
     session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
 

homeassistant/components/aladdin_connect/strings.json

@@ -37,9 +37,6 @@
     "close_door_failed": {
       "message": "Failed to close the garage door"
     },
-    "oauth2_implementation_unavailable": {
-      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
-    },
     "open_door_failed": {
       "message": "Failed to open the garage door"
     }

homeassistant/components/alarm_control_panel/conditions.yaml

@@ -7,11 +7,9 @@
       required: true
       default: any
       selector:
-        select:
+        automation_behavior:
           translation_key: condition_behavior
-          options:
-            - all
-            - any
+          mode: condition
 
 is_armed: *condition_common
 

homeassistant/components/alarm_control_panel/triggers.yaml

@@ -7,12 +7,9 @@
       required: true
       default: any
       selector:
-        select:
-          options:
-            - first
-            - last
-            - any
+        automation_behavior:
           translation_key: trigger_behavior
+          mode: trigger
 
 armed: *trigger_common
 

homeassistant/components/alexa_devices/manifest.json

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

homeassistant/components/anglian_water/manifest.json

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

homeassistant/components/anthropic/__init__.py

@@ -45,21 +45,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: AnthropicConfigEntry) ->
     try:
         await client.models.list(timeout=10.0)
     except anthropic.AuthenticationError as err:
-        raise ConfigEntryAuthFailed(
-            translation_domain=DOMAIN,
-            translation_key="api_authentication_error",
-            translation_placeholders={"message": err.message},
-        ) from err
+        raise ConfigEntryAuthFailed(err) from err
     except anthropic.AnthropicError as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="api_error",
-            translation_placeholders={
-                "message": err.message
-                if isinstance(err, anthropic.APIError)
-                else str(err)
-            },
-        ) from err
+        raise ConfigEntryNotReady(err) from err
 
     entry.runtime_data = client
 

homeassistant/components/anthropic/ai_task.py

@@ -12,7 +12,6 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.json import json_loads
 
-from .const import DOMAIN
 from .entity import AnthropicBaseLLMEntity
 
 if TYPE_CHECKING:
@@ -61,7 +60,7 @@ class AnthropicTaskEntity(
 
         if not isinstance(chat_log.content[-1], conversation.AssistantContent):
             raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="response_not_found"
+                "Last content in chat log is not an AssistantContent"
             )
 
         text = chat_log.content[-1].content or ""
@@ -79,9 +78,7 @@ class AnthropicTaskEntity(
                 err,
                 text,
             )
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="json_parse_error"
-            ) from err
+            raise HomeAssistantError("Error with Claude structured response") from err
 
         return ai_task.GenDataTaskResult(
             conversation_id=chat_log.conversation_id,

homeassistant/components/anthropic/entity.py

@@ -401,11 +401,7 @@ def _convert_content(
                 messages[-1]["content"] = messages[-1]["content"][0]["text"]
         else:
             # Note: We don't pass SystemContent here as it's passed to the API as the prompt
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="unexpected_chat_log_content",
-                translation_placeholders={"type": type(content).__name__},
-            )
+            raise HomeAssistantError("Unexpected content type in chat log")
 
     return messages, container_id
 
@@ -447,9 +443,7 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
     Each message could contain multiple blocks of the same type.
     """
     if stream is None or not hasattr(stream, "__aiter__"):
-        raise HomeAssistantError(
-            translation_domain=DOMAIN, translation_key="unexpected_stream_object"
-        )
+        raise HomeAssistantError("Expected a stream of messages")
 
     current_tool_block: ToolUseBlockParam | ServerToolUseBlockParam | None = None
     current_tool_args: str
@@ -611,9 +605,7 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                 chat_log.async_trace(_create_token_stats(input_usage, usage))
             content_details.container = response.delta.container
             if response.delta.stop_reason == "refusal":
-                raise HomeAssistantError(
-                    translation_domain=DOMAIN, translation_key="api_refusal"
-                )
+                raise HomeAssistantError("Potential policy violation detected")
         elif isinstance(response, RawMessageStopEvent):
             if content_details:
                 content_details.delete_empty()
@@ -672,9 +664,7 @@ class AnthropicBaseLLMEntity(Entity):
 
         system = chat_log.content[0]
         if not isinstance(system, conversation.SystemContent):
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="system_message_not_found"
-            )
+            raise HomeAssistantError("First message must be a system message")
 
         # System prompt with caching enabled
         system_prompt: list[TextBlockParam] = [
@@ -764,7 +754,7 @@ class AnthropicBaseLLMEntity(Entity):
             last_message = messages[-1]
             if last_message["role"] != "user":
                 raise HomeAssistantError(
-                    translation_domain=DOMAIN, translation_key="user_message_not_found"
+                    "Last message must be a user message to add attachments"
                 )
             if isinstance(last_message["content"], str):
                 last_message["content"] = [
@@ -869,19 +859,11 @@ class AnthropicBaseLLMEntity(Entity):
             except anthropic.AuthenticationError as err:
                 self.entry.async_start_reauth(self.hass)
                 raise HomeAssistantError(
-                    translation_domain=DOMAIN,
-                    translation_key="api_authentication_error",
-                    translation_placeholders={"message": err.message},
+                    "Authentication error with Anthropic API, reauthentication required"
                 ) from err
             except anthropic.AnthropicError as err:
                 raise HomeAssistantError(
-                    translation_domain=DOMAIN,
-                    translation_key="api_error",
-                    translation_placeholders={
-                        "message": err.message
-                        if isinstance(err, anthropic.APIError)
-                        else str(err)
-                    },
+                    f"Sorry, I had a problem talking to Anthropic: {err}"
                 ) from err
 
             if not chat_log.unresponded_tool_results:
@@ -901,23 +883,15 @@ async def async_prepare_files_for_prompt(
 
         for file_path, mime_type in files:
             if not file_path.exists():
-                raise HomeAssistantError(
-                    translation_domain=DOMAIN,
-                    translation_key="wrong_file_path",
-                    translation_placeholders={"file_path": file_path.as_posix()},
-                )
+                raise HomeAssistantError(f"`{file_path}` does not exist")
 
             if mime_type is None:
                 mime_type = guess_file_type(file_path)[0]
 
             if not mime_type or not mime_type.startswith(("image/", "application/pdf")):
                 raise HomeAssistantError(
-                    translation_domain=DOMAIN,
-                    translation_key="wrong_file_type",
-                    translation_placeholders={
-                        "file_path": file_path.as_posix(),
-                        "mime_type": mime_type or "unknown",
-                    },
+                    "Only images and PDF are supported by the Anthropic API,"
+                    f"`{file_path}` is not an image file or PDF"
                 )
             if mime_type == "image/jpg":
                 mime_type = "image/jpeg"

homeassistant/components/anthropic/quality_scale.yaml

@@ -59,7 +59,10 @@ rules:
     status: exempt
     comment: |
       No data updates.
-  docs-examples: done
+  docs-examples:
+    status: todo
+    comment: |
+      To give examples of how people use the integration
   docs-known-limitations: done
   docs-supported-devices:
     status: todo
@@ -85,7 +88,7 @@ rules:
     comment: |
       No entities disabled by default.
   entity-translations: todo
-  exception-translations: done
+  exception-translations: todo
   icon-translations: done
   reconfiguration-flow: done
   repair-issues: done

homeassistant/components/anthropic/repairs.py

@@ -161,9 +161,7 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
             is None
             or (subentry := entry.subentries.get(self._current_subentry_id)) is None
         ):
-            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="subentry_not_found"
-            )
+            raise HomeAssistantError("Subentry not found")
 
         updated_data = {
             **subentry.data,
@@ -192,6 +190,4 @@ async def async_create_fix_flow(
     """Create flow."""
     if issue_id == "model_deprecated":
         return ModelDeprecatedRepairFlow()
-    raise HomeAssistantError(
-        translation_domain=DOMAIN, translation_key="unknown_issue_id"
-    )
+    raise HomeAssistantError("Unknown issue ID")

homeassistant/components/anthropic/strings.json

@@ -149,47 +149,6 @@
       }
     }
   },
-  "exceptions": {
-    "api_authentication_error": {
-      "message": "Authentication error with Anthropic API: {message}. Reauthentication required."
-    },
-    "api_error": {
-      "message": "Anthropic API error: {message}."
-    },
-    "api_refusal": {
-      "message": "Potential policy violation detected."
-    },
-    "json_parse_error": {
-      "message": "Error with Claude structured response."
-    },
-    "response_not_found": {
-      "message": "Last content in chat log is not an AssistantContent."
-    },
-    "subentry_not_found": {
-      "message": "Subentry not found."
-    },
-    "system_message_not_found": {
-      "message": "First message must be a system message."
-    },
-    "unexpected_chat_log_content": {
-      "message": "Unexpected content type in chat log: {type}."
-    },
-    "unexpected_stream_object": {
-      "message": "Expected a stream of messages."
-    },
-    "unknown_issue_id": {
-      "message": "Unknown issue ID."
-    },
-    "user_message_not_found": {
-      "message": "Last message must be a user message to add attachments."
-    },
-    "wrong_file_path": {
-      "message": "`{file_path}` does not exist."
-    },
-    "wrong_file_type": {
-      "message": "Only images and PDF are supported by the Anthropic API, `{file_path}` ({mime_type}) is not an image file or PDF."
-    }
-  },
   "issues": {
     "model_deprecated": {
       "fix_flow": {

homeassistant/components/arcam_fmj/__init__.py

@@ -2,8 +2,8 @@
 
 import asyncio
 from asyncio import timeout
-from contextlib import AsyncExitStack
 import logging
+from typing import Any
 
 from arcam.fmj import ConnectionFailed
 from arcam.fmj.client import Client
@@ -54,31 +54,36 @@ async def _run_client(
     client = runtime_data.client
     coordinators = runtime_data.coordinators
 
+    def _listen(_: Any) -> None:
+        for coordinator in coordinators.values():
+            coordinator.async_notify_data_updated()
+
     while True:
         try:
-            async with AsyncExitStack() as stack:
-                async with timeout(interval):
-                    await client.start()
-                stack.push_async_callback(client.stop)
+            async with timeout(interval):
+                await client.start()
 
-                _LOGGER.debug("Client connected %s", client.host)
+            _LOGGER.debug("Client connected %s", client.host)
 
-                try:
+            try:
+                for coordinator in coordinators.values():
+                    await coordinator.state.start()
+
+                with client.listen(_listen):
                     for coordinator in coordinators.values():
-                        await stack.enter_async_context(
-                            coordinator.async_monitor_client()
-                        )
-
+                        coordinator.async_notify_connected()
                     await client.process()
-                finally:
-                    _LOGGER.debug("Client disconnected %s", client.host)
+            finally:
+                await client.stop()
+
+                _LOGGER.debug("Client disconnected %s", client.host)
+                for coordinator in coordinators.values():
+                    coordinator.async_notify_disconnected()
 
         except ConnectionFailed:
-            pass
+            await asyncio.sleep(interval)
         except TimeoutError:
             continue
         except Exception:
             _LOGGER.exception("Unexpected exception, aborting arcam client")
             return
-
-        await asyncio.sleep(interval)

homeassistant/components/arcam_fmj/coordinator.py

@@ -2,13 +2,11 @@
 
 from __future__ import annotations
 
-from collections.abc import AsyncGenerator
-from contextlib import asynccontextmanager
 from dataclasses import dataclass
 import logging
 
 from arcam.fmj import ConnectionFailed
-from arcam.fmj.client import AmxDuetResponse, Client, ResponsePacket
+from arcam.fmj.client import Client
 from arcam.fmj.state import State
 
 from homeassistant.config_entries import ConfigEntry
@@ -53,7 +51,7 @@ class ArcamFmjCoordinator(DataUpdateCoordinator[None]):
         )
         self.client = client
         self.state = State(client, zone)
-        self.update_in_progress = False
+        self.last_update_success = False
 
         name = config_entry.title
         unique_id = config_entry.unique_id or config_entry.entry_id
@@ -76,34 +74,24 @@ class ArcamFmjCoordinator(DataUpdateCoordinator[None]):
     async def _async_update_data(self) -> None:
         """Fetch data for manual refresh."""
         try:
-            self.update_in_progress = True
             await self.state.update()
         except ConnectionFailed as err:
             raise UpdateFailed(
                 f"Connection failed during update for zone {self.state.zn}"
             ) from err
-        finally:
-            self.update_in_progress = False
 
     @callback
-    def _async_notify_packet(self, packet: ResponsePacket | AmxDuetResponse) -> None:
-        """Packet callback to detect changes to state."""
-        if (
-            not isinstance(packet, ResponsePacket)
-            or packet.zn != self.state.zn
-            or self.update_in_progress
-        ):
-            return
+    def async_notify_data_updated(self) -> None:
+        """Notify that new data has been received from the device."""
+        self.async_set_updated_data(None)
 
+    @callback
+    def async_notify_connected(self) -> None:
+        """Handle client connected."""
+        self.hass.async_create_task(self.async_refresh())
+
+    @callback
+    def async_notify_disconnected(self) -> None:
+        """Handle client disconnected."""
+        self.last_update_success = False
         self.async_update_listeners()
-
-    @asynccontextmanager
-    async def async_monitor_client(self) -> AsyncGenerator[None]:
-        """Monitor a client and state for changes while connected."""
-        async with self.state:
-            self.hass.async_create_task(self.async_refresh())
-            try:
-                with self.client.listen(self._async_notify_packet):
-                    yield
-            finally:
-                self.hass.async_create_task(self.async_refresh())

homeassistant/components/arcam_fmj/entity.py

@@ -26,8 +26,3 @@ class ArcamFmjEntity(CoordinatorEntity[ArcamFmjCoordinator]):
         if description is not None:
             self._attr_unique_id = f"{self._attr_unique_id}-{description.key}"
             self.entity_description = description
-
-    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return super().available and self.coordinator.client.connected

homeassistant/components/assist_satellite/conditions.yaml

@@ -7,11 +7,9 @@
       required: true
       default: any
       selector:
-        select:
+        automation_behavior:
           translation_key: condition_behavior
-          options:
-            - all
-            - any
+          mode: condition
 
 is_idle: *condition_common
 is_listening: *condition_common

homeassistant/components/assist_satellite/triggers.yaml

@@ -7,12 +7,9 @@
       required: true
       default: any
       selector:
-        select:
-          options:
-            - first
-            - last
-            - any
+        automation_behavior:
           translation_key: trigger_behavior
+          mode: trigger
 
 idle: *trigger_common
 listening: *trigger_common

homeassistant/components/auth/login_flow.py

@@ -142,13 +142,6 @@ class WellKnownOAuthInfoView(HomeAssistantView):
             "authorization_endpoint": f"{url_prefix}/auth/authorize",
             "token_endpoint": f"{url_prefix}/auth/token",
             "revocation_endpoint": f"{url_prefix}/auth/revoke",
-            # Home Assistant already accepts URL-based client_ids via
-            # IndieAuth without prior registration, which is compatible with
-            # draft-ietf-oauth-client-id-metadata-document. This flag
-            # advertises that support to encourage clients to use it. The
-            # metadata document is not actually fetched as IndieAuth doesn't
-            # require it.
-            "client_id_metadata_document_supported": True,
             "response_types_supported": ["code"],
             "service_documentation": (
                 "https://developers.home-assistant.io/docs/auth_api"

homeassistant/components/automation/__init__.py

@@ -122,7 +122,6 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "alarm_control_panel",
     "assist_satellite",
     "battery",
-    "calendar",
     "climate",
     "cover",
     "device_tracker",
@@ -137,20 +136,15 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "light",
     "lock",
     "media_player",
-    "moisture",
     "motion",
     "occupancy",
     "person",
     "power",
     "schedule",
-    "select",
     "siren",
     "switch",
-    "temperature",
     "text",
-    "timer",
     "vacuum",
-    "valve",
     "water_heater",
     "window",
 }
@@ -159,10 +153,8 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "air_quality",
     "alarm_control_panel",
     "assist_satellite",
-    "battery",
     "button",
     "climate",
-    "counter",
     "cover",
     "device_tracker",
     "door",
@@ -190,10 +182,8 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "switch",
     "temperature",
     "text",
-    "todo",
     "update",
     "vacuum",
-    "valve",
     "water_heater",
     "window",
 }

homeassistant/components/automation/strings.json

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

homeassistant/components/backup/const.py

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

homeassistant/components/battery/__init__.py

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

homeassistant/components/battery/condition.py

@@ -6,6 +6,7 @@ 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
@@ -26,6 +27,7 @@ BATTERY_CHARGING_DOMAIN_SPECS = {
 }
 BATTERY_PERCENTAGE_DOMAIN_SPECS = {
     SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.BATTERY),
+    NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.BATTERY),
 }
 
 CONDITIONS: dict[str, type[Condition]] = {

homeassistant/components/battery/conditions.yaml

@@ -8,25 +8,28 @@
       required: true
       default: any
       selector:
-        select:
+        automation_behavior:
           translation_key: condition_behavior
-          options:
-            - all
-            - any
+          mode: condition
 
-.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: "%"
+.number_or_entity: &number_or_entity
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              unit_of_measurement: "%"
+        entity:
+          selector:
+            entity:
+              filter:
+                domain:
+                  - input_number
+                  - number
+                  - sensor
+      translation_key: number_or_entity
 
 is_low: *condition_common
 
@@ -53,12 +56,9 @@ is_level:
     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
+    above: *number_or_entity
+    below: *number_or_entity

homeassistant/components/battery/icons.json

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

homeassistant/components/battery/strings.json

@@ -1,14 +1,7 @@
 {
   "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",
-    "trigger_behavior_description": "The behavior of the targeted batteries to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Behavior"
   },
   "conditions": {
     "is_charging": {
@@ -24,13 +17,17 @@
     "is_level": {
       "description": "Tests the battery level of one or more batteries.",
       "fields": {
+        "above": {
+          "description": "Require the battery percentage to be above this value.",
+          "name": "Above"
+        },
         "behavior": {
           "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::battery::common::condition_threshold_description%]",
-          "name": "[%key:component::battery::common::condition_threshold_name%]"
+        "below": {
+          "description": "Require the battery percentage to be below this value.",
+          "name": "Below"
         }
       },
       "name": "Battery level"
@@ -73,79 +70,12 @@
         "any": "Any"
       }
     },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+    "number_or_entity": {
+      "choices": {
+        "entity": "Entity",
+        "number": "Number"
       }
     }
   },
-  "title": "Battery",
-  "triggers": {
-    "level_changed": {
-      "description": "Triggers after the battery level of one or more batteries changes.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::battery::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::battery::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Battery level changed"
-    },
-    "level_crossed_threshold": {
-      "description": "Triggers after the battery level of one or more batteries crosses a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::battery::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::battery::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Battery level crossed threshold"
-    },
-    "low": {
-      "description": "Triggers after one or more batteries become low.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery low"
-    },
-    "not_low": {
-      "description": "Triggers after one or more batteries are no longer low.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery not low"
-    },
-    "started_charging": {
-      "description": "Triggers after one or more batteries start charging.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery started charging"
-    },
-    "stopped_charging": {
-      "description": "Triggers after one or more batteries stop charging.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery stopped charging"
-    }
-  }
+  "title": "Battery"
 }

homeassistant/components/battery/trigger.py

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

homeassistant/components/battery/triggers.yaml

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

homeassistant/components/bluesound/manifest.json

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

homeassistant/components/bsblan/manifest.json

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

homeassistant/components/calendar/__init__.py

@@ -578,13 +578,13 @@ class CalendarEntity(Entity):
         return STATE_OFF
 
     @callback
-    def _async_write_ha_state(self) -> None:
+    def async_write_ha_state(self) -> None:
         """Write the state to the state machine.
 
         This sets up listeners to handle state transitions for start or end of
         the current or upcoming event.
         """
-        super()._async_write_ha_state()
+        super().async_write_ha_state()
         if self._alarm_unsubs is None:
             self._alarm_unsubs = []
         _LOGGER.debug(

homeassistant/components/calendar/condition.py

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

homeassistant/components/calendar/conditions.yaml

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

homeassistant/components/calendar/icons.json

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

homeassistant/components/calendar/strings.json

@@ -1,20 +1,4 @@
 {
-  "common": {
-    "condition_behavior_description": "How the state should match on the targeted calendars.",
-    "condition_behavior_name": "Behavior"
-  },
-  "conditions": {
-    "is_event_active": {
-      "description": "Tests if one or more calendars have an active event.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::calendar::common::condition_behavior_description%]",
-          "name": "[%key:component::calendar::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Calendar event is active"
-    }
-  },
   "entity_component": {
     "_": {
       "name": "[%key:component::calendar::title%]",
@@ -62,12 +46,6 @@
     }
   },
   "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
     "trigger_offset_type": {
       "options": {
         "after": "After",

homeassistant/components/camera/__init__.py

@@ -760,12 +760,12 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
         return CameraCapabilities(frontend_stream_types)
 
     @callback
-    def _async_write_ha_state(self) -> None:
+    def async_write_ha_state(self) -> None:
         """Write the state to the state machine.
 
         Schedules async_refresh_providers if support of streams have changed.
         """
-        super()._async_write_ha_state()
+        super().async_write_ha_state()
         if self.__supports_stream != (
             supports_stream := self.supported_features & CameraEntityFeature.STREAM
         ):

homeassistant/components/casper_glow/__init__.py

@@ -11,12 +11,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 
 from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
 
-PLATFORMS: list[Platform] = [
-    Platform.BINARY_SENSOR,
-    Platform.BUTTON,
-    Platform.LIGHT,
-    Platform.SELECT,
-]
+PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.LIGHT]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: CasperGlowConfigEntry) -> bool:

homeassistant/components/casper_glow/button.py

@@ -1,73 +0,0 @@
-"""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/const.py

@@ -12,7 +12,5 @@ SORTED_BRIGHTNESS_LEVELS = sorted(BRIGHTNESS_LEVELS)
 
 DEFAULT_DIMMING_TIME_MINUTES: int = DIMMING_TIME_MINUTES[0]
 
-DIMMING_TIME_OPTIONS: tuple[str, ...] = tuple(str(m) for m in DIMMING_TIME_MINUTES)
-
 # Interval between periodic state polls to catch externally-triggered changes.
 STATE_POLL_INTERVAL = timedelta(seconds=30)

homeassistant/components/casper_glow/coordinator.py

@@ -19,7 +19,7 @@ from homeassistant.components.bluetooth.active_update_coordinator import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 
-from .const import SORTED_BRIGHTNESS_LEVELS, STATE_POLL_INTERVAL
+from .const import STATE_POLL_INTERVAL
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -51,15 +51,6 @@ class CasperGlowCoordinator(ActiveBluetoothDataUpdateCoordinator[None]):
         )
         self.title = title
 
-        # The device API couples brightness and dimming time into a
-        # single command (set_brightness_and_dimming_time), so both
-        # values must be tracked here for cross-entity use.
-        self.last_brightness_pct: int = (
-            device.state.brightness_level
-            if device.state.brightness_level is not None
-            else SORTED_BRIGHTNESS_LEVELS[0]
-        )
-
     @callback
     def _needs_poll(
         self,

homeassistant/components/casper_glow/diagnostics.py

@@ -1,31 +0,0 @@
-"""Diagnostics support for the Casper Glow integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.components import bluetooth
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.core import HomeAssistant
-
-from .coordinator import CasperGlowConfigEntry
-
-SERVICE_INFO_TO_REDACT = frozenset({"address", "name", "source", "device"})
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: CasperGlowConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    coordinator = entry.runtime_data
-
-    service_info = bluetooth.async_last_service_info(
-        hass, coordinator.device.address, connectable=True
-    )
-
-    return {
-        "service_info": async_redact_data(
-            service_info.as_dict() if service_info else None,
-            SERVICE_INFO_TO_REDACT,
-        ),
-    }

homeassistant/components/casper_glow/icons.json

@@ -4,19 +4,6 @@
       "paused": {
         "default": "mdi:timer-pause"
       }
-    },
-    "button": {
-      "pause": {
-        "default": "mdi:pause"
-      },
-      "resume": {
-        "default": "mdi:play"
-      }
-    },
-    "select": {
-      "dimming_time": {
-        "default": "mdi:timer-outline"
-      }
     }
   }
 }

homeassistant/components/casper_glow/light.py

@@ -71,7 +71,6 @@ class CasperGlowLight(CasperGlowEntity, LightEntity):
             self._attr_color_mode = ColorMode.BRIGHTNESS
         if state.brightness_level is not None:
             self._attr_brightness = _device_pct_to_ha_brightness(state.brightness_level)
-            self.coordinator.last_brightness_pct = state.brightness_level
 
     @callback
     def _async_handle_state_update(self, state: GlowState) -> None:
@@ -98,7 +97,6 @@ class CasperGlowLight(CasperGlowEntity, LightEntity):
                 )
             )
             self._attr_brightness = _device_pct_to_ha_brightness(brightness_pct)
-            self.coordinator.last_brightness_pct = brightness_pct
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the light off."""

homeassistant/components/casper_glow/manifest.json

@@ -14,6 +14,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["pycasperglow"],
-  "quality_scale": "silver",
+  "quality_scale": "bronze",
   "requirements": ["pycasperglow==1.1.0"]
 }

homeassistant/components/casper_glow/quality_scale.yaml

@@ -32,14 +32,12 @@ rules:
   integration-owner: done
   log-when-unavailable: done
   parallel-updates: done
-  reauthentication-flow:
-    status: exempt
-    comment: Bluetooth device with no authentication credentials.
+  reauthentication-flow: todo
   test-coverage: done
 
   # Gold
   devices: done
-  diagnostics: done
+  diagnostics: todo
   discovery-update-info:
     status: exempt
     comment: No network discovery.
@@ -52,14 +50,18 @@ rules:
   docs-troubleshooting: done
   docs-use-cases: todo
   dynamic-devices: todo
-  entity-category: done
-  entity-device-class:
-    status: exempt
-    comment: No applicable device classes for binary_sensor, button, light, or select entities.
+  entity-category: todo
+  entity-device-class: todo
   entity-disabled-by-default: todo
-  entity-translations: done
-  exception-translations: done
-  icon-translations: done
+  entity-translations:
+    status: exempt
+    comment: No entity translations needed.
+  exception-translations:
+    status: exempt
+    comment: No custom services that raise exceptions.
+  icon-translations:
+    status: exempt
+    comment: No icon translations needed.
   reconfiguration-flow: todo
   repair-issues: todo
   stale-devices: todo

homeassistant/components/casper_glow/select.py

@@ -1,92 +0,0 @@
-"""Casper Glow integration select platform for dimming time."""
-
-from __future__ import annotations
-
-from pycasperglow import GlowState
-
-from homeassistant.components.select import SelectEntity
-from homeassistant.const import EntityCategory, UnitOfTime
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.restore_state import RestoreEntity
-
-from .const import DIMMING_TIME_OPTIONS
-from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
-from .entity import CasperGlowEntity
-
-PARALLEL_UPDATES = 1
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: CasperGlowConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the select platform for Casper Glow."""
-    async_add_entities([CasperGlowDimmingTimeSelect(entry.runtime_data)])
-
-
-class CasperGlowDimmingTimeSelect(CasperGlowEntity, SelectEntity, RestoreEntity):
-    """Select entity for Casper Glow dimming time."""
-
-    _attr_translation_key = "dimming_time"
-    _attr_entity_category = EntityCategory.CONFIG
-    _attr_options = list(DIMMING_TIME_OPTIONS)
-    _attr_unit_of_measurement = UnitOfTime.MINUTES
-
-    def __init__(self, coordinator: CasperGlowCoordinator) -> None:
-        """Initialize the dimming time select entity."""
-        super().__init__(coordinator)
-        self._attr_unique_id = f"{format_mac(coordinator.device.address)}_dimming_time"
-
-    @property
-    def current_option(self) -> str | None:
-        """Return the currently selected dimming time from the coordinator."""
-        if self.coordinator.last_dimming_time_minutes is None:
-            return None
-        return str(self.coordinator.last_dimming_time_minutes)
-
-    async def async_added_to_hass(self) -> None:
-        """Restore last known dimming time and register state update callback."""
-        await super().async_added_to_hass()
-        if self.coordinator.last_dimming_time_minutes is None and (
-            last_state := await self.async_get_last_state()
-        ):
-            if last_state.state in DIMMING_TIME_OPTIONS:
-                self.coordinator.last_dimming_time_minutes = int(last_state.state)
-        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.brightness_level is not None:
-            self.coordinator.last_brightness_pct = state.brightness_level
-        if (
-            state.configured_dimming_time_minutes is not None
-            and self.coordinator.last_dimming_time_minutes is None
-        ):
-            self.coordinator.last_dimming_time_minutes = (
-                state.configured_dimming_time_minutes
-            )
-            # Dimming time is not part of the device state
-            # that is provided via BLE update. Therefore
-            # we need to trigger a state update for the select entity
-            # to update the current state.
-            self.async_write_ha_state()
-
-    async def async_select_option(self, option: str) -> None:
-        """Set the dimming time."""
-        await self._async_command(
-            self._device.set_brightness_and_dimming_time(
-                self.coordinator.last_brightness_pct, int(option)
-            )
-        )
-        self.coordinator.last_dimming_time_minutes = int(option)
-        # Dimming time is not part of the device state
-        # that is provided via BLE update. Therefore
-        # we need to trigger a state update for the select entity
-        # to update the current state.
-        self.async_write_ha_state()

homeassistant/components/casper_glow/strings.json

@@ -31,19 +31,6 @@
       "paused": {
         "name": "Dimming paused"
       }
-    },
-    "button": {
-      "pause": {
-        "name": "Pause dimming"
-      },
-      "resume": {
-        "name": "Resume dimming"
-      }
-    },
-    "select": {
-      "dimming_time": {
-        "name": "Dimming time"
-      }
     }
   },
   "exceptions": {

homeassistant/components/chess_com/icons.json

@@ -1,68 +1,20 @@
 {
   "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,9 +2,6 @@
 
 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,
@@ -27,14 +24,7 @@ class ChessEntityDescription(SensorEntityDescription):
     value_fn: Callable[[ChessData], float]
 
 
-@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, ...] = (
+SENSORS: tuple[ChessEntityDescription, ...] = (
     ChessEntityDescription(
         key="followers",
         translation_key="followers",
@@ -43,46 +33,35 @@ PLAYER_SENSORS: tuple[ChessEntityDescription, ...] = (
         value_fn=lambda state: state.player.followers,
         entity_registry_enabled_default=False,
     ),
-)
-
-GAME_MODE_SENSORS: tuple[ChessModeEntityDescription, ...] = (
-    ChessModeEntityDescription(
-        key="rating",
-        translation_key="rating",
+    ChessEntityDescription(
+        key="chess_daily_rating",
+        translation_key="chess_daily_rating",
         state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda mode: mode["last"]["rating"],
+        value_fn=lambda state: state.stats.chess_daily["last"]["rating"],
     ),
-    ChessModeEntityDescription(
-        key="won",
-        translation_key="won",
+    ChessEntityDescription(
+        key="total_daily_won",
+        translation_key="total_daily_won",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda mode: mode["record"]["win"],
+        value_fn=lambda state: state.stats.chess_daily["record"]["win"],
     ),
-    ChessModeEntityDescription(
-        key="lost",
-        translation_key="lost",
+    ChessEntityDescription(
+        key="total_daily_lost",
+        translation_key="total_daily_lost",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda mode: mode["record"]["loss"],
+        value_fn=lambda state: state.stats.chess_daily["record"]["loss"],
     ),
-    ChessModeEntityDescription(
-        key="draw",
-        translation_key="draw",
+    ChessEntityDescription(
+        key="total_daily_draw",
+        translation_key="total_daily_draw",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda mode: mode["record"]["draw"],
+        value_fn=lambda state: state.stats.chess_daily["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,
@@ -92,22 +71,13 @@ async def async_setup_entry(
     """Initialize the entries."""
     coordinator = entry.runtime_data
 
-    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)
+    async_add_entities(
+        ChessPlayerSensor(coordinator, description) for description in SENSORS
+    )
 
 
 class ChessPlayerSensor(ChessEntity, SensorEntity):
-    """Chess.com player sensor."""
+    """Chess.com sensor."""
 
     entity_description: ChessEntityDescription
 
@@ -125,33 +95,3 @@ 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,84 +23,24 @@
   },
   "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,18 +1,10 @@
 """Provides conditions for climates."""
 
-from typing import TYPE_CHECKING
-
-import voluptuous as vol
-
-from homeassistant.const import ATTR_TEMPERATURE, CONF_OPTIONS, UnitOfTemperature
+from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
 from homeassistant.helpers.condition import (
-    ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL,
     Condition,
-    ConditionConfig,
-    EntityConditionBase,
     EntityNumericalConditionWithUnitBase,
     make_entity_numerical_condition,
     make_entity_state_condition,
@@ -21,42 +13,12 @@ from homeassistant.util.unit_conversion import TemperatureConverter
 
 from .const import ATTR_HUMIDITY, ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
 
-CONF_HVAC_MODE = "hvac_mode"
-
-_HVAC_MODE_CONDITION_SCHEMA = ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL.extend(
-    {
-        vol.Required(CONF_OPTIONS): {
-            vol.Required(CONF_HVAC_MODE): vol.All(
-                cv.ensure_list, vol.Length(min=1), [vol.Coerce(HVACMode)]
-            ),
-        },
-    }
-)
-
-
-class ClimateHVACModeCondition(EntityConditionBase):
-    """Condition for climate HVAC mode."""
-
-    _domain_specs = {DOMAIN: DomainSpec()}
-    _schema = _HVAC_MODE_CONDITION_SCHEMA
-
-    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
-        """Initialize the HVAC mode condition."""
-        super().__init__(hass, config)
-        if TYPE_CHECKING:
-            assert config.options is not None
-        self._hvac_modes: set[str] = set(config.options[CONF_HVAC_MODE])
-
-    def is_valid_state(self, entity_state: State) -> bool:
-        """Check if the state matches any of the expected HVAC modes."""
-        return entity_state.state in self._hvac_modes
-
 
 class ClimateTargetTemperatureCondition(EntityNumericalConditionWithUnitBase):
     """Mixin for climate target temperature conditions with unit conversion."""
 
     _base_unit = UnitOfTemperature.CELSIUS
-    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_TEMPERATURE)}
+    _domain_specs = {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
     _unit_converter = TemperatureConverter
 
     def _get_entity_unit(self, entity_state: State) -> str | None:
@@ -66,7 +28,6 @@ class ClimateTargetTemperatureCondition(EntityNumericalConditionWithUnitBase):
 
 
 CONDITIONS: dict[str, type[Condition]] = {
-    "is_hvac_mode": ClimateHVACModeCondition,
     "is_off": make_entity_state_condition(DOMAIN, HVACMode.OFF),
     "is_on": make_entity_state_condition(
         DOMAIN,
@@ -89,7 +50,7 @@ CONDITIONS: dict[str, type[Condition]] = {
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.HEATING
     ),
     "target_humidity": make_entity_numerical_condition(
-        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
+        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
         valid_unit="%",
     ),
     "target_temperature": ClimateTargetTemperatureCondition,

homeassistant/components/climate/conditions.yaml

@@ -7,37 +7,62 @@
       required: true
       default: any
       selector:
-        select:
+        automation_behavior:
           translation_key: condition_behavior
-          options:
-            - all
-            - any
+          mode: condition
 
-.humidity_threshold_entity: &humidity_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "%"
-  - domain: sensor
-    device_class: humidity
-  - domain: number
-    device_class: humidity
+.number_or_entity_humidity: &number_or_entity_humidity
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "%"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "%"
+                - domain: sensor
+                  device_class: humidity
+                - domain: number
+                  device_class: humidity
+      translation_key: number_or_entity
 
-.humidity_threshold_number: &humidity_threshold_number
-  min: 0
-  max: 100
-  mode: box
-  unit_of_measurement: "%"
+.number_or_entity_temperature: &number_or_entity_temperature
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "°C"
+                    - "°F"
+                - domain: sensor
+                  device_class: temperature
+                - domain: number
+                  device_class: temperature
+      translation_key: number_or_entity
 
-.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
+.condition_unit_temperature: &condition_unit_temperature
+  required: false
+  selector:
+    select:
+      options:
+        - "°C"
+        - "°F"
 
 is_off: *condition_common
 is_on: *condition_common
@@ -45,43 +70,17 @@ is_cooling: *condition_common
 is_drying: *condition_common
 is_heating: *condition_common
 
-is_hvac_mode:
-  target: *condition_climate_target
-  fields:
-    behavior: *condition_behavior
-    hvac_mode:
-      context:
-        filter_target: target
-      required: true
-      selector:
-        state:
-          hide_states:
-            - unavailable
-            - unknown
-          multiple: true
-
 target_humidity:
   target: *condition_climate_target
   fields:
     behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *humidity_threshold_entity
-          mode: is
-          number: *humidity_threshold_number
+    above: *number_or_entity_humidity
+    below: *number_or_entity_humidity
 
 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
+    above: *number_or_entity_temperature
+    below: *number_or_entity_temperature
+    unit: *condition_unit_temperature

homeassistant/components/climate/icons.json

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

homeassistant/components/climate/services.yaml

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

homeassistant/components/climate/strings.json

@@ -2,13 +2,8 @@
   "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_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"
+    "trigger_behavior_name": "Behavior"
   },
   "conditions": {
     "is_cooling": {
@@ -41,20 +36,6 @@
       },
       "name": "Climate-control device is heating"
     },
-    "is_hvac_mode": {
-      "description": "Tests if one or more climate-control devices are set to a specific HVAC mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
-          "name": "[%key:component::climate::common::condition_behavior_name%]"
-        },
-        "hvac_mode": {
-          "description": "The HVAC modes to test for.",
-          "name": "Modes"
-        }
-      },
-      "name": "Climate-control device HVAC mode"
-    },
     "is_off": {
       "description": "Tests if one or more climate-control devices are off.",
       "fields": {
@@ -78,13 +59,17 @@
     "target_humidity": {
       "description": "Tests the humidity setpoint of one or more climate-control devices.",
       "fields": {
+        "above": {
+          "description": "Require the target humidity to be above this value.",
+          "name": "Above"
+        },
         "behavior": {
           "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::climate::common::condition_threshold_description%]",
-          "name": "[%key:component::climate::common::condition_threshold_name%]"
+        "below": {
+          "description": "Require the target humidity to be below this value.",
+          "name": "Below"
         }
       },
       "name": "Climate-control device target humidity"
@@ -92,13 +77,21 @@
     "target_temperature": {
       "description": "Tests the temperature setpoint of one or more climate-control devices.",
       "fields": {
+        "above": {
+          "description": "Require the target temperature to be above this value.",
+          "name": "Above"
+        },
         "behavior": {
           "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::climate::common::condition_threshold_description%]",
-          "name": "[%key:component::climate::common::condition_threshold_name%]"
+        "below": {
+          "description": "Require the target temperature to be below this value.",
+          "name": "Below"
+        },
+        "unit": {
+          "description": "All values will be converted to this unit when evaluating the condition.",
+          "name": "Unit of measurement"
         }
       },
       "name": "Climate-control device target temperature"
@@ -288,12 +281,37 @@
         "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": {
@@ -441,9 +459,13 @@
     "target_humidity_changed": {
       "description": "Triggers after the humidity setpoint of one or more climate-control devices changes.",
       "fields": {
-        "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::climate::common::trigger_threshold_name%]"
+        "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"
         }
       },
       "name": "Climate-control device target humidity changed"
@@ -455,9 +477,17 @@
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::climate::common::trigger_threshold_name%]"
+        "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"
         }
       },
       "name": "Climate-control device target humidity crossed threshold"
@@ -465,9 +495,17 @@
     "target_temperature_changed": {
       "description": "Triggers after the temperature setpoint of one or more climate-control devices changes.",
       "fields": {
-        "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::climate::common::trigger_threshold_name%]"
+        "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"
+        },
+        "unit": {
+          "description": "All values will be converted to this unit when evaluating the trigger.",
+          "name": "Unit of measurement"
         }
       },
       "name": "Climate-control device target temperature changed"
@@ -479,9 +517,21 @@
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::climate::common::trigger_threshold_name%]"
+        "lower_limit": {
+          "description": "Lower threshold limit.",
+          "name": "Lower threshold"
+        },
+        "threshold_type": {
+          "description": "Type of threshold crossing to trigger on.",
+          "name": "Threshold type"
+        },
+        "unit": {
+          "description": "[%key:component::climate::triggers::target_temperature_changed::fields::unit::description%]",
+          "name": "[%key:component::climate::triggers::target_temperature_changed::fields::unit::name%]"
+        },
+        "upper_limit": {
+          "description": "Upper threshold limit.",
+          "name": "Upper threshold"
         }
       },
       "name": "Climate-control device target temperature crossed threshold"

homeassistant/components/climate/trigger.py

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

homeassistant/components/climate/triggers.yaml

@@ -7,38 +7,74 @@
       required: true
       default: any
       selector:
-        select:
+        automation_behavior:
           translation_key: trigger_behavior
-          options:
-            - first
-            - last
-            - any
+          mode: trigger
 
-.humidity_threshold_entity: &humidity_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "%"
-  - domain: sensor
-    device_class: humidity
-  - domain: number
-    device_class: humidity
+.number_or_entity_humidity: &number_or_entity_humidity
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "%"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "%"
+                - domain: sensor
+                  device_class: humidity
+                - domain: number
+                  device_class: humidity
+      translation_key: number_or_entity
 
-.humidity_threshold_number: &humidity_threshold_number
-  min: 0
-  max: 100
-  mode: box
-  unit_of_measurement: "%"
+.number_or_entity_temperature: &number_or_entity_temperature
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement:
+                    - "°C"
+                    - "°F"
+                - domain: sensor
+                  device_class: temperature
+                - domain: number
+                  device_class: temperature
+      translation_key: number_or_entity
 
-.temperature_units: &temperature_units
-  - "°C"
-  - "°F"
+.trigger_unit_temperature: &trigger_unit_temperature
+  required: false
+  selector:
+    select:
+      options:
+        - "°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
+.trigger_threshold_type: &trigger_threshold_type
+  required: true
+  default: above
+  selector:
+    select:
+      options:
+        - above
+        - below
+        - between
+        - outside
+      translation_key: trigger_threshold_type
 
 started_cooling: *trigger_common
 started_drying: *trigger_common
@@ -64,49 +100,29 @@ hvac_mode_changed:
 target_humidity_changed:
   target: *trigger_climate_target
   fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *humidity_threshold_entity
-          mode: changed
-          number: *humidity_threshold_number
+    above: *number_or_entity_humidity
+    below: *number_or_entity_humidity
 
 target_humidity_crossed_threshold:
   target: *trigger_climate_target
   fields:
     behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *humidity_threshold_entity
-          mode: crossed
-          number: *humidity_threshold_number
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_humidity
+    upper_limit: *number_or_entity_humidity
 
 target_temperature_changed:
   target: *trigger_climate_target
   fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *temperature_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *temperature_units
+    above: *number_or_entity_temperature
+    below: *number_or_entity_temperature
+    unit: *trigger_unit_temperature
 
 target_temperature_crossed_threshold:
   target: *trigger_climate_target
   fields:
     behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *temperature_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *temperature_units
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_temperature
+    upper_limit: *number_or_entity_temperature
+    unit: *trigger_unit_temperature

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 Home Assistant Cloud remote access"
+      "name": "Enable 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 Home Assistant Cloud remote access"
+      "name": "Disable remote access"
     }
   },
   "system_health": {

homeassistant/components/comelit/climate.py

@@ -9,6 +9,7 @@ from aiocomelit import ComelitSerialBridgeObject
 from aiocomelit.const import CLIMATE
 
 from homeassistant.components.climate import (
+    DOMAIN as CLIMATE_DOMAIN,
     ClimateEntity,
     ClimateEntityFeature,
     HVACAction,
@@ -91,7 +92,7 @@ async def async_setup_entry(
 
     entities: list[ClimateEntity] = []
     for device in coordinator.data[CLIMATE].values():
-        values = load_api_data(device, "climate")
+        values = load_api_data(device, CLIMATE_DOMAIN)
         if values[0] == 0 and values[4] == 0:
             # No climate data, device is only a humidifier/dehumidifier
 
@@ -139,7 +140,7 @@ class ComelitClimateEntity(ComelitBridgeBaseEntity, ClimateEntity):
     def _update_attributes(self) -> None:
         """Update class attributes."""
         device = self.coordinator.data[CLIMATE][self._device.index]
-        values = load_api_data(device, "climate")
+        values = load_api_data(device, CLIMATE_DOMAIN)
 
         _active = values[1]
         _mode = values[2]  # Values from API: "O", "L", "U"

homeassistant/components/comelit/humidifier.py

@@ -9,6 +9,7 @@ from aiocomelit import ComelitSerialBridgeObject
 from aiocomelit.const import CLIMATE
 
 from homeassistant.components.humidifier import (
+    DOMAIN as HUMIDIFIER_DOMAIN,
     MODE_AUTO,
     MODE_NORMAL,
     HumidifierAction,
@@ -67,7 +68,7 @@ async def async_setup_entry(
 
     entities: list[ComelitHumidifierEntity] = []
     for device in coordinator.data[CLIMATE].values():
-        values = load_api_data(device, "humidifier")
+        values = load_api_data(device, HUMIDIFIER_DOMAIN)
         if values[0] == 0 and values[4] == 0:
             # No humidity data, device is only a climate
 
@@ -141,7 +142,7 @@ class ComelitHumidifierEntity(ComelitBridgeBaseEntity, HumidifierEntity):
     def _update_attributes(self) -> None:
         """Update class attributes."""
         device = self.coordinator.data[CLIMATE][self._device.index]
-        values = load_api_data(device, "humidifier")
+        values = load_api_data(device, HUMIDIFIER_DOMAIN)
 
         _active = values[1]
         _mode = values[2]  # Values from API: "O", "L", "U"

homeassistant/components/comelit/strings.json

@@ -113,6 +113,9 @@
     "humidity_while_off": {
       "message": "Cannot change humidity while off"
     },
+    "invalid_clima_data": {
+      "message": "Invalid 'clima' data"
+    },
     "update_failed": {
       "message": "Failed to update data: {error}"
     }

homeassistant/components/comelit/utils.py

@@ -2,12 +2,13 @@
 
 from collections.abc import Awaitable, Callable, Coroutine
 from functools import wraps
-from typing import TYPE_CHECKING, Any, Concatenate, Literal
+from typing import TYPE_CHECKING, Any, Concatenate
 
 from aiocomelit.api import ComelitSerialBridgeObject
 from aiocomelit.exceptions import CannotAuthenticate, CannotConnect, CannotRetrieveData
 from aiohttp import ClientSession, CookieJar
 
+from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
@@ -29,19 +30,17 @@ async def async_client_session(hass: HomeAssistant) -> ClientSession:
     )
 
 
-def load_api_data(
-    device: ComelitSerialBridgeObject,
-    domain: Literal["climate", "humidifier"],
-) -> list[Any]:
+def load_api_data(device: ComelitSerialBridgeObject, domain: str) -> list[Any]:
     """Load data from the API."""
-    # This function is called when the data is loaded from the API.
-    # For climate and humidifier device.val is always a list.
-    if TYPE_CHECKING:
-        assert isinstance(device.val, list)
+    # This function is called when the data is loaded from the API
+    if not isinstance(device.val, list):
+        raise HomeAssistantError(
+            translation_domain=domain, translation_key="invalid_clima_data"
+        )
     # CLIMATE has a 2 item tuple:
     # - first  for Clima
     # - second for Humidifier
-    return device.val[0] if domain == "climate" else device.val[1]
+    return device.val[0] if domain == CLIMATE_DOMAIN else device.val[1]
 
 
 async def cleanup_stale_entity(

homeassistant/components/conversation/strings.json

@@ -6,7 +6,7 @@
   },
   "services": {
     "process": {
-      "description": "Sends text to a conversation agent for processing.",
+      "description": "Launches a conversation from a transcribed text.",
       "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 conversation"
+      "name": "Process"
     },
     "reload": {
-      "description": "Reloads the intent configuration of conversation agents.",
+      "description": "Reloads the intent configuration.",
       "fields": {
         "agent_id": {
           "description": "Conversation agent to reload.",
@@ -39,7 +39,7 @@
           "name": "[%key:common::config_flow::data::language%]"
         }
       },
-      "name": "Reload conversation agents"
+      "name": "[%key:common::action::reload%]"
     }
   },
   "title": "Conversation"

homeassistant/components/counter/icons.json

@@ -12,22 +12,5 @@
     "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,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description": "The behavior of the targeted counters to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "entity_component": {
     "_": {
       "name": "[%key:component::counter::title%]",
@@ -29,78 +25,29 @@
       }
     }
   },
-  "selector": {
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "decrement": {
       "description": "Decrements a counter by its step size.",
-      "name": "Decrement counter"
+      "name": "Decrement"
     },
     "increment": {
       "description": "Increments a counter by its step size.",
-      "name": "Increment counter"
+      "name": "Increment"
     },
     "reset": {
       "description": "Resets a counter to its initial value.",
-      "name": "Reset counter"
+      "name": "Reset"
     },
     "set_value": {
-      "description": "Sets a counter to a specific value.",
+      "description": "Sets the counter to a specific value.",
       "fields": {
         "value": {
           "description": "The new counter value the entity should be set to.",
           "name": "Value"
         }
       },
-      "name": "Set counter value"
+      "name": "Set"
     }
   },
-  "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"
-    }
-  }
+  "title": "Counter"
 }

homeassistant/components/counter/trigger.py

@@ -1,113 +0,0 @@
-"""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,27 +0,0 @@
-.trigger_common: &trigger_common
-  target:
-    entity:
-      domain: counter
-  fields:
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          translation_key: trigger_behavior
-          options:
-            - first
-            - last
-            - any
-
-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,5 @@
 """Provides conditions for covers."""
 
-from collections.abc import Mapping
-
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.condition import Condition, EntityConditionBase
@@ -10,11 +8,9 @@ from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
 from .models import CoverDomainSpec
 
 
-class CoverConditionBase(EntityConditionBase):
+class CoverConditionBase(EntityConditionBase[CoverDomainSpec]):
     """Base condition for cover state checks."""
 
-    _domain_specs: Mapping[str, CoverDomainSpec]
-
     def is_valid_state(self, entity_state: State) -> bool:
         """Check if the state matches the expected cover state."""
         domain_spec = self._domain_specs[entity_state.domain]

homeassistant/components/cover/conditions.yaml

@@ -3,11 +3,9 @@
     required: true
     default: any
     selector:
-      select:
+      automation_behavior:
         translation_key: condition_behavior
-        options:
-          - all
-          - any
+        mode: condition
 
 awning_is_closed:
   fields: *condition_common_fields

homeassistant/components/cover/trigger.py

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

homeassistant/components/cover/triggers.yaml

@@ -3,12 +3,9 @@
     required: true
     default: any
     selector:
-      select:
+      automation_behavior:
         translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
+        mode: trigger
 
 awning_closed:
   fields: *trigger_common_fields

homeassistant/components/decora_wifi/__init__.py

@@ -1,91 +1 @@
-"""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)
+"""The decora_wifi component."""

homeassistant/components/decora_wifi/config_flow.py

@@ -1,104 +0,0 @@
-"""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

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

homeassistant/components/decora_wifi/light.py

@@ -6,8 +6,13 @@ 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,
@@ -16,21 +21,13 @@ from homeassistant.components.light import (
     LightEntity,
     LightEntityFeature,
 )
-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.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.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
@@ -38,65 +35,63 @@ 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"
 
-async def async_setup_platform(
+
+def setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
+    add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up the Decora WiFi platform from YAML (deprecated)."""
-    result = await hass.config_entries.flow.async_init(
-        DOMAIN,
-        context={"source": SOURCE_IMPORT},
-        data=config,
-    )
+    """Set up the Decora WiFi platform."""
 
-    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
+    email = config[CONF_USERNAME]
+    password = config[CONF_PASSWORD]
+    session = DecoraWiFiSession()
 
-    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,
-        },
-    )
+    try:
+        success = session.login(email, password)
 
+        # 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
 
-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
-    )
+        # 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)
 
 
 class DecoraWifiLight(LightEntity):

homeassistant/components/decora_wifi/manifest.json

@@ -2,9 +2,7 @@
   "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

@@ -1,35 +0,0 @@
-{
-  "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/demo/remote.py

@@ -44,18 +44,18 @@ class DemoRemote(RemoteEntity):
             return {"last_command_sent": self._last_command_sent}
         return None
 
-    async def async_turn_on(self, **kwargs: Any) -> None:
+    def turn_on(self, **kwargs: Any) -> None:
         """Turn the remote on."""
         self._attr_is_on = True
-        self.async_write_ha_state()
+        self.schedule_update_ha_state()
 
-    async def async_turn_off(self, **kwargs: Any) -> None:
+    def turn_off(self, **kwargs: Any) -> None:
         """Turn the remote off."""
         self._attr_is_on = False
-        self.async_write_ha_state()
+        self.schedule_update_ha_state()
 
-    async def async_send_command(self, command: Iterable[str], **kwargs: Any) -> None:
+    def send_command(self, command: Iterable[str], **kwargs: Any) -> None:
         """Send a command to a device."""
         for com in command:
             self._last_command_sent = com
-        self.async_write_ha_state()
+        self.schedule_update_ha_state()

homeassistant/components/demo/switch.py

@@ -61,12 +61,12 @@ class DemoSwitch(SwitchEntity):
             name=device_name,
         )
 
-    async def async_turn_on(self, **kwargs: Any) -> None:
+    def turn_on(self, **kwargs: Any) -> None:
         """Turn the switch on."""
         self._attr_is_on = True
-        self.async_write_ha_state()
+        self.schedule_update_ha_state()
 
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the switch off."""
+    def turn_off(self, **kwargs: Any) -> None:
+        """Turn the device off."""
         self._attr_is_on = False
-        self.async_write_ha_state()
+        self.schedule_update_ha_state()

homeassistant/components/device_tracker/conditions.yaml

@@ -7,11 +7,9 @@
       required: true
       default: any
       selector:
-        select:
+        automation_behavior:
           translation_key: condition_behavior
-          options:
-            - all
-            - any
+          mode: condition
 
 is_home: *condition_common
 is_not_home: *condition_common

homeassistant/components/device_tracker/strings.json

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

homeassistant/components/device_tracker/triggers.yaml

@@ -7,12 +7,9 @@
       required: true
       default: any
       selector:
-        select:
-          options:
-            - first
-            - last
-            - any
+        automation_behavior:
           translation_key: trigger_behavior
+          mode: trigger
 
 entered_home: *trigger_common
 left_home: *trigger_common

homeassistant/components/diagnostics/util.py

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

homeassistant/components/dlna_dmr/media_player.py

@@ -353,10 +353,10 @@ class DlnaDmrEntity(MediaPlayerEntity):
         # Device was de/re-connected, state might have changed
         self.async_write_ha_state()
 
-    def _async_write_ha_state(self) -> None:
+    def async_write_ha_state(self) -> None:
         """Write the state."""
         self._attr_supported_features = self._supported_features()
-        super()._async_write_ha_state()
+        super().async_write_ha_state()
 
     async def _device_connect(self, location: str) -> None:
         """Connect to the device now that it's available."""

homeassistant/components/door/conditions.yaml

@@ -3,11 +3,9 @@
     required: true
     default: any
     selector:
-      select:
+      automation_behavior:
         translation_key: condition_behavior
-        options:
-          - all
-          - any
+        mode: condition
 
 is_closed:
   fields: *condition_common_fields

homeassistant/components/door/triggers.yaml

@@ -3,12 +3,9 @@
     required: true
     default: any
     selector:
-      select:
+      automation_behavior:
         translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
+        mode: trigger
 
 closed:
   fields: *trigger_common_fields