Remove autogenerated list of skills from copilot-instructions

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

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

.github/copilot-instructions.md

@@ -5,7 +5,8 @@
 # Copilot code review instructions
 
 - Start review comments with a short, one-sentence summary of the suggested fix.
-- Do not comment on code style, formatting or linting issues.
+- Do comment on code style, formatting or linting issues.
+- When reviewing an integration, follow the instructions in .claude/skills/ha-integration-knowledge/SKILL.md
 
 # GitHub Copilot & Claude Code Instructions
 

.github/instructions/integrations.instructions.md

@@ -1,46 +0,0 @@
----
-applyTo: "homeassistant/components/**, tests/components/**"
-excludeAgent: "cloud-agent"
----
-
-<!-- Automatically generated by gen_copilot_instructions.py, do not edit -->
-
-
-## File Locations
-- **Integration code**: `./homeassistant/components/<integration_domain>/`
-- **Integration tests**: `./tests/components/<integration_domain>/`
-
-## General guidelines
-
-- 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.
-- For entity actions and entity services, avoid requesting redundant defensive checks for fields already enforced by Home Assistant validation schemas and entity filters; only request extra guards when values bypass validation or are transformed unsafely.
-- When validation guarantees a key is present, prefer direct dictionary indexing (`data["key"]`) over `.get("key")` so invalid assumptions fail fast.
-- Integrations should be thin wrappers. Protocol parsing, device state machines, or other domain logic belong in a separate PyPI library, not in the integration itself. If unsure, ask before inlining.
-
-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
-
-
-## 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.
-
-Template scale file: `./script/scaffold/templates/integration/integration/quality_scale.yaml`
-
-### How Rules Apply
-1. **Check `manifest.json`**: Look for `"quality_scale"` key to determine integration level
-2. **Bronze Rules**: Always required for any integration with quality scale
-3. **Higher Tier Rules**: Only apply if integration targets that tier or higher
-4. **Rule Status**: Check `quality_scale.yaml` in integration folder for:
-   - `done`: Rule implemented
-   - `exempt`: Rule doesn't apply (with reason in comment)
-   - `todo`: Rule needs implementation
-
-
-## 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

.github/renovate.json

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

.github/workflows/ci.yaml

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

.pre-commit-config.yaml

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

CODEOWNERS

@@ -851,8 +851,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/input_select/ @home-assistant/core
 /homeassistant/components/input_text/ @home-assistant/core
 /tests/components/input_text/ @home-assistant/core
-/homeassistant/components/insteon/ @teharris1 @ssyrell
-/tests/components/insteon/ @teharris1 @ssyrell
+/homeassistant/components/insteon/ @teharris1
+/tests/components/insteon/ @teharris1
 /homeassistant/components/integration/ @dgomes
 /tests/components/integration/ @dgomes
 /homeassistant/components/intelliclima/ @dvdinth
@@ -1203,8 +1203,6 @@ CLAUDE.md @home-assistant/core
 /tests/components/notify_events/ @matrozov @papajojo
 /homeassistant/components/notion/ @bachya
 /tests/components/notion/ @bachya
-/homeassistant/components/novy_cooker_hood/ @piitaya
-/tests/components/novy_cooker_hood/ @piitaya
 /homeassistant/components/nrgkick/ @andijakl
 /tests/components/nrgkick/ @andijakl
 /homeassistant/components/nsw_fuel_station/ @nickw444
@@ -1241,8 +1239,6 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/ollama/ @synesthesiam
 /tests/components/ollama/ @synesthesiam
 /homeassistant/components/ombi/ @larssont
-/homeassistant/components/omie/ @luuuis
-/tests/components/omie/ @luuuis
 /homeassistant/components/onboarding/ @home-assistant/core
 /tests/components/onboarding/ @home-assistant/core
 /homeassistant/components/ondilo_ico/ @JeromeHXP

homeassistant/auth/permissions/__init__.py

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

homeassistant/brands/sensereo.json

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

homeassistant/brands/zunzunbee.json

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

homeassistant/components/acaia/sensor.py

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

homeassistant/components/acer_projector/manifest.json

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

homeassistant/components/actron_air/climate.py

@@ -38,7 +38,6 @@ HVAC_MODE_MAPPING_ACTRONAIR_TO_HA = {
     "HEAT": HVACMode.HEAT,
     "FAN": HVACMode.FAN_ONLY,
     "AUTO": HVACMode.AUTO,
-    "DRY": HVACMode.DRY,
     "OFF": HVACMode.OFF,
 }
 HVAC_MODE_MAPPING_HA_TO_ACTRONAIR = {
@@ -80,6 +79,7 @@ class ActronAirClimateEntity(ClimateEntity):
     )
     _attr_name = None
     _attr_fan_modes = list(FAN_MODE_MAPPING_ACTRONAIR_TO_HA.values())
+    _attr_hvac_modes = list(HVAC_MODE_MAPPING_ACTRONAIR_TO_HA.values())
 
 
 class ActronSystemClimate(ActronAirAcEntity, ActronAirClimateEntity):
@@ -93,17 +93,6 @@ class ActronSystemClimate(ActronAirAcEntity, ActronAirClimateEntity):
         super().__init__(coordinator)
         self._attr_unique_id = self._serial_number
 
-    @property
-    def hvac_modes(self) -> list[HVACMode]:
-        """Return the list of supported HVAC modes."""
-        modes = [
-            HVAC_MODE_MAPPING_ACTRONAIR_TO_HA[mode]
-            for mode in self._status.user_aircon_settings.supported_modes
-            if mode in HVAC_MODE_MAPPING_ACTRONAIR_TO_HA
-        ]
-        modes.append(HVACMode.OFF)
-        return modes
-
     @property
     def min_temp(self) -> float:
         """Return the minimum temperature that can be set."""
@@ -147,7 +136,7 @@ class ActronSystemClimate(ActronAirAcEntity, ActronAirClimateEntity):
     @property
     def target_temperature(self) -> float:
         """Return the target temperature."""
-        return self._status.user_aircon_settings.current_setpoint
+        return self._status.user_aircon_settings.temperature_setpoint_cool_c
 
     @actron_air_command
     async def async_set_fan_mode(self, fan_mode: str) -> None:
@@ -190,18 +179,6 @@ class ActronZoneClimate(ActronAirZoneEntity, ActronAirClimateEntity):
         super().__init__(coordinator, zone)
         self._attr_unique_id: str = self._zone_identifier
 
-    @property
-    def hvac_modes(self) -> list[HVACMode]:
-        """Return the list of supported HVAC modes."""
-        status = self.coordinator.data
-        modes = [
-            HVAC_MODE_MAPPING_ACTRONAIR_TO_HA[mode]
-            for mode in status.user_aircon_settings.supported_modes
-            if mode in HVAC_MODE_MAPPING_ACTRONAIR_TO_HA
-        ]
-        modes.append(HVACMode.OFF)
-        return modes
-
     @property
     def min_temp(self) -> float:
         """Return the minimum temperature that can be set."""
@@ -239,7 +216,7 @@ class ActronZoneClimate(ActronAirZoneEntity, ActronAirClimateEntity):
     @property
     def target_temperature(self) -> float | None:
         """Return the target temperature."""
-        return self._zone.current_setpoint
+        return self._zone.temperature_setpoint_cool_c
 
     @actron_air_command
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:

homeassistant/components/air_quality/condition.py

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

homeassistant/components/air_quality/conditions.yaml

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

homeassistant/components/air_quality/strings.json

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

homeassistant/components/air_quality/triggers.yaml

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

homeassistant/components/alarm_control_panel/condition.py

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

homeassistant/components/alarm_control_panel/conditions.yaml

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

homeassistant/components/alarm_control_panel/strings.json

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

homeassistant/components/alarm_control_panel/triggers.yaml

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

homeassistant/components/alexa_devices/__init__.py

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

homeassistant/components/alexa_devices/button.py

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

homeassistant/components/alexa_devices/coordinator.py

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

homeassistant/components/alexa_devices/entity.py

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

homeassistant/components/assist_satellite/condition.py

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

homeassistant/components/assist_satellite/conditions.yaml

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

homeassistant/components/assist_satellite/strings.json

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

homeassistant/components/assist_satellite/triggers.yaml

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

homeassistant/components/automation/__init__.py

@@ -4,10 +4,10 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 import asyncio
-from collections.abc import Callable
+from collections.abc import Callable, Mapping
 from dataclasses import dataclass
 import logging
-from typing import Any, cast
+from typing import Any, Protocol, cast
 
 from propcache.api import cached_property
 import voluptuous as vol
@@ -194,7 +194,6 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "switch",
     "temperature",
     "text",
-    "timer",
     "todo",
     "update",
     "vacuum",
@@ -230,11 +229,14 @@ def is_disabled_experimental_trigger(hass: HomeAssistant, platform: str) -> bool
     )
 
 
-class IfAction(condition_helper.ConditionsChecker):
+class IfAction(Protocol):
     """Define the format of if_action."""
 
     config: list[ConfigType]
 
+    def __call__(self, variables: Mapping[str, Any] | None = None) -> bool:
+        """AND all conditions."""
+
 
 def is_on(hass: HomeAssistant, entity_id: str) -> bool:
     """Return true if specified automation entity_id is on.
@@ -833,7 +835,7 @@ class AutomationEntity(BaseAutomationEntity, RestoreEntity):
             if (
                 not skip_condition
                 and self._condition is not None
-                and not self._condition.async_check(variables=variables)
+                and not self._condition(variables)
             ):
                 self._logger.debug(
                     "Conditions not met, aborting automation. Condition summary: %s",
@@ -901,15 +903,7 @@ class AutomationEntity(BaseAutomationEntity, RestoreEntity):
     async def async_will_remove_from_hass(self) -> None:
         """Remove listeners when removing automation from Home Assistant."""
         await super().async_will_remove_from_hass()
-        if self.registry_entry and self.registry_entry.entity_id != self.entity_id:
-            # Entity ID change, do not unload the script or conditions as they will
-            # be reused.
-            await self._async_disable()
-            return
-        await self._async_disable(stop_actions=False)
-        await self.action_script.async_unload()
-        if self._condition is not None:
-            self._condition.async_unload()
+        await self._async_disable()
 
     async def _async_enable_automation(self, event: Event) -> None:
         """Start automation on startup."""

homeassistant/components/axis/const.py

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

homeassistant/components/axis/event.py

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

homeassistant/components/axis/hub/api.py

@@ -36,7 +36,6 @@ async def get_axis_api(
             username=config[CONF_USERNAME],
             password=config[CONF_PASSWORD],
             web_proto=config.get(CONF_PROTOCOL, "http"),
-            websocket_enabled=True,
         )
     )
 

homeassistant/components/axis/manifest.json

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

homeassistant/components/battery/condition.py

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

homeassistant/components/battery/conditions.yaml

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

homeassistant/components/battery/strings.json

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

homeassistant/components/battery/triggers.yaml

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

homeassistant/components/bayesian/config_flow.py

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

homeassistant/components/blebox/cover.py

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

homeassistant/components/blebox/manifest.json

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

homeassistant/components/bluetooth/__init__.py

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

homeassistant/components/bluetooth/api.py

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

homeassistant/components/bring/manifest.json

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

homeassistant/components/broadlink/const.py

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

homeassistant/components/broadlink/infrared.py

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

homeassistant/components/broadlink/strings.json

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

homeassistant/components/brother/sensor.py

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

homeassistant/components/brother/strings.json

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

homeassistant/components/bsblan/manifest.json

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

homeassistant/components/calendar/__init__.py

@@ -15,10 +15,7 @@ from aiohttp import web
 from dateutil.rrule import rrulestr
 import voluptuous as vol
 
-from homeassistant.auth.models import User
-from homeassistant.auth.permissions.const import POLICY_CONTROL, POLICY_READ
 from homeassistant.components import frontend, http, websocket_api
-from homeassistant.components.http import KEY_HASS_USER
 from homeassistant.components.websocket_api import (
     ERR_INVALID_FORMAT,
     ERR_NOT_FOUND,
@@ -35,7 +32,7 @@ from homeassistant.core import (
     SupportsResponse,
     callback,
 )
-from homeassistant.exceptions import HomeAssistantError, Unauthorized
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.entity import Entity, EntityDescription
@@ -789,10 +786,6 @@ class CalendarEventView(http.HomeAssistantView):
 
     async def get(self, request: web.Request, entity_id: str) -> web.Response:
         """Return calendar events."""
-        user: User = request[KEY_HASS_USER]
-        if not user.permissions.check_entity(entity_id, POLICY_READ):
-            raise Unauthorized(entity_id=entity_id)
-
         if not (entity := self.component.get_entity(entity_id)) or not isinstance(
             entity, CalendarEntity
         ):
@@ -844,14 +837,10 @@ class CalendarListView(http.HomeAssistantView):
 
     async def get(self, request: web.Request) -> web.Response:
         """Retrieve calendar list."""
-        user: User = request[KEY_HASS_USER]
         hass = request.app[http.KEY_HASS]
-        entity_perm = user.permissions.check_entity
         calendar_list: list[dict[str, str]] = []
 
         for entity in self.component.entities:
-            if not entity_perm(entity.entity_id, POLICY_READ):
-                continue
             state = hass.states.get(entity.entity_id)
             assert state
             calendar_list.append({"name": state.name, "entity_id": entity.entity_id})
@@ -871,9 +860,6 @@ async def handle_calendar_event_create(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Handle creation of a calendar event."""
-    if not connection.user.permissions.check_entity(msg["entity_id"], POLICY_CONTROL):
-        raise Unauthorized(entity_id=msg["entity_id"])
-
     if not (entity := hass.data[DATA_COMPONENT].get_entity(msg["entity_id"])):
         connection.send_error(msg["id"], ERR_NOT_FOUND, "Entity not found")
         return
@@ -913,8 +899,6 @@ async def handle_calendar_event_delete(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Handle delete of a calendar event."""
-    if not connection.user.permissions.check_entity(msg["entity_id"], POLICY_CONTROL):
-        raise Unauthorized(entity_id=msg["entity_id"])
 
     if not (entity := hass.data[DATA_COMPONENT].get_entity(msg["entity_id"])):
         connection.send_error(msg["id"], ERR_NOT_FOUND, "Entity not found")
@@ -960,10 +944,7 @@ async def handle_calendar_event_delete(
 async def handle_calendar_event_update(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
 ) -> None:
-    """Handle update of a calendar event."""
-    if not connection.user.permissions.check_entity(msg["entity_id"], POLICY_CONTROL):
-        raise Unauthorized(entity_id=msg["entity_id"])
-
+    """Handle creation of a calendar event."""
     if not (entity := hass.data[DATA_COMPONENT].get_entity(msg["entity_id"])):
         connection.send_error(msg["id"], ERR_NOT_FOUND, "Entity not found")
         return
@@ -1008,9 +989,6 @@ async def handle_calendar_event_subscribe(
     """Subscribe to calendar event updates."""
     entity_id: str = msg["entity_id"]
 
-    if not connection.user.permissions.check_entity(entity_id, POLICY_READ):
-        raise Unauthorized(entity_id=entity_id)
-
     if not (entity := hass.data[DATA_COMPONENT].get_entity(entity_id)):
         connection.send_error(
             msg["id"],

homeassistant/components/calendar/condition.py

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

homeassistant/components/calendar/conditions.yaml

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

homeassistant/components/calendar/strings.json

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

homeassistant/components/climate/condition.py

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

homeassistant/components/climate/conditions.yaml

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

homeassistant/components/climate/strings.json

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

homeassistant/components/climate/trigger.py

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

homeassistant/components/climate/triggers.yaml

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

homeassistant/components/comelit/coordinator.py

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

homeassistant/components/comelit/strings.json

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

homeassistant/components/comelit/utils.py

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

homeassistant/components/conversation/manifest.json

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

homeassistant/components/counter/conditions.yaml

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

homeassistant/components/counter/strings.json

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

homeassistant/components/counter/triggers.yaml

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

homeassistant/components/cover/conditions.yaml

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

homeassistant/components/cover/strings.json

@@ -1,7 +1,6 @@
 {
   "common": {
     "condition_behavior_name": "Condition passes if",
-    "condition_for_name": "For at least",
     "trigger_behavior_name": "Trigger when",
     "trigger_for_name": "For at least"
   },
@@ -11,9 +10,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::cover::common::condition_for_name%]"
         }
       },
       "name": "Awning is closed"
@@ -23,9 +19,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::cover::common::condition_for_name%]"
         }
       },
       "name": "Awning is open"
@@ -35,9 +28,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::cover::common::condition_for_name%]"
         }
       },
       "name": "Blind is closed"
@@ -47,9 +37,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::cover::common::condition_for_name%]"
         }
       },
       "name": "Blind is open"
@@ -59,9 +46,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::cover::common::condition_for_name%]"
         }
       },
       "name": "Curtain is closed"
@@ -71,9 +55,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::cover::common::condition_for_name%]"
         }
       },
       "name": "Curtain is open"
@@ -83,9 +64,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::cover::common::condition_for_name%]"
         }
       },
       "name": "Shade is closed"
@@ -95,9 +73,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::cover::common::condition_for_name%]"
         }
       },
       "name": "Shade is open"
@@ -107,9 +82,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::cover::common::condition_for_name%]"
         }
       },
       "name": "Shutter is closed"
@@ -119,9 +91,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::cover::common::condition_for_name%]"
         }
       },
       "name": "Shutter is open"
@@ -210,6 +179,21 @@
       "name": "Window"
     }
   },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "services": {
     "close_cover": {
       "description": "Closes a cover.",

homeassistant/components/cover/triggers.yaml

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

homeassistant/components/devolo_home_network/__init__.py

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

homeassistant/components/devolo_home_network/sensor.py

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

homeassistant/components/devolo_home_network/strings.json

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

homeassistant/components/door/conditions.yaml

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

homeassistant/components/door/strings.json

@@ -1,7 +1,6 @@
 {
   "common": {
     "condition_behavior_name": "Condition passes if",
-    "condition_for_name": "For at least",
     "trigger_behavior_name": "Trigger when",
     "trigger_for_name": "For at least"
   },
@@ -11,9 +10,6 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::door::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::door::common::condition_for_name%]"
         }
       },
       "name": "Door is closed"
@@ -23,14 +19,26 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::door::common::condition_behavior_name%]"
-        },
-        "for": {
-          "name": "[%key:component::door::common::condition_for_name%]"
         }
       },
       "name": "Door is open"
     }
   },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "title": "Door",
   "triggers": {
     "closed": {

homeassistant/components/door/triggers.yaml

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

homeassistant/components/duco/const.py

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

homeassistant/components/duco/fan.py

@@ -35,7 +35,7 @@ PRESET_AUTO = "auto"
 # again always round-trips to the same Duco state.
 _SPEED_LEVEL_PERCENTAGES: list[int] = [
     (i + 1) * 100 // len(ORDERED_NAMED_FAN_SPEEDS)
-    for i, _ in enumerate(ORDERED_NAMED_FAN_SPEEDS)
+    for i in range(len(ORDERED_NAMED_FAN_SPEEDS))
 ]
 
 # Maps every active Duco state (including timed MAN variants) to its

homeassistant/components/duco/manifest.json

@@ -13,7 +13,7 @@
   "iot_class": "local_polling",
   "loggers": ["duco"],
   "quality_scale": "platinum",
-  "requirements": ["python-duco-client==0.4.1"],
+  "requirements": ["python-duco-client==0.3.9"],
   "zeroconf": [
     {
       "name": "duco [[][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][]].*",

homeassistant/components/duco/sensor.py

@@ -143,7 +143,6 @@ async def async_setup_entry(
 
     @callback
     def _async_add_new_entities() -> None:
-        """Add new sensor entities and remove stale ones on coordinator updates."""
         # Remove devices whose nodes have disappeared from the API.
         # The firmware removes deregistered RF/wired nodes automatically.
         # BSRH box sensors that are physically unplugged from the PCB are
@@ -167,19 +166,14 @@ async def async_setup_entry(
         for node in coordinator.data.nodes.values():
             if node.node_id in known_nodes:
                 continue
+            known_nodes.add(node.node_id)
             if node.general.node_type == NodeType.UNKNOWN:
-                # Do not add the node to known_nodes so that it is re-evaluated
-                # on every coordinator update. This allows entities to be
-                # created automatically once a firmware update or library
-                # update adds support for the device type.
-                _LOGGER.debug(
-                    "Duco node %s (%s) has an unsupported device type and will be "
-                    "retried on subsequent coordinator updates",
+                _LOGGER.warning(
+                    "Duco node %s (%s) has an unsupported device type and will be ignored",
                     node.node_id,
                     node.general.name,
                 )
                 continue
-            known_nodes.add(node.node_id)
             new_entities.extend(
                 DucoSensorEntity(coordinator, node, description)
                 for description in SENSOR_DESCRIPTIONS

homeassistant/components/ecovacs/manifest.json

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

homeassistant/components/emulated_kasa/manifest.json

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

homeassistant/components/energy/sensor.py

@@ -715,9 +715,6 @@ class EnergyPowerSensor(SensorEntity):
                 self._attr_native_value = None
                 return
 
-            self._attr_native_unit_of_measurement = source_state.attributes.get(
-                ATTR_UNIT_OF_MEASUREMENT
-            )
             self._attr_native_value = value * -1
 
         elif self._is_combined:
@@ -766,11 +763,13 @@ class EnergyPowerSensor(SensorEntity):
             # Check first sensor
             if source_entry := entity_reg.async_get(self._source_sensors[0]):
                 device_id = source_entry.device_id
-                # Combined mode always emits Watts because we convert
-                # heterogeneous source units internally. For inverted mode the
-                # unit is copied from the source state in _update_state.
+                # For combined mode, always use Watts because we may have different source units; for inverted mode, copy source unit
                 if self._is_combined:
                     self._attr_native_unit_of_measurement = UnitOfPower.WATT
+                else:
+                    self._attr_native_unit_of_measurement = (
+                        source_entry.unit_of_measurement
+                    )
                 # Get source name from registry
                 source_name = source_entry.name or source_entry.original_name
             # Assign power sensor to same device as source sensor(s)

homeassistant/components/fan/condition.py

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

homeassistant/components/fan/conditions.yaml

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

homeassistant/components/fan/strings.json

@@ -93,11 +93,24 @@
     }
   },
   "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "direction": {
       "options": {
         "forward": "Forward",
         "reverse": "Reverse"
       }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
     }
   },
   "services": {

homeassistant/components/fan/triggers.yaml

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

homeassistant/components/forecast_solar/config_flow.py

@@ -15,7 +15,7 @@ from homeassistant.config_entries import (
     OptionsFlow,
     SubentryFlowResult,
 )
-from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE
+from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
 from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv, selector
 
@@ -94,7 +94,7 @@ class ForecastSolarFlowHandler(ConfigFlow, domain=DOMAIN):
         """Handle a flow initiated by the user."""
         if user_input is not None:
             return self.async_create_entry(
-                title="",
+                title=user_input[CONF_NAME],
                 data={
                     CONF_LATITUDE: user_input[CONF_LATITUDE],
                     CONF_LONGITUDE: user_input[CONF_LONGITUDE],
@@ -118,11 +118,13 @@ class ForecastSolarFlowHandler(ConfigFlow, domain=DOMAIN):
             data_schema=self.add_suggested_values_to_schema(
                 vol.Schema(
                     {
+                        vol.Required(CONF_NAME): str,
                         vol.Required(CONF_LATITUDE): cv.latitude,
                         vol.Required(CONF_LONGITUDE): cv.longitude,
                     }
                 ).extend(PLANE_SCHEMA.schema),
                 {
+                    CONF_NAME: self.hass.config.location_name,
                     CONF_LATITUDE: self.hass.config.latitude,
                     CONF_LONGITUDE: self.hass.config.longitude,
                     CONF_DECLINATION: DEFAULT_DECLINATION,

homeassistant/components/forecast_solar/strings.json

@@ -7,7 +7,8 @@
           "declination": "Declination (0 = Horizontal, 90 = Vertical)",
           "latitude": "[%key:common::config_flow::data::latitude%]",
           "longitude": "[%key:common::config_flow::data::longitude%]",
-          "modules_power": "Total Watt peak power of your solar modules"
+          "modules_power": "Total Watt peak power of your solar modules",
+          "name": "[%key:common::config_flow::data::name%]"
         },
         "description": "Fill in the data of your solar panels. Please refer to the documentation if a field is unclear."
       }

homeassistant/components/fritz/button.py

@@ -45,7 +45,6 @@ BUTTONS: Final = [
         device_class=ButtonDeviceClass.UPDATE,
         entity_category=EntityCategory.CONFIG,
         press_action=lambda avm_wrapper: avm_wrapper.async_trigger_firmware_update(),
-        entity_registry_enabled_default=False,
     ),
     FritzButtonDescription(
         key="reboot",
@@ -97,33 +96,6 @@ def repair_issue_cleanup(hass: HomeAssistant, avm_wrapper: AvmWrapper) -> None:
         )
 
 
-def repair_issue_firmware_update(hass: HomeAssistant, avm_wrapper: AvmWrapper) -> None:
-    """Repair issue for firmware update button."""
-    entity_registry = er.async_get(hass)
-
-    if (
-        (
-            entity_button := entity_registry.async_get_entity_id(
-                "button", DOMAIN, f"{avm_wrapper.unique_id}-firmware_update"
-            )
-        )
-        and (entity_entry := entity_registry.async_get(entity_button))
-        and not entity_entry.disabled
-    ):
-        # Deprecate the 'firmware update' button: create a Repairs issue for users
-        ir.async_create_issue(
-            hass,
-            domain=DOMAIN,
-            issue_id="deprecated_firmware_update_button",
-            is_fixable=False,
-            is_persistent=True,
-            severity=ir.IssueSeverity.WARNING,
-            translation_key="deprecated_firmware_update_button",
-            translation_placeholders={"removal_version": "2026.11.0"},
-            breaks_in_ha_version="2026.11.0",
-        )
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: FritzConfigEntry,
@@ -140,7 +112,6 @@ async def async_setup_entry(
     if avm_wrapper.mesh_role == MeshRoles.SLAVE:
         async_add_entities(entities_list)
         repair_issue_cleanup(hass, avm_wrapper)
-        repair_issue_firmware_update(hass, avm_wrapper)
         return
 
     data_fritz = hass.data[FRITZ_DATA_KEY]
@@ -160,7 +131,6 @@ async def async_setup_entry(
     )
 
     repair_issue_cleanup(hass, avm_wrapper)
-    repair_issue_firmware_update(hass, avm_wrapper)
 
 
 class FritzButton(ButtonEntity):
@@ -194,12 +164,6 @@ class FritzButton(ButtonEntity):
                 "Please update your automations and dashboards to remove any usage of this button. "
                 "The action is now performed automatically at each data refresh",
             )
-        elif self.entity_description.key == "firmware_update":
-            _LOGGER.warning(
-                "The 'firmware update' button is deprecated and will be removed in Home Assistant Core "
-                "2026.11.0. It has been superseded by an update entity. Please update your automations "
-                "and dashboards to remove any usage of this button",
-            )
         await self.entity_description.press_action(self.avm_wrapper)
 
 

homeassistant/components/fritz/coordinator.py

@@ -10,7 +10,6 @@ from functools import partial
 import logging
 import re
 from typing import Any, TypedDict, cast
-from xml.etree.ElementTree import ParseError
 
 from fritzconnection import FritzConnection
 from fritzconnection.core.exceptions import FritzActionError
@@ -27,7 +26,7 @@ from homeassistant.components.device_tracker import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady, HomeAssistantError
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from homeassistant.helpers.dispatcher import async_dispatcher_send
@@ -229,13 +228,7 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         self.fritz_guest_wifi = FritzGuestWLAN(fc=self.connection)
         self.fritz_status = FritzStatus(fc=self.connection)
         self.fritz_call = FritzCall(fc=self.connection)
-        try:
-            info = self.fritz_status.get_device_info()
-        except ParseError as ex:
-            raise ConfigEntryNotReady(
-                translation_domain=DOMAIN,
-                translation_key="error_parse_device_info",
-            ) from ex
+        info = self.fritz_status.get_device_info()
 
         _LOGGER.debug(
             "gathered device info of %s %s",
@@ -702,7 +695,7 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         _LOGGER.debug("Device tracker cleanup triggered")
         device_hosts = {self.mac: Device(True, "", "", "", "", None)}
         if self.device_discovery_enabled:
-            device_hosts.update(await self._async_update_hosts_info())
+            device_hosts = await self._async_update_hosts_info()
         entity_reg: er.EntityRegistry = er.async_get(self.hass)
         config_entry = self.config_entry
 

homeassistant/components/fritz/sensor.py

@@ -7,7 +7,6 @@ from dataclasses import dataclass
 from datetime import datetime, timedelta
 import logging
 
-from fritzconnection.core.exceptions import FritzConnectionException
 from fritzconnection.lib.fritzstatus import FritzStatus
 from requests.exceptions import RequestException
 
@@ -146,7 +145,7 @@ def _is_suitable_cpu_temperature(status: FritzStatus) -> bool:
     """Return whether the CPU temperature sensor is suitable."""
     try:
         cpu_temp = status.get_cpu_temperatures()[0]
-    except RequestException, IndexError, FritzConnectionException:
+    except RequestException, IndexError:
         _LOGGER.debug("CPU temperature not supported by the device")
         return False
     if cpu_temp == 0:
@@ -295,6 +294,7 @@ CONNECTION_SENSOR_TYPES: tuple[FritzConnectionSensorEntityDescription, ...] = (
 DEVICE_SENSOR_TYPES: tuple[FritzDeviceSensorEntityDescription, ...] = (
     FritzDeviceSensorEntityDescription(
         key="device_uptime",
+        translation_key="device_uptime",
         device_class=SensorDeviceClass.UPTIME,
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=_retrieve_device_uptime_state,

homeassistant/components/fritz/strings.json

@@ -120,6 +120,9 @@
       "cpu_temperature": {
         "name": "CPU temperature"
       },
+      "device_uptime": {
+        "name": "Last restart"
+      },
       "external_ip": {
         "name": "External IP"
       },
@@ -185,9 +188,6 @@
     "config_entry_not_found": {
       "message": "Failed to perform action \"{service}\". Config entry for target not found"
     },
-    "error_parse_device_info": {
-      "message": "Error parsing device info. Please check the system event log of your FRITZ!Box for malformed data and clear the event list."
-    },
     "error_refresh_hosts_info": {
       "message": "Error refreshing hosts info"
     },
@@ -211,10 +211,6 @@
     "deprecated_cleanup_button": {
       "description": "The 'Cleanup' button is deprecated and will be removed in Home Assistant Core {removal_version}. Please update your automations and dashboards to remove any usage of this button. The action is now performed automatically at each data refresh.",
       "title": "'Cleanup' button is deprecated"
-    },
-    "deprecated_firmware_update_button": {
-      "description": "The 'Firmware update' button is deprecated and will be removed in Home Assistant Core {removal_version}. It has been superseded by an update entity. Please update your automations and dashboards to remove any usage of this button.",
-      "title": "'Firmware update' button is deprecated"
     }
   },
   "options": {

homeassistant/components/frontend/manifest.json

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

homeassistant/components/fumis/__init__.py

@@ -11,7 +11,6 @@ PLATFORMS = [
     Platform.BINARY_SENSOR,
     Platform.BUTTON,
     Platform.CLIMATE,
-    Platform.NUMBER,
     Platform.SENSOR,
 ]
 

homeassistant/components/fumis/diagnostics.py

@@ -1,21 +0,0 @@
-"""Diagnostics support for Fumis."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.core import HomeAssistant
-
-from .coordinator import FumisConfigEntry
-
-TO_REDACT_UNIT = {"id", "ip"}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: FumisConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    data = await entry.runtime_data.client.raw_status()
-    data["unit"] = async_redact_data(data["unit"], TO_REDACT_UNIT)
-    return data

homeassistant/components/fumis/icons.json

@@ -5,64 +5,13 @@
         "default": "mdi:clock-sync"
       }
     },
-    "number": {
-      "fan_speed": {
-        "default": "mdi:fan"
-      },
-      "power_level": {
-        "default": "mdi:fire"
-      }
-    },
     "sensor": {
-      "alert": {
-        "default": "mdi:alert",
-        "state": {
-          "airflow_malfunction": "mdi:fan-off",
-          "door_open": "mdi:door-open",
-          "flue_gas_warning": "mdi:thermometer-alert",
-          "low_battery": "mdi:battery-alert",
-          "low_fuel": "mdi:gauge-empty",
-          "none": "mdi:check-circle",
-          "service_due": "mdi:wrench-clock",
-          "speed_sensor_failure": "mdi:fan-alert"
-        }
-      },
       "combustion_chamber_temperature": {
         "default": "mdi:thermometer-high"
       },
       "detailed_stove_status": {
         "default": "mdi:fireplace"
       },
-      "error": {
-        "default": "mdi:alert-circle",
-        "state": {
-          "chimney_alarm": "mdi:broom",
-          "chimney_dirty": "mdi:broom",
-          "door_alarm": "mdi:door-open",
-          "fire_error": "mdi:fire-alert",
-          "flue_gas_overtemp": "mdi:thermometer-high",
-          "fuel_ignition_timeout": "mdi:fire-off",
-          "gas_alarm": "mdi:alert-circle",
-          "general_error": "mdi:alert-circle",
-          "grate_error": "mdi:alert-circle",
-          "ignition_failed": "mdi:fire-alert",
-          "mfdoor_alarm": "mdi:door-open",
-          "no_pellet_alarm": "mdi:gauge-empty",
-          "none": "mdi:check-circle",
-          "ntc1_alarm": "mdi:thermometer-alert",
-          "ntc2_alarm": "mdi:thermometer-alert",
-          "ntc3_alarm": "mdi:thermometer-alert",
-          "pressure_alarm": "mdi:gauge-empty",
-          "pressure_sensor_off": "mdi:gauge-empty",
-          "safety_switch": "mdi:shield-alert",
-          "sensor_t01_t02": "mdi:thermometer-alert",
-          "sensor_t01_t03": "mdi:thermometer-alert",
-          "sensor_t02": "mdi:thermometer-alert",
-          "sensor_t03_t05": "mdi:thermometer-alert",
-          "sensor_t04": "mdi:thermometer-alert",
-          "tc1_alarm": "mdi:thermometer-alert"
-        }
-      },
       "fan_1_speed": {
         "default": "mdi:fan"
       },

homeassistant/components/fumis/manifest.json

@@ -12,6 +12,6 @@
   "integration_type": "device",
   "iot_class": "cloud_polling",
   "loggers": ["fumis"],
-  "quality_scale": "platinum",
+  "quality_scale": "bronze",
   "requirements": ["fumis==0.4.0"]
 }

homeassistant/components/fumis/number.py

@@ -1,97 +0,0 @@
-"""Support for Fumis number entities."""
-
-from __future__ import annotations
-
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import Any
-
-from fumis import Fumis, FumisInfo
-
-from homeassistant.components.number import NumberEntity, NumberEntityDescription
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import FumisConfigEntry, FumisDataUpdateCoordinator
-from .entity import FumisEntity
-from .helpers import fumis_exception_handler
-
-PARALLEL_UPDATES = 1
-
-
-@dataclass(frozen=True, kw_only=True)
-class FumisNumberEntityDescription(NumberEntityDescription):
-    """Describes a Fumis number entity."""
-
-    has_fn: Callable[[FumisInfo], bool] = lambda _: True
-    value_fn: Callable[[FumisInfo], float | None]
-    set_fn: Callable[[Fumis, float], Awaitable[Any]]
-
-
-NUMBERS: tuple[FumisNumberEntityDescription, ...] = (
-    FumisNumberEntityDescription(
-        key="fan_speed",
-        translation_key="fan_speed",
-        entity_category=EntityCategory.CONFIG,
-        entity_registry_enabled_default=False,
-        native_min_value=0,
-        native_max_value=5,
-        native_step=1,
-        has_fn=lambda data: len(data.controller.fans) > 0,
-        value_fn=lambda data: (
-            data.controller.fans[0].speed if data.controller.fans else None
-        ),
-        set_fn=lambda client, value: client.set_fan_speed(int(value)),
-    ),
-    FumisNumberEntityDescription(
-        key="power_level",
-        translation_key="power_level",
-        native_min_value=1,
-        native_max_value=5,
-        native_step=1,
-        value_fn=lambda data: data.controller.power.set_power,
-        set_fn=lambda client, value: client.set_power(int(value)),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: FumisConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Fumis number entities based on a config entry."""
-    coordinator = entry.runtime_data
-    async_add_entities(
-        FumisNumberEntity(coordinator=coordinator, description=description)
-        for description in NUMBERS
-        if description.has_fn(coordinator.data)
-    )
-
-
-class FumisNumberEntity(FumisEntity, NumberEntity):
-    """Defines a Fumis number entity."""
-
-    entity_description: FumisNumberEntityDescription
-
-    def __init__(
-        self,
-        coordinator: FumisDataUpdateCoordinator,
-        description: FumisNumberEntityDescription,
-    ) -> None:
-        """Initialize the Fumis number entity."""
-        super().__init__(coordinator)
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.config_entry.unique_id}_{description.key}"
-
-    @property
-    def native_value(self) -> float | None:
-        """Return the current value."""
-        return self.entity_description.value_fn(self.coordinator.data)
-
-    @fumis_exception_handler
-    async def async_set_native_value(self, value: float) -> None:
-        """Set a new value."""
-        await self.entity_description.set_fn(self.coordinator.client, value)
-        await self.coordinator.async_request_refresh()

homeassistant/components/fumis/quality_scale.yaml

@@ -41,7 +41,7 @@ rules:
 
   # Gold
   devices: done
-  diagnostics: done
+  diagnostics: todo
   discovery: done
   discovery-update-info:
     status: exempt

homeassistant/components/fumis/sensor.py

@@ -5,9 +5,8 @@ from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime, timedelta
-from typing import Any
 
-from fumis import FumisInfo, StoveAlert, StoveError, StoveState, StoveStatus
+from fumis import FumisInfo, StoveState, StoveStatus
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -35,52 +34,15 @@ from .entity import FumisEntity
 PARALLEL_UPDATES = 0
 
 
-def _code_to_state(code: StoveAlert | StoveError | None) -> str | None:
-    """Convert a stove alert or error code to a sensor state value.
-
-    Returns "none" when there is no active alert/error, None when the code
-    is unknown, or the enum member name in lowercase for known codes.
-    """
-    if code is None:
-        return "none"
-    if code.name == "UNKNOWN":
-        return None
-    return code.name.lower()
-
-
-def _code_to_attr(code: StoveAlert | StoveError | None) -> dict[str, str | None]:
-    """Convert a stove alert or error code to extra state attributes."""
-    if code is None or code.name == "UNKNOWN":
-        return {"code": None}
-    return {"code": code.value}
-
-
 @dataclass(frozen=True, kw_only=True)
 class FumisSensorEntityDescription(SensorEntityDescription):
     """Describes a Fumis sensor entity."""
 
-    attr_fn: Callable[[FumisInfo], dict[str, Any]] | None = None
     has_fn: Callable[[FumisInfo], bool] = lambda _: True
     value_fn: Callable[[FumisInfo], datetime | float | int | str | None]
 
 
 SENSORS: tuple[FumisSensorEntityDescription, ...] = (
-    FumisSensorEntityDescription(
-        key="alert",
-        translation_key="alert",
-        device_class=SensorDeviceClass.ENUM,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        options=[
-            "none",
-            *(
-                alert.name.lower()
-                for alert in StoveAlert
-                if alert != StoveAlert.UNKNOWN
-            ),
-        ],
-        value_fn=lambda data: _code_to_state(data.controller.stove_alert),
-        attr_fn=lambda data: _code_to_attr(data.controller.stove_alert),
-    ),
     FumisSensorEntityDescription(
         key="combustion_chamber_temperature",
         translation_key="combustion_chamber_temperature",
@@ -107,22 +69,6 @@ SENSORS: tuple[FumisSensorEntityDescription, ...] = (
             else data.controller.stove_status.name.lower()
         ),
     ),
-    FumisSensorEntityDescription(
-        key="error",
-        translation_key="error",
-        device_class=SensorDeviceClass.ENUM,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        options=[
-            "none",
-            *(
-                error.name.lower()
-                for error in StoveError
-                if error != StoveError.UNKNOWN
-            ),
-        ],
-        value_fn=lambda data: _code_to_state(data.controller.stove_error),
-        attr_fn=lambda data: _code_to_attr(data.controller.stove_error),
-    ),
     FumisSensorEntityDescription(
         key="fan_1_speed",
         translation_key="fan_1_speed",
@@ -321,13 +267,6 @@ class FumisSensorEntity(FumisEntity, SensorEntity):
         self.entity_description = description
         self._attr_unique_id = f"{coordinator.config_entry.unique_id}_{description.key}"
 
-    @property
-    def extra_state_attributes(self) -> dict[str, Any] | None:
-        """Return additional state attributes."""
-        if self.entity_description.attr_fn is None:
-            return None
-        return self.entity_description.attr_fn(self.coordinator.data)
-
     @property
     def native_value(self) -> datetime | float | int | str | None:
         """Return the sensor value."""