Adjust device_registry.async_setup

Co-authored-by: Erik Montnemery <erik@montnemery.com>
Co-authored-by: Artur Pragacz <49985303+arturpragacz@users.noreply.github.com>

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

@@ -0,0 +1,228 @@
+---
+name: raise-pull-request
+description: |
+  Use this agent when creating a pull request for the Home Assistant core repository after completing implementation work. This agent automates the PR creation process including running tests, formatting checks, and proper checkbox handling.
+model: inherit
+color: green
+tools: Read, Bash, Grep, Glob
+---
+
+You are an expert at creating pull requests for the Home Assistant core repository. You will automate the PR creation process with proper verification, formatting, testing, and checkbox handling.
+
+**Execute each step in order. Do not skip steps.**
+
+## Step 1: Gather Information
+
+Run these commands in parallel to analyze the changes:
+
+```bash
+# Get current branch and remote
+git branch --show-current
+git remote -v | grep push
+
+# Determine the best available dev reference
+if git rev-parse --verify --quiet upstream/dev >/dev/null; then
+  BASE_REF="upstream/dev"
+elif git rev-parse --verify --quiet origin/dev >/dev/null; then
+  BASE_REF="origin/dev"
+elif git rev-parse --verify --quiet dev >/dev/null; then
+  BASE_REF="dev"
+else
+  echo "Could not find upstream/dev, origin/dev, or local dev"
+  exit 1
+fi
+
+BASE_SHA="$(git merge-base "$BASE_REF" HEAD)"
+echo "BASE_REF=$BASE_REF"
+echo "BASE_SHA=$BASE_SHA"
+
+# Get commit info for this branch vs dev
+git log "${BASE_SHA}..HEAD" --oneline
+
+# Check what files changed
+git diff "${BASE_SHA}..HEAD" --name-only
+
+# Check if test files were added/modified
+git diff "${BASE_SHA}..HEAD" --name-only | grep -E "^tests/.*\.py$" || echo "NO_TESTS_CHANGED"
+
+# Check if manifest.json changed
+git diff "${BASE_SHA}..HEAD" --name-only | grep "manifest.json" || echo "NO_MANIFEST_CHANGED"
+```
+
+From the file paths, extract the **integration domain** from `homeassistant/components/{integration}/` or `tests/components/{integration}/`.
+
+**Track results:**
+- `BASE_REF`: the dev reference used for comparison
+- `BASE_SHA`: the merge-base commit used for diff-based checks
+- `TESTS_CHANGED`: true if test files were added or modified
+- `MANIFEST_CHANGED`: true if manifest.json was modified
+
+**If no suitable dev reference is available, STOP and tell the user to fetch `upstream/dev`, `origin/dev`, or a local `dev` branch before continuing.**
+
+## Step 2: Run Code Quality Checks
+
+Run `prek` to perform code quality checks (formatting, linting, hassfest, etc.) on the files changed since `BASE_SHA`:
+
+```bash
+prek run --from-ref "$BASE_SHA" --to-ref HEAD
+```
+
+**Track results:**
+- `PREK_PASSED`: true if `prek run` exits with code 0
+
+**If `prek` fails or is not available, STOP and report the failure to the user. Do not proceed with PR creation. If the failure appears to be an environment setup issue (e.g., missing tools, command not found, venv not activated), also point the user to https://developers.home-assistant.io/docs/development_environment.**
+
+## Step 3: Stage Any Changes from Checks
+
+If `prek` made any formatting or generated file changes, stage and commit them as a separate commit:
+
+```bash
+git status --porcelain
+# If changes exist:
+git add -A
+git commit -m "Apply prek formatting and generated file updates"
+```
+
+## Step 4: Run Tests
+
+Run pytest for the specific integration:
+
+```bash
+pytest tests/components/{integration} \
+  --timeout=60 \
+  --durations-min=1 \
+  --durations=0 \
+  -q
+```
+
+**Track results:**
+- `TESTS_PASSED`: true if pytest exits with code 0
+
+**If tests fail, STOP and report the failures to the user. Do not proceed with PR creation.**
+
+## Step 5: Identify PR Metadata
+
+Write a release-note-style PR title summarizing the change. The title becomes the release notes entry, so it should be a complete sentence fragment describing what changed in imperative mood.
+
+**PR Title Examples by Type:**
+| Type | Example titles |
+|------|----------------|
+| Bugfix | `Fix Hikvision NVR binary sensors not being detected` |
+| | `Fix JSON serialization of time objects in anthropic tool results` |
+| | `Fix config flow bug in Tesla Fleet` |
+| Dependency | `Bump eheimdigital to 1.5.0` |
+| | `Bump python-otbr-api to 2.7.1` |
+| New feature | `Add asyncio-level timeout to Backblaze B2 uploads` |
+| | `Add Nettleie optimization option` |
+| Code quality | `Add exception translations to Teslemetry` |
+| | `Improve test coverage of Tesla Fleet` |
+| | `Refactor adguard tests to use proper fixtures for mocking` |
+| | `Simplify entity init in Proxmox` |
+
+## Step 6: Verify Development Checklist
+
+Check each item from the [development checklist](https://developers.home-assistant.io/docs/development_checklist/):
+
+| Item | How to verify |
+|------|---------------|
+| External libraries on PyPI | Check manifest.json requirements - all should be PyPI packages |
+| Dependencies in requirements_all.txt | Only if dependency declarations changed (the `requirements` field in `manifest.json` or `requirements_all.txt`), run `python -m script.gen_requirements_all` |
+| Codeowners updated | If this is a new integration, ensure its `manifest.json` includes a `codeowners` field with one or more GitHub usernames |
+| No commented out code | Visually scan the diff for blocks of commented-out code |
+
+**Track results:**
+- `NO_COMMENTED_CODE`: true if no blocks of commented-out code found in the diff
+- `DEPENDENCIES_CHANGED`: true if the diff changes the `requirements` field in `manifest.json` or changes `requirements_all.txt`
+- `REQUIREMENTS_UPDATED`: true if `DEPENDENCIES_CHANGED` is true and requirements_all.txt was regenerated successfully; not applicable if `DEPENDENCIES_CHANGED` is false
+- `CHECKLIST_PASSED`: true if all items above pass
+
+## Step 7: Determine Type of Change
+
+Select exactly ONE based on the changes. Mark the selected type with `[x]` and all others with `[ ]` (space):
+
+| Type | Condition |
+|------|-----------|
+| Dependency upgrade | Only manifest.json/requirements changes |
+| Bugfix | Fixes broken behavior, no new features |
+| New integration | New folder in components/ |
+| New feature | Adds capability to existing integration |
+| Deprecation | Adds deprecation warnings for future breaking change |
+| Breaking change | Removes or changes existing functionality |
+| Code quality | Only refactoring or test additions, no functional change |
+
+**Track results:**
+- `CHANGE_TYPE`: the selected type (e.g., "Bugfix", "New feature", "Code quality", etc.)
+
+**Important:** All seven type options must remain in the PR body. Only the selected type gets `[x]`, all others get `[ ]`.
+
+## Step 8: Determine Checkbox States
+
+Based on the verification steps above, determine checkbox states:
+
+| Checkbox | Condition to tick |
+|----------|-------------------|
+| The code change is tested and works locally | Leave unchecked for the contributor to verify manually (this refers to manual testing, not unit tests) |
+| Local tests pass | Tick only if `TESTS_PASSED` is true |
+| I understand the code I am submitting and can explain how it works | Leave unchecked for the contributor to review and set manually |
+| There is no commented out code | Tick only if `NO_COMMENTED_CODE` is true |
+| Development checklist | Tick only if `CHECKLIST_PASSED` is true |
+| Perfect PR recommendations | Tick only if the PR affects a single integration or closely related modules, represents one primary type of change, and has a clear, self-contained scope |
+| Formatted using Ruff | Tick only if `PREK_PASSED` is true |
+| Tests have been added | Tick only if `TESTS_CHANGED` is true AND the changes exercise new or changed functionality (not only cosmetic test changes) |
+| Documentation added/updated | Tick if documentation PR created (or not applicable) |
+| Manifest file fields filled out | Tick if `PREK_PASSED` is true (or not applicable) |
+| Dependencies in requirements_all.txt | Tick only if `DEPENDENCIES_CHANGED` is false, or if `DEPENDENCIES_CHANGED` is true and `REQUIREMENTS_UPDATED` is true |
+| Dependency changelog linked | Tick if dependency changelog linked in PR description (or not applicable) |
+| Any generated code has been carefully reviewed | Leave unchecked for the contributor to review and set manually |
+
+## Step 9: Breaking Change Section
+
+**If `CHANGE_TYPE` is NOT "Breaking change" or "Deprecation": REMOVE the entire "## Breaking change" section from the PR body (including the heading).**
+
+If `CHANGE_TYPE` IS "Breaking change" or "Deprecation", keep the `## Breaking change` section and describe:
+- What breaks
+- How users can fix it
+- Why it was necessary
+
+## 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#')
+
+# Create PR (gh pr create pushes the branch automatically)
+gh pr create --repo home-assistant/core --base dev \
+  --head "$GITHUB_USER:$BRANCH" \
+  --title "TITLE_HERE" \
+  --body "$(cat <<'EOF'
+BODY_HERE
+EOF
+)"
+```
+
+### PR Body Template
+
+Read the PR template from `.github/PULL_REQUEST_TEMPLATE.md` and use it as the basis for the PR body. **Do not hardcode the template — always read it from the file to stay in sync with upstream changes.**
+
+Use any HTML comments (`<!-- ... -->`) in the template as guidance to understand what to fill in. For the final PR body sent to GitHub, keep the template text intact — do not delete any text from the template unless it explicitly instructs removal (e.g., the breaking change section when not applicable). Then fill in the sections:
+
+1. **Breaking change section**: If the type is NOT "Breaking change" or "Deprecation", remove the entire `## Breaking change` section (heading and body). Otherwise, describe what breaks, how users can fix it, and why.
+2. **Proposed change section**: Fill in a description of the change extracted from commit messages.
+3. **Type of change**: Check exactly ONE checkbox matching the determined type from Step 7. Leave all others unchecked.
+4. **Additional information**: Fill in any related issue numbers if known.
+5. **Checklist**: Check boxes based on the conditions in Step 8. Leave manual-verification boxes unchecked for the contributor.
+
+**Important:** Preserve all template structure, options, and link references exactly as they appear in the file — only modify checkbox states and fill in content sections.
+
+## Step 11: Report Result
+
+Provide the user with:
+1. **PR URL** - The created pull request link
+2. **Verification Summary** - Which checks passed/failed
+3. **Unchecked Items** - List any checkboxes left unchecked and why
+4. **User Action Required** - Remind user to:
+   - Review and set manual-verification checkboxes ("I understand the code..." and "Any generated code...") as applicable
+   - Consider reviewing two other open PRs
+   - Add any related issue numbers if applicable

.claude/skills/github-pr-reviewer/SKILL.md

@@ -5,14 +5,6 @@ description: Review a GitHub pull request and provide feedback comments. Use whe
 
 # Review GitHub Pull Request
 
-## Preparation:
-- Check if the local commit matches the last one in the PR. If not, checkout the PR locally using 'gh pr checkout'. 
-- CRITICAL: If 'gh pr checkout' fails for ANY reason, you MUST immediately STOP.
-    - Do NOT attempt any workarounds. 
-    - Do NOT proceed with the review.
-    - ALERT about the failure and WAIT for instructions.
-    - This is a hard requirement - no exceptions.
-
 ## Follow these steps:
 1. Use 'gh pr view' to get the PR details and description.
 2. Use 'gh pr diff' to see all the changes in the PR.

.github/workflows/builder.yml

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

.github/workflows/ci.yaml

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

.strict-typing

@@ -174,7 +174,6 @@ homeassistant.components.dnsip.*
 homeassistant.components.doorbird.*
 homeassistant.components.dormakaba_dkey.*
 homeassistant.components.downloader.*
-homeassistant.components.dropbox.*
 homeassistant.components.droplet.*
 homeassistant.components.dsmr.*
 homeassistant.components.duckdns.*
@@ -274,10 +273,12 @@ homeassistant.components.homekit_controller.storage
 homeassistant.components.homekit_controller.utils
 homeassistant.components.homewizard.*
 homeassistant.components.homeworks.*
+homeassistant.components.hr_energy_qube.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
 homeassistant.components.humidifier.*
 homeassistant.components.husqvarna_automower.*
+homeassistant.components.huum.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.hypontech.*
@@ -327,6 +328,7 @@ homeassistant.components.ld2410_ble.*
 homeassistant.components.led_ble.*
 homeassistant.components.lektrico.*
 homeassistant.components.letpot.*
+homeassistant.components.lg_infrared.*
 homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*
@@ -576,6 +578,7 @@ homeassistant.components.trmnl.*
 homeassistant.components.tts.*
 homeassistant.components.twentemilieu.*
 homeassistant.components.unifi.*
+homeassistant.components.unifi_access.*
 homeassistant.components.unifiprotect.*
 homeassistant.components.upcloud.*
 homeassistant.components.update.*

CODEOWNERS

@@ -222,8 +222,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/binary_sensor/ @home-assistant/core
 /tests/components/binary_sensor/ @home-assistant/core
 /homeassistant/components/bizkaibus/ @UgaitzEtxebarria
-/homeassistant/components/blebox/ @bbx-a @swistakm
-/tests/components/blebox/ @bbx-a @swistakm
+/homeassistant/components/blebox/ @bbx-a @swistakm @bkobus-bbx
+/tests/components/blebox/ @bbx-a @swistakm @bkobus-bbx
 /homeassistant/components/blink/ @fronzbot
 /tests/components/blink/ @fronzbot
 /homeassistant/components/blue_current/ @gleeuwen @NickKoepr @jtodorova23
@@ -401,8 +401,6 @@ build.json @home-assistant/supervisor
 /tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/drop_connect/ @ChandlerSystems @pfrazer
 /tests/components/drop_connect/ @ChandlerSystems @pfrazer
-/homeassistant/components/dropbox/ @bdr99
-/tests/components/dropbox/ @bdr99
 /homeassistant/components/droplet/ @sarahseidman
 /tests/components/droplet/ @sarahseidman
 /homeassistant/components/dsmr/ @Robbie1221
@@ -739,8 +737,10 @@ build.json @home-assistant/supervisor
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
 /tests/components/honeywell/ @rdfurman @mkmer
-/homeassistant/components/html5/ @alexyao2015
-/tests/components/html5/ @alexyao2015
+/homeassistant/components/hr_energy_qube/ @MattieGit
+/tests/components/hr_energy_qube/ @MattieGit
+/homeassistant/components/html5/ @alexyao2015 @tr4nt0r
+/tests/components/html5/ @alexyao2015 @tr4nt0r
 /homeassistant/components/http/ @home-assistant/core
 /tests/components/http/ @home-assistant/core
 /homeassistant/components/huawei_lte/ @scop @fphammerle
@@ -947,6 +947,8 @@ build.json @home-assistant/supervisor
 /tests/components/lektrico/ @lektrico
 /homeassistant/components/letpot/ @jpelgrom
 /tests/components/letpot/ @jpelgrom
+/homeassistant/components/lg_infrared/ @home-assistant/core
+/tests/components/lg_infrared/ @home-assistant/core
 /homeassistant/components/lg_netcast/ @Drafteed @splinter98
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
@@ -1075,6 +1077,8 @@ build.json @home-assistant/supervisor
 /tests/components/modern_forms/ @wonderslug
 /homeassistant/components/moehlenhoff_alpha2/ @j-a-n
 /tests/components/moehlenhoff_alpha2/ @j-a-n
+/homeassistant/components/moisture/ @home-assistant/core
+/tests/components/moisture/ @home-assistant/core
 /homeassistant/components/monarch_money/ @jeeftor
 /tests/components/monarch_money/ @jeeftor
 /homeassistant/components/monoprice/ @etsinko @OnFreund
@@ -1222,12 +1226,12 @@ build.json @home-assistant/supervisor
 /tests/components/onewire/ @garbled1 @epenet
 /homeassistant/components/onkyo/ @arturpragacz @eclair4151
 /tests/components/onkyo/ @arturpragacz @eclair4151
-/homeassistant/components/onvif/ @hunterjm @jterrace
-/tests/components/onvif/ @hunterjm @jterrace
+/homeassistant/components/onvif/ @jterrace
+/tests/components/onvif/ @jterrace
 /homeassistant/components/open_meteo/ @frenck
 /tests/components/open_meteo/ @frenck
-/homeassistant/components/open_router/ @joostlek
-/tests/components/open_router/ @joostlek
+/homeassistant/components/open_router/ @joostlek @ab3lson
+/tests/components/open_router/ @joostlek @ab3lson
 /homeassistant/components/opendisplay/ @g4bri3lDev
 /tests/components/opendisplay/ @g4bri3lDev
 /homeassistant/components/openerz/ @misialq
@@ -1758,6 +1762,8 @@ build.json @home-assistant/supervisor
 /tests/components/tomorrowio/ @raman325 @lymanepp
 /homeassistant/components/totalconnect/ @austinmroczek
 /tests/components/totalconnect/ @austinmroczek
+/homeassistant/components/touchline/ @mnordseth
+/tests/components/touchline/ @mnordseth
 /homeassistant/components/touchline_sl/ @jnsgruk
 /tests/components/touchline_sl/ @jnsgruk
 /homeassistant/components/tplink/ @rytilahti @bdraco @sdb9696

Dockerfile

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

homeassistant/bootstrap.py

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

homeassistant/brands/bega.json

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

homeassistant/brands/lg.json

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

homeassistant/components/abode/manifest.json

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

homeassistant/components/abode/sensor.py

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

homeassistant/components/actiontec/__init__.py

@@ -1 +1 @@
-"""The actiontec component."""
+"""The Actiontec integration."""

homeassistant/components/air_quality/condition.py

@@ -0,0 +1,134 @@
+"""Provides conditions for air quality."""
+
+from homeassistant.components.binary_sensor import (
+    DOMAIN as BINARY_SENSOR_DOMAIN,
+    BinarySensorDeviceClass,
+)
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
+from homeassistant.const import (
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    CONCENTRATION_PARTS_PER_BILLION,
+    CONCENTRATION_PARTS_PER_MILLION,
+    STATE_OFF,
+    STATE_ON,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.condition import (
+    Condition,
+    make_entity_numerical_condition,
+    make_entity_numerical_condition_with_unit,
+    make_entity_state_condition,
+)
+from homeassistant.util.unit_conversion import (
+    CarbonMonoxideConcentrationConverter,
+    MassVolumeConcentrationConverter,
+    NitrogenDioxideConcentrationConverter,
+    NitrogenMonoxideConcentrationConverter,
+    OzoneConcentrationConverter,
+    SulphurDioxideConcentrationConverter,
+    UnitlessRatioConverter,
+)
+
+
+def _make_detected_condition(
+    device_class: BinarySensorDeviceClass,
+) -> type[Condition]:
+    """Create a detected condition for a binary sensor device class."""
+    return make_entity_state_condition(
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_ON
+    )
+
+
+def _make_cleared_condition(
+    device_class: BinarySensorDeviceClass,
+) -> type[Condition]:
+    """Create a cleared condition for a binary sensor device class."""
+    return make_entity_state_condition(
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_OFF
+    )
+
+
+CONDITIONS: dict[str, type[Condition]] = {
+    # Binary sensor conditions (detected/cleared)
+    "is_gas_detected": _make_detected_condition(BinarySensorDeviceClass.GAS),
+    "is_gas_cleared": _make_cleared_condition(BinarySensorDeviceClass.GAS),
+    "is_co_detected": _make_detected_condition(BinarySensorDeviceClass.CO),
+    "is_co_cleared": _make_cleared_condition(BinarySensorDeviceClass.CO),
+    "is_smoke_detected": _make_detected_condition(BinarySensorDeviceClass.SMOKE),
+    "is_smoke_cleared": _make_cleared_condition(BinarySensorDeviceClass.SMOKE),
+    # Numerical sensor conditions with unit conversion
+    "is_co_value": make_entity_numerical_condition_with_unit(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        CarbonMonoxideConcentrationConverter,
+    ),
+    "is_ozone_value": make_entity_numerical_condition_with_unit(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        OzoneConcentrationConverter,
+    ),
+    "is_voc_value": make_entity_numerical_condition_with_unit(
+        {
+            SENSOR_DOMAIN: DomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        MassVolumeConcentrationConverter,
+    ),
+    "is_voc_ratio_value": make_entity_numerical_condition_with_unit(
+        {
+            SENSOR_DOMAIN: DomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
+            )
+        },
+        CONCENTRATION_PARTS_PER_BILLION,
+        UnitlessRatioConverter,
+    ),
+    "is_no_value": make_entity_numerical_condition_with_unit(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        NitrogenMonoxideConcentrationConverter,
+    ),
+    "is_no2_value": make_entity_numerical_condition_with_unit(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        NitrogenDioxideConcentrationConverter,
+    ),
+    "is_so2_value": make_entity_numerical_condition_with_unit(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        SulphurDioxideConcentrationConverter,
+    ),
+    # Numerical sensor conditions without unit conversion (single-unit device classes)
+    "is_co2_value": make_entity_numerical_condition(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
+        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+    "is_pm1_value": make_entity_numerical_condition(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "is_pm25_value": make_entity_numerical_condition(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "is_pm4_value": make_entity_numerical_condition(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "is_pm10_value": make_entity_numerical_condition(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "is_n2o_value": make_entity_numerical_condition(
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the air quality conditions."""
+    return CONDITIONS

homeassistant/components/air_quality/conditions.yaml

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

homeassistant/components/air_quality/icons.json

@@ -1,4 +1,63 @@
 {
+  "conditions": {
+    "is_co2_value": {
+      "condition": "mdi:molecule-co2"
+    },
+    "is_co_cleared": {
+      "condition": "mdi:check-circle"
+    },
+    "is_co_detected": {
+      "condition": "mdi:molecule-co"
+    },
+    "is_co_value": {
+      "condition": "mdi:molecule-co"
+    },
+    "is_gas_cleared": {
+      "condition": "mdi:check-circle"
+    },
+    "is_gas_detected": {
+      "condition": "mdi:gas-cylinder"
+    },
+    "is_n2o_value": {
+      "condition": "mdi:factory"
+    },
+    "is_no2_value": {
+      "condition": "mdi:factory"
+    },
+    "is_no_value": {
+      "condition": "mdi:factory"
+    },
+    "is_ozone_value": {
+      "condition": "mdi:weather-sunny-alert"
+    },
+    "is_pm10_value": {
+      "condition": "mdi:blur"
+    },
+    "is_pm1_value": {
+      "condition": "mdi:blur"
+    },
+    "is_pm25_value": {
+      "condition": "mdi:blur"
+    },
+    "is_pm4_value": {
+      "condition": "mdi:blur"
+    },
+    "is_smoke_cleared": {
+      "condition": "mdi:check-circle"
+    },
+    "is_smoke_detected": {
+      "condition": "mdi:smoke-detector-variant"
+    },
+    "is_so2_value": {
+      "condition": "mdi:factory"
+    },
+    "is_voc_ratio_value": {
+      "condition": "mdi:air-filter"
+    },
+    "is_voc_value": {
+      "condition": "mdi:air-filter"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:air-filter"

homeassistant/components/air_quality/strings.json

@@ -1,23 +1,227 @@
 {
   "common": {
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_changed_above_name": "Above",
-    "trigger_changed_below_name": "Below",
-    "trigger_threshold_lower_limit_description": "The lower limit of the threshold.",
-    "trigger_threshold_lower_limit_name": "Lower limit",
-    "trigger_threshold_type_description": "The type of threshold to use.",
-    "trigger_threshold_type_name": "Threshold type",
-    "trigger_threshold_upper_limit_description": "The upper limit of the threshold.",
-    "trigger_threshold_upper_limit_name": "Upper limit",
-    "trigger_unit_description": "All values will be converted to this unit when evaluating the trigger.",
-    "trigger_unit_name": "Unit of measurement"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
+  },
+  "conditions": {
+    "is_co2_value": {
+      "description": "Tests the carbon dioxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Carbon dioxide value"
+    },
+    "is_co_cleared": {
+      "description": "Tests if one or more carbon monoxide sensors are cleared.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Carbon monoxide cleared"
+    },
+    "is_co_detected": {
+      "description": "Tests if one or more carbon monoxide sensors are detecting carbon monoxide.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Carbon monoxide detected"
+    },
+    "is_co_value": {
+      "description": "Tests the carbon monoxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Carbon monoxide value"
+    },
+    "is_gas_cleared": {
+      "description": "Tests if one or more gas sensors are cleared.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Gas cleared"
+    },
+    "is_gas_detected": {
+      "description": "Tests if one or more gas sensors are detecting gas.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Gas detected"
+    },
+    "is_n2o_value": {
+      "description": "Tests the nitrous oxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Nitrous oxide value"
+    },
+    "is_no2_value": {
+      "description": "Tests the nitrogen dioxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Nitrogen dioxide value"
+    },
+    "is_no_value": {
+      "description": "Tests the nitrogen monoxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Nitrogen monoxide value"
+    },
+    "is_ozone_value": {
+      "description": "Tests the ozone level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Ozone value"
+    },
+    "is_pm10_value": {
+      "description": "Tests the PM10 level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "PM10 value"
+    },
+    "is_pm1_value": {
+      "description": "Tests the PM1 level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "PM1 value"
+    },
+    "is_pm25_value": {
+      "description": "Tests the PM2.5 level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "PM2.5 value"
+    },
+    "is_pm4_value": {
+      "description": "Tests the PM4 level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "PM4 value"
+    },
+    "is_smoke_cleared": {
+      "description": "Tests if one or more smoke sensors are cleared.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Smoke cleared"
+    },
+    "is_smoke_detected": {
+      "description": "Tests if one or more smoke sensors are detecting smoke.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Smoke detected"
+    },
+    "is_so2_value": {
+      "description": "Tests the sulphur dioxide level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Sulphur dioxide value"
+    },
+    "is_voc_ratio_value": {
+      "description": "Tests the volatile organic compounds ratio of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Volatile organic compounds ratio value"
+    },
+    "is_voc_value": {
+      "description": "Tests the volatile organic compounds level of one or more entities.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
+        }
+      },
+      "name": "Volatile organic compounds value"
+    }
   },
   "selector": {
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
       }
     },
     "trigger_behavior": {
@@ -26,14 +230,6 @@
         "first": "First",
         "last": "Last"
       }
-    },
-    "trigger_threshold_type": {
-      "options": {
-        "above": "Above",
-        "below": "Below",
-        "between": "Between",
-        "outside": "Outside"
-      }
     }
   },
   "title": "Air Quality",
@@ -41,13 +237,8 @@
     "co2_changed": {
       "description": "Triggers after one or more carbon dioxide levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when carbon dioxide level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when carbon dioxide level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Carbon dioxide level changed"
@@ -56,20 +247,10 @@
       "description": "Triggers after one or more carbon dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Carbon dioxide level crossed threshold"
@@ -77,17 +258,8 @@
     "co_changed": {
       "description": "Triggers after one or more carbon monoxide levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when carbon monoxide level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when carbon monoxide level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Carbon monoxide level changed"
@@ -96,7 +268,6 @@
       "description": "Triggers after one or more carbon monoxide sensors stop detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -106,24 +277,10 @@
       "description": "Triggers after one or more carbon monoxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Carbon monoxide level crossed threshold"
@@ -132,7 +289,6 @@
       "description": "Triggers after one or more carbon monoxide sensors start detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -142,7 +298,6 @@
       "description": "Triggers after one or more gas sensors stop detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -152,7 +307,6 @@
       "description": "Triggers after one or more gas sensors start detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -161,13 +315,8 @@
     "n2o_changed": {
       "description": "Triggers after one or more nitrous oxide levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when nitrous oxide level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when nitrous oxide level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Nitrous oxide level changed"
@@ -176,20 +325,10 @@
       "description": "Triggers after one or more nitrous oxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Nitrous oxide level crossed threshold"
@@ -197,17 +336,8 @@
     "no2_changed": {
       "description": "Triggers after one or more nitrogen dioxide levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when nitrogen dioxide level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when nitrogen dioxide level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Nitrogen dioxide level changed"
@@ -216,24 +346,10 @@
       "description": "Triggers after one or more nitrogen dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Nitrogen dioxide level crossed threshold"
@@ -241,17 +357,8 @@
     "no_changed": {
       "description": "Triggers after one or more nitrogen monoxide levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when nitrogen monoxide level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when nitrogen monoxide level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Nitrogen monoxide level changed"
@@ -260,24 +367,10 @@
       "description": "Triggers after one or more nitrogen monoxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Nitrogen monoxide level crossed threshold"
@@ -285,17 +378,8 @@
     "ozone_changed": {
       "description": "Triggers after one or more ozone levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when ozone level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when ozone level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Ozone level changed"
@@ -304,24 +388,10 @@
       "description": "Triggers after one or more ozone levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Ozone level crossed threshold"
@@ -329,13 +399,8 @@
     "pm10_changed": {
       "description": "Triggers after one or more PM10 levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when PM10 level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when PM10 level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "PM10 level changed"
@@ -344,20 +409,10 @@
       "description": "Triggers after one or more PM10 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "PM10 level crossed threshold"
@@ -365,13 +420,8 @@
     "pm1_changed": {
       "description": "Triggers after one or more PM1 levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when PM1 level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when PM1 level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "PM1 level changed"
@@ -380,20 +430,10 @@
       "description": "Triggers after one or more PM1 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "PM1 level crossed threshold"
@@ -401,13 +441,8 @@
     "pm25_changed": {
       "description": "Triggers after one or more PM2.5 levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when PM2.5 level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when PM2.5 level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "PM2.5 level changed"
@@ -416,20 +451,10 @@
       "description": "Triggers after one or more PM2.5 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "PM2.5 level crossed threshold"
@@ -437,13 +462,8 @@
     "pm4_changed": {
       "description": "Triggers after one or more PM4 levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when PM4 level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when PM4 level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "PM4 level changed"
@@ -452,20 +472,10 @@
       "description": "Triggers after one or more PM4 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "PM4 level crossed threshold"
@@ -474,7 +484,6 @@
       "description": "Triggers after one or more smoke sensors stop detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -484,7 +493,6 @@
       "description": "Triggers after one or more smoke sensors start detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -493,17 +501,8 @@
     "so2_changed": {
       "description": "Triggers after one or more sulphur dioxide levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when sulphur dioxide level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when sulphur dioxide level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Sulphur dioxide level changed"
@@ -512,24 +511,10 @@
       "description": "Triggers after one or more sulphur dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Sulphur dioxide level crossed threshold"
@@ -537,17 +522,8 @@
     "voc_changed": {
       "description": "Triggers after one or more volatile organic compound levels change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when volatile organic compounds level is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when volatile organic compounds level is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Volatile organic compounds level changed"
@@ -556,24 +532,10 @@
       "description": "Triggers after one or more volatile organic compounds levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Volatile organic compounds level crossed threshold"
@@ -581,17 +543,8 @@
     "voc_ratio_changed": {
       "description": "Triggers after one or more volatile organic compound ratios change.",
       "fields": {
-        "above": {
-          "description": "Only trigger when volatile organic compounds ratio is above this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
-        },
-        "below": {
-          "description": "Only trigger when volatile organic compounds ratio is below this value.",
-          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Volatile organic compounds ratio changed"
@@ -600,24 +553,10 @@
       "description": "Triggers after one or more volatile organic compounds ratios cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
-        "lower_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
-        },
-        "threshold_type": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
-        },
-        "upper_limit": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
       "name": "Volatile organic compounds ratio crossed threshold"

homeassistant/components/air_quality/trigger.py

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

homeassistant/components/air_quality/triggers.yaml

@@ -10,374 +10,155 @@
           - last
           - any
 
-.number_or_entity_co: &number_or_entity_co
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                    - "mg/m³"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: carbon_monoxide
-                - domain: number
-                  device_class: carbon_monoxide
-      translation_key: number_or_entity
+# --- Unit lists for multi-unit pollutants ---
 
-.number_or_entity_co2: &number_or_entity_co2
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "ppm"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "ppm"
-                - domain: sensor
-                  device_class: carbon_dioxide
-                - domain: number
-                  device_class: carbon_dioxide
-      translation_key: number_or_entity
+.co_units: &co_units
+  - "ppb"
+  - "ppm"
+  - "mg/m³"
+  - "μg/m³"
 
-.number_or_entity_pm1: &number_or_entity_pm1
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm1
-                - domain: number
-                  device_class: pm1
-      translation_key: number_or_entity
+.ozone_units: &ozone_units
+  - "ppb"
+  - "ppm"
+  - "μg/m³"
 
-.number_or_entity_pm25: &number_or_entity_pm25
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm25
-                - domain: number
-                  device_class: pm25
-      translation_key: number_or_entity
+.voc_units: &voc_units
+  - "μg/m³"
+  - "mg/m³"
 
-.number_or_entity_pm4: &number_or_entity_pm4
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm4
-                - domain: number
-                  device_class: pm4
-      translation_key: number_or_entity
+.voc_ratio_units: &voc_ratio_units
+  - "ppb"
+  - "ppm"
 
-.number_or_entity_pm10: &number_or_entity_pm10
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm10
-                - domain: number
-                  device_class: pm10
-      translation_key: number_or_entity
+.no_units: &no_units
+  - "ppb"
+  - "μg/m³"
 
-.number_or_entity_ozone: &number_or_entity_ozone
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: ozone
-                - domain: number
-                  device_class: ozone
-      translation_key: number_or_entity
+.no2_units: &no2_units
+  - "ppb"
+  - "ppm"
+  - "μg/m³"
 
-.number_or_entity_voc: &number_or_entity_voc
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "μg/m³"
-                    - "mg/m³"
-                - domain: sensor
-                  device_class: volatile_organic_compounds
-                - domain: number
-                  device_class: volatile_organic_compounds
-      translation_key: number_or_entity
+.so2_units: &so2_units
+  - "ppb"
+  - "μg/m³"
 
-.number_or_entity_voc_ratio: &number_or_entity_voc_ratio
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                - domain: sensor
-                  device_class: volatile_organic_compounds_parts
-                - domain: number
-                  device_class: volatile_organic_compounds_parts
-      translation_key: number_or_entity
+# --- Entity filter anchors ---
 
-.number_or_entity_no: &number_or_entity_no
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: nitrogen_monoxide
-                - domain: number
-                  device_class: nitrogen_monoxide
-      translation_key: number_or_entity
+.co_threshold_entity: &co_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *co_units
+  - domain: sensor
+    device_class: carbon_monoxide
+  - domain: number
+    device_class: carbon_monoxide
 
-.number_or_entity_no2: &number_or_entity_no2
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: nitrogen_dioxide
-                - domain: number
-                  device_class: nitrogen_dioxide
-      translation_key: number_or_entity
+.co2_threshold_entity: &co2_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "ppm"
+  - domain: sensor
+    device_class: carbon_dioxide
+  - domain: number
+    device_class: carbon_dioxide
 
-.number_or_entity_n2o: &number_or_entity_n2o
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: nitrous_oxide
-                - domain: number
-                  device_class: nitrous_oxide
-      translation_key: number_or_entity
+.pm1_threshold_entity: &pm1_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm1
+  - domain: number
+    device_class: pm1
 
-.number_or_entity_so2: &number_or_entity_so2
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: sulphur_dioxide
-                - domain: number
-                  device_class: sulphur_dioxide
-      translation_key: number_or_entity
+.pm25_threshold_entity: &pm25_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm25
+  - domain: number
+    device_class: pm25
 
-.unit_co: &unit_co
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
-        - "mg/m³"
-        - "μg/m³"
+.pm4_threshold_entity: &pm4_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm4
+  - domain: number
+    device_class: pm4
 
-.unit_ozone: &unit_ozone
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
-        - "μg/m³"
+.pm10_threshold_entity: &pm10_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm10
+  - domain: number
+    device_class: pm10
 
-.unit_no2: &unit_no2
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
-        - "μg/m³"
+.ozone_threshold_entity: &ozone_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *ozone_units
+  - domain: sensor
+    device_class: ozone
+  - domain: number
+    device_class: ozone
 
-.unit_no: &unit_no
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "μg/m³"
+.voc_threshold_entity: &voc_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *voc_units
+  - domain: sensor
+    device_class: volatile_organic_compounds
+  - domain: number
+    device_class: volatile_organic_compounds
 
-.unit_so2: &unit_so2
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "μg/m³"
+.voc_ratio_threshold_entity: &voc_ratio_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *voc_ratio_units
+  - domain: sensor
+    device_class: volatile_organic_compounds_parts
+  - domain: number
+    device_class: volatile_organic_compounds_parts
 
-.unit_voc: &unit_voc
-  required: false
-  selector:
-    select:
-      options:
-        - "μg/m³"
-        - "mg/m³"
+.no_threshold_entity: &no_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *no_units
+  - domain: sensor
+    device_class: nitrogen_monoxide
+  - domain: number
+    device_class: nitrogen_monoxide
 
-.unit_voc_ratio: &unit_voc_ratio
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
+.no2_threshold_entity: &no2_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *no2_units
+  - domain: sensor
+    device_class: nitrogen_dioxide
+  - domain: number
+    device_class: nitrogen_dioxide
 
-.trigger_threshold_type: &trigger_threshold_type
-  required: true
-  default: above
-  selector:
-    select:
-      options:
-        - above
-        - below
-        - between
-        - outside
-      translation_key: trigger_threshold_type
+.n2o_threshold_entity: &n2o_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: nitrous_oxide
+  - domain: number
+    device_class: nitrous_oxide
+
+.so2_threshold_entity: &so2_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *so2_units
+  - domain: sensor
+    device_class: sulphur_dioxide
+  - domain: number
+    device_class: sulphur_dioxide
+
+# --- Number anchors for single-unit pollutants ---
+
+.co2_threshold_number: &co2_threshold_number
+  mode: box
+  unit_of_measurement: "ppm"
+
+.ugm3_threshold_number: &ugm3_threshold_number
+  mode: box
+  unit_of_measurement: "μg/m³"
 
 # Binary sensor detected/cleared trigger fields
 .trigger_binary_fields: &trigger_binary_fields
@@ -495,198 +276,342 @@ smoke_cleared:
 
 # --- Numerical sensor triggers ---
 
+# CO (multi-unit)
 co_changed:
   target: *target_co_sensor
   fields:
-    above: *number_or_entity_co
-    below: *number_or_entity_co
-    unit: *unit_co
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *co_units
 
 co_crossed_threshold:
   target: *target_co_sensor
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_co
-    upper_limit: *number_or_entity_co
-    unit: *unit_co
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *co_units
 
+# CO2 (single-unit: ppm)
 co2_changed:
   target: *target_co2
   fields:
-    above: *number_or_entity_co2
-    below: *number_or_entity_co2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co2_threshold_entity
+          mode: changed
+          number: *co2_threshold_number
 
 co2_crossed_threshold:
   target: *target_co2
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_co2
-    upper_limit: *number_or_entity_co2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co2_threshold_entity
+          mode: crossed
+          number: *co2_threshold_number
 
+# PM1 (single-unit: μg/m³)
 pm1_changed:
   target: *target_pm1
   fields:
-    above: *number_or_entity_pm1
-    below: *number_or_entity_pm1
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm1_threshold_entity
+          mode: changed
+          number: *ugm3_threshold_number
 
 pm1_crossed_threshold:
   target: *target_pm1
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_pm1
-    upper_limit: *number_or_entity_pm1
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm1_threshold_entity
+          mode: crossed
+          number: *ugm3_threshold_number
 
+# PM2.5 (single-unit: μg/m³)
 pm25_changed:
   target: *target_pm25
   fields:
-    above: *number_or_entity_pm25
-    below: *number_or_entity_pm25
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm25_threshold_entity
+          mode: changed
+          number: *ugm3_threshold_number
 
 pm25_crossed_threshold:
   target: *target_pm25
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_pm25
-    upper_limit: *number_or_entity_pm25
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm25_threshold_entity
+          mode: crossed
+          number: *ugm3_threshold_number
 
+# PM4 (single-unit: μg/m³)
 pm4_changed:
   target: *target_pm4
   fields:
-    above: *number_or_entity_pm4
-    below: *number_or_entity_pm4
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm4_threshold_entity
+          mode: changed
+          number: *ugm3_threshold_number
 
 pm4_crossed_threshold:
   target: *target_pm4
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_pm4
-    upper_limit: *number_or_entity_pm4
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm4_threshold_entity
+          mode: crossed
+          number: *ugm3_threshold_number
 
+# PM10 (single-unit: μg/m³)
 pm10_changed:
   target: *target_pm10
   fields:
-    above: *number_or_entity_pm10
-    below: *number_or_entity_pm10
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm10_threshold_entity
+          mode: changed
+          number: *ugm3_threshold_number
 
 pm10_crossed_threshold:
   target: *target_pm10
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_pm10
-    upper_limit: *number_or_entity_pm10
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm10_threshold_entity
+          mode: crossed
+          number: *ugm3_threshold_number
 
+# Ozone (multi-unit)
 ozone_changed:
   target: *target_ozone
   fields:
-    above: *number_or_entity_ozone
-    below: *number_or_entity_ozone
-    unit: *unit_ozone
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *ozone_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *ozone_units
 
 ozone_crossed_threshold:
   target: *target_ozone
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_ozone
-    upper_limit: *number_or_entity_ozone
-    unit: *unit_ozone
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *ozone_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *ozone_units
 
+# VOC (multi-unit)
 voc_changed:
   target: *target_voc
   fields:
-    above: *number_or_entity_voc
-    below: *number_or_entity_voc
-    unit: *unit_voc
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *voc_units
 
 voc_crossed_threshold:
   target: *target_voc
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_voc
-    upper_limit: *number_or_entity_voc
-    unit: *unit_voc
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *voc_units
 
+# VOC ratio (multi-unit)
 voc_ratio_changed:
   target: *target_voc_ratio
   fields:
-    above: *number_or_entity_voc_ratio
-    below: *number_or_entity_voc_ratio
-    unit: *unit_voc_ratio
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_ratio_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *voc_ratio_units
 
 voc_ratio_crossed_threshold:
   target: *target_voc_ratio
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_voc_ratio
-    upper_limit: *number_or_entity_voc_ratio
-    unit: *unit_voc_ratio
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_ratio_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *voc_ratio_units
 
+# NO (multi-unit)
 no_changed:
   target: *target_no
   fields:
-    above: *number_or_entity_no
-    below: *number_or_entity_no
-    unit: *unit_no
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *no_units
 
 no_crossed_threshold:
   target: *target_no
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_no
-    upper_limit: *number_or_entity_no
-    unit: *unit_no
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *no_units
 
+# NO2 (multi-unit)
 no2_changed:
   target: *target_no2
   fields:
-    above: *number_or_entity_no2
-    below: *number_or_entity_no2
-    unit: *unit_no2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no2_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *no2_units
 
 no2_crossed_threshold:
   target: *target_no2
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_no2
-    upper_limit: *number_or_entity_no2
-    unit: *unit_no2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no2_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *no2_units
 
+# N2O (single-unit: μg/m³)
 n2o_changed:
   target: *target_n2o
   fields:
-    above: *number_or_entity_n2o
-    below: *number_or_entity_n2o
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *n2o_threshold_entity
+          mode: changed
+          number: *ugm3_threshold_number
 
 n2o_crossed_threshold:
   target: *target_n2o
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_n2o
-    upper_limit: *number_or_entity_n2o
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *n2o_threshold_entity
+          mode: crossed
+          number: *ugm3_threshold_number
 
+# SO2 (multi-unit)
 so2_changed:
   target: *target_so2
   fields:
-    above: *number_or_entity_so2
-    below: *number_or_entity_so2
-    unit: *unit_so2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *so2_threshold_entity
+          mode: changed
+          number:
+            mode: box
+          unit_of_measurement: *so2_units
 
 so2_crossed_threshold:
   target: *target_so2
   fields:
     behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity_so2
-    upper_limit: *number_or_entity_so2
-    unit: *unit_so2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *so2_threshold_entity
+          mode: crossed
+          number:
+            mode: box
+          unit_of_measurement: *so2_units

homeassistant/components/airq/config_flow.py

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

homeassistant/components/airq/strings.json

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

homeassistant/components/aladdin_connect/__init__.py

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

homeassistant/components/aladdin_connect/strings.json

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

homeassistant/components/alarm_control_panel/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted alarms.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted alarms to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_armed": {
       "description": "Tests if one or more alarms are armed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more alarms are armed in away mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more alarms are armed in home mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more alarms are armed in night mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -50,7 +44,6 @@
       "description": "Tests if one or more alarms are armed in vacation mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -60,7 +53,6 @@
       "description": "Tests if one or more alarms are disarmed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -70,7 +62,6 @@
       "description": "Tests if one or more alarms are triggered.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
         }
       },
@@ -173,7 +164,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm away"
+      "name": "Arm alarm away"
     },
     "alarm_arm_custom_bypass": {
       "description": "Arms an alarm while allowing to bypass a custom area.",
@@ -183,7 +174,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm with custom bypass"
+      "name": "Arm alarm with custom bypass"
     },
     "alarm_arm_home": {
       "description": "Arms an alarm in the home mode.",
@@ -193,7 +184,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm home"
+      "name": "Arm alarm home"
     },
     "alarm_arm_night": {
       "description": "Arms an alarm in the night mode.",
@@ -203,7 +194,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm night"
+      "name": "Arm alarm night"
     },
     "alarm_arm_vacation": {
       "description": "Arms an alarm in the vacation mode.",
@@ -213,7 +204,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm vacation"
+      "name": "Arm alarm vacation"
     },
     "alarm_disarm": {
       "description": "Disarms an alarm.",
@@ -223,7 +214,7 @@
           "name": "Code"
         }
       },
-      "name": "Disarm"
+      "name": "Disarm alarm"
     },
     "alarm_trigger": {
       "description": "Triggers an alarm manually.",
@@ -233,7 +224,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Trigger"
+      "name": "Trigger alarm"
     }
   },
   "title": "Alarm control panel",
@@ -242,7 +233,6 @@
       "description": "Triggers after one or more alarms become armed, regardless of the mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -252,7 +242,6 @@
       "description": "Triggers after one or more alarms become armed in away mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -262,7 +251,6 @@
       "description": "Triggers after one or more alarms become armed in home mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -272,7 +260,6 @@
       "description": "Triggers after one or more alarms become armed in night mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -282,7 +269,6 @@
       "description": "Triggers after one or more alarms become armed in vacation mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -292,7 +278,6 @@
       "description": "Triggers after one or more alarms become disarmed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -302,7 +287,6 @@
       "description": "Triggers after one or more alarms become triggered.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/alarmdecoder/config_flow.py

@@ -3,10 +3,10 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import Any, cast
 
 from adext import AdExt
-from alarmdecoder.devices import SerialDevice, SocketDevice
+from alarmdecoder.devices import Device, SerialDevice, SocketDevice
 from alarmdecoder.util import NoDeviceError
 import voluptuous as vol
 
@@ -102,16 +102,21 @@ class AlarmDecoderFlowHandler(ConfigFlow, domain=DOMAIN):
                 self._async_current_entries(), user_input, self.protocol
             ):
                 return self.async_abort(reason="already_configured")
-            connection = {}
+            connection: dict[str, Any] = {}
             baud = None
+            device: Device
             if self.protocol == PROTOCOL_SOCKET:
-                host = connection[CONF_HOST] = user_input[CONF_HOST]
-                port = connection[CONF_PORT] = user_input[CONF_PORT]
-                title = f"{host}:{port}"
+                host = connection[CONF_HOST] = cast(str, user_input[CONF_HOST])
+                port = connection[CONF_PORT] = cast(int, user_input[CONF_PORT])
+                title: str = f"{host}:{port}"
                 device = SocketDevice(interface=(host, port))
             if self.protocol == PROTOCOL_SERIAL:
-                path = connection[CONF_DEVICE_PATH] = user_input[CONF_DEVICE_PATH]
-                baud = connection[CONF_DEVICE_BAUD] = user_input[CONF_DEVICE_BAUD]
+                path = connection[CONF_DEVICE_PATH] = cast(
+                    str, user_input[CONF_DEVICE_PATH]
+                )
+                baud = connection[CONF_DEVICE_BAUD] = cast(
+                    int, user_input[CONF_DEVICE_BAUD]
+                )
                 title = path
                 device = SerialDevice(interface=path)
 
@@ -132,6 +137,7 @@ class AlarmDecoderFlowHandler(ConfigFlow, domain=DOMAIN):
                 _LOGGER.exception("Unexpected exception during AlarmDecoder setup")
                 errors["base"] = "unknown"
 
+        schema: vol.Schema
         if self.protocol == PROTOCOL_SOCKET:
             schema = vol.Schema(
                 {

homeassistant/components/alexa_devices/manifest.json

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

homeassistant/components/analytics_insights/__init__.py

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

homeassistant/components/anglian_water/manifest.json

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

homeassistant/components/anthropic/__init__.py

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

homeassistant/components/anthropic/ai_task.py

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

homeassistant/components/anthropic/const.py

@@ -71,6 +71,16 @@ 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",
+]
+
 DEPRECATED_MODELS = [
     "claude-3",
 ]

homeassistant/components/anthropic/diagnostics.py

@@ -0,0 +1,64 @@
+"""Diagnostics support for Anthropic."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+from anthropic import __title__, __version__
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_API_KEY
+from homeassistant.helpers import entity_registry as er
+
+from .const import (
+    CONF_PROMPT,
+    CONF_WEB_SEARCH_CITY,
+    CONF_WEB_SEARCH_COUNTRY,
+    CONF_WEB_SEARCH_REGION,
+    CONF_WEB_SEARCH_TIMEZONE,
+)
+
+if TYPE_CHECKING:
+    from homeassistant.core import HomeAssistant
+
+    from . import AnthropicConfigEntry
+
+
+TO_REDACT = {
+    CONF_API_KEY,
+    CONF_PROMPT,
+    CONF_WEB_SEARCH_CITY,
+    CONF_WEB_SEARCH_REGION,
+    CONF_WEB_SEARCH_COUNTRY,
+    CONF_WEB_SEARCH_TIMEZONE,
+}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: AnthropicConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+
+    return {
+        "client": f"{__title__}=={__version__}",
+        "title": entry.title,
+        "entry_id": entry.entry_id,
+        "entry_version": f"{entry.version}.{entry.minor_version}",
+        "state": entry.state.value,
+        "data": async_redact_data(entry.data, TO_REDACT),
+        "options": async_redact_data(entry.options, TO_REDACT),
+        "subentries": {
+            subentry.subentry_id: {
+                "title": subentry.title,
+                "subentry_type": subentry.subentry_type,
+                "data": async_redact_data(subentry.data, TO_REDACT),
+            }
+            for subentry in entry.subentries.values()
+        },
+        "entities": {
+            entity_entry.entity_id: entity_entry.extended_dict
+            for entity_entry in er.async_entries_for_config_entry(
+                er.async_get(hass), entry.entry_id
+            )
+        },
+    }

homeassistant/components/anthropic/entity.py

@@ -19,6 +19,8 @@ from anthropic.types import (
     CitationsWebSearchResultLocation,
     CitationWebSearchResultLocationParam,
     CodeExecutionTool20250825Param,
+    CodeExecutionToolResultBlock,
+    CodeExecutionToolResultBlockParamContentParam,
     Container,
     ContentBlockParam,
     DocumentBlockParam,
@@ -61,15 +63,16 @@ from anthropic.types import (
     ToolUseBlockParam,
     Usage,
     WebSearchTool20250305Param,
+    WebSearchTool20260209Param,
     WebSearchToolResultBlock,
     WebSearchToolResultBlockParamContentParam,
 )
 from anthropic.types.bash_code_execution_tool_result_block_param import (
-    Content as BashCodeExecutionToolResultContentParam,
+    Content as BashCodeExecutionToolResultBlockParamContentParam,
 )
 from anthropic.types.message_create_params import MessageCreateParamsStreaming
 from anthropic.types.text_editor_code_execution_tool_result_block_param import (
-    Content as TextEditorCodeExecutionToolResultContentParam,
+    Content as TextEditorCodeExecutionToolResultBlockParamContentParam,
 )
 import voluptuous as vol
 from voluptuous_openapi import convert
@@ -105,6 +108,7 @@ from .const import (
     MIN_THINKING_BUDGET,
     NON_ADAPTIVE_THINKING_MODELS,
     NON_THINKING_MODELS,
+    PROGRAMMATIC_TOOL_CALLING_UNSUPPORTED_MODELS,
     UNSUPPORTED_STRUCTURED_OUTPUT_MODELS,
 )
 
@@ -224,12 +228,22 @@ def _convert_content(
                         },
                     ),
                 }
+            elif content.tool_name == "code_execution":
+                tool_result_block = {
+                    "type": "code_execution_tool_result",
+                    "tool_use_id": content.tool_call_id,
+                    "content": cast(
+                        CodeExecutionToolResultBlockParamContentParam,
+                        content.tool_result,
+                    ),
+                }
             elif content.tool_name == "bash_code_execution":
                 tool_result_block = {
                     "type": "bash_code_execution_tool_result",
                     "tool_use_id": content.tool_call_id,
                     "content": cast(
-                        BashCodeExecutionToolResultContentParam, content.tool_result
+                        BashCodeExecutionToolResultBlockParamContentParam,
+                        content.tool_result,
                     ),
                 }
             elif content.tool_name == "text_editor_code_execution":
@@ -237,7 +251,7 @@ def _convert_content(
                     "type": "text_editor_code_execution_tool_result",
                     "tool_use_id": content.tool_call_id,
                     "content": cast(
-                        TextEditorCodeExecutionToolResultContentParam,
+                        TextEditorCodeExecutionToolResultBlockParamContentParam,
                         content.tool_result,
                     ),
                 }
@@ -368,6 +382,7 @@ def _convert_content(
                             name=cast(
                                 Literal[
                                     "web_search",
+                                    "code_execution",
                                     "bash_code_execution",
                                     "text_editor_code_execution",
                                 ],
@@ -379,6 +394,7 @@ def _convert_content(
                         and tool_call.tool_name
                         in [
                             "web_search",
+                            "code_execution",
                             "bash_code_execution",
                             "text_editor_code_execution",
                         ]
@@ -401,7 +417,11 @@ def _convert_content(
                 messages[-1]["content"] = messages[-1]["content"][0]["text"]
         else:
             # Note: We don't pass SystemContent here as it's passed to the API as the prompt
-            raise HomeAssistantError("Unexpected content type in chat log")
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="unexpected_chat_log_content",
+                translation_placeholders={"type": type(content).__name__},
+            )
 
     return messages, container_id
 
@@ -443,7 +463,9 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
     Each message could contain multiple blocks of the same type.
     """
     if stream is None or not hasattr(stream, "__aiter__"):
-        raise HomeAssistantError("Expected a stream of messages")
+        raise HomeAssistantError(
+            translation_domain=DOMAIN, translation_key="unexpected_stream_object"
+        )
 
     current_tool_block: ToolUseBlockParam | ServerToolUseBlockParam | None = None
     current_tool_args: str
@@ -464,7 +486,7 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                     type="tool_use",
                     id=response.content_block.id,
                     name=response.content_block.name,
-                    input={},
+                    input=response.content_block.input or {},
                 )
                 current_tool_args = ""
                 if response.content_block.name == output_tool:
@@ -526,13 +548,14 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                     type="server_tool_use",
                     id=response.content_block.id,
                     name=response.content_block.name,
-                    input={},
+                    input=response.content_block.input or {},
                 )
                 current_tool_args = ""
             elif isinstance(
                 response.content_block,
                 (
                     WebSearchToolResultBlock,
+                    CodeExecutionToolResultBlock,
                     BashCodeExecutionToolResultBlock,
                     TextEditorCodeExecutionToolResultBlock,
                 ),
@@ -588,13 +611,13 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                     current_tool_block = None
                     continue
                 tool_args = json.loads(current_tool_args) if current_tool_args else {}
-                current_tool_block["input"] = tool_args
+                current_tool_block["input"] |= tool_args
                 yield {
                     "tool_calls": [
                         llm.ToolInput(
                             id=current_tool_block["id"],
                             tool_name=current_tool_block["name"],
-                            tool_args=tool_args,
+                            tool_args=current_tool_block["input"],
                             external=current_tool_block["type"] == "server_tool_use",
                         )
                     ]
@@ -605,7 +628,9 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                 chat_log.async_trace(_create_token_stats(input_usage, usage))
             content_details.container = response.delta.container
             if response.delta.stop_reason == "refusal":
-                raise HomeAssistantError("Potential policy violation detected")
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN, translation_key="api_refusal"
+                )
         elif isinstance(response, RawMessageStopEvent):
             if content_details:
                 content_details.delete_empty()
@@ -664,7 +689,9 @@ class AnthropicBaseLLMEntity(Entity):
 
         system = chat_log.content[0]
         if not isinstance(system, conversation.SystemContent):
-            raise HomeAssistantError("First message must be a system message")
+            raise HomeAssistantError(
+                translation_domain=DOMAIN, translation_key="system_message_not_found"
+            )
 
         # System prompt with caching enabled
         system_prompt: list[TextBlockParam] = [
@@ -725,19 +752,34 @@ class AnthropicBaseLLMEntity(Entity):
             ]
 
         if options.get(CONF_CODE_EXECUTION):
-            tools.append(
-                CodeExecutionTool20250825Param(
-                    name="code_execution",
-                    type="code_execution_20250825",
-                ),
-            )
+            # 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):
+                tools.append(
+                    CodeExecutionTool20250825Param(
+                        name="code_execution",
+                        type="code_execution_20250825",
+                    ),
+                )
 
         if options.get(CONF_WEB_SEARCH):
-            web_search = WebSearchTool20250305Param(
-                name="web_search",
-                type="web_search_20250305",
-                max_uses=options.get(CONF_WEB_SEARCH_MAX_USES),
-            )
+            if model.startswith(
+                tuple(PROGRAMMATIC_TOOL_CALLING_UNSUPPORTED_MODELS)
+            ) or not options.get(CONF_CODE_EXECUTION):
+                web_search: WebSearchTool20250305Param | WebSearchTool20260209Param = (
+                    WebSearchTool20250305Param(
+                        name="web_search",
+                        type="web_search_20250305",
+                        max_uses=options.get(CONF_WEB_SEARCH_MAX_USES),
+                    )
+                )
+            else:
+                web_search = WebSearchTool20260209Param(
+                    name="web_search",
+                    type="web_search_20260209",
+                    max_uses=options.get(CONF_WEB_SEARCH_MAX_USES),
+                )
             if options.get(CONF_WEB_SEARCH_USER_LOCATION):
                 web_search["user_location"] = {
                     "type": "approximate",
@@ -754,7 +796,7 @@ class AnthropicBaseLLMEntity(Entity):
             last_message = messages[-1]
             if last_message["role"] != "user":
                 raise HomeAssistantError(
-                    "Last message must be a user message to add attachments"
+                    translation_domain=DOMAIN, translation_key="user_message_not_found"
                 )
             if isinstance(last_message["content"], str):
                 last_message["content"] = [
@@ -859,11 +901,19 @@ class AnthropicBaseLLMEntity(Entity):
             except anthropic.AuthenticationError as err:
                 self.entry.async_start_reauth(self.hass)
                 raise HomeAssistantError(
-                    "Authentication error with Anthropic API, reauthentication required"
+                    translation_domain=DOMAIN,
+                    translation_key="api_authentication_error",
+                    translation_placeholders={"message": err.message},
                 ) from err
             except anthropic.AnthropicError as err:
                 raise HomeAssistantError(
-                    f"Sorry, I had a problem talking to Anthropic: {err}"
+                    translation_domain=DOMAIN,
+                    translation_key="api_error",
+                    translation_placeholders={
+                        "message": err.message
+                        if isinstance(err, anthropic.APIError)
+                        else str(err)
+                    },
                 ) from err
 
             if not chat_log.unresponded_tool_results:
@@ -883,15 +933,23 @@ async def async_prepare_files_for_prompt(
 
         for file_path, mime_type in files:
             if not file_path.exists():
-                raise HomeAssistantError(f"`{file_path}` does not exist")
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN,
+                    translation_key="wrong_file_path",
+                    translation_placeholders={"file_path": file_path.as_posix()},
+                )
 
             if mime_type is None:
                 mime_type = guess_file_type(file_path)[0]
 
             if not mime_type or not mime_type.startswith(("image/", "application/pdf")):
                 raise HomeAssistantError(
-                    "Only images and PDF are supported by the Anthropic API,"
-                    f"`{file_path}` is not an image file or PDF"
+                    translation_domain=DOMAIN,
+                    translation_key="wrong_file_type",
+                    translation_placeholders={
+                        "file_path": file_path.as_posix(),
+                        "mime_type": mime_type or "unknown",
+                    },
                 )
             if mime_type == "image/jpg":
                 mime_type = "image/jpeg"

homeassistant/components/anthropic/quality_scale.yaml

@@ -46,7 +46,7 @@ rules:
   test-coverage: done
   # Gold
   devices: done
-  diagnostics: todo
+  diagnostics: done
   discovery-update-info:
     status: exempt
     comment: |
@@ -59,17 +59,11 @@ rules:
     status: exempt
     comment: |
       No data updates.
-  docs-examples:
-    status: todo
-    comment: |
-      To give examples of how people use the integration
+  docs-examples: done
   docs-known-limitations: done
-  docs-supported-devices:
-    status: todo
-    comment: |
-      To write something about what models we support.
+  docs-supported-devices: done
   docs-supported-functions: done
-  docs-troubleshooting: todo
+  docs-troubleshooting: done
   docs-use-cases: done
   dynamic-devices:
     status: exempt
@@ -88,7 +82,7 @@ rules:
     comment: |
       No entities disabled by default.
   entity-translations: todo
-  exception-translations: todo
+  exception-translations: done
   icon-translations: done
   reconfiguration-flow: done
   repair-issues: done

homeassistant/components/anthropic/repairs.py

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

homeassistant/components/anthropic/strings.json

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

homeassistant/components/apple_tv/__init__.py

@@ -30,9 +30,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers import config_validation as cv, device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.typing import ConfigType
 
 from .const import (
     CONF_CREDENTIALS,
@@ -42,9 +43,12 @@ from .const import (
     SIGNAL_CONNECTED,
     SIGNAL_DISCONNECTED,
 )
+from .services import async_setup_services
 
 _LOGGER = logging.getLogger(__name__)
 
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
+
 DEFAULT_NAME_TV = "Apple TV"
 DEFAULT_NAME_HP = "HomePod"
 
@@ -77,6 +81,12 @@ DEVICE_EXCEPTIONS = (
 type AppleTvConfigEntry = ConfigEntry[AppleTVManager]
 
 
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Apple TV component."""
+    async_setup_services(hass)
+    return True
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: AppleTvConfigEntry) -> bool:
     """Set up a config entry for Apple TV."""
     manager = AppleTVManager(hass, entry)

homeassistant/components/apple_tv/const.py

@@ -9,3 +9,5 @@ CONF_START_OFF = "start_off"
 
 SIGNAL_CONNECTED = "apple_tv_connected"
 SIGNAL_DISCONNECTED = "apple_tv_disconnected"
+
+ATTR_TEXT = "text"

homeassistant/components/apple_tv/icons.json

@@ -8,5 +8,16 @@
         }
       }
     }
+  },
+  "services": {
+    "append_keyboard_text": {
+      "service": "mdi:keyboard"
+    },
+    "clear_keyboard_text": {
+      "service": "mdi:keyboard-off"
+    },
+    "set_keyboard_text": {
+      "service": "mdi:keyboard"
+    }
   }
 }

homeassistant/components/apple_tv/services.py

@@ -0,0 +1,130 @@
+"""Define services for the Apple TV integration."""
+
+from __future__ import annotations
+
+from pyatv.const import KeyboardFocusState
+from pyatv.exceptions import NotSupportedError, ProtocolError
+from pyatv.interface import AppleTV as AppleTVInterface
+import voluptuous as vol
+
+from homeassistant.const import ATTR_CONFIG_ENTRY_ID
+from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.helpers import config_validation as cv, service
+
+from .const import ATTR_TEXT, DOMAIN
+
+SERVICE_SET_KEYBOARD_TEXT = "set_keyboard_text"
+SERVICE_SET_KEYBOARD_TEXT_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_CONFIG_ENTRY_ID): cv.string,
+        vol.Required(ATTR_TEXT): cv.string,
+    }
+)
+
+SERVICE_APPEND_KEYBOARD_TEXT = "append_keyboard_text"
+SERVICE_APPEND_KEYBOARD_TEXT_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_CONFIG_ENTRY_ID): cv.string,
+        vol.Required(ATTR_TEXT): cv.string,
+    }
+)
+
+SERVICE_CLEAR_KEYBOARD_TEXT = "clear_keyboard_text"
+SERVICE_CLEAR_KEYBOARD_TEXT_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_CONFIG_ENTRY_ID): cv.string,
+    }
+)
+
+
+def _get_atv(call: ServiceCall) -> AppleTVInterface:
+    """Get the AppleTVInterface for a service call."""
+    entry = service.async_get_config_entry(
+        call.hass, DOMAIN, call.data[ATTR_CONFIG_ENTRY_ID]
+    )
+    atv: AppleTVInterface | None = entry.runtime_data.atv
+    if atv is None:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="not_connected",
+        )
+    return atv
+
+
+def _check_keyboard_focus(atv: AppleTVInterface) -> None:
+    """Check that keyboard is focused on the device."""
+    try:
+        focus_state = atv.keyboard.text_focus_state
+    except NotSupportedError as err:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="keyboard_not_available",
+        ) from err
+    if focus_state != KeyboardFocusState.Focused:
+        raise ServiceValidationError(
+            translation_domain=DOMAIN,
+            translation_key="keyboard_not_focused",
+        )
+
+
+async def _async_set_keyboard_text(call: ServiceCall) -> None:
+    """Set text in the keyboard input field on an Apple TV."""
+    atv = _get_atv(call)
+    _check_keyboard_focus(atv)
+    try:
+        await atv.keyboard.text_set(call.data[ATTR_TEXT])
+    except ProtocolError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="keyboard_error",
+        ) from err
+
+
+async def _async_append_keyboard_text(call: ServiceCall) -> None:
+    """Append text to the keyboard input field on an Apple TV."""
+    atv = _get_atv(call)
+    _check_keyboard_focus(atv)
+    try:
+        await atv.keyboard.text_append(call.data[ATTR_TEXT])
+    except ProtocolError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="keyboard_error",
+        ) from err
+
+
+async def _async_clear_keyboard_text(call: ServiceCall) -> None:
+    """Clear text in the keyboard input field on an Apple TV."""
+    atv = _get_atv(call)
+    _check_keyboard_focus(atv)
+    try:
+        await atv.keyboard.text_clear()
+    except ProtocolError as err:
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="keyboard_error",
+        ) from err
+
+
+@callback
+def async_setup_services(hass: HomeAssistant) -> None:
+    """Set up the services for the Apple TV integration."""
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_SET_KEYBOARD_TEXT,
+        _async_set_keyboard_text,
+        schema=SERVICE_SET_KEYBOARD_TEXT_SCHEMA,
+    )
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_APPEND_KEYBOARD_TEXT,
+        _async_append_keyboard_text,
+        schema=SERVICE_APPEND_KEYBOARD_TEXT_SCHEMA,
+    )
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_CLEAR_KEYBOARD_TEXT,
+        _async_clear_keyboard_text,
+        schema=SERVICE_CLEAR_KEYBOARD_TEXT_SCHEMA,
+    )

homeassistant/components/apple_tv/services.yaml

@@ -0,0 +1,31 @@
+set_keyboard_text:
+  fields:
+    config_entry_id:
+      required: true
+      selector:
+        config_entry:
+          integration: apple_tv
+    text:
+      required: true
+      selector:
+        text:
+
+append_keyboard_text:
+  fields:
+    config_entry_id:
+      required: true
+      selector:
+        config_entry:
+          integration: apple_tv
+    text:
+      required: true
+      selector:
+        text:
+
+clear_keyboard_text:
+  fields:
+    config_entry_id:
+      required: true
+      selector:
+        config_entry:
+          integration: apple_tv

homeassistant/components/apple_tv/strings.json

@@ -69,6 +69,20 @@
       }
     }
   },
+  "exceptions": {
+    "keyboard_error": {
+      "message": "An error occurred while sending text to the Apple TV"
+    },
+    "keyboard_not_available": {
+      "message": "Keyboard input is not supported by this device"
+    },
+    "keyboard_not_focused": {
+      "message": "No text input field is currently focused on the Apple TV"
+    },
+    "not_connected": {
+      "message": "Apple TV is not connected"
+    }
+  },
   "options": {
     "step": {
       "init": {
@@ -78,5 +92,45 @@
         "description": "Configure general device settings"
       }
     }
+  },
+  "services": {
+    "append_keyboard_text": {
+      "description": "Appends text to the currently focused text input field on an Apple TV.",
+      "fields": {
+        "config_entry_id": {
+          "description": "[%key:component::apple_tv::services::set_keyboard_text::fields::config_entry_id::description%]",
+          "name": "[%key:component::apple_tv::services::set_keyboard_text::fields::config_entry_id::name%]"
+        },
+        "text": {
+          "description": "The text to append.",
+          "name": "[%key:component::apple_tv::services::set_keyboard_text::fields::text::name%]"
+        }
+      },
+      "name": "Append keyboard text"
+    },
+    "clear_keyboard_text": {
+      "description": "Clears the text in the currently focused text input field on an Apple TV.",
+      "fields": {
+        "config_entry_id": {
+          "description": "[%key:component::apple_tv::services::set_keyboard_text::fields::config_entry_id::description%]",
+          "name": "[%key:component::apple_tv::services::set_keyboard_text::fields::config_entry_id::name%]"
+        }
+      },
+      "name": "Clear keyboard text"
+    },
+    "set_keyboard_text": {
+      "description": "Sets the text in the currently focused text input field on an Apple TV.",
+      "fields": {
+        "config_entry_id": {
+          "description": "The Apple TV to send text to.",
+          "name": "Apple TV"
+        },
+        "text": {
+          "description": "The text to set.",
+          "name": "Text"
+        }
+      },
+      "name": "Set keyboard text"
+    }
   }
 }

homeassistant/components/arcam_fmj/__init__.py

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

homeassistant/components/arcam_fmj/coordinator.py

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

homeassistant/components/arcam_fmj/entity.py

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

homeassistant/components/arris_tg2492lg/__init__.py

@@ -1 +1 @@
-"""The Arris TG2492LG component."""
+"""The Arris TG2492LG integration."""

homeassistant/components/aruba/__init__.py

@@ -1 +1 @@
-"""The aruba component."""
+"""The Aruba integration."""

homeassistant/components/assist_pipeline/__init__.py

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

homeassistant/components/assist_pipeline/error.py

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

homeassistant/components/assist_pipeline/pipeline.py

@@ -73,8 +73,10 @@ from .const import (
 from .error import (
     DuplicateWakeUpDetectedError,
     IntentRecognitionError,
+    InvalidPipelineStagesError,
     PipelineError,
     PipelineNotFound,
+    PipelineRunValidationError,
     SpeechToTextError,
     TextToSpeechError,
     WakeWordDetectionAborted,
@@ -492,24 +494,6 @@ PIPELINE_STAGE_ORDER = [
 ]
 
 
-class PipelineRunValidationError(Exception):
-    """Error when a pipeline run is not valid."""
-
-
-class InvalidPipelineStagesError(PipelineRunValidationError):
-    """Error when given an invalid combination of start/end stages."""
-
-    def __init__(
-        self,
-        start_stage: PipelineStage,
-        end_stage: PipelineStage,
-    ) -> None:
-        """Set error message."""
-        super().__init__(
-            f"Invalid stage combination: start={start_stage}, end={end_stage}"
-        )
-
-
 @dataclass(frozen=True)
 class WakeWordSettings:
     """Settings for wake word detection."""
@@ -1680,26 +1664,39 @@ class PipelineInput:
     satellite_id: str | None = None
     """Identifier of the satellite that is processing the input/output of the pipeline."""
 
-    async def execute(self) -> None:
+    async def execute(self, validate: bool = False) -> None:
         """Run pipeline."""
+        validation_error: PipelineError | None = None
+        if validate:
+            try:
+                await self.validate()
+            except PipelineError as err:
+                validation_error = err
+
         self.run.start(
             conversation_id=self.session.conversation_id,
             device_id=self.device_id,
             satellite_id=self.satellite_id,
         )
         current_stage: PipelineStage | None = self.run.start_stage
-        stt_audio_buffer: list[EnhancedAudioChunk] = []
-        stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
-
-        if self.stt_stream is not None:
-            if self.run.audio_settings.needs_processor:
-                # VAD/noise suppression/auto gain/volume
-                stt_processed_stream = self.run.process_enhance_audio(self.stt_stream)
-            else:
-                # Volume multiplier only
-                stt_processed_stream = self.run.process_volume_only(self.stt_stream)
 
         try:
+            if validation_error is not None:
+                raise validation_error
+
+            stt_audio_buffer: list[EnhancedAudioChunk] = []
+            stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
+
+            if self.stt_stream is not None:
+                if self.run.audio_settings.needs_processor:
+                    # VAD/noise suppression/auto gain/volume
+                    stt_processed_stream = self.run.process_enhance_audio(
+                        self.stt_stream
+                    )
+                else:
+                    # Volume multiplier only
+                    stt_processed_stream = self.run.process_volume_only(self.stt_stream)
+
             if current_stage == PipelineStage.WAKE_WORD:
                 # wake-word-detection
                 assert stt_processed_stream is not None

homeassistant/components/assist_satellite/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted Assist satellites.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted Assist satellites to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_idle": {
       "description": "Tests if one or more Assist satellites are idle.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more Assist satellites are listening.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more Assist satellites are processing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more Assist satellites are responding.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -165,7 +159,6 @@
       "description": "Triggers after one or more voice assistant satellites become idle after having processed a command.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
@@ -175,7 +168,6 @@
       "description": "Triggers after one or more voice assistant satellites start listening for a command from someone.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
@@ -185,7 +177,6 @@
       "description": "Triggers after one or more voice assistant satellites start processing a command after having heard it.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
@@ -195,7 +186,6 @@
       "description": "Triggers after one or more voice assistant satellites start responding to a command after having processed it, or start announcing something.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/auth/__init__.py

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

homeassistant/components/auth/login_flow.py

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

homeassistant/components/automation/__init__.py

@@ -118,10 +118,13 @@ SERVICE_TRIGGER = "trigger"
 NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG = "new_triggers_conditions"
 
 _EXPERIMENTAL_CONDITION_PLATFORMS = {
+    "air_quality",
     "alarm_control_panel",
     "assist_satellite",
     "battery",
+    "calendar",
     "climate",
+    "counter",
     "cover",
     "device_tracker",
     "door",
@@ -129,18 +132,27 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "garage_door",
     "gate",
     "humidifier",
+    "humidity",
+    "illuminance",
     "lawn_mower",
     "light",
     "lock",
     "media_player",
+    "moisture",
     "motion",
     "occupancy",
     "person",
+    "power",
     "schedule",
+    "select",
     "siren",
     "switch",
+    "temperature",
     "text",
+    "timer",
     "vacuum",
+    "valve",
+    "water_heater",
     "window",
 }
 
@@ -148,8 +160,10 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "air_quality",
     "alarm_control_panel",
     "assist_satellite",
+    "battery",
     "button",
     "climate",
+    "counter",
     "cover",
     "device_tracker",
     "door",
@@ -164,6 +178,7 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "light",
     "lock",
     "media_player",
+    "moisture",
     "motion",
     "occupancy",
     "person",
@@ -176,8 +191,10 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "switch",
     "temperature",
     "text",
+    "todo",
     "update",
     "vacuum",
+    "valve",
     "water_heater",
     "window",
 }

homeassistant/components/automation/strings.json

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

homeassistant/components/backup/const.py

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

homeassistant/components/backup/manager.py

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

homeassistant/components/battery/__init__.py

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

homeassistant/components/battery/condition.py

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

homeassistant/components/battery/conditions.yaml

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

homeassistant/components/battery/icons.json

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

homeassistant/components/battery/strings.json

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

homeassistant/components/battery/trigger.py

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

homeassistant/components/battery/triggers.yaml

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

homeassistant/components/bbox/__init__.py

@@ -1 +1 @@
-"""The bbox component."""
+"""The Bbox integration."""

homeassistant/components/bitcoin/__init__.py

@@ -1 +1 @@
-"""The bitcoin component."""
+"""The Bitcoin integration."""

homeassistant/components/blebox/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "blebox",
   "name": "BleBox devices",
-  "codeowners": ["@bbx-a", "@swistakm"],
+  "codeowners": ["@bbx-a", "@swistakm", "@bkobus-bbx"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/blebox",
   "integration_type": "device",

homeassistant/components/blinksticklight/__init__.py

@@ -1 +1 @@
-"""The blinksticklight component."""
+"""The BlinkStick integration."""

homeassistant/components/blinksticklight/light.py

@@ -1,4 +1,4 @@
-"""Support for Blinkstick lights."""
+"""Support for BlinkStick lights."""
 
 # mypy: ignore-errors
 from __future__ import annotations
@@ -40,7 +40,7 @@ def setup_platform(
     add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
-    """Set up Blinkstick device specified by serial number."""
+    """Set up BlinkStick device specified by serial number."""
 
     name = config[CONF_NAME]
     serial = config[CONF_SERIAL]

homeassistant/components/bluesound/manifest.json

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

homeassistant/components/bmw_connected_drive/__init__.py

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

homeassistant/components/bmw_connected_drive/config_flow.py

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

homeassistant/components/bmw_connected_drive/manifest.json

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

homeassistant/components/bmw_connected_drive/strings.json

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

homeassistant/components/brands/__init__.py

@@ -52,7 +52,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         """Rotate the access token."""
         access_tokens.append(hex(_RND.getrandbits(256))[2:])
 
-    async_track_time_interval(hass, _rotate_token, TOKEN_CHANGE_INTERVAL)
+    async_track_time_interval(
+        hass, _rotate_token, TOKEN_CHANGE_INTERVAL, cancel_on_shutdown=True
+    )
 
     hass.http.register_view(BrandsIntegrationView(hass))
     hass.http.register_view(BrandsHardwareView(hass))

homeassistant/components/bsblan/manifest.json

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

homeassistant/components/button/strings.json

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

homeassistant/components/calendar/__init__.py

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

homeassistant/components/calendar/condition.py

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

homeassistant/components/calendar/conditions.yaml

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

homeassistant/components/calendar/icons.json

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

homeassistant/components/calendar/strings.json

@@ -1,4 +1,18 @@
 {
+  "common": {
+    "condition_behavior_name": "Condition passes if"
+  },
+  "conditions": {
+    "is_event_active": {
+      "description": "Tests if one or more calendars have an active event.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::calendar::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Calendar event is active"
+    }
+  },
   "entity_component": {
     "_": {
       "name": "[%key:component::calendar::title%]",
@@ -46,6 +60,12 @@
     }
   },
   "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_offset_type": {
       "options": {
         "after": "After",
@@ -90,7 +110,7 @@
           "name": "Summary"
         }
       },
-      "name": "Create event"
+      "name": "Create calendar event"
     },
     "get_events": {
       "description": "Retrieves events on a calendar within a time range.",
@@ -108,7 +128,7 @@
           "name": "Start time"
         }
       },
-      "name": "Get events"
+      "name": "Get calendar events"
     }
   },
   "title": "Calendar",

homeassistant/components/camera/__init__.py

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

homeassistant/components/camera/strings.json

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

homeassistant/components/casper_glow/__init__.py

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

homeassistant/components/casper_glow/binary_sensor.py

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

homeassistant/components/casper_glow/button.py

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

homeassistant/components/casper_glow/const.py

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

homeassistant/components/casper_glow/coordinator.py

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

homeassistant/components/casper_glow/diagnostics.py

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

homeassistant/components/casper_glow/icons.json

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

homeassistant/components/casper_glow/light.py

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

homeassistant/components/casper_glow/manifest.json

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

homeassistant/components/casper_glow/quality_scale.yaml

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

homeassistant/components/casper_glow/select.py

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

homeassistant/components/casper_glow/strings.json

@@ -26,6 +26,26 @@
       }
     }
   },
+  "entity": {
+    "binary_sensor": {
+      "paused": {
+        "name": "Dimming paused"
+      }
+    },
+    "button": {
+      "pause": {
+        "name": "Pause dimming"
+      },
+      "resume": {
+        "name": "Resume dimming"
+      }
+    },
+    "select": {
+      "dimming_time": {
+        "name": "Dimming time"
+      }
+    }
+  },
   "exceptions": {
     "communication_error": {
       "message": "An error occurred while communicating with the Casper Glow: {error}"

homeassistant/components/chess_com/config_flow.py

@@ -30,6 +30,7 @@ class ChessConfigFlow(ConfigFlow, domain=DOMAIN):
             client = ChessComClient(session=session)
             try:
                 user = await client.get_player(user_input[CONF_USERNAME])
+                await client.get_player_stats(user_input[CONF_USERNAME])
             except NotFoundError:
                 errors["base"] = "player_not_found"
             except Exception:

homeassistant/components/chess_com/icons.json

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

homeassistant/components/chess_com/sensor.py

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

homeassistant/components/chess_com/strings.json

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