Merge branch 'dev' into evo_refactor_ids

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.claude/agents/raise-pull-request.md

@@ -186,15 +186,11 @@ If `CHANGE_TYPE` IS "Breaking change" or "Deprecation", keep the `## Breaking ch
 
 ## Step 10: Push Branch and Create PR
 
-```bash
-# Get branch name and GitHub username
-BRANCH=$(git branch --show-current)
-PUSH_REMOTE=$(git config "branch.$BRANCH.remote" 2>/dev/null || git remote | head -1)
-GITHUB_USER=$(gh api user --jq .login 2>/dev/null || git remote get-url "$PUSH_REMOTE" | sed -E 's#.*[:/]([^/]+)/([^/]+)(\.git)?$#\1#')
+Push the branch with upstream tracking, and create a PR against `home-assistant/core` with the generated title and body:
 
+```bash
 # Create PR (gh pr create pushes the branch automatically)
 gh pr create --repo home-assistant/core --base dev \
-  --head "$GITHUB_USER:$BRANCH" \
   --draft \
   --title "TITLE_HERE" \
   --body "$(cat <<'EOF'

.github/renovate.json

@@ -78,6 +78,50 @@
       "enabled": true,
       "labels": ["dependency", "core"]
     },
+    {
+      "description": "Common Python utilities (allowlisted)",
+      "matchPackageNames": [
+        "astral",
+        "atomicwrites-homeassistant",
+        "audioop-lts",
+        "awesomeversion",
+        "bcrypt",
+        "ciso8601",
+        "cronsim",
+        "defusedxml",
+        "fnv-hash-fast",
+        "getmac",
+        "ical",
+        "ifaddr",
+        "lru-dict",
+        "mutagen",
+        "propcache",
+        "pyserial",
+        "python-slugify",
+        "PyTurboJPEG",
+        "securetar",
+        "standard-aifc",
+        "standard-telnetlib",
+        "ulid-transform",
+        "url-normalize",
+        "xmltodict"
+      ],
+      "enabled": true,
+      "labels": ["dependency"]
+    },
+    {
+      "description": "Home Assistant ecosystem packages (core-maintained, no cooldown)",
+      "matchPackageNames": [
+        "hassil",
+        "home-assistant-bluetooth",
+        "home-assistant-frontend",
+        "home-assistant-intents",
+        "infrared-protocols"
+      ],
+      "enabled": true,
+      "minimumReleaseAge": null,
+      "labels": ["dependency", "core"]
+    },
     {
       "description": "Test dependencies (allowlisted)",
       "matchPackageNames": [

.github/workflows/builder.yml

@@ -76,7 +76,7 @@ jobs:
         run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
 
       - name: Upload translations
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: translations
           path: translations.tar.gz
@@ -530,7 +530,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -543,7 +543,7 @@ jobs:
       - name: Push Docker image
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
         id: push
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile

.github/workflows/ci.yaml

@@ -458,7 +458,7 @@ jobs:
           python --version
           uv pip freeze >> pip_freeze.txt
       - name: Upload pip_freeze artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: pip-freeze-${{ matrix.python-version }}
           path: pip_freeze.txt
@@ -659,7 +659,7 @@ jobs:
           . venv/bin/activate
           python -m script.licenses extract --output-file=licenses-${PYTHON_VERSION}.json
       - name: Upload licenses
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: licenses-${{ github.run_number }}-${{ matrix.python-version }}
           path: licenses-${{ matrix.python-version }}.json
@@ -903,7 +903,7 @@ jobs:
           . venv/bin/activate
           python -m script.split_tests ${TEST_GROUP_COUNT} tests
       - name: Upload pytest_buckets
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: pytest_buckets
           path: pytest_buckets.txt
@@ -1022,14 +1022,14 @@ jobs:
               2>&1 | tee pytest-${PYTHON_VERSION}-${TEST_GROUP}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-full.conclusion == 'failure'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
           path: pytest-*.txt
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -1042,7 +1042,7 @@ jobs:
           mv "junit.xml-tmp" "junit.xml"
       - name: Upload test results artifact
         if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: test-results-full-${{ matrix.python-version }}-${{ matrix.group }}
           path: junit.xml
@@ -1181,7 +1181,7 @@ jobs:
               2>&1 | tee pytest-${PYTHON_VERSION}-${mariadb}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1189,7 +1189,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1203,7 +1203,7 @@ jobs:
           mv "junit.xml-tmp" "junit.xml"
       - name: Upload test results artifact
         if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: test-results-mariadb-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1342,7 +1342,7 @@ jobs:
               2>&1 | tee pytest-${PYTHON_VERSION}-${postgresql}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1350,7 +1350,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1364,7 +1364,7 @@ jobs:
           mv "junit.xml-tmp" "junit.xml"
       - name: Upload test results artifact
         if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: test-results-postgres-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1518,14 +1518,14 @@ jobs:
               2>&1 | tee pytest-${PYTHON_VERSION}-${TEST_GROUP}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
           path: pytest-*.txt
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -1538,7 +1538,7 @@ jobs:
           mv "junit.xml-tmp" "junit.xml"
       - name: Upload test results artifact
         if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: test-results-partial-${{ matrix.python-version }}-${{ matrix.group }}
           path: junit.xml

.github/workflows/detect-duplicate-issues.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Check if integration label was added and extract details
         id: extract
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             // Debug: Log the event payload
@@ -118,7 +118,7 @@ jobs:
       - name: Fetch similar issues
         id: fetch_similar
         if: steps.extract.outputs.should_continue == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           INTEGRATION_LABELS: ${{ steps.extract.outputs.integration_labels }}
           CURRENT_NUMBER: ${{ steps.extract.outputs.current_number }}
@@ -285,7 +285,7 @@ jobs:
       - name: Post duplicate detection results
         id: post_results
         if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           AI_RESPONSE: ${{ steps.ai_detection.outputs.response }}
           SIMILAR_ISSUES: ${{ steps.fetch_similar.outputs.similar_issues }}

.github/workflows/detect-non-english-issues.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Check issue language
         id: detect_language
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           ISSUE_NUMBER: ${{ github.event.issue.number }}
           ISSUE_TITLE: ${{ github.event.issue.title }}
@@ -95,7 +95,7 @@ jobs:
 
       - name: Process non-English issues
         if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         env:
           AI_RESPONSE: ${{ steps.ai_language_detection.outputs.response }}
           ISSUE_NUMBER: ${{ steps.detect_language.outputs.issue_number }}

.github/workflows/restrict-task-creation.yml

@@ -22,7 +22,7 @@ jobs:
       || github.event.issue.type.name == 'Opportunity'
     steps:
       - name: Add no-stale label
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             await github.rest.issues.addLabels({
@@ -42,7 +42,7 @@ jobs:
     if: github.event.issue.type.name == 'Task'
     steps:
       - name: Check if user is authorized
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
             const issueAuthor = context.payload.issue.user.login;

.github/workflows/wheels.yml

@@ -74,7 +74,7 @@ jobs:
           ) > .env_file
 
       - name: Upload env_file
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: env_file
           path: ./.env_file
@@ -82,7 +82,7 @@ jobs:
           overwrite: true
 
       - name: Upload requirements_diff
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: requirements_diff
           path: ./requirements_diff.txt
@@ -94,7 +94,7 @@ jobs:
           python -m script.gen_requirements_all ci
 
       - name: Upload requirements_all_wheels
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: requirements_all_wheels
           path: ./requirements_all_wheels_*.txt

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: ruff-format
         files: ^((homeassistant|pylint|script|tests)/.+)?[^/]+\.(py|pyi)$
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
       - id: codespell
         args:

.strict-typing

@@ -552,6 +552,7 @@ homeassistant.components.tcp.*
 homeassistant.components.technove.*
 homeassistant.components.tedee.*
 homeassistant.components.telegram_bot.*
+homeassistant.components.teleinfo.*
 homeassistant.components.teslemetry.*
 homeassistant.components.text.*
 homeassistant.components.thethingsnetwork.*

CODEOWNERS

@@ -362,6 +362,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/deluge/ @tkdrob
 /homeassistant/components/demo/ @home-assistant/core
 /tests/components/demo/ @home-assistant/core
+/homeassistant/components/denon_rs232/ @balloob
+/tests/components/denon_rs232/ @balloob
 /homeassistant/components/denonavr/ @ol-iver @starkillerOG
 /tests/components/denonavr/ @ol-iver @starkillerOG
 /homeassistant/components/derivative/ @afaucogney @karwosts
@@ -428,6 +430,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/dynalite/ @ziv1234
 /homeassistant/components/eafm/ @Jc2k
 /tests/components/eafm/ @Jc2k
+/homeassistant/components/earn_e_p1/ @Miggets7
+/tests/components/earn_e_p1/ @Miggets7
 /homeassistant/components/easyenergy/ @klaasnicolaas
 /tests/components/easyenergy/ @klaasnicolaas
 /homeassistant/components/ecoforest/ @pjanuario
@@ -898,8 +902,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/jewish_calendar/ @tsvi
 /homeassistant/components/justnimbus/ @kvanzuijlen
 /tests/components/justnimbus/ @kvanzuijlen
-/homeassistant/components/jvc_projector/ @SteveEasley @msavazzi
-/tests/components/jvc_projector/ @SteveEasley @msavazzi
+/homeassistant/components/jvc_projector/ @SteveEasley
+/tests/components/jvc_projector/ @SteveEasley
 /homeassistant/components/kaiterra/ @Michsior14
 /homeassistant/components/kaleidescape/ @SteveEasley
 /tests/components/kaleidescape/ @SteveEasley
@@ -912,6 +916,8 @@ CLAUDE.md @home-assistant/core
 /homeassistant/components/keyboard_remote/ @bendavid @lanrat
 /homeassistant/components/keymitt_ble/ @spycle
 /tests/components/keymitt_ble/ @spycle
+/homeassistant/components/kiosker/ @Claeysson
+/tests/components/kiosker/ @Claeysson
 /homeassistant/components/kitchen_sink/ @home-assistant/core
 /tests/components/kitchen_sink/ @home-assistant/core
 /homeassistant/components/kmtronic/ @dgomes
@@ -1726,6 +1732,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/tedee/ @patrickhilker @zweckj
 /homeassistant/components/telegram_bot/ @hanwg
 /tests/components/telegram_bot/ @hanwg
+/homeassistant/components/teleinfo/ @esciara
+/tests/components/teleinfo/ @esciara
 /homeassistant/components/tellduslive/ @fredrike
 /tests/components/tellduslive/ @fredrike
 /homeassistant/components/teltonika/ @karlbeecken

Dockerfile

@@ -19,25 +19,22 @@ ENV \
     UV_SYSTEM_PYTHON=true \
     UV_NO_CACHE=true
 
+WORKDIR /usr/src
+
 # Home Assistant S6-Overlay
 COPY rootfs /
 
 # Add go2rtc binary
 COPY --from=ghcr.io/alexxit/go2rtc@sha256:675c318b23c06fd862a61d262240c9a63436b4050d177ffc68a32710d9e05bae /usr/local/bin/go2rtc /bin/go2rtc
 
+## Setup Home Assistant Core dependencies
+COPY --parents requirements.txt homeassistant/package_constraints.txt homeassistant/
 RUN \
     # Verify go2rtc can be executed
     go2rtc --version \
-    # Install uv
-    && pip3 install uv==0.11.1
-
-WORKDIR /usr/src
-
-## Setup Home Assistant Core dependencies
-COPY requirements.txt homeassistant/
-COPY homeassistant/package_constraints.txt homeassistant/homeassistant/
-RUN \
-    uv pip install \
+    # Install uv at the version pinned in the requirements file
+    && pip3 install --no-cache-dir "uv==$(awk -F'==' '/^uv==/{print $2}' homeassistant/requirements.txt)" \
+    && uv pip install \
         --no-build \
         -r homeassistant/requirements.txt
 
@@ -51,7 +48,7 @@ RUN \
         -r homeassistant/requirements_all.txt
 
 ## Setup Home Assistant Core
-COPY . homeassistant/
+COPY --parents LICENSE* README* homeassistant/ pyproject.toml homeassistant/
 RUN \
     uv pip install \
         -e ./homeassistant \

homeassistant/auth/jwt_wrapper.py

@@ -7,23 +7,31 @@ to speed up the process.
 
 from __future__ import annotations
 
+from collections.abc import Container, Iterable, Sequence
 from datetime import timedelta
-from functools import lru_cache, partial
-from typing import Any
+from functools import lru_cache
+from typing import Any, override
 
-from jwt import DecodeError, PyJWS, PyJWT
+from jwt import DecodeError, PyJWK, PyJWS, PyJWT
+from jwt.algorithms import AllowedPublicKeys
+from jwt.types import Options
 
 from homeassistant.util.json import json_loads
 
 JWT_TOKEN_CACHE_SIZE = 16
 MAX_TOKEN_SIZE = 8192
 
-_VERIFY_KEYS = ("signature", "exp", "nbf", "iat", "aud", "iss", "sub", "jti")
-
-_VERIFY_OPTIONS: dict[str, Any] = {f"verify_{key}": True for key in _VERIFY_KEYS} | {
-    "require": []
-}
-_NO_VERIFY_OPTIONS = {f"verify_{key}": False for key in _VERIFY_KEYS}
+_NO_VERIFY_OPTIONS = Options(
+    verify_signature=False,
+    verify_exp=False,
+    verify_nbf=False,
+    verify_iat=False,
+    verify_aud=False,
+    verify_iss=False,
+    verify_sub=False,
+    verify_jti=False,
+    require=[],
+)
 
 
 class _PyJWSWithLoadCache(PyJWS):
@@ -38,9 +46,6 @@ class _PyJWSWithLoadCache(PyJWS):
         return super()._load(jwt)
 
 
-_jws = _PyJWSWithLoadCache()
-
-
 @lru_cache(maxsize=JWT_TOKEN_CACHE_SIZE)
 def _decode_payload(json_payload: str) -> dict[str, Any]:
     """Decode the payload from a JWS dictionary."""
@@ -56,21 +61,12 @@ def _decode_payload(json_payload: str) -> dict[str, Any]:
 class _PyJWTWithVerify(PyJWT):
     """PyJWT with a fast decode implementation."""
 
-    def decode_payload(
-        self, jwt: str, key: str, options: dict[str, Any], algorithms: list[str]
-    ) -> dict[str, Any]:
-        """Decode a JWT's payload."""
-        if len(jwt) > MAX_TOKEN_SIZE:
-            # Avoid caching impossible tokens
-            raise DecodeError("Token too large")
-        return _decode_payload(
-            _jws.decode_complete(
-                jwt=jwt,
-                key=key,
-                algorithms=algorithms,
-                options=options,
-            )["payload"]
-        )
+    def __init__(self) -> None:
+        """Initialize the PyJWT instance."""
+        # We require exp and iat claims to be present
+        super().__init__(Options(require=["exp", "iat"]))
+        # Override the _jws instance with our cached version
+        self._jws = _PyJWSWithLoadCache()
 
     def verify_and_decode(
         self,
@@ -79,37 +75,70 @@ class _PyJWTWithVerify(PyJWT):
         algorithms: list[str],
         issuer: str | None = None,
         leeway: float | timedelta = 0,
-        options: dict[str, Any] | None = None,
+        options: Options | None = None,
     ) -> dict[str, Any]:
         """Verify a JWT's signature and claims."""
-        merged_options = {**_VERIFY_OPTIONS, **(options or {})}
-        payload = self.decode_payload(
+        return self.decode(
             jwt=jwt,
             key=key,
-            options=merged_options,
             algorithms=algorithms,
-        )
-        # These should never be missing since we verify them
-        # but this is an additional safeguard to make sure
-        # nothing slips through.
-        assert "exp" in payload, "exp claim is required"
-        assert "iat" in payload, "iat claim is required"
-        self._validate_claims(
-            payload=payload,
-            options=merged_options,
             issuer=issuer,
             leeway=leeway,
+            options=options,
         )
-        return payload
+
+    @override
+    def decode(
+        self,
+        jwt: str | bytes,
+        key: AllowedPublicKeys | PyJWK | str | bytes = "",
+        algorithms: Sequence[str] | None = None,
+        options: Options | None = None,
+        verify: bool | None = None,
+        detached_payload: bytes | None = None,
+        audience: str | Iterable[str] | None = None,
+        subject: str | None = None,
+        issuer: str | Container[str] | None = None,
+        leeway: float | timedelta = 0,
+        **kwargs: Any,
+    ) -> dict[str, Any]:
+        """Decode a JWT, verifying the signature and claims."""
+        if len(jwt) > MAX_TOKEN_SIZE:
+            # Avoid caching impossible tokens
+            raise DecodeError("Token too large")
+        return super().decode(
+            jwt=jwt,
+            key=key,
+            algorithms=algorithms,
+            options=options,
+            verify=verify,
+            detached_payload=detached_payload,
+            audience=audience,
+            subject=subject,
+            issuer=issuer,
+            leeway=leeway,
+            **kwargs,
+        )
+
+    @override
+    def _decode_payload(self, decoded: dict[str, Any]) -> dict[str, Any]:
+        return _decode_payload(decoded["payload"])
 
 
 _jwt = _PyJWTWithVerify()
 verify_and_decode = _jwt.verify_and_decode
-unverified_hs256_token_decode = lru_cache(maxsize=JWT_TOKEN_CACHE_SIZE)(
-    partial(
-        _jwt.decode_payload, key="", algorithms=["HS256"], options=_NO_VERIFY_OPTIONS
+
+
+@lru_cache(maxsize=JWT_TOKEN_CACHE_SIZE)
+def unverified_hs256_token_decode(jwt: str) -> dict[str, Any]:
+    """Decode a JWT without verifying the signature."""
+    return _jwt.decode(
+        jwt=jwt,
+        key="",
+        algorithms=["HS256"],
+        options=_NO_VERIFY_OPTIONS,
     )
-)
+
 
 __all__ = [
     "unverified_hs256_token_decode",

homeassistant/brands/denon.json

@@ -1,5 +1,5 @@
 {
   "domain": "denon",
   "name": "Denon",
-  "integrations": ["denon", "denonavr", "heos"]
+  "integrations": ["denon", "denonavr", "denon_rs232", "heos"]
 }

homeassistant/components/acer_projector/const.py

@@ -6,10 +6,11 @@ from typing import Final
 
 from homeassistant.const import STATE_OFF, STATE_ON
 
+CONF_READ_TIMEOUT: Final = "timeout"
 CONF_WRITE_TIMEOUT: Final = "write_timeout"
 
 DEFAULT_NAME: Final = "Acer Projector"
-DEFAULT_TIMEOUT: Final = 1
+DEFAULT_READ_TIMEOUT: Final = 1
 DEFAULT_WRITE_TIMEOUT: Final = 1
 
 ECO_MODE: Final = "ECO Mode"

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": ["pyserial==3.5"]
+  "requirements": ["serialx==1.2.2"]
 }

homeassistant/components/acer_projector/switch.py

@@ -6,7 +6,7 @@ import logging
 import re
 from typing import Any
 
-import serial
+from serialx import Serial, SerialException
 import voluptuous as vol
 
 from homeassistant.components.switch import (
@@ -16,21 +16,22 @@ from homeassistant.components.switch import (
 from homeassistant.const import (
     CONF_FILENAME,
     CONF_NAME,
-    CONF_TIMEOUT,
     STATE_OFF,
     STATE_ON,
     STATE_UNKNOWN,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (
     CMD_DICT,
+    CONF_READ_TIMEOUT,
     CONF_WRITE_TIMEOUT,
     DEFAULT_NAME,
-    DEFAULT_TIMEOUT,
+    DEFAULT_READ_TIMEOUT,
     DEFAULT_WRITE_TIMEOUT,
     ECO_MODE,
     ICON,
@@ -45,7 +46,7 @@ PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_FILENAME): cv.isdevice,
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
+        vol.Optional(CONF_READ_TIMEOUT, default=DEFAULT_READ_TIMEOUT): cv.positive_int,
         vol.Optional(
             CONF_WRITE_TIMEOUT, default=DEFAULT_WRITE_TIMEOUT
         ): cv.positive_int,
@@ -62,10 +63,10 @@ def setup_platform(
     """Connect with serial port and return Acer Projector."""
     serial_port = config[CONF_FILENAME]
     name = config[CONF_NAME]
-    timeout = config[CONF_TIMEOUT]
+    read_timeout = config[CONF_READ_TIMEOUT]
     write_timeout = config[CONF_WRITE_TIMEOUT]
 
-    add_entities([AcerSwitch(serial_port, name, timeout, write_timeout)], True)
+    add_entities([AcerSwitch(serial_port, name, read_timeout, write_timeout)], True)
 
 
 class AcerSwitch(SwitchEntity):
@@ -77,14 +78,14 @@ class AcerSwitch(SwitchEntity):
         self,
         serial_port: str,
         name: str,
-        timeout: int,
+        read_timeout: int,
         write_timeout: int,
     ) -> None:
         """Init of the Acer projector."""
-        self.serial = serial.Serial(
-            port=serial_port, timeout=timeout, write_timeout=write_timeout
-        )
         self._serial_port = serial_port
+        self._read_timeout = read_timeout
+        self._write_timeout = write_timeout
+
         self._attr_name = name
         self._attributes = {
             LAMP_HOURS: STATE_UNKNOWN,
@@ -94,22 +95,26 @@ class AcerSwitch(SwitchEntity):
 
     def _write_read(self, msg: str) -> str:
         """Write to the projector and read the return."""
-        ret = ""
+
         # Sometimes the projector won't answer for no reason or the projector
         # was disconnected during runtime.
         # This way the projector can be reconnected and will still work
         try:
-            if not self.serial.is_open:
-                self.serial.open()
-            self.serial.write(msg.encode("utf-8"))
-            # Size is an experience value there is no real limit.
-            # AFAIK there is no limit and no end character so we will usually
-            # need to wait for timeout
-            ret = self.serial.read_until(size=20).decode("utf-8")
-        except serial.SerialException:
-            _LOGGER.error("Problem communicating with %s", self._serial_port)
-        self.serial.close()
-        return ret
+            with Serial.from_url(
+                self._serial_port,
+                read_timeout=self._read_timeout,
+                write_timeout=self._write_timeout,
+            ) as serial:
+                serial.write(msg.encode("utf-8"))
+
+                # Size is an experience value there is no real limit.
+                # AFAIK there is no limit and no end character so we will usually
+                # need to wait for timeout
+                return serial.read_until(size=20).decode("utf-8")
+        except (OSError, SerialException, TimeoutError) as exc:
+            raise HomeAssistantError(
+                f"Problem communicating with {self._serial_port}"
+            ) from exc
 
     def _write_read_format(self, msg: str) -> str:
         """Write msg, obtain answer and format output."""

homeassistant/components/air_quality/strings.json

@@ -3,6 +3,7 @@
     "condition_behavior_name": "Condition passes if",
     "condition_threshold_name": "Threshold type",
     "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least",
     "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
@@ -249,6 +250,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -269,6 +273,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
         }
       },
       "name": "Carbon monoxide cleared"
@@ -279,6 +286,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -290,6 +300,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
         }
       },
       "name": "Carbon monoxide detected"
@@ -299,6 +312,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
         }
       },
       "name": "Gas cleared"
@@ -308,6 +324,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
         }
       },
       "name": "Gas detected"
@@ -327,6 +346,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -348,6 +370,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -369,6 +394,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -390,6 +418,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -411,6 +442,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -432,6 +466,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -453,6 +490,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -474,6 +514,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -485,6 +528,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
         }
       },
       "name": "Smoke cleared"
@@ -494,6 +540,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
         }
       },
       "name": "Smoke detected"
@@ -513,6 +562,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -534,6 +586,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
@@ -555,6 +610,9 @@
         "behavior": {
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::air_quality::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }

homeassistant/components/air_quality/triggers.yaml

@@ -9,6 +9,11 @@
           - first
           - last
           - any
+  for: &trigger_for
+    required: true
+    default: 00:00:00
+    selector:
+      duration:
 
 # --- Unit lists for multi-unit pollutants ---
 
@@ -163,6 +168,7 @@
 # Binary sensor detected/cleared trigger fields
 .trigger_binary_fields: &trigger_binary_fields
   behavior: *trigger_behavior
+  for: *trigger_for
 
 # --- Binary sensor targets ---
 
@@ -294,6 +300,7 @@ co_crossed_threshold:
   target: *target_co_sensor
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -320,6 +327,7 @@ co2_crossed_threshold:
   target: *target_co2
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -344,6 +352,7 @@ pm1_crossed_threshold:
   target: *target_pm1
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -368,6 +377,7 @@ pm25_crossed_threshold:
   target: *target_pm25
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -392,6 +402,7 @@ pm4_crossed_threshold:
   target: *target_pm4
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -416,6 +427,7 @@ pm10_crossed_threshold:
   target: *target_pm10
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -442,6 +454,7 @@ ozone_crossed_threshold:
   target: *target_ozone
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -470,6 +483,7 @@ voc_crossed_threshold:
   target: *target_voc
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -498,6 +512,7 @@ voc_ratio_crossed_threshold:
   target: *target_voc_ratio
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -526,6 +541,7 @@ no_crossed_threshold:
   target: *target_no
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -554,6 +570,7 @@ no2_crossed_threshold:
   target: *target_no2
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -580,6 +597,7 @@ n2o_crossed_threshold:
   target: *target_n2o
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -606,6 +624,7 @@ so2_crossed_threshold:
   target: *target_so2
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:

homeassistant/components/alarm_control_panel/strings.json

@@ -1,7 +1,8 @@
 {
   "common": {
     "condition_behavior_name": "Condition passes if",
-    "trigger_behavior_name": "Trigger when"
+    "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least"
   },
   "conditions": {
     "is_armed": {
@@ -234,6 +235,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::alarm_control_panel::common::trigger_for_name%]"
         }
       },
       "name": "Alarm armed"
@@ -243,6 +247,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::alarm_control_panel::common::trigger_for_name%]"
         }
       },
       "name": "Alarm armed away"
@@ -252,6 +259,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::alarm_control_panel::common::trigger_for_name%]"
         }
       },
       "name": "Alarm armed home"
@@ -261,6 +271,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::alarm_control_panel::common::trigger_for_name%]"
         }
       },
       "name": "Alarm armed night"
@@ -270,6 +283,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::alarm_control_panel::common::trigger_for_name%]"
         }
       },
       "name": "Alarm armed vacation"
@@ -279,6 +295,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::alarm_control_panel::common::trigger_for_name%]"
         }
       },
       "name": "Alarm disarmed"
@@ -288,6 +307,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::alarm_control_panel::common::trigger_for_name%]"
         }
       },
       "name": "Alarm triggered"

homeassistant/components/alarm_control_panel/triggers.yaml

@@ -13,6 +13,11 @@
             - last
             - any
           translation_key: trigger_behavior
+    for:
+      required: true
+      default: 00:00:00
+      selector:
+        duration:
 
 armed: *trigger_common
 

homeassistant/components/anthropic/config_flow.py

@@ -29,6 +29,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import llm
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.selector import (
     NumberSelector,
@@ -64,8 +65,7 @@ from .const import (
     DEFAULT_AI_TASK_NAME,
     DEFAULT_CONVERSATION_NAME,
     DOMAIN,
-    NON_ADAPTIVE_THINKING_MODELS,
-    NON_THINKING_MODELS,
+    MIN_THINKING_BUDGET,
     TOOL_SEARCH_UNSUPPORTED_MODELS,
     WEB_SEARCH_UNSUPPORTED_MODELS,
     PromptCaching,
@@ -324,10 +324,6 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
             ): SelectSelector(
                 SelectSelectorConfig(options=self._get_model_list(), custom_value=True)
             ),
-            vol.Optional(
-                CONF_MAX_TOKENS,
-                default=DEFAULT[CONF_MAX_TOKENS],
-            ): int,
             vol.Optional(
                 CONF_TEMPERATURE,
                 default=DEFAULT[CONF_TEMPERATURE],
@@ -384,30 +380,59 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
         """Manage model-specific options."""
         errors: dict[str, str] = {}
 
-        step_schema: VolDictType = {}
+        step_schema: VolDictType = {
+            vol.Optional(
+                CONF_MAX_TOKENS,
+                default=DEFAULT[CONF_MAX_TOKENS],
+            ): vol.All(
+                NumberSelector(
+                    NumberSelectorConfig(min=0, max=self.model_info.max_tokens)
+                ),
+                vol.Coerce(int),
+            )
+            if self.model_info.max_tokens
+            else cv.positive_int,
+        }
 
         model = self.options[CONF_CHAT_MODEL]
 
-        if not model.startswith(tuple(NON_THINKING_MODELS)) and model.startswith(
-            tuple(NON_ADAPTIVE_THINKING_MODELS)
+        if (
+            self.model_info.capabilities
+            and self.model_info.capabilities.thinking.supported
+            and not self.model_info.capabilities.thinking.types.adaptive.supported
         ):
             step_schema[
                 vol.Optional(
                     CONF_THINKING_BUDGET, default=DEFAULT[CONF_THINKING_BUDGET]
                 )
-            ] = vol.All(
-                NumberSelector(
-                    NumberSelectorConfig(
-                        min=0,
-                        max=self.options.get(CONF_MAX_TOKENS, DEFAULT[CONF_MAX_TOKENS]),
-                    )
-                ),
-                vol.Coerce(int),
+            ] = (
+                vol.All(
+                    NumberSelector(
+                        NumberSelectorConfig(min=0, max=self.model_info.max_tokens)
+                    ),
+                    vol.Coerce(int),
+                )
+                if self.model_info.max_tokens
+                else cv.positive_int
             )
         else:
             self.options.pop(CONF_THINKING_BUDGET, None)
 
-        if not model.startswith(tuple(NON_ADAPTIVE_THINKING_MODELS)):
+        if (
+            self.model_info.capabilities
+            and (effort_capability := self.model_info.capabilities.effort).supported
+        ):
+            effort_options: list[str] = []
+            if self.model_info.capabilities.thinking.types.adaptive.supported:
+                effort_options.append("none")
+            if effort_capability.low.supported:
+                effort_options.append("low")
+            if effort_capability.medium.supported:
+                effort_options.append("medium")
+            if effort_capability.high.supported:
+                effort_options.append("high")
+            if effort_capability.max.supported:
+                effort_options.append("max")
             step_schema[
                 vol.Optional(
                     CONF_THINKING_EFFORT,
@@ -415,7 +440,7 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
                 )
             ] = SelectSelector(
                 SelectSelectorConfig(
-                    options=["none", "low", "medium", "high", "max"],
+                    options=effort_options,
                     translation_key=CONF_THINKING_EFFORT,
                     mode=SelectSelectorMode.DROPDOWN,
                 )
@@ -471,9 +496,19 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
             self.options.pop(CONF_TOOL_SEARCH, None)
 
         if not step_schema:
-            user_input = {}
+            # Currently our schema is always present, but if one day it becomes empty,
+            # then the below line is needed to skip this step
+            user_input = {}  # pragma: no cover
 
         if user_input is not None:
+            if (
+                CONF_THINKING_BUDGET in user_input
+                and user_input[CONF_THINKING_BUDGET] >= MIN_THINKING_BUDGET
+                and user_input[CONF_THINKING_BUDGET]
+                >= user_input.get(CONF_MAX_TOKENS, DEFAULT[CONF_MAX_TOKENS])
+            ):
+                errors[CONF_THINKING_BUDGET] = "thinking_budget_too_large"
+
             if user_input.get(CONF_WEB_SEARCH, DEFAULT[CONF_WEB_SEARCH]) and not errors:
                 if user_input.get(
                     CONF_WEB_SEARCH_USER_LOCATION,

homeassistant/components/anthropic/const.py

@@ -52,31 +52,6 @@ DEFAULT = {
     CONF_WEB_SEARCH_MAX_USES: 5,
 }
 
-NON_THINKING_MODELS = [
-    "claude-3-haiku",
-]
-
-NON_ADAPTIVE_THINKING_MODELS = [
-    "claude-opus-4-5",
-    "claude-sonnet-4-5",
-    "claude-haiku-4-5",
-    "claude-opus-4-1",
-    "claude-opus-4-0",
-    "claude-opus-4-20250514",
-    "claude-sonnet-4-0",
-    "claude-sonnet-4-20250514",
-    "claude-3-haiku",
-]
-
-UNSUPPORTED_STRUCTURED_OUTPUT_MODELS = [
-    "claude-opus-4-1",
-    "claude-opus-4-0",
-    "claude-opus-4-20250514",
-    "claude-sonnet-4-0",
-    "claude-sonnet-4-20250514",
-    "claude-3-haiku",
-]
-
 WEB_SEARCH_UNSUPPORTED_MODELS = [
     "claude-3-haiku",
 ]
@@ -85,16 +60,6 @@ CODE_EXECUTION_UNSUPPORTED_MODELS = [
     "claude-3-haiku",
 ]
 
-PROGRAMMATIC_TOOL_CALLING_UNSUPPORTED_MODELS = [
-    "claude-haiku-4-5",
-    "claude-opus-4-1",
-    "claude-opus-4-0",
-    "claude-opus-4-20250514",
-    "claude-sonnet-4-0",
-    "claude-sonnet-4-20250514",
-    "claude-3-haiku",
-]
-
 TOOL_SEARCH_UNSUPPORTED_MODELS = [
     "claude-3",
     "claude-haiku",

homeassistant/components/anthropic/entity.py

@@ -30,6 +30,7 @@ from anthropic.types import (
     MessageDeltaUsage,
     MessageParam,
     MessageStreamEvent,
+    ModelInfo,
     OutputConfigParam,
     RawContentBlockDeltaEvent,
     RawContentBlockStartEvent,
@@ -112,10 +113,6 @@ from .const import (
     DOMAIN,
     LOGGER,
     MIN_THINKING_BUDGET,
-    NON_ADAPTIVE_THINKING_MODELS,
-    NON_THINKING_MODELS,
-    PROGRAMMATIC_TOOL_CALLING_UNSUPPORTED_MODELS,
-    UNSUPPORTED_STRUCTURED_OUTPUT_MODELS,
     PromptCaching,
 )
 from .coordinator import AnthropicConfigEntry, AnthropicCoordinator
@@ -757,7 +754,10 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
         ):
             model_args["cache_control"] = {"type": "ephemeral"}
 
-        if not model.startswith(tuple(NON_ADAPTIVE_THINKING_MODELS)):
+        if (
+            self.model_info.capabilities
+            and self.model_info.capabilities.thinking.types.adaptive.supported
+        ):
             thinking_effort = options.get(
                 CONF_THINKING_EFFORT, DEFAULT[CONF_THINKING_EFFORT]
             )
@@ -774,7 +774,8 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                 CONF_THINKING_BUDGET, DEFAULT[CONF_THINKING_BUDGET]
             )
             if (
-                not model.startswith(tuple(NON_THINKING_MODELS))
+                self.model_info.capabilities
+                and self.model_info.capabilities.thinking.types.enabled.supported
                 and thinking_budget >= MIN_THINKING_BUDGET
             ):
                 model_args["thinking"] = ThinkingConfigEnabledParam(
@@ -786,6 +787,16 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                     CONF_TEMPERATURE, DEFAULT[CONF_TEMPERATURE]
                 )
 
+            if (
+                self.model_info.capabilities
+                and self.model_info.capabilities.effort.supported
+            ):
+                model_args["output_config"] = OutputConfigParam(
+                    effort=options.get(
+                        CONF_THINKING_EFFORT, DEFAULT[CONF_THINKING_EFFORT]
+                    )
+                )
+
         tools: list[ToolUnionParam] = []
         if chat_log.llm_api:
             tools = [
@@ -795,9 +806,11 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
 
         if options.get(CONF_CODE_EXECUTION):
             # The `web_search_20260209` tool automatically enables `code_execution_20260120` tool
-            if model.startswith(
-                tuple(PROGRAMMATIC_TOOL_CALLING_UNSUPPORTED_MODELS)
-            ) or not options.get(CONF_WEB_SEARCH):
+            if (
+                not self.model_info.capabilities
+                or not self.model_info.capabilities.code_execution.supported
+                or not options.get(CONF_WEB_SEARCH)
+            ):
                 tools.append(
                     CodeExecutionTool20250825Param(
                         name="code_execution",
@@ -806,9 +819,11 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                 )
 
         if options.get(CONF_WEB_SEARCH):
-            if model.startswith(
-                tuple(PROGRAMMATIC_TOOL_CALLING_UNSUPPORTED_MODELS)
-            ) or not options.get(CONF_CODE_EXECUTION):
+            if (
+                not self.model_info.capabilities
+                or not self.model_info.capabilities.code_execution.supported
+                or not options.get(CONF_CODE_EXECUTION)
+            ):
                 web_search: WebSearchTool20250305Param | WebSearchTool20260209Param = (
                     WebSearchTool20250305Param(
                         name="web_search",
@@ -846,12 +861,17 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                 ]
             last_message["content"].extend(  # type: ignore[union-attr]
                 await async_prepare_files_for_prompt(
-                    self.hass, [(a.path, a.mime_type) for a in last_content.attachments]
+                    self.hass,
+                    self.model_info,
+                    [(a.path, a.mime_type) for a in last_content.attachments],
                 )
             )
 
         if structure and structure_name:
-            if not model.startswith(tuple(UNSUPPORTED_STRUCTURED_OUTPUT_MODELS)):
+            if (
+                self.model_info.capabilities
+                and self.model_info.capabilities.structured_outputs.supported
+            ):
                 # Native structured output for those models who support it.
                 structure_name = None
                 model_args.setdefault("output_config", OutputConfigParam())[
@@ -992,7 +1012,7 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
 
 
 async def async_prepare_files_for_prompt(
-    hass: HomeAssistant, files: list[tuple[Path, str | None]]
+    hass: HomeAssistant, model_info: ModelInfo, files: list[tuple[Path, str | None]]
 ) -> Iterable[ImageBlockParam | DocumentBlockParam]:
     """Append files to a prompt.
 
@@ -1013,13 +1033,26 @@ async def async_prepare_files_for_prompt(
             if mime_type is None:
                 mime_type = guess_file_type(file_path)[0]
 
-            if not mime_type or not mime_type.startswith(("image/", "application/pdf")):
+            if (
+                not mime_type
+                or not mime_type.startswith(("image/", "application/pdf"))
+                or not model_info.capabilities
+                or (
+                    mime_type.startswith("image/")
+                    and not model_info.capabilities.image_input.supported
+                )
+                or (
+                    mime_type.startswith("application/pdf")
+                    and not model_info.capabilities.pdf_input.supported
+                )
+            ):
                 raise HomeAssistantError(
                     translation_domain=DOMAIN,
                     translation_key="wrong_file_type",
                     translation_placeholders={
                         "file_path": file_path.as_posix(),
                         "mime_type": mime_type or "unknown",
+                        "model": model_info.display_name,
                     },
                 )
             if mime_type == "image/jpg":

homeassistant/components/anthropic/strings.json

@@ -40,7 +40,8 @@
       "entry_type": "AI task",
       "error": {
         "api_error": "[%key:component::anthropic::config_subentries::conversation::error::api_error%]",
-        "model_not_found": "[%key:component::anthropic::config_subentries::conversation::error::model_not_found%]"
+        "model_not_found": "[%key:component::anthropic::config_subentries::conversation::error::model_not_found%]",
+        "thinking_budget_too_large": "[%key:component::anthropic::config_subentries::conversation::error::thinking_budget_too_large%]"
       },
       "initiate_flow": {
         "reconfigure": "Reconfigure AI task",
@@ -50,13 +51,11 @@
         "advanced": {
           "data": {
             "chat_model": "[%key:common::generic::model%]",
-            "max_tokens": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data::max_tokens%]",
             "prompt_caching": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data::prompt_caching%]",
             "temperature": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data::temperature%]"
           },
           "data_description": {
             "chat_model": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::chat_model%]",
-            "max_tokens": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::max_tokens%]",
             "prompt_caching": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::prompt_caching%]",
             "temperature": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::temperature%]"
           },
@@ -76,6 +75,7 @@
         "model": {
           "data": {
             "code_execution": "[%key:component::anthropic::config_subentries::conversation::step::model::data::code_execution%]",
+            "max_tokens": "[%key:component::anthropic::config_subentries::conversation::step::model::data::max_tokens%]",
             "thinking_budget": "[%key:component::anthropic::config_subentries::conversation::step::model::data::thinking_budget%]",
             "thinking_effort": "[%key:component::anthropic::config_subentries::conversation::step::model::data::thinking_effort%]",
             "tool_search": "[%key:component::anthropic::config_subentries::conversation::step::model::data::tool_search%]",
@@ -85,6 +85,7 @@
           },
           "data_description": {
             "code_execution": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::code_execution%]",
+            "max_tokens": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::max_tokens%]",
             "thinking_budget": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::thinking_budget%]",
             "thinking_effort": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::thinking_effort%]",
             "tool_search": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::tool_search%]",
@@ -104,7 +105,8 @@
       "entry_type": "Conversation agent",
       "error": {
         "api_error": "Unable to get model info: {message}",
-        "model_not_found": "Model not found"
+        "model_not_found": "Model not found",
+        "thinking_budget_too_large": "Thinking budget must be less than the Maximum tokens."
       },
       "initiate_flow": {
         "reconfigure": "Reconfigure conversation agent",
@@ -114,13 +116,11 @@
         "advanced": {
           "data": {
             "chat_model": "[%key:common::generic::model%]",
-            "max_tokens": "Maximum tokens to return in response",
             "prompt_caching": "Caching strategy",
             "temperature": "Temperature"
           },
           "data_description": {
             "chat_model": "The model to serve the responses.",
-            "max_tokens": "Limit the number of response tokens.",
             "prompt_caching": "Optimize your API cost and response times based on your usage.",
             "temperature": "Control the randomness of the response, trading off between creativity and coherence."
           },
@@ -144,6 +144,7 @@
         "model": {
           "data": {
             "code_execution": "Code execution",
+            "max_tokens": "Maximum tokens to return in response",
             "thinking_budget": "Thinking budget",
             "thinking_effort": "Thinking effort",
             "tool_search": "Enable tool search tool",
@@ -153,6 +154,7 @@
           },
           "data_description": {
             "code_execution": "Allow the model to execute code in a secure sandbox environment, enabling it to analyze data and perform complex calculations.",
+            "max_tokens": "Limit the number of response tokens.",
             "thinking_budget": "The number of tokens the model can use to think about the response out of the total maximum number of tokens. Set to 1024 or greater to enable extended thinking.",
             "thinking_effort": "Control how many tokens Claude uses when responding, trading off between response thoroughness and token efficiency",
             "tool_search": "Enable dynamic tool discovery instead of preloading all tools into the context",
@@ -203,7 +205,7 @@
       "message": "`{file_path}` does not exist."
     },
     "wrong_file_type": {
-      "message": "Only images and PDF are supported by the Anthropic API, `{file_path}` ({mime_type}) is not an image file or PDF."
+      "message": "The {model} model does not support {mime_type} file types (for `{file_path}`)."
     }
   },
   "issues": {

homeassistant/components/assist_satellite/strings.json

@@ -1,7 +1,8 @@
 {
   "common": {
     "condition_behavior_name": "Condition passes if",
-    "trigger_behavior_name": "Trigger when"
+    "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least"
   },
   "conditions": {
     "is_idle": {
@@ -160,6 +161,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::assist_satellite::common::trigger_for_name%]"
         }
       },
       "name": "Satellite became idle"
@@ -169,6 +173,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::assist_satellite::common::trigger_for_name%]"
         }
       },
       "name": "Satellite started listening"
@@ -178,6 +185,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::assist_satellite::common::trigger_for_name%]"
         }
       },
       "name": "Satellite started processing"
@@ -187,6 +197,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::assist_satellite::common::trigger_for_name%]"
         }
       },
       "name": "Satellite started responding"

homeassistant/components/assist_satellite/triggers.yaml

@@ -13,6 +13,11 @@
             - last
             - any
           translation_key: trigger_behavior
+    for:
+      required: true
+      default: 00:00:00
+      selector:
+        duration:
 
 idle: *trigger_common
 listening: *trigger_common

homeassistant/components/auth/__init__.py

@@ -157,7 +157,6 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.config_entry_oauth2_flow import OAuth2AuthorizeCallbackView
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
 from homeassistant.util import dt as dt_util
 from homeassistant.util.hass_dict import HassKey
 
@@ -173,7 +172,6 @@ CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 DELETE_CURRENT_TOKEN_DELAY = 2
 
 
-@bind_hass
 def create_auth_code(
     hass: HomeAssistant, client_id: str, credential: Credentials
 ) -> str:

homeassistant/components/automation/__init__.py

@@ -83,7 +83,6 @@ from homeassistant.helpers.trace import (
     trace_path,
 )
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
 from homeassistant.util.dt import parse_datetime
 from homeassistant.util.hass_dict import HassKey
 
@@ -152,6 +151,7 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "text",
     "timer",
     "todo",
+    "update",
     "vacuum",
     "valve",
     "water_heater",
@@ -237,7 +237,6 @@ class IfAction(Protocol):
         """AND all conditions."""
 
 
-@bind_hass
 def is_on(hass: HomeAssistant, entity_id: str) -> bool:
     """Return true if specified automation entity_id is on.
 

homeassistant/components/battery/strings.json

@@ -3,6 +3,7 @@
     "condition_behavior_name": "Condition passes if",
     "condition_threshold_name": "Threshold type",
     "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least",
     "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
@@ -87,6 +88,9 @@
         "behavior": {
           "name": "[%key:component::battery::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::battery::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::battery::common::trigger_threshold_name%]"
         }
@@ -98,6 +102,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::battery::common::trigger_for_name%]"
         }
       },
       "name": "Battery low"
@@ -107,6 +114,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::battery::common::trigger_for_name%]"
         }
       },
       "name": "Battery not low"
@@ -116,6 +126,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::battery::common::trigger_for_name%]"
         }
       },
       "name": "Battery started charging"
@@ -125,6 +138,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::battery::common::trigger_for_name%]"
         }
       },
       "name": "Battery stopped charging"

homeassistant/components/battery/triggers.yaml

@@ -9,6 +9,11 @@
           - first
           - last
           - any
+  for: &trigger_for
+    required: true
+    default: 00:00:00
+    selector:
+      duration:
 
 .battery_threshold_entity: &battery_threshold_entity
   - domain: input_number
@@ -42,21 +47,25 @@
 low:
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
   target: *trigger_target_battery
 
 not_low:
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
   target: *trigger_target_battery
 
 started_charging:
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
   target: *trigger_target_charging
 
 stopped_charging:
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
   target: *trigger_target_charging
 
 level_changed:
@@ -74,6 +83,7 @@ level_crossed_threshold:
   target: *trigger_target_percentage
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:

homeassistant/components/camera/__init__.py

@@ -58,7 +58,6 @@ from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.network import get_url
 from homeassistant.helpers.template import Template
 from homeassistant.helpers.typing import ConfigType, VolDictType
-from homeassistant.loader import bind_hass
 
 from .const import (
     CAMERA_IMAGE_TIMEOUT,
@@ -163,7 +162,6 @@ class CameraCapabilities:
     frontend_stream_types: set[StreamType]
 
 
-@bind_hass
 async def async_request_stream(hass: HomeAssistant, entity_id: str, fmt: str) -> str:
     """Request a stream for a camera entity."""
     camera = get_camera_from_entity_id(hass, entity_id)
@@ -212,7 +210,6 @@ async def _async_get_image(
     raise HomeAssistantError("Unable to get image")
 
 
-@bind_hass
 async def async_get_image(
     hass: HomeAssistant,
     entity_id: str,
@@ -247,14 +244,12 @@ async def _async_get_stream_image(
     return None
 
 
-@bind_hass
 async def async_get_stream_source(hass: HomeAssistant, entity_id: str) -> str | None:
     """Fetch the stream source for a camera entity."""
     camera = get_camera_from_entity_id(hass, entity_id)
     return await camera.stream_source()
 
 
-@bind_hass
 async def async_get_mjpeg_stream(
     hass: HomeAssistant, request: web.Request, entity_id: str
 ) -> web.StreamResponse | None:

homeassistant/components/camera/manifest.json

@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/camera",
   "integration_type": "entity",
   "quality_scale": "internal",
-  "requirements": ["PyTurboJPEG==1.8.0"]
+  "requirements": ["PyTurboJPEG==2.2.0"]
 }

homeassistant/components/climate/strings.json

@@ -3,6 +3,7 @@
     "condition_behavior_name": "Condition passes if",
     "condition_threshold_name": "Threshold type",
     "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least",
     "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
@@ -385,6 +386,9 @@
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
+        },
         "hvac_mode": {
           "description": "The HVAC modes to trigger on.",
           "name": "Modes"
@@ -397,6 +401,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
         }
       },
       "name": "Climate-control device started cooling"
@@ -406,6 +413,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
         }
       },
       "name": "Climate-control device started drying"
@@ -415,6 +425,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
         }
       },
       "name": "Climate-control device started heating"
@@ -434,6 +447,9 @@
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
@@ -455,6 +471,9 @@
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
@@ -466,6 +485,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
         }
       },
       "name": "Climate-control device turned off"
@@ -475,6 +497,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
         }
       },
       "name": "Climate-control device turned on"

homeassistant/components/climate/triggers.yaml

@@ -13,6 +13,11 @@
             - first
             - last
             - any
+    for: &trigger_for
+      required: true
+      default: 00:00:00
+      selector:
+        duration:
 
 .humidity_threshold_entity: &humidity_threshold_entity
   - domain: input_number
@@ -50,6 +55,7 @@ hvac_mode_changed:
   target: *trigger_climate_target
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     hvac_mode:
       context:
         filter_target: target
@@ -76,6 +82,7 @@ target_humidity_crossed_threshold:
   target: *trigger_climate_target
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:
@@ -101,6 +108,7 @@ target_temperature_crossed_threshold:
   target: *trigger_climate_target
   fields:
     behavior: *trigger_behavior
+    for: *trigger_for
     threshold:
       required: true
       selector:

homeassistant/components/cloud/__init__.py

@@ -36,7 +36,7 @@ from homeassistant.helpers.dispatcher import (
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.service import async_register_admin_service
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import async_get_integration, bind_hass
+from homeassistant.loader import async_get_integration
 from homeassistant.util.signal_type import SignalType
 
 # Pre-import backup to avoid it being imported
@@ -181,7 +181,6 @@ class CloudConnectionState(Enum):
     CLOUD_DISCONNECTED = "cloud_disconnected"
 
 
-@bind_hass
 @callback
 def async_is_logged_in(hass: HomeAssistant) -> bool:
     """Test if user is logged in.
@@ -191,7 +190,6 @@ def async_is_logged_in(hass: HomeAssistant) -> bool:
     return DATA_CLOUD in hass.data and hass.data[DATA_CLOUD].is_logged_in
 
 
-@bind_hass
 @callback
 def async_is_connected(hass: HomeAssistant) -> bool:
     """Test if connected to the cloud."""
@@ -207,7 +205,6 @@ def async_listen_connection_change(
     return async_dispatcher_connect(hass, SIGNAL_CLOUD_CONNECTION_STATE, target)
 
 
-@bind_hass
 @callback
 def async_active_subscription(hass: HomeAssistant) -> bool:
     """Test if user has an active subscription."""
@@ -230,7 +227,6 @@ async def async_get_or_create_cloudhook(hass: HomeAssistant, webhook_id: str) ->
     return await async_create_cloudhook(hass, webhook_id)
 
 
-@bind_hass
 async def async_create_cloudhook(hass: HomeAssistant, webhook_id: str) -> str:
     """Create a cloudhook."""
     if not async_is_connected(hass):
@@ -245,7 +241,6 @@ async def async_create_cloudhook(hass: HomeAssistant, webhook_id: str) -> str:
     return cloudhook_url
 
 
-@bind_hass
 async def async_delete_cloudhook(hass: HomeAssistant, webhook_id: str) -> None:
     """Delete a cloudhook."""
     if DATA_CLOUD not in hass.data:
@@ -272,7 +267,6 @@ def async_listen_cloudhook_change(
     )
 
 
-@bind_hass
 @callback
 def async_remote_ui_url(hass: HomeAssistant) -> str:
     """Get the remote UI URL."""

homeassistant/components/configurator/__init__.py

@@ -25,7 +25,6 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import async_generate_entity_id
 from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
 from homeassistant.util.async_ import run_callback_threadsafe
 
 _KEY_INSTANCE = "configurator"
@@ -54,7 +53,6 @@ type ConfiguratorCallback = Callable[[list[dict[str, str]]], None]
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
 
-@bind_hass
 @async_callback
 def async_request_config(
     hass: HomeAssistant,
@@ -93,7 +91,6 @@ def async_request_config(
     return request_id
 
 
-@bind_hass
 def request_config(hass: HomeAssistant, *args: Any, **kwargs: Any) -> str:
     """Create a new request for configuration.
 
@@ -104,7 +101,6 @@ def request_config(hass: HomeAssistant, *args: Any, **kwargs: Any) -> str:
     ).result()
 
 
-@bind_hass
 @async_callback
 def async_notify_errors(hass: HomeAssistant, request_id: str, error: str) -> None:
     """Add errors to a config request."""
@@ -112,7 +108,6 @@ def async_notify_errors(hass: HomeAssistant, request_id: str, error: str) -> Non
         _get_requests(hass)[request_id].async_notify_errors(request_id, error)
 
 
-@bind_hass
 def notify_errors(hass: HomeAssistant, request_id: str, error: str) -> None:
     """Add errors to a config request."""
     return run_callback_threadsafe(
@@ -120,7 +115,6 @@ def notify_errors(hass: HomeAssistant, request_id: str, error: str) -> None:
     ).result()
 
 
-@bind_hass
 @async_callback
 def async_request_done(hass: HomeAssistant, request_id: str) -> None:
     """Mark a configuration request as done."""
@@ -128,7 +122,6 @@ def async_request_done(hass: HomeAssistant, request_id: str) -> None:
         _get_requests(hass).pop(request_id).async_request_done(request_id)
 
 
-@bind_hass
 def request_done(hass: HomeAssistant, request_id: str) -> None:
     """Mark a configuration request as done."""
     return run_callback_threadsafe(

homeassistant/components/conversation/__init__.py

@@ -23,7 +23,6 @@ from homeassistant.helpers import config_validation as cv, intent
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.reload import async_integration_yaml_config
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
 
 from .agent_manager import (
     AgentInfo,
@@ -127,7 +126,6 @@ CONFIG_SCHEMA = vol.Schema(
 
 
 @callback
-@bind_hass
 def async_set_agent(
     hass: HomeAssistant,
     config_entry: ConfigEntry,
@@ -138,7 +136,6 @@ def async_set_agent(
 
 
 @callback
-@bind_hass
 def async_unset_agent(
     hass: HomeAssistant,
     config_entry: ConfigEntry,

homeassistant/components/counter/strings.json

@@ -1,6 +1,7 @@
 {
   "common": {
-    "trigger_behavior_name": "Trigger when"
+    "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least"
   },
   "conditions": {
     "is_value": {
@@ -96,6 +97,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::counter::common::trigger_for_name%]"
         }
       },
       "name": "Counter reached maximum"
@@ -105,6 +109,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::counter::common::trigger_for_name%]"
         }
       },
       "name": "Counter reached minimum"
@@ -114,6 +121,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::counter::common::trigger_for_name%]"
         }
       },
       "name": "Counter reset"

homeassistant/components/counter/triggers.yaml

@@ -13,6 +13,11 @@
             - first
             - last
             - any
+    for:
+      required: true
+      default: 00:00:00
+      selector:
+        duration:
 
 incremented:
   target:

homeassistant/components/cover/__init__.py

@@ -29,7 +29,6 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
 from homeassistant.util.hass_dict import HassKey
 
 from .condition import make_cover_is_closed_condition, make_cover_is_open_condition
@@ -87,7 +86,6 @@ __all__ = [
 ]
 
 
-@bind_hass
 def is_closed(hass: HomeAssistant, entity_id: str) -> bool:
     """Return if the cover is closed based on the statemachine."""
     return hass.states.is_state(entity_id, CoverState.CLOSED)

homeassistant/components/cover/strings.json

@@ -1,7 +1,8 @@
 {
   "common": {
     "condition_behavior_name": "Condition passes if",
-    "trigger_behavior_name": "Trigger when"
+    "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least"
   },
   "conditions": {
     "awning_is_closed": {
@@ -254,6 +255,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::cover::common::trigger_for_name%]"
         }
       },
       "name": "Awning closed"
@@ -263,6 +267,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::cover::common::trigger_for_name%]"
         }
       },
       "name": "Awning opened"
@@ -272,6 +279,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::cover::common::trigger_for_name%]"
         }
       },
       "name": "Blind closed"
@@ -281,6 +291,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::cover::common::trigger_for_name%]"
         }
       },
       "name": "Blind opened"
@@ -290,6 +303,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::cover::common::trigger_for_name%]"
         }
       },
       "name": "Curtain closed"
@@ -299,6 +315,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::cover::common::trigger_for_name%]"
         }
       },
       "name": "Curtain opened"
@@ -308,6 +327,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::cover::common::trigger_for_name%]"
         }
       },
       "name": "Shade closed"
@@ -317,6 +339,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::cover::common::trigger_for_name%]"
         }
       },
       "name": "Shade opened"
@@ -326,6 +351,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::cover::common::trigger_for_name%]"
         }
       },
       "name": "Shutter closed"
@@ -335,6 +363,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::cover::common::trigger_for_name%]"
         }
       },
       "name": "Shutter opened"

homeassistant/components/cover/triggers.yaml

@@ -9,6 +9,11 @@
           - first
           - last
           - any
+  for:
+    required: true
+    default: 00:00:00
+    selector:
+      duration:
 
 awning_closed:
   fields: *trigger_common_fields

homeassistant/components/demo/image_processing.py

@@ -45,7 +45,7 @@ class DemoImageProcessingFace(ImageProcessingFaceEntity):
         """Return minimum confidence for send events."""
         return 80
 
-    def process_image(self, image: bytes) -> None:
+    async def async_process_image(self, image: bytes) -> None:
         """Process image."""
         demo_data = [
             FaceInformation(
@@ -58,4 +58,4 @@ class DemoImageProcessingFace(ImageProcessingFaceEntity):
             FaceInformation(confidence=62.53, name="Luna"),
         ]
 
-        self.process_faces(demo_data, 4)
+        self.async_process_faces(demo_data, 4)

homeassistant/components/denon_rs232/__init__.py

@@ -0,0 +1,57 @@
+"""The Denon RS232 integration."""
+
+from __future__ import annotations
+
+from denon_rs232 import DenonReceiver, ReceiverState
+from denon_rs232.models import MODELS
+
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import CONF_DEVICE, CONF_MODEL, Platform
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import ConfigEntryNotReady
+
+from .const import LOGGER, DenonRS232ConfigEntry
+
+PLATFORMS = [Platform.MEDIA_PLAYER]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: DenonRS232ConfigEntry) -> bool:
+    """Set up Denon RS232 from a config entry."""
+    port = entry.data[CONF_DEVICE]
+    model = MODELS[entry.data[CONF_MODEL]]
+    receiver = DenonReceiver(port, model=model)
+
+    try:
+        await receiver.connect()
+        await receiver.query_state()
+    except (ConnectionError, OSError, TimeoutError) as err:
+        LOGGER.error("Error connecting to Denon receiver at %s: %s", port, err)
+        if receiver.connected:
+            await receiver.disconnect()
+        raise ConfigEntryNotReady from err
+
+    entry.runtime_data = receiver
+
+    @callback
+    def _on_disconnect(state: ReceiverState | None) -> None:
+        # Only reload if the entry is still loaded. During entry removal,
+        # disconnect() fires this callback but the entry is already gone.
+        if state is None and entry.state is ConfigEntryState.LOADED:
+            LOGGER.warning("Denon receiver disconnected, reloading config entry")
+            hass.config_entries.async_schedule_reload(entry.entry_id)
+
+    entry.async_on_unload(receiver.subscribe(_on_disconnect))
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: DenonRS232ConfigEntry) -> bool:
+    """Unload a config entry."""
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+    if unload_ok:
+        await entry.runtime_data.disconnect()
+
+    return unload_ok

homeassistant/components/denon_rs232/config_flow.py

@@ -0,0 +1,119 @@
+"""Config flow for the Denon RS232 integration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from denon_rs232 import DenonReceiver
+from denon_rs232.models import MODELS
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_DEVICE, CONF_MODEL
+from homeassistant.helpers.selector import (
+    SelectOptionDict,
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+    SerialSelector,
+)
+
+from .const import DOMAIN, LOGGER
+
+CONF_MODEL_NAME = "model_name"
+
+# Build a flat list of (model_key, individual_name) pairs by splitting
+# grouped names like "AVR-3803 / AVC-3570 / AVR-2803" into separate entries.
+# Sorted alphabetically with "Other" at the bottom.
+MODEL_OPTIONS: list[tuple[str, str]] = sorted(
+    (
+        (_key, _name)
+        for _key, _model in MODELS.items()
+        if _key != "other"
+        for _name in _model.name.split(" / ")
+    ),
+    key=lambda x: x[1],
+)
+MODEL_OPTIONS.append(("other", "Other"))
+
+
+async def _async_attempt_connect(port: str, model_key: str) -> str | None:
+    """Attempt to connect to the receiver at the given port.
+
+    Returns None on success, error on failure.
+    """
+    model = MODELS[model_key]
+    receiver = DenonReceiver(port, model=model)
+
+    try:
+        await receiver.connect()
+    except (
+        # When the port contains invalid connection data
+        ValueError,
+        # If it is a remote port, and we cannot connect
+        ConnectionError,
+        OSError,
+        TimeoutError,
+    ):
+        return "cannot_connect"
+    except Exception:  # noqa: BLE001
+        LOGGER.exception("Unexpected exception")
+        return "unknown"
+    else:
+        await receiver.disconnect()
+        return None
+
+
+class DenonRS232ConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Denon RS232."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            model_key, _, model_name = user_input[CONF_MODEL].partition(":")
+            resolved_name = model_name if model_key != "other" else None
+
+            self._async_abort_entries_match({CONF_DEVICE: user_input[CONF_DEVICE]})
+            error = await _async_attempt_connect(user_input[CONF_DEVICE], model_key)
+            if not error:
+                return self.async_create_entry(
+                    title=resolved_name or "Denon Receiver",
+                    data={
+                        CONF_DEVICE: user_input[CONF_DEVICE],
+                        CONF_MODEL: model_key,
+                        CONF_MODEL_NAME: resolved_name,
+                    },
+                )
+            errors["base"] = error
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=self.add_suggested_values_to_schema(
+                vol.Schema(
+                    {
+                        vol.Required(CONF_MODEL): SelectSelector(
+                            SelectSelectorConfig(
+                                options=[
+                                    SelectOptionDict(
+                                        value=f"{key}:{name}",
+                                        label=name,
+                                    )
+                                    for key, name in MODEL_OPTIONS
+                                ],
+                                mode=SelectSelectorMode.DROPDOWN,
+                                translation_key="model",
+                            )
+                        ),
+                        vol.Required(CONF_DEVICE): SerialSelector(),
+                    }
+                ),
+                user_input or {},
+            ),
+            errors=errors,
+        )

homeassistant/components/denon_rs232/const.py

@@ -0,0 +1,12 @@
+"""Constants for the Denon RS232 integration."""
+
+import logging
+
+from denon_rs232 import DenonReceiver
+
+from homeassistant.config_entries import ConfigEntry
+
+LOGGER = logging.getLogger(__package__)
+DOMAIN = "denon_rs232"
+
+type DenonRS232ConfigEntry = ConfigEntry[DenonReceiver]

homeassistant/components/denon_rs232/manifest.json

@@ -0,0 +1,13 @@
+{
+  "domain": "denon_rs232",
+  "name": "Denon RS232",
+  "codeowners": ["@balloob"],
+  "config_flow": true,
+  "dependencies": ["usb"],
+  "documentation": "https://www.home-assistant.io/integrations/denon_rs232",
+  "integration_type": "hub",
+  "iot_class": "local_push",
+  "loggers": ["denon_rs232"],
+  "quality_scale": "bronze",
+  "requirements": ["denon-rs232==4.1.0"]
+}

homeassistant/components/denon_rs232/media_player.py

@@ -0,0 +1,235 @@
+"""Media player platform for the Denon RS232 integration."""
+
+from __future__ import annotations
+
+from typing import Literal, cast
+
+from denon_rs232 import (
+    MIN_VOLUME_DB,
+    VOLUME_DB_RANGE,
+    DenonReceiver,
+    InputSource,
+    MainPlayer,
+    ReceiverState,
+    ZonePlayer,
+)
+
+from homeassistant.components.media_player import (
+    MediaPlayerDeviceClass,
+    MediaPlayerEntity,
+    MediaPlayerEntityFeature,
+    MediaPlayerState,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .config_flow import CONF_MODEL_NAME
+from .const import DOMAIN, DenonRS232ConfigEntry
+
+INPUT_SOURCE_DENON_TO_HA: dict[InputSource, str] = {
+    InputSource.PHONO: "phono",
+    InputSource.CD: "cd",
+    InputSource.TUNER: "tuner",
+    InputSource.DVD: "dvd",
+    InputSource.VDP: "vdp",
+    InputSource.TV: "tv",
+    InputSource.DBS_SAT: "dbs_sat",
+    InputSource.VCR_1: "vcr_1",
+    InputSource.VCR_2: "vcr_2",
+    InputSource.VCR_3: "vcr_3",
+    InputSource.V_AUX: "v_aux",
+    InputSource.CDR_TAPE1: "cdr_tape1",
+    InputSource.MD_TAPE2: "md_tape2",
+    InputSource.HDP: "hdp",
+    InputSource.DVR: "dvr",
+    InputSource.TV_CBL: "tv_cbl",
+    InputSource.SAT: "sat",
+    InputSource.NET_USB: "net_usb",
+    InputSource.DOCK: "dock",
+    InputSource.IPOD: "ipod",
+    InputSource.BD: "bd",
+    InputSource.SAT_CBL: "sat_cbl",
+    InputSource.MPLAY: "mplay",
+    InputSource.GAME: "game",
+    InputSource.AUX1: "aux1",
+    InputSource.AUX2: "aux2",
+    InputSource.NET: "net",
+    InputSource.BT: "bt",
+    InputSource.USB_IPOD: "usb_ipod",
+    InputSource.EIGHT_K: "eight_k",
+    InputSource.PANDORA: "pandora",
+    InputSource.SIRIUSXM: "siriusxm",
+    InputSource.SPOTIFY: "spotify",
+    InputSource.FLICKR: "flickr",
+    InputSource.IRADIO: "iradio",
+    InputSource.SERVER: "server",
+    InputSource.FAVORITES: "favorites",
+    InputSource.LASTFM: "lastfm",
+    InputSource.XM: "xm",
+    InputSource.SIRIUS: "sirius",
+    InputSource.HDRADIO: "hdradio",
+    InputSource.DAB: "dab",
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: DenonRS232ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the Denon RS232 media player."""
+    receiver = config_entry.runtime_data
+    entities = [DenonRS232MediaPlayer(receiver, receiver.main, config_entry, "main")]
+
+    if receiver.zone_2.power is not None:
+        entities.append(
+            DenonRS232MediaPlayer(receiver, receiver.zone_2, config_entry, "zone_2")
+        )
+    if receiver.zone_3.power is not None:
+        entities.append(
+            DenonRS232MediaPlayer(receiver, receiver.zone_3, config_entry, "zone_3")
+        )
+
+    async_add_entities(entities)
+
+
+class DenonRS232MediaPlayer(MediaPlayerEntity):
+    """Representation of a Denon receiver controlled over RS232."""
+
+    _attr_device_class = MediaPlayerDeviceClass.RECEIVER
+    _attr_has_entity_name = True
+    _attr_translation_key = "receiver"
+    _attr_should_poll = False
+
+    _volume_min = MIN_VOLUME_DB
+    _volume_range = VOLUME_DB_RANGE
+
+    def __init__(
+        self,
+        receiver: DenonReceiver,
+        player: MainPlayer | ZonePlayer,
+        config_entry: DenonRS232ConfigEntry,
+        zone: Literal["main", "zone_2", "zone_3"],
+    ) -> None:
+        """Initialize the media player."""
+        self._receiver = receiver
+        self._player = player
+        self._is_main = zone == "main"
+
+        model = receiver.model
+        assert model is not None  # We always set this
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, config_entry.entry_id)},
+            manufacturer="Denon",
+            model_id=config_entry.data.get(CONF_MODEL_NAME),
+        )
+        self._attr_unique_id = f"{config_entry.entry_id}_{zone}"
+
+        self._attr_source_list = sorted(
+            INPUT_SOURCE_DENON_TO_HA[source] for source in model.input_sources
+        )
+        self._attr_supported_features = (
+            MediaPlayerEntityFeature.TURN_ON
+            | MediaPlayerEntityFeature.TURN_OFF
+            | MediaPlayerEntityFeature.VOLUME_SET
+            | MediaPlayerEntityFeature.VOLUME_STEP
+            | MediaPlayerEntityFeature.SELECT_SOURCE
+        )
+
+        if zone == "main":
+            self._attr_name = None
+            self._attr_supported_features |= MediaPlayerEntityFeature.VOLUME_MUTE
+        else:
+            self._attr_name = "Zone 2" if zone == "zone_2" else "Zone 3"
+
+        self._async_update_from_player()
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to receiver state updates."""
+        self.async_on_remove(self._receiver.subscribe(self._async_on_state_update))
+
+    @callback
+    def _async_on_state_update(self, state: ReceiverState | None) -> None:
+        """Handle a state update from the receiver."""
+        if state is None:
+            self._attr_available = False
+        else:
+            self._attr_available = True
+            self._async_update_from_player()
+        self.async_write_ha_state()
+
+    @callback
+    def _async_update_from_player(self) -> None:
+        """Update entity attributes from the shared player object."""
+        if self._player.power is None:
+            self._attr_state = None
+        else:
+            self._attr_state = (
+                MediaPlayerState.ON if self._player.power else MediaPlayerState.OFF
+            )
+
+        source = self._player.input_source
+        self._attr_source = INPUT_SOURCE_DENON_TO_HA.get(source) if source else None
+
+        volume_min = self._player.volume_min
+        volume_max = self._player.volume_max
+        if volume_min is not None:
+            self._volume_min = volume_min
+
+            if volume_max is not None and volume_max > volume_min:
+                self._volume_range = volume_max - volume_min
+
+        volume = self._player.volume
+        if volume is not None:
+            self._attr_volume_level = (volume - self._volume_min) / self._volume_range
+        else:
+            self._attr_volume_level = None
+
+        if self._is_main:
+            self._attr_is_volume_muted = cast(MainPlayer, self._player).mute
+
+    async def async_turn_on(self) -> None:
+        """Turn the receiver on."""
+        await self._player.power_on()
+
+    async def async_turn_off(self) -> None:
+        """Turn the receiver off."""
+        await self._player.power_standby()
+
+    async def async_set_volume_level(self, volume: float) -> None:
+        """Set volume level, range 0..1."""
+        db = volume * self._volume_range + self._volume_min
+        await self._player.set_volume(db)
+
+    async def async_volume_up(self) -> None:
+        """Volume up."""
+        await self._player.volume_up()
+
+    async def async_volume_down(self) -> None:
+        """Volume down."""
+        await self._player.volume_down()
+
+    async def async_mute_volume(self, mute: bool) -> None:
+        """Mute or unmute."""
+        player = cast(MainPlayer, self._player)
+        if mute:
+            await player.mute_on()
+        else:
+            await player.mute_off()
+
+    async def async_select_source(self, source: str) -> None:
+        """Select input source."""
+        input_source = next(
+            (
+                input_source
+                for input_source, ha_source in INPUT_SOURCE_DENON_TO_HA.items()
+                if ha_source == source
+            ),
+            None,
+        )
+        if input_source is None:
+            raise HomeAssistantError("Invalid source")
+
+        await self._player.select_input_source(input_source)

homeassistant/components/denon_rs232/quality_scale.yaml

@@ -0,0 +1,64 @@
+rules:
+  # Bronze
+  action-setup: done
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions: done
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup: done
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions: todo
+  config-entry-unloading: done
+  docs-configuration-parameters: todo
+  docs-installation-parameters: todo
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: todo
+  parallel-updates: todo
+  reauthentication-flow: todo
+  test-coverage: todo
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info: todo
+  discovery: todo
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices:
+    status: exempt
+    comment: "The integration does not create dynamic devices."
+  entity-category: todo
+  entity-device-class: todo
+  entity-disabled-by-default: todo
+  entity-translations: todo
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues: todo
+  stale-devices:
+    status: exempt
+    comment: "The integration does not create devices that can become stale."
+
+  # Platinum
+  async-dependency: done
+  inject-websession: todo
+  strict-typing: todo

homeassistant/components/denon_rs232/strings.json

@@ -0,0 +1,84 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "device": "[%key:common::config_flow::data::port%]",
+          "model": "Receiver model"
+        },
+        "data_description": {
+          "device": "Serial port path to connect to",
+          "model": "Determines available features"
+        }
+      }
+    }
+  },
+  "entity": {
+    "media_player": {
+      "receiver": {
+        "state_attributes": {
+          "source": {
+            "state": {
+              "aux1": "Aux 1",
+              "aux2": "Aux 2",
+              "bd": "BD Player",
+              "bt": "Bluetooth",
+              "cd": "CD",
+              "cdr_tape1": "CDR/Tape 1",
+              "dab": "DAB",
+              "dbs_sat": "DBS/Sat",
+              "dock": "Dock",
+              "dvd": "DVD",
+              "dvr": "DVR",
+              "eight_k": "8K",
+              "favorites": "Favorites",
+              "flickr": "Flickr",
+              "game": "Game",
+              "hdp": "HDP",
+              "hdradio": "HD Radio",
+              "ipod": "iPod",
+              "iradio": "Internet Radio",
+              "lastfm": "Last.fm",
+              "md_tape2": "MD/Tape 2",
+              "mplay": "Media Player",
+              "net": "HEOS Music",
+              "net_usb": "Network/USB",
+              "pandora": "Pandora",
+              "phono": "Phono",
+              "sat": "Sat",
+              "sat_cbl": "Satellite/Cable",
+              "server": "Server",
+              "sirius": "Sirius",
+              "siriusxm": "SiriusXM",
+              "spotify": "Spotify",
+              "tuner": "Tuner",
+              "tv": "TV Audio",
+              "tv_cbl": "TV/Cable",
+              "usb_ipod": "USB/iPod",
+              "v_aux": "V. Aux",
+              "vcr_1": "VCR 1",
+              "vcr_2": "VCR 2",
+              "vcr_3": "VCR 3",
+              "vdp": "VDP",
+              "xm": "XM"
+            }
+          }
+        }
+      }
+    }
+  },
+  "selector": {
+    "model": {
+      "options": {
+        "other": "Other"
+      }
+    }
+  }
+}

homeassistant/components/device_tracker/__init__.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 from homeassistant.const import ATTR_GPS_ACCURACY, STATE_HOME  # noqa: F401
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
 
 from .config_entry import (  # noqa: F401
     ScannerEntity,
@@ -52,7 +51,6 @@ from .legacy import (  # noqa: F401
 )
 
 
-@bind_hass
 def is_on(hass: HomeAssistant, entity_id: str) -> bool:
     """Return the state if any or a specified device is home."""
     return hass.states.is_state(entity_id, STATE_HOME)

homeassistant/components/device_tracker/condition.py

@@ -1,17 +0,0 @@
-"""Provides conditions for device trackers."""
-
-from homeassistant.const import STATE_HOME, STATE_NOT_HOME
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.condition import Condition, make_entity_state_condition
-
-from .const import DOMAIN
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_home": make_entity_state_condition(DOMAIN, STATE_HOME),
-    "is_not_home": make_entity_state_condition(DOMAIN, STATE_NOT_HOME),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the conditions for device trackers."""
-    return CONDITIONS

homeassistant/components/device_tracker/conditions.yaml

@@ -1,17 +0,0 @@
-.condition_common: &condition_common
-  target:
-    entity:
-      domain: device_tracker
-  fields:
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
-
-is_home: *condition_common
-is_not_home: *condition_common

homeassistant/components/device_tracker/icons.json

@@ -1,12 +1,4 @@
 {
-  "conditions": {
-    "is_home": {
-      "condition": "mdi:account"
-    },
-    "is_not_home": {
-      "condition": "mdi:account-arrow-right"
-    }
-  },
   "entity_component": {
     "_": {
       "default": "mdi:account",
@@ -19,13 +11,5 @@
     "see": {
       "service": "mdi:account-eye"
     }
-  },
-  "triggers": {
-    "entered_home": {
-      "trigger": "mdi:account-arrow-left"
-    },
-    "left_home": {
-      "trigger": "mdi:account-arrow-right"
-    }
   }
 }

homeassistant/components/device_tracker/strings.json

@@ -1,28 +1,4 @@
 {
-  "common": {
-    "condition_behavior_name": "Condition passes if",
-    "trigger_behavior_name": "Trigger when"
-  },
-  "conditions": {
-    "is_home": {
-      "description": "Tests if one or more device trackers are home.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::device_tracker::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Device tracker is home"
-    },
-    "is_not_home": {
-      "description": "Tests if one or more device trackers are not home.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::device_tracker::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Device tracker is not home"
-    }
-  },
   "device_automation": {
     "condition_type": {
       "is_home": "{entity_name} is home",
@@ -68,21 +44,6 @@
       }
     }
   },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "see": {
       "description": "Manually update the records of a seen legacy device tracker in the known_devices.yaml file.",
@@ -119,25 +80,5 @@
       "name": "See device tracker"
     }
   },
-  "title": "Device tracker",
-  "triggers": {
-    "entered_home": {
-      "description": "Triggers when one or more device trackers enter home.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::device_tracker::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Entered home"
-    },
-    "left_home": {
-      "description": "Triggers when one or more device trackers leave home.",
-      "fields": {
-        "behavior": {
-          "name": "[%key:component::device_tracker::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Left home"
-    }
-  }
+  "title": "Device tracker"
 }

homeassistant/components/device_tracker/trigger.py

@@ -1,21 +0,0 @@
-"""Provides triggers for device_trackers."""
-
-from homeassistant.const import STATE_HOME
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.trigger import (
-    Trigger,
-    make_entity_origin_state_trigger,
-    make_entity_target_state_trigger,
-)
-
-from .const import DOMAIN
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "entered_home": make_entity_target_state_trigger(DOMAIN, STATE_HOME),
-    "left_home": make_entity_origin_state_trigger(DOMAIN, from_state=STATE_HOME),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for device trackers."""
-    return TRIGGERS

homeassistant/components/device_tracker/triggers.yaml

@@ -1,18 +0,0 @@
-.trigger_common: &trigger_common
-  target:
-    entity:
-      domain: device_tracker
-  fields:
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          options:
-            - first
-            - last
-            - any
-          translation_key: trigger_behavior
-
-entered_home: *trigger_common
-left_home: *trigger_common

homeassistant/components/door/strings.json

@@ -1,7 +1,8 @@
 {
   "common": {
     "condition_behavior_name": "Condition passes if",
-    "trigger_behavior_name": "Trigger when"
+    "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least"
   },
   "conditions": {
     "is_closed": {
@@ -45,6 +46,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::door::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::door::common::trigger_for_name%]"
         }
       },
       "name": "Door closed"
@@ -54,6 +58,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::door::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::door::common::trigger_for_name%]"
         }
       },
       "name": "Door opened"

homeassistant/components/door/triggers.yaml

@@ -9,6 +9,11 @@
           - first
           - last
           - any
+  for:
+    required: true
+    default: 00:00:00
+    selector:
+      duration:
 
 closed:
   fields: *trigger_common_fields

homeassistant/components/dsmr/sensor.py

@@ -87,6 +87,7 @@ class MbusDeviceType(IntEnum):
     GAS = 3
     HEAT = 4
     WATER = 7
+    HEAT_COOL = 12
 
 
 SENSORS: tuple[DSMRSensorEntityDescription, ...] = (
@@ -571,6 +572,16 @@ SENSORS_MBUS_DEVICE_TYPE: dict[int, tuple[DSMRSensorEntityDescription, ...]] = {
             state_class=SensorStateClass.TOTAL_INCREASING,
         ),
     ),
+    MbusDeviceType.HEAT_COOL: (
+        DSMRSensorEntityDescription(
+            key="heat_reading",
+            translation_key="heat_meter_reading",
+            obis_reference="MBUS_METER_READING",
+            is_heat=True,
+            device_class=SensorDeviceClass.ENERGY,
+            state_class=SensorStateClass.TOTAL_INCREASING,
+        ),
+    ),
 }
 
 

homeassistant/components/duco/coordinator.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from dataclasses import dataclass
 import logging
 
 from duco import DucoClient
@@ -18,7 +19,14 @@ from .const import DOMAIN, SCAN_INTERVAL
 _LOGGER = logging.getLogger(__name__)
 
 type DucoConfigEntry = ConfigEntry[DucoCoordinator]
-type DucoData = dict[int, Node]
+
+
+@dataclass
+class DucoData:
+    """Data returned by the Duco coordinator."""
+
+    nodes: dict[int, Node]
+    rssi_wifi: int | None
 
 
 class DucoCoordinator(DataUpdateCoordinator[DucoData]):
@@ -72,4 +80,23 @@ class DucoCoordinator(DataUpdateCoordinator[DucoData]):
                 translation_key="api_error",
                 translation_placeholders={"error": repr(err)},
             ) from err
-        return {node.node_id: node for node in nodes}
+
+        try:
+            lan_info = await self.client.async_get_lan_info()
+        except DucoConnectionError as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="cannot_connect",
+                translation_placeholders={"error": repr(err)},
+            ) from err
+        except DucoError as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="api_error",
+                translation_placeholders={"error": repr(err)},
+            ) from err
+
+        return DucoData(
+            nodes={node.node_id: node for node in nodes},
+            rssi_wifi=lan_info.rssi_wifi,
+        )

homeassistant/components/duco/diagnostics.py

@@ -44,7 +44,8 @@ async def async_get_config_entry_diagnostics(
             "board_info": board,
             "lan_info": asdict(lan_info),
             "nodes": {
-                str(node_id): asdict(node) for node_id, node in coordinator.data.items()
+                str(node_id): asdict(node)
+                for node_id, node in coordinator.data.nodes.items()
             },
             "duco_diagnostics": [asdict(d) for d in duco_diags],
             "write_requests_remaining": write_remaining,

homeassistant/components/duco/entity.py

@@ -44,9 +44,9 @@ class DucoEntity(CoordinatorEntity[DucoCoordinator]):
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
-        return super().available and self._node_id in self.coordinator.data
+        return super().available and self._node_id in self.coordinator.data.nodes
 
     @property
     def _node(self) -> Node:
         """Return the current node data from the coordinator."""
-        return self.coordinator.data[self._node_id]
+        return self.coordinator.data.nodes[self._node_id]

homeassistant/components/duco/fan.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from duco.exceptions import DucoError
-from duco.models import Node, VentilationState
+from duco.models import Node, NodeType, VentilationState
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.core import HomeAssistant
@@ -62,8 +62,8 @@ async def async_setup_entry(
 
     async_add_entities(
         DucoVentilationFanEntity(coordinator, node)
-        for node in coordinator.data.values()
-        if node.general.node_type == "BOX"
+        for node in coordinator.data.nodes.values()
+        if node.general.node_type == NodeType.BOX
     )
 
 

homeassistant/components/duco/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["duco"],
   "quality_scale": "bronze",
-  "requirements": ["python-duco-client==0.3.0"]
+  "requirements": ["python-duco-client==0.3.1"]
 }

homeassistant/components/duco/quality_scale.yaml

@@ -70,7 +70,7 @@ rules:
     comment: >-
       Users can pair new modules (CO2 sensors, humidity sensors, zone valves)
       to their Duco box. Dynamic device support to be added in a follow-up PR.
-  entity-category: todo
+  entity-category: done
   entity-device-class: done
   entity-disabled-by-default: done
   entity-translations: done

homeassistant/components/duco/sensor.py

@@ -13,7 +13,12 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import CONCENTRATION_PARTS_PER_MILLION, PERCENTAGE
+from homeassistant.const import (
+    CONCENTRATION_PARTS_PER_MILLION,
+    PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    EntityCategory,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
@@ -31,6 +36,13 @@ class DucoSensorEntityDescription(SensorEntityDescription):
     node_types: tuple[NodeType, ...]
 
 
+@dataclass(frozen=True, kw_only=True)
+class DucoBoxSensorEntityDescription(SensorEntityDescription):
+    """Duco sensor entity description for box-level diagnostic data."""
+
+    value_fn: Callable[[DucoCoordinator], int | float | None]
+
+
 SENSOR_DESCRIPTIONS: tuple[DucoSensorEntityDescription, ...] = (
     DucoSensorEntityDescription(
         key="ventilation_state",
@@ -78,6 +90,18 @@ SENSOR_DESCRIPTIONS: tuple[DucoSensorEntityDescription, ...] = (
     ),
 )
 
+BOX_SENSOR_DESCRIPTIONS: tuple[DucoBoxSensorEntityDescription, ...] = (
+    DucoBoxSensorEntityDescription(
+        key="rssi_wifi",
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        value_fn=lambda coordinator: coordinator.data.rssi_wifi,
+    ),
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -88,10 +112,20 @@ async def async_setup_entry(
     coordinator = entry.runtime_data
 
     async_add_entities(
-        DucoSensorEntity(coordinator, node, description)
-        for node in coordinator.data.values()
-        for description in SENSOR_DESCRIPTIONS
-        if node.general.node_type in description.node_types
+        [
+            *[
+                DucoSensorEntity(coordinator, node, description)
+                for node in coordinator.data.nodes.values()
+                for description in SENSOR_DESCRIPTIONS
+                if node.general.node_type in description.node_types
+            ],
+            *[
+                DucoBoxSensorEntity(coordinator, node, description)
+                for node in coordinator.data.nodes.values()
+                for description in BOX_SENSOR_DESCRIPTIONS
+                if node.general.node_type == NodeType.BOX
+            ],
+        ]
     )
 
 
@@ -117,3 +151,27 @@ class DucoSensorEntity(DucoEntity, SensorEntity):
     def native_value(self) -> int | float | str | None:
         """Return the sensor value."""
         return self.entity_description.value_fn(self._node)
+
+
+class DucoBoxSensorEntity(DucoEntity, SensorEntity):
+    """Sensor entity for box-level diagnostic data."""
+
+    entity_description: DucoBoxSensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator: DucoCoordinator,
+        node: Node,
+        description: DucoBoxSensorEntityDescription,
+    ) -> None:
+        """Initialize the box sensor entity."""
+        super().__init__(coordinator, node)
+        self.entity_description = description
+        self._attr_unique_id = (
+            f"{coordinator.config_entry.unique_id}_{node.node_id}_{description.key}"
+        )
+
+    @property
+    def native_value(self) -> int | float | None:
+        """Return the sensor value."""
+        return self.entity_description.value_fn(self.coordinator)

homeassistant/components/earn_e_p1/__init__.py

@@ -0,0 +1,60 @@
+"""The EARN-E P1 Meter integration."""
+
+from __future__ import annotations
+
+from earn_e_p1 import DEFAULT_PORT, EarnEP1Listener
+
+from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.const import CONF_HOST, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+
+from .const import CONF_SERIAL, DOMAIN
+from .coordinator import EarnEP1Coordinator
+
+PLATFORMS: list[Platform] = [Platform.SENSOR]
+
+type EarnEP1ConfigEntry = ConfigEntry[EarnEP1Coordinator]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: EarnEP1ConfigEntry) -> bool:
+    """Set up EARN-E P1 Meter from a config entry."""
+    host = entry.data[CONF_HOST]
+    serial = entry.data[CONF_SERIAL]
+
+    # Get or create shared listener
+    if DOMAIN not in hass.data:
+        listener = EarnEP1Listener()
+        try:
+            await listener.start()
+        except OSError as err:
+            raise ConfigEntryNotReady(
+                f"Cannot start UDP listener on port {DEFAULT_PORT}: {err}"
+            ) from err
+        hass.data[DOMAIN] = listener
+
+    listener = hass.data[DOMAIN]
+    coordinator = EarnEP1Coordinator(hass, entry, host, serial, listener)
+    coordinator.start()
+
+    entry.runtime_data = coordinator
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: EarnEP1ConfigEntry) -> bool:
+    """Unload a config entry."""
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok:
+        entry.runtime_data.stop()
+
+        # Stop shared listener if no other entries are loaded
+        other_loaded = any(
+            e.state is ConfigEntryState.LOADED and e.entry_id != entry.entry_id
+            for e in hass.config_entries.async_entries(DOMAIN)
+        )
+        if not other_loaded:
+            await hass.data[DOMAIN].stop()
+            hass.data.pop(DOMAIN)
+
+    return unload_ok

homeassistant/components/earn_e_p1/config_flow.py

@@ -0,0 +1,154 @@
+"""Config flow for the EARN-E P1 Meter integration."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from earn_e_p1 import EarnEP1Device, EarnEP1Listener, discover, validate
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_HOST
+
+from .const import CONF_SERIAL, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+DISCOVERY_TIMEOUT = 10
+VALIDATION_TIMEOUT = 65
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_HOST): str,
+    }
+)
+
+
+class EarnEP1ConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for EARN-E P1 Meter."""
+
+    VERSION = 1
+    MINOR_VERSION = 1
+
+    def __init__(self) -> None:
+        """Initialize the config flow."""
+        self._discovered_device: EarnEP1Device | None = None
+
+    async def _async_discover(self) -> EarnEP1Device | None:
+        """Discover an EARN-E device on the network."""
+        listener: EarnEP1Listener | None = self.hass.data.get(DOMAIN)
+        if listener is not None:
+            devices = await listener.discover(timeout=DISCOVERY_TIMEOUT)
+        else:
+            try:
+                devices = await discover(timeout=DISCOVERY_TIMEOUT)
+            except OSError:
+                return None
+        return devices[0] if devices else None
+
+    async def _async_validate_host(self, host: str) -> EarnEP1Device | None:
+        """Validate a host and wait for a packet containing its serial.
+
+        Uses the shared listener if available, otherwise creates a temporary one.
+        Returns the device if serial is found, None on timeout.
+        """
+        listener: EarnEP1Listener | None = self.hass.data.get(DOMAIN)
+        if listener is not None:
+            return await listener.validate(host, timeout=VALIDATION_TIMEOUT)
+        return await validate(host, timeout=VALIDATION_TIMEOUT)
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        if user_input is not None:
+            return await self._async_validate_and_create(user_input)
+
+        # Attempt auto-discovery before showing manual form
+        device = await self._async_discover()
+        if device:
+            self._discovered_device = device
+            return await self.async_step_discovery_confirm()
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=STEP_USER_DATA_SCHEMA,
+        )
+
+    async def _async_validate_and_create(
+        self, user_input: dict[str, Any]
+    ) -> ConfigFlowResult:
+        """Validate manual IP entry and create config entry."""
+        errors: dict[str, str] = {}
+        host = user_input[CONF_HOST]
+
+        try:
+            device = await self._async_validate_host(host)
+        except OSError:
+            errors["base"] = "cannot_connect"
+            device = None
+        except Exception:
+            _LOGGER.exception("Unexpected error validating device")
+            errors["base"] = "unknown"
+            device = None
+
+        if device is None and "base" not in errors:
+            errors["base"] = "cannot_connect"
+
+        if errors:
+            return self.async_show_form(
+                step_id="user",
+                data_schema=STEP_USER_DATA_SCHEMA,
+                errors=errors,
+            )
+
+        assert device is not None
+        await self.async_set_unique_id(device.serial)
+        self._abort_if_unique_id_configured()
+
+        return self.async_create_entry(
+            title=f"EARN-E P1 ({host})",
+            data={CONF_HOST: host, CONF_SERIAL: device.serial},
+        )
+
+    async def async_step_discovery_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Confirm setup of a discovered device."""
+        assert self._discovered_device is not None
+        device = self._discovered_device
+
+        if user_input is not None:
+            # If discovery already got the serial, use it directly
+            if device.serial:
+                await self.async_set_unique_id(device.serial)
+                self._abort_if_unique_id_configured()
+                return self.async_create_entry(
+                    title=f"EARN-E P1 ({device.host})",
+                    data={CONF_HOST: device.host, CONF_SERIAL: device.serial},
+                )
+
+            # Discovery didn't get serial — validate to obtain it
+            try:
+                validated = await self._async_validate_host(device.host)
+            except OSError:
+                validated = None
+            except Exception:
+                _LOGGER.exception("Unexpected error validating device")
+                return self.async_abort(reason="unknown")
+
+            if validated is None:
+                return self.async_abort(reason="cannot_connect")
+
+            await self.async_set_unique_id(validated.serial)
+            self._abort_if_unique_id_configured()
+            return self.async_create_entry(
+                title=f"EARN-E P1 ({validated.host})",
+                data={CONF_HOST: validated.host, CONF_SERIAL: validated.serial},
+            )
+
+        return self.async_show_form(
+            step_id="discovery_confirm",
+            description_placeholders={"host": device.host},
+        )

homeassistant/components/earn_e_p1/const.py

@@ -0,0 +1,6 @@
+"""Constants for the EARN-E P1 Meter integration."""
+
+from __future__ import annotations
+
+DOMAIN = "earn_e_p1"
+CONF_SERIAL = "serial"

homeassistant/components/earn_e_p1/coordinator.py

@@ -0,0 +1,71 @@
+"""DataUpdateCoordinator for the EARN-E P1 Meter integration."""
+
+from __future__ import annotations
+
+import logging
+from typing import TYPE_CHECKING, Any
+
+from earn_e_p1 import EarnEP1Device, EarnEP1Listener
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN
+
+if TYPE_CHECKING:
+    from . import EarnEP1ConfigEntry
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class EarnEP1Coordinator(DataUpdateCoordinator[dict[str, Any]]):
+    """Coordinator for the EARN-E P1 Meter."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        entry: EarnEP1ConfigEntry,
+        host: str,
+        serial: str,
+        listener: EarnEP1Listener,
+    ) -> None:
+        """Initialize the coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            config_entry=entry,
+        )
+        self.host = host
+        self.serial = serial
+        self.identifier = serial
+        self.model: str | None = None
+        self.sw_version: str | None = None
+        self._listener = listener
+
+    def _handle_update(self, device: EarnEP1Device, _raw: dict[str, Any]) -> None:
+        """Handle data update from the listener."""
+        if self.model != device.model or self.sw_version != device.sw_version:
+            self.model = device.model
+            self.sw_version = device.sw_version
+            device_registry = dr.async_get(self.hass)
+            if (
+                device_entry := device_registry.async_get_device(
+                    identifiers={(DOMAIN, self.identifier)}
+                )
+            ) is not None:
+                device_registry.async_update_device(
+                    device_entry.id,
+                    model=self.model,
+                    sw_version=self.sw_version,
+                )
+        self.async_set_updated_data(device.data)
+
+    def start(self) -> None:
+        """Register with the shared listener."""
+        self._listener.register(self.host, self._handle_update)
+
+    def stop(self) -> None:
+        """Unregister from the shared listener."""
+        self._listener.unregister(self.host)

homeassistant/components/earn_e_p1/entity.py

@@ -0,0 +1,27 @@
+"""Base entity for the EARN-E P1 Meter integration."""
+
+from __future__ import annotations
+
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import EarnEP1Coordinator
+
+
+class EarnEP1Entity(CoordinatorEntity[EarnEP1Coordinator]):
+    """Base class for EARN-E P1 entities."""
+
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: EarnEP1Coordinator) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator)
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, coordinator.identifier)},
+            name="EARN-E P1 Meter",
+            manufacturer="EARN-E",
+            model=coordinator.model,
+            serial_number=coordinator.serial,
+            sw_version=coordinator.sw_version,
+        )

homeassistant/components/earn_e_p1/manifest.json

@@ -0,0 +1,11 @@
+{
+  "domain": "earn_e_p1",
+  "name": "EARN-E P1 Meter",
+  "codeowners": ["@Miggets7"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/earn_e_p1",
+  "integration_type": "device",
+  "iot_class": "local_push",
+  "quality_scale": "bronze",
+  "requirements": ["earn-e-p1==0.1.0"]
+}

homeassistant/components/earn_e_p1/quality_scale.yaml

@@ -0,0 +1,87 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: This integration does not have custom actions.
+  appropriate-polling:
+    status: exempt
+    comment: Integration uses local_push via UDP, no polling.
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: This integration does not have custom actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: Uses CoordinatorEntity which handles event subscriptions.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: This integration does not have custom actions.
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: This integration has no configuration options beyond initial setup.
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable:
+    status: exempt
+    comment: >-
+      Push-based integration; the device stops sending UDP packets when
+      unavailable. The entity becomes unavailable via the custom available
+      property but there is no error event to log.
+  parallel-updates: done
+  reauthentication-flow:
+    status: exempt
+    comment: This integration does not require authentication.
+  test-coverage: done
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info: todo
+  discovery: todo
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices:
+    status: exempt
+    comment: Each config entry represents a single physical device.
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: done
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues:
+    status: exempt
+    comment: This integration does not have any known issues that require repair.
+  stale-devices:
+    status: exempt
+    comment: Each config entry represents a single physical device.
+
+  # Platinum
+  async-dependency: done
+  inject-websession:
+    status: exempt
+    comment: This integration does not make HTTP requests.
+  strict-typing: todo

homeassistant/components/earn_e_p1/sensor.py

@@ -0,0 +1,161 @@
+"""Sensor platform for the EARN-E P1 Meter integration."""
+
+from __future__ import annotations
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.const import (
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    EntityCategory,
+    UnitOfElectricCurrent,
+    UnitOfElectricPotential,
+    UnitOfEnergy,
+    UnitOfPower,
+    UnitOfVolume,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.typing import StateType
+
+from . import EarnEP1ConfigEntry
+from .coordinator import EarnEP1Coordinator
+from .entity import EarnEP1Entity
+
+PARALLEL_UPDATES = 0
+
+SENSOR_DESCRIPTIONS: tuple[SensorEntityDescription, ...] = (
+    SensorEntityDescription(
+        key="power_delivered",
+        translation_key="power_imported",
+        native_unit_of_measurement=UnitOfPower.KILO_WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=2,
+    ),
+    SensorEntityDescription(
+        key="power_returned",
+        translation_key="power_exported",
+        native_unit_of_measurement=UnitOfPower.KILO_WATT,
+        device_class=SensorDeviceClass.POWER,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=2,
+    ),
+    SensorEntityDescription(
+        key="voltage_l1",
+        translation_key="voltage_l1",
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        device_class=SensorDeviceClass.VOLTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+    ),
+    SensorEntityDescription(
+        key="current_l1",
+        translation_key="current_l1",
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        device_class=SensorDeviceClass.CURRENT,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=2,
+    ),
+    SensorEntityDescription(
+        key="energy_delivered_tariff1",
+        translation_key="energy_imported_tariff1",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        suggested_display_precision=2,
+    ),
+    SensorEntityDescription(
+        key="energy_delivered_tariff2",
+        translation_key="energy_imported_tariff2",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        suggested_display_precision=2,
+    ),
+    SensorEntityDescription(
+        key="energy_returned_tariff1",
+        translation_key="energy_exported_tariff1",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        suggested_display_precision=2,
+    ),
+    SensorEntityDescription(
+        key="energy_returned_tariff2",
+        translation_key="energy_exported_tariff2",
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        device_class=SensorDeviceClass.ENERGY,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        suggested_display_precision=2,
+    ),
+    SensorEntityDescription(
+        key="gas_delivered",
+        translation_key="gas_consumed",
+        native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
+        device_class=SensorDeviceClass.GAS,
+        state_class=SensorStateClass.TOTAL_INCREASING,
+        suggested_display_precision=2,
+    ),
+    SensorEntityDescription(
+        key="wifiRSSI",
+        translation_key="wifi_rssi",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+        entity_category=EntityCategory.DIAGNOSTIC,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: EarnEP1ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up EARN-E P1 sensor entities."""
+    coordinator = entry.runtime_data
+    added = False
+
+    @callback
+    def _async_add_sensors() -> None:
+        nonlocal added
+        if added or coordinator.data is None:
+            return
+        added = True
+        async_add_entities(
+            EarnEP1Sensor(coordinator, description)
+            for description in SENSOR_DESCRIPTIONS
+            if description.key in coordinator.data
+        )
+
+    entry.async_on_unload(coordinator.async_add_listener(_async_add_sensors))
+    _async_add_sensors()
+
+
+class EarnEP1Sensor(EarnEP1Entity, SensorEntity):
+    """Representation of an EARN-E P1 sensor."""
+
+    def __init__(
+        self,
+        coordinator: EarnEP1Coordinator,
+        description: SensorEntityDescription,
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.identifier}_{description.key}"
+
+    @property
+    def available(self) -> bool:
+        """Return True if the sensor value is available."""
+        return super().available and self.coordinator.data is not None
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the sensor value."""
+        return self.coordinator.data.get(self.entity_description.key)

homeassistant/components/earn_e_p1/strings.json

@@ -0,0 +1,63 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "cannot_connect": "Cannot connect — no data received from the device.",
+      "unknown": "Unexpected error"
+    },
+    "error": {
+      "cannot_connect": "Cannot connect — no data received from the device. Verify the IP address and that the EARN-E is powered on.",
+      "unknown": "[%key:common::config_flow::error::unknown%]"
+    },
+    "step": {
+      "discovery_confirm": {
+        "description": "An EARN-E P1 meter was found at **{host}**.",
+        "title": "Discovered EARN-E P1 meter"
+      },
+      "user": {
+        "data": {
+          "host": "[%key:common::config_flow::data::ip%]"
+        },
+        "data_description": {
+          "host": "The local IP address of your EARN-E P1 meter (e.g. 192.168.1.100)."
+        },
+        "description": "No device was automatically discovered. Enter the IP address of your EARN-E energy monitor manually.",
+        "title": "Connect to EARN-E P1 meter"
+      }
+    }
+  },
+  "entity": {
+    "sensor": {
+      "current_l1": {
+        "name": "Current L1"
+      },
+      "energy_exported_tariff1": {
+        "name": "Energy exported tariff 1"
+      },
+      "energy_exported_tariff2": {
+        "name": "Energy exported tariff 2"
+      },
+      "energy_imported_tariff1": {
+        "name": "Energy imported tariff 1"
+      },
+      "energy_imported_tariff2": {
+        "name": "Energy imported tariff 2"
+      },
+      "gas_consumed": {
+        "name": "Gas consumed"
+      },
+      "power_exported": {
+        "name": "Power exported"
+      },
+      "power_imported": {
+        "name": "Power imported"
+      },
+      "voltage_l1": {
+        "name": "Voltage L1"
+      },
+      "wifi_rssi": {
+        "name": "Wi-Fi RSSI"
+      }
+    }
+  }
+}

homeassistant/components/eurotronic_cometblue/__init__.py

@@ -18,6 +18,7 @@ from .coordinator import CometBlueConfigEntry, CometBlueDataUpdateCoordinator
 PLATFORMS: list[Platform] = [
     Platform.BUTTON,
     Platform.CLIMATE,
+    Platform.SENSOR,
 ]
 
 

homeassistant/components/eurotronic_cometblue/coordinator.py

@@ -32,6 +32,7 @@ class CometBlueCoordinatorData:
 
     temperatures: dict[str, float | int] = field(default_factory=dict)
     holiday: dict = field(default_factory=dict)
+    battery: int | None = None
 
 
 class CometBlueDataUpdateCoordinator(DataUpdateCoordinator[CometBlueCoordinatorData]):
@@ -53,6 +54,7 @@ class CometBlueDataUpdateCoordinator(DataUpdateCoordinator[CometBlueCoordinatorD
         )
         self.device = cometblue
         self.address = cometblue.client.address
+        self.data = CometBlueCoordinatorData()
 
     async def send_command(
         self,
@@ -64,11 +66,11 @@ class CometBlueDataUpdateCoordinator(DataUpdateCoordinator[CometBlueCoordinatorD
         LOGGER.debug("Updating device %s with '%s'", self.name, payload)
         retry_count = 0
         while retry_count < MAX_RETRIES:
+            retry_count += 1
             try:
                 async with self.device:
                     return await function(**payload)
             except (InvalidByteValueError, TimeoutError, BleakError) as ex:
-                retry_count += 1
                 if retry_count >= MAX_RETRIES:
                     raise HomeAssistantError(
                         f"Error sending command to '{self.name}': {ex}"
@@ -88,20 +90,23 @@ class CometBlueDataUpdateCoordinator(DataUpdateCoordinator[CometBlueCoordinatorD
 
     async def _async_update_data(self) -> CometBlueCoordinatorData:
         """Poll the device."""
-        data: CometBlueCoordinatorData = CometBlueCoordinatorData()
+        data = CometBlueCoordinatorData()
 
         retry_count = 0
 
         while retry_count < MAX_RETRIES and not data.temperatures:
             try:
+                retry_count += 1
                 async with self.device:
                     # temperatures are required and must trigger a retry if not available
                     if not data.temperatures:
                         data.temperatures = await self.device.get_temperature_async()
-                    # holiday is optional and should not trigger a retry
+                    # holiday and battery are optional and should not trigger a retry
                     try:
                         if not data.holiday:
                             data.holiday = await self.device.get_holiday_async(1) or {}
+                        if not data.battery:
+                            data.battery = await self.device.get_battery_async()
                     except InvalidByteValueError as ex:
                         LOGGER.warning(
                             "Failed to retrieve optional data for %s: %s (%s)",
@@ -110,7 +115,6 @@ class CometBlueDataUpdateCoordinator(DataUpdateCoordinator[CometBlueCoordinatorD
                             ex,
                         )
             except (InvalidByteValueError, TimeoutError, BleakError) as ex:
-                retry_count += 1
                 if retry_count >= MAX_RETRIES:
                     raise UpdateFailed(
                         f"Error retrieving data: {ex}", retry_after=30
@@ -128,5 +132,9 @@ class CometBlueDataUpdateCoordinator(DataUpdateCoordinator[CometBlueCoordinatorD
                 ) from ex
 
         # If one value was not retrieved correctly, keep the old value
+        if not data.holiday:
+            data.holiday = self.data.holiday
+        if not data.battery:
+            data.battery = self.data.battery
         LOGGER.debug("Received data for %s: %s", self.name, data)
         return data

homeassistant/components/eurotronic_cometblue/sensor.py

@@ -0,0 +1,53 @@
+"""Comet Blue sensor integration."""
+
+from __future__ import annotations
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+)
+from homeassistant.const import PERCENTAGE
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import CometBlueConfigEntry, CometBlueDataUpdateCoordinator
+from .entity import CometBlueBluetoothEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: CometBlueConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the client entities."""
+
+    coordinator = entry.runtime_data
+    entities = [CometBlueBatterySensorEntity(coordinator)]
+
+    async_add_entities(entities)
+
+
+class CometBlueBatterySensorEntity(CometBlueBluetoothEntity, SensorEntity):
+    """Representation of a sensor."""
+
+    def __init__(
+        self,
+        coordinator: CometBlueDataUpdateCoordinator,
+    ) -> None:
+        """Initialize CometBlueSensorEntity."""
+
+        super().__init__(coordinator)
+        self.entity_description = SensorEntityDescription(
+            key="battery",
+            device_class=SensorDeviceClass.BATTERY,
+            native_unit_of_measurement=PERCENTAGE,
+        )
+        self._attr_unique_id = f"{coordinator.address}-{self.entity_description.key}"
+
+    @property
+    def native_value(self) -> float | None:
+        """Return the entity value to represent the entity state."""
+        return self.coordinator.data.battery

homeassistant/components/evohome/button.py

@@ -12,7 +12,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import EVOHOME_DATA
 from .coordinator import EvoDataUpdateCoordinator
-from .entity import EvoEntity, is_valid_zone
+from .entity import EvoEntity, is_valid_zone, unique_zone_id
 
 
 async def async_setup_platform(
@@ -45,28 +45,11 @@ async def async_setup_platform(
 
 
 class EvoResetButtonBase(EvoEntity, ButtonEntity):
-    """Button entity for system reset."""
+    """Base for reset button entities."""
 
     _attr_entity_category = EntityCategory.CONFIG
-
     _evo_state_attr_names = ()
 
-    def __init__(
-        self,
-        coordinator: EvoDataUpdateCoordinator,
-        evo_device: evo.ControlSystem | evo.HotWater | evo.Zone,
-    ) -> None:
-        """Initialize the system reset button."""
-        super().__init__(coordinator, evo_device)
-
-        # zones can be renamed, so set name in their property method
-        if isinstance(evo_device, evo.ControlSystem):
-            self._attr_name = f"Reset {evo_device.location.name}"
-        elif not isinstance(evo_device, evo.Zone):
-            self._attr_name = f"Reset {evo_device.name}"
-
-        self._attr_unique_id = f"{evo_device.id}_reset"
-
     async def async_press(self) -> None:
         """Reset the Evohome entity to its base operating mode."""
         await self.coordinator.call_client_api(self._evo_device.reset())
@@ -80,6 +63,17 @@ class EvoResetSystemButton(EvoResetButtonBase):
     _evo_device: evo.ControlSystem
     _evo_id_attr = "system_id"
 
+    def __init__(
+        self,
+        coordinator: EvoDataUpdateCoordinator,
+        evo_device: evo.ControlSystem,
+    ) -> None:
+        """Initialize the system reset button."""
+        super().__init__(coordinator, evo_device)
+
+        self._attr_unique_id = f"{evo_device.id}_reset"
+        self._attr_name = f"Reset {evo_device.location.name}"
+
 
 class EvoResetDhwButton(EvoResetButtonBase):
     """Button entity for DHW override reset."""
@@ -89,6 +83,17 @@ class EvoResetDhwButton(EvoResetButtonBase):
     _evo_device: evo.HotWater
     _evo_id_attr = "dhw_id"
 
+    def __init__(
+        self,
+        coordinator: EvoDataUpdateCoordinator,
+        evo_device: evo.HotWater,
+    ) -> None:
+        """Initialize the DHW reset button."""
+        super().__init__(coordinator, evo_device)
+
+        self._attr_unique_id = f"{evo_device.id}_reset"
+        self._attr_name = f"Reset {evo_device.name}"
+
 
 class EvoResetZoneButton(EvoResetButtonBase):
     """Button entity for zone override reset."""
@@ -105,12 +110,9 @@ class EvoResetZoneButton(EvoResetButtonBase):
     ) -> None:
         """Initialize the zone reset button."""
         super().__init__(coordinator, evo_device)
-
-        if evo_device.id == evo_device.tcs.id:
-            # this system does not have a distinct ID for the zone
-            self._attr_unique_id = f"{evo_device.id}z_reset"
+        self._attr_unique_id = f"{unique_zone_id(evo_device)}_reset"
 
     @property
     def name(self) -> str:
-        """Return the name of the evohome entity."""
+        """Return the name, dynamically following any zone rename."""
         return f"Reset {self._evo_device.name}"

homeassistant/components/evohome/climate.py

@@ -35,13 +35,22 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
-from .const import ATTR_DURATION, ATTR_PERIOD, DOMAIN, EVOHOME_DATA, EvoService
+from .const import (
+    ATTR_DURATION,
+    ATTR_PERIOD,
+    DOMAIN,
+    EVOHOME_DATA,
+    RESET_BREAKS_IN_HA_VERSION,
+    EvoService,
+)
 from .coordinator import EvoDataUpdateCoordinator
-from .entity import EvoChild, EvoEntity, is_valid_zone
+from .entity import EvoChild, EvoEntity, is_valid_zone, unique_zone_id
+from .helpers import async_create_deprecation_issue_once
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -161,13 +170,8 @@ class EvoZone(EvoChild, EvoClimateEntity):
         """Initialize an evohome-compatible heating zone."""
 
         super().__init__(coordinator, evo_device)
-        self._evo_id = evo_device.id
 
-        if evo_device.id == evo_device.tcs.id:
-            # this system does not have a distinct ID for the zone
-            self._attr_unique_id = f"{evo_device.id}z"
-        else:
-            self._attr_unique_id = evo_device.id
+        self._attr_unique_id = unique_zone_id(evo_device)
 
         if coordinator.client_v1:
             self._attr_precision = PRECISION_TENTHS
@@ -185,6 +189,11 @@ class EvoZone(EvoChild, EvoClimateEntity):
 
     async def async_clear_zone_override(self) -> None:
         """Clear the zone override (if any) and return to following its schedule."""
+        async_create_deprecation_issue_once(
+            self.hass,
+            "deprecated_clear_zone_override_service",
+            RESET_BREAKS_IN_HA_VERSION,
+        )
         await self.coordinator.call_client_api(self._evo_device.reset())
 
     async def async_set_zone_override(
@@ -338,7 +347,6 @@ class EvoController(EvoClimateEntity):
         """Initialize an evohome-compatible controller."""
 
         super().__init__(coordinator, evo_device)
-        self._evo_id = evo_device.id
 
         self._attr_unique_id = evo_device.id
         self._attr_name = evo_device.location.name
@@ -353,11 +361,26 @@ class EvoController(EvoClimateEntity):
             ClimateEntityFeature.TURN_OFF | ClimateEntityFeature.TURN_ON
         )
 
+    async def async_added_to_hass(self) -> None:
+        """Run when entity about to be added to hass."""
+        await super().async_added_to_hass()
+
+        async_dispatcher_connect(self.hass, DOMAIN, self.process_signal)
+
+    async def process_signal(self, payload: dict | None = None) -> None:
+        """Process any signals."""
+
+        if payload is None:
+            raise NotImplementedError
+        if payload["unique_id"] != self._attr_unique_id:
+            return
+        await self.async_tcs_svc_request(payload["service"], payload["data"])
+
     async def async_tcs_svc_request(self, service: str, data: dict[str, Any]) -> None:
         """Process a service request (system mode) for a controller.
 
-        Data validation is not required here; it is performed upstream by the service
-        handler (service schema plus runtime checks).
+        Data validation must be performed upstream in the service handler, before the
+        dispatcher call, so a ServiceValidationError can be seen, if raised.
         """
 
         if service == EvoService.RESET_SYSTEM:
@@ -447,6 +470,13 @@ class EvoController(EvoClimateEntity):
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set the preset mode; if None, then revert to 'Auto' mode."""
+        if preset_mode == PRESET_RESET:
+            async_create_deprecation_issue_once(
+                self.hass,
+                "deprecated_preset_reset",
+                RESET_BREAKS_IN_HA_VERSION,
+            )
+
         await self._set_tcs_mode(HA_PRESET_TO_TCS.get(preset_mode, EvoSystemMode.AUTO))
 
     @callback

homeassistant/components/evohome/const.py

@@ -26,6 +26,11 @@ ATTR_DURATION: Final = "duration"  # number of minutes, <24h
 ATTR_PERIOD: Final = "period"  # number of days
 ATTR_SETPOINT: Final = "setpoint"
 
+# Support for the reset service calls/presets is being deprecated
+RESET_BREAKS_IN_HA_VERSION: Final = "2026.11.0"
+# Support for untargeted service calls to controllers is being deprecated
+SERVICE_BREAKS_IN_HA_VERSION: Final = "2026.11.0"
+
 
 @unique
 class EvoService(StrEnum):

homeassistant/components/evohome/entity.py

@@ -13,10 +13,8 @@ from evohomeasync2.schemas.const import (
 from evohomeasync2.schemas.typedefs import DayOfWeekDhwT
 
 from homeassistant.core import callback
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN
 from .coordinator import EvoDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
@@ -30,6 +28,17 @@ def is_valid_zone(zone: evo.Zone) -> bool:
     )
 
 
+def unique_zone_id(evo_device: evo.Zone) -> str:
+    """Return a unique identifier for a zone-based entity.
+
+    Some systems assign the zone the same ID as its parent TCS; in that case
+    we append 'z' so the zone entity doesn't collide with the controller entity.
+    """
+    if evo_device.id == evo_device.tcs.id:
+        return f"{evo_device.id}z"
+    return evo_device.id
+
+
 class EvoEntity(CoordinatorEntity[EvoDataUpdateCoordinator]):
     """Base for any evohome-compatible entity (controller, DHW, zone).
 
@@ -52,30 +61,11 @@ class EvoEntity(CoordinatorEntity[EvoDataUpdateCoordinator]):
 
         self._device_state_attrs: dict[str, Any] = {}
 
-    async def process_signal(self, payload: dict | None = None) -> None:
-        """Process any signals."""
-
-        if payload is None:
-            raise NotImplementedError
-        if payload["unique_id"] != self._attr_unique_id:
-            return
-        await self.async_tcs_svc_request(payload["service"], payload["data"])
-
-    async def async_tcs_svc_request(self, service: str, data: dict[str, Any]) -> None:
-        """Process a service request (system mode) for a controller."""
-        raise NotImplementedError
-
     @property
     def extra_state_attributes(self) -> Mapping[str, Any]:
         """Return the evohome-specific state attributes."""
         return {"status": self._device_state_attrs}
 
-    async def async_added_to_hass(self) -> None:
-        """Run when entity about to be added to hass."""
-        await super().async_added_to_hass()
-
-        async_dispatcher_connect(self.hass, DOMAIN, self.process_signal)
-
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
@@ -107,6 +97,7 @@ class EvoChild(EvoEntity):
         """Initialize an evohome-compatible child entity (DHW, zone)."""
         super().__init__(coordinator, evo_device)
 
+        self._evo_id = evo_device.id
         self._evo_tcs = evo_device.tcs
 
         self._schedule: list[DayOfWeekDhwT] | None = None

homeassistant/components/evohome/helpers.py

@@ -0,0 +1,36 @@
+"""Helpers for the Evohome integration."""
+
+from __future__ import annotations
+
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import issue_registry as ir
+
+from .const import DOMAIN
+
+
+@callback
+def async_create_deprecation_issue_once(
+    hass: HomeAssistant,
+    issue_id: str,
+    breaks_in_ha_version: str,
+    translation_key: str | None = None,
+    translation_placeholders: dict[str, str] | None = None,
+) -> None:
+    """Create or update a deprecation issue entry."""
+
+    placeholders = {
+        **(translation_placeholders or {}),
+        "breaks_in_ha_version": breaks_in_ha_version,
+    }
+
+    ir.async_get(hass).async_get_or_create(
+        DOMAIN,
+        issue_id,
+        breaks_in_ha_version=breaks_in_ha_version,
+        is_fixable=False,
+        is_persistent=True,
+        issue_domain=DOMAIN,
+        severity=ir.IssueSeverity.WARNING,
+        translation_key=translation_key or issue_id,
+        translation_placeholders=placeholders,
+    )

homeassistant/components/evohome/services.py

@@ -15,15 +15,28 @@ import voluptuous as vol
 
 from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
 from homeassistant.components.water_heater import DOMAIN as WATER_HEATER_DOMAIN
-from homeassistant.const import ATTR_MODE, ATTR_STATE
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE, ATTR_STATE
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers import config_validation as cv, service
+from homeassistant.helpers import (
+    config_validation as cv,
+    entity_registry as er,
+    service,
+)
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.service import verify_domain_control
 
-from .const import ATTR_DURATION, ATTR_PERIOD, ATTR_SETPOINT, DOMAIN, EvoService
+from .const import (
+    ATTR_DURATION,
+    ATTR_PERIOD,
+    ATTR_SETPOINT,
+    DOMAIN,
+    RESET_BREAKS_IN_HA_VERSION,
+    SERVICE_BREAKS_IN_HA_VERSION,
+    EvoService,
+)
 from .coordinator import EvoDataUpdateCoordinator
+from .helpers import async_create_deprecation_issue_once
 
 # System service schemas (registered as domain services)
 SET_SYSTEM_MODE_SCHEMA: Final[dict[str | vol.Marker, Any]] = {
@@ -37,6 +50,7 @@ SET_SYSTEM_MODE_SCHEMA: Final[dict[str | vol.Marker, Any]] = {
         cv.time_period,
         vol.Range(min=timedelta(days=1), max=timedelta(days=99)),
     ),
+    vol.Optional(ATTR_ENTITY_ID): cv.entity_id,
 }
 
 # Zone service schemas (registered as entity services)
@@ -81,6 +95,50 @@ def _register_zone_entity_services(hass: HomeAssistant) -> None:
     )
 
 
+def _resolve_ctl_unique_id(
+    hass: HomeAssistant,
+    call: ServiceCall,
+    tcs_id: str,
+) -> str:
+    """Resolve the target controller unique_id from an optional entity_id.
+
+    During the deprecation window, advise users to switch to targeting the controller.
+    """
+
+    if (entity_id := call.data.get(ATTR_ENTITY_ID)) is None:
+        async_create_deprecation_issue_once(
+            hass,
+            f"deprecated_{call.service}_service",
+            SERVICE_BREAKS_IN_HA_VERSION,
+            translation_key="deprecated_controller_service",
+            translation_placeholders={"service": call.service},
+        )
+        return tcs_id
+
+    entry = er.async_get(hass).async_get(entity_id)
+
+    if entry is None:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="entity_not_found",
+            translation_placeholders={ATTR_ENTITY_ID: entity_id},
+        )
+
+    # currently, evohome supports only 1 controller
+    if (
+        entry.domain != CLIMATE_DOMAIN
+        or entry.platform != DOMAIN
+        or entry.unique_id != tcs_id
+    ):
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="controller_only_service",
+            translation_placeholders={"service": call.service},
+        )
+
+    return tcs_id
+
+
 def _register_dhw_entity_services(hass: HomeAssistant) -> None:
     """Register entity-level services for DHW zones."""
 
@@ -154,15 +212,32 @@ def setup_service_functions(
     async def set_system_mode(call: ServiceCall) -> None:
         """Set the Evohome system mode or reset the system."""
 
+        # We can rely upon coordinator.tcs being non-None here, since:
+        # - services are registered only if coordinator.async_first_refresh() succeeds
+        # - without config flow, the controller entity will never be de-registered
+
+        assert coordinator.tcs is not None  # mypy
+
         # No additional validation for RESET_SYSTEM here, as the library method invoked
         # via that service call may be able to emulate the reset even if the system
         # doesn't support AutoWithReset natively
 
+        if call.service == EvoService.RESET_SYSTEM:
+            async_create_deprecation_issue_once(
+                hass,
+                "deprecated_reset_system_service",
+                RESET_BREAKS_IN_HA_VERSION,
+            )
+
         if call.service == EvoService.SET_SYSTEM_MODE:
             _validate_set_system_mode_params(coordinator.tcs, call.data)
+            unique_id = _resolve_ctl_unique_id(hass, call, coordinator.tcs.id)
+        else:
+            # this service call to be deprecated, so no need to _resolve_ctl_unique_id
+            unique_id = coordinator.tcs.id
 
         payload = {
-            "unique_id": coordinator.tcs.id,
+            "unique_id": unique_id,
             "service": call.service,
             "data": call.data,
         }

homeassistant/components/evohome/services.yaml

@@ -3,6 +3,11 @@
 
 set_system_mode:
   fields:
+    entity_id:
+      selector:
+        entity:
+          integration: evohome
+          domain: climate
     mode:
       required: true
       default: Auto

homeassistant/components/evohome/strings.json

@@ -1,5 +1,11 @@
 {
   "exceptions": {
+    "controller_only_service": {
+      "message": "Only Evohome controllers support the `{service}` action"
+    },
+    "entity_not_found": {
+      "message": "The specified entity `{entity_id}` could not be found"
+    },
     "invalid_system_mode": {
       "message": "The requested system mode is not supported: {error}"
     },
@@ -19,9 +25,27 @@
       "message": "Only zones support the `{service}` action"
     }
   },
+  "issues": {
+    "deprecated_clear_zone_override_service": {
+      "description": "The `clear_zone_override` action is deprecated and will stop working in Home Assistant {breaks_in_ha_version}. Use the zone's Reset button instead.",
+      "title": "Evohome 'Clear zone override' action is deprecated"
+    },
+    "deprecated_controller_service": {
+      "description": "The `{service}` action without `entity_id` is deprecated and will stop working in Home Assistant {breaks_in_ha_version}. Update any automation or script to include the Evohome controller climate entity `entity_id`.",
+      "title": "Untargeted Evohome controller action is deprecated"
+    },
+    "deprecated_preset_reset": {
+      "description": "Using the `Reset` preset on an Evohome controller is deprecated and will stop working in Home Assistant {breaks_in_ha_version}. Use the system's Reset button instead.",
+      "title": "Evohome Reset preset is deprecated"
+    },
+    "deprecated_reset_system_service": {
+      "description": "The `reset_system` action is deprecated and will stop working in Home Assistant {breaks_in_ha_version}. Use the system's Reset button instead.",
+      "title": "Evohome 'Reset system' action is deprecated"
+    }
+  },
   "services": {
     "clear_zone_override": {
-      "description": "Sets the zone to follow its schedule.",
+      "description": "Sets a zone to follow its schedule (deprecated).",
       "name": "Clear zone override"
     },
     "refresh_system": {
@@ -29,11 +53,11 @@
       "name": "Refresh system"
     },
     "reset_system": {
-      "description": "Sets the system mode to `Auto` mode and resets all the zones to follow their schedules. Not all Evohome systems support this feature (i.e. `AutoWithReset` mode).",
+      "description": "Sets a system's mode to `Auto` mode and resets all its zones to follow their schedules (deprecated). Some older systems may not support this feature.",
       "name": "Reset system"
     },
     "set_dhw_override": {
-      "description": "Overrides the DHW state, either indefinitely or for a specified duration, after which it will revert to following its schedule.",
+      "description": "Overrides a DHW's state, either indefinitely or for a specified duration, after which it will revert to following its schedule.",
       "fields": {
         "duration": {
           "description": "The DHW will revert to its schedule after this time. If 0 the change is until the next scheduled setpoint.",
@@ -47,12 +71,16 @@
       "name": "Set DHW override"
     },
     "set_system_mode": {
-      "description": "Sets the system mode, either indefinitely or until a specified end time, after which it will revert to `Auto`. Not all systems support all modes.",
+      "description": "Sets a system's mode, either indefinitely or until a specified end time, after which it will revert to `Auto`. Not all systems support all modes.",
       "fields": {
         "duration": {
           "description": "The duration in hours; used only with `AutoWithEco` mode (up to 24 hours).",
           "name": "Duration"
         },
+        "entity_id": {
+          "description": "The Evohome controller climate entity.",
+          "name": "Entity"
+        },
         "mode": {
           "description": "Mode to set the system to.",
           "name": "[%key:common::config_flow::data::mode%]"
@@ -65,7 +93,7 @@
       "name": "Set system mode"
     },
     "set_zone_override": {
-      "description": "Overrides the zone setpoint, either indefinitely or for a specified duration, after which it will revert to following its schedule.",
+      "description": "Overrides a zone's setpoint, either indefinitely or for a specified duration, after which it will revert to following its schedule.",
       "fields": {
         "duration": {
           "description": "The zone will revert to its schedule after this time. If 0 the change is until the next scheduled setpoint.",

homeassistant/components/evohome/water_heater.py

@@ -70,7 +70,6 @@ async def async_setup_platform(
 class EvoDHW(EvoChild, WaterHeaterEntity):
     """Base for any evohome-compatible DHW controller."""
 
-    _attr_name = "DHW controller"
     _attr_operation_list = list(HA_STATE_TO_EVO)
     _attr_supported_features = (
         WaterHeaterEntityFeature.AWAY_MODE
@@ -89,7 +88,6 @@ class EvoDHW(EvoChild, WaterHeaterEntity):
         """Initialize an evohome-compatible DHW controller."""
 
         super().__init__(coordinator, evo_device)
-        self._evo_id = evo_device.id
 
         self._attr_unique_id = evo_device.id
         self._attr_name = evo_device.name  # is static

homeassistant/components/fan/__init__.py

@@ -25,7 +25,6 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity import ToggleEntity, ToggleEntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
 from homeassistant.util.hass_dict import HassKey
 from homeassistant.util.percentage import (
     percentage_to_ranged_value,
@@ -88,7 +87,6 @@ class NotValidPresetModeError(ServiceValidationError):
         )
 
 
-@bind_hass
 def is_on(hass: HomeAssistant, entity_id: str) -> bool:
     """Return if the fans are on based on the statemachine."""
     entity = hass.states.get(entity_id)

homeassistant/components/fan/strings.json

@@ -1,7 +1,8 @@
 {
   "common": {
     "condition_behavior_name": "Condition passes if",
-    "trigger_behavior_name": "Trigger when"
+    "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least"
   },
   "conditions": {
     "is_off": {
@@ -196,6 +197,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::fan::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::fan::common::trigger_for_name%]"
         }
       },
       "name": "Fan turned off"
@@ -205,6 +209,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::fan::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::fan::common::trigger_for_name%]"
         }
       },
       "name": "Fan turned on"

homeassistant/components/fan/triggers.yaml

@@ -13,6 +13,11 @@
             - last
             - any
           translation_key: trigger_behavior
+    for:
+      required: true
+      default: 00:00:00
+      selector:
+        duration:
 
 turned_on: *trigger_common
 turned_off: *trigger_common

homeassistant/components/ffmpeg/__init__.py

@@ -20,7 +20,6 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
 from homeassistant.util.system_info import is_official_image
 
 from .const import (
@@ -71,7 +70,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     return True
 
 
-@bind_hass
 def get_ffmpeg_manager(hass: HomeAssistant) -> FFmpegManager:
     """Return the FFmpegManager."""
     if DATA_FFMPEG not in hass.data:
@@ -79,7 +77,6 @@ def get_ffmpeg_manager(hass: HomeAssistant) -> FFmpegManager:
     return hass.data[DATA_FFMPEG]
 
 
-@bind_hass
 async def async_get_image(
     hass: HomeAssistant,
     input_source: str,

homeassistant/components/fjaraskupan/__init__.py

@@ -12,6 +12,7 @@ from homeassistant.components.bluetooth import (
     BluetoothChange,
     BluetoothScanningMode,
     BluetoothServiceInfoBleak,
+    async_discovered_service_info,
     async_rediscover_address,
     async_register_callback,
 )
@@ -131,3 +132,17 @@ async def async_unload_entry(
                     async_rediscover_address(hass, conn[1])
 
     return unload_ok
+
+
+async def async_remove_config_entry_device(
+    hass: HomeAssistant,
+    config_entry: FjaraskupanConfigEntry,
+    device_entry: dr.DeviceEntry,
+) -> bool:
+    """Remove a config entry from a device."""
+    for service_info in async_discovered_service_info(hass, False):
+        if (DOMAIN, service_info.address) in device_entry.identifiers:
+            return False
+
+    # No matching service info, so allow removal.
+    return True

homeassistant/components/fritz/manifest.json

@@ -9,7 +9,7 @@
   "iot_class": "local_polling",
   "loggers": ["fritzconnection"],
   "quality_scale": "gold",
-  "requirements": ["fritzconnection[qr]==1.15.1", "xmltodict==1.0.2"],
+  "requirements": ["fritzconnection[qr]==1.15.1", "xmltodict==1.0.4"],
   "ssdp": [
     {
       "st": "urn:schemas-upnp-org:device:fritzbox:1"

homeassistant/components/frontend/__init__.py

@@ -34,7 +34,7 @@ from homeassistant.helpers.json import json_dumps_sorted
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import async_get_integration, bind_hass
+from homeassistant.loader import async_get_integration
 from homeassistant.util.hass_dict import HassKey
 
 from .pr_download import download_pr_artifact
@@ -354,7 +354,6 @@ class Panel:
         return response
 
 
-@bind_hass
 @callback
 def async_register_built_in_panel(
     hass: HomeAssistant,
@@ -393,7 +392,6 @@ def async_register_built_in_panel(
     hass.bus.async_fire(EVENT_PANELS_UPDATED)
 
 
-@bind_hass
 @callback
 def async_remove_panel(
     hass: HomeAssistant, frontend_url_path: str, *, warn_if_unknown: bool = True
@@ -599,6 +597,13 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         sidebar_title="home",
         show_in_sidebar=False,
     )
+    async_register_built_in_panel(
+        hass,
+        "maintenance",
+        sidebar_icon="mdi:wrench",
+        sidebar_title="maintenance",
+        show_in_sidebar=False,
+    )
 
     async_register_built_in_panel(hass, "profile")
     async_register_built_in_panel(hass, "notfound")

homeassistant/components/frontier_silicon/__init__.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 
-from afsapi import AFSAPI, ConnectionError as FSConnectionError
+from afsapi import AFSAPI, FSConnectionError
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PIN, Platform

homeassistant/components/frontier_silicon/browse_media.py

@@ -2,7 +2,7 @@
 
 import logging
 
-from afsapi import AFSAPI, FSApiException, OutOfRangeException, Preset
+from afsapi import AFSAPI, FSApiError, OutOfRangeError, Preset
 
 from homeassistant.components.media_player import (
     BrowseError,
@@ -136,11 +136,11 @@ async def browse_node(
             # Return items in this folder
             children = [
                 _item_payload(key, item, player_mode, parent_keys=parent_keys)
-                async for key, item in await afsapi.nav_list()
+                async for key, item in afsapi.nav_list()
             ]
-    except OutOfRangeException as err:
+    except OutOfRangeError as err:
         raise BrowseError("The requested item is out of range") from err
-    except FSApiException as err:
+    except FSApiError as err:
         raise BrowseError(str(err)) from err
 
     return BrowseMedia(

homeassistant/components/frontier_silicon/config_flow.py

@@ -7,12 +7,7 @@ import logging
 from typing import Any
 from urllib.parse import urlparse
 
-from afsapi import (
-    AFSAPI,
-    ConnectionError as FSConnectionError,
-    InvalidPinException,
-    NotImplementedException,
-)
+from afsapi import AFSAPI, FSConnectionError, FSNotImplementedError, InvalidPinError
 import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
@@ -116,12 +111,12 @@ class FrontierSiliconConfigFlow(ConfigFlow, domain=DOMAIN):
         afsapi = AFSAPI(self._webfsapi_url, DEFAULT_PIN)
         try:
             await afsapi.get_friendly_name()
-        except InvalidPinException:
+        except InvalidPinError:
             return self.async_abort(reason="invalid_auth")
 
         try:
             unique_id = await afsapi.get_radio_id()
-        except NotImplementedException:
+        except FSNotImplementedError:
             unique_id = None
 
         await self.async_set_unique_id(unique_id)
@@ -144,7 +139,7 @@ class FrontierSiliconConfigFlow(ConfigFlow, domain=DOMAIN):
             afsapi = AFSAPI(self._webfsapi_url, DEFAULT_PIN)
 
             self._name = await afsapi.get_friendly_name()
-        except InvalidPinException:
+        except InvalidPinError:
             # Ask for a PIN
             return await self.async_step_device_config()
 
@@ -152,7 +147,7 @@ class FrontierSiliconConfigFlow(ConfigFlow, domain=DOMAIN):
 
         try:
             unique_id = await afsapi.get_radio_id()
-        except NotImplementedException:
+        except FSNotImplementedError:
             unique_id = None
         await self.async_set_unique_id(unique_id)
         self._abort_if_unique_id_configured()
@@ -201,7 +196,7 @@ class FrontierSiliconConfigFlow(ConfigFlow, domain=DOMAIN):
 
         except FSConnectionError:
             errors["base"] = "cannot_connect"
-        except InvalidPinException:
+        except InvalidPinError:
             errors["base"] = "invalid_auth"
         except Exception:
             _LOGGER.exception("Unexpected exception")
@@ -215,7 +210,7 @@ class FrontierSiliconConfigFlow(ConfigFlow, domain=DOMAIN):
 
             try:
                 unique_id = await afsapi.get_radio_id()
-            except NotImplementedException:
+            except FSNotImplementedError:
                 unique_id = None
             await self.async_set_unique_id(unique_id, raise_on_progress=False)
             self._abort_if_unique_id_configured()

homeassistant/components/frontier_silicon/manifest.json

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