Add total disk size to glances as an entity (#168131)

Co-authored-by: Joostlek <joostlek@outlook.com>

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

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

.github/copilot-instructions.md

@@ -11,10 +11,9 @@
 
 This repository contains the core of Home Assistant, a Python 3 based home automation application.
 
-## Code Review Guidelines
+## Git Commit Guidelines
 
-**Git commit practices during review:**
-- **Do NOT amend, squash, or rebase commits after review has started** - Reviewers need to see what changed since their last review
+- **Do NOT amend, squash, or rebase commits that have already been pushed to the PR branch after the PR is opened** - Reviewers need to follow the commit history, as well as see what changed since their last review
 
 ## Development Commands
 

.github/renovate.json

@@ -0,0 +1,205 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended"],
+
+  "enabledManagers": [
+    "pep621",
+    "pip_requirements",
+    "pre-commit",
+    "homeassistant-manifest"
+  ],
+
+  "pre-commit": {
+    "enabled": true
+  },
+
+  "pip_requirements": {
+    "managerFilePatterns": [
+      "/(^|/)requirements[\\w_-]*\\.txt$/",
+      "/(^|/)homeassistant/package_constraints\\.txt$/"
+    ]
+  },
+
+  "homeassistant-manifest": {
+    "managerFilePatterns": [
+      "/^homeassistant/components/[^/]+/manifest\\.json$/"
+    ]
+  },
+
+  "minimumReleaseAge": "7 days",
+  "prConcurrentLimit": 10,
+  "prHourlyLimit": 2,
+  "schedule": ["before 6am"],
+
+  "semanticCommits": "disabled",
+  "commitMessageAction": "Update",
+  "commitMessageTopic": "{{depName}}",
+  "commitMessageExtra": "to {{newVersion}}",
+
+  "automerge": false,
+
+  "vulnerabilityAlerts": {
+    "enabled": false
+  },
+
+  "packageRules": [
+    {
+      "description": "Deny all by default — allowlist below re-enables specific packages",
+      "matchPackageNames": ["*"],
+      "enabled": false
+    },
+    {
+      "description": "Core runtime dependencies (allowlisted)",
+      "matchPackageNames": [
+        "aiohttp",
+        "aiohttp-fast-zlib",
+        "aiohttp_cors",
+        "aiohttp-asyncmdnsresolver",
+        "yarl",
+        "httpx",
+        "requests",
+        "urllib3",
+        "certifi",
+        "orjson",
+        "PyYAML",
+        "Jinja2",
+        "cryptography",
+        "pyOpenSSL",
+        "PyJWT",
+        "SQLAlchemy",
+        "Pillow",
+        "attrs",
+        "uv",
+        "voluptuous",
+        "voluptuous-serialize",
+        "voluptuous-openapi",
+        "zeroconf"
+      ],
+      "enabled": true,
+      "labels": ["dependency", "core"]
+    },
+    {
+      "description": "Common Python utilities (allowlisted)",
+      "matchPackageNames": [
+        "astral",
+        "atomicwrites-homeassistant",
+        "audioop-lts",
+        "awesomeversion",
+        "bcrypt",
+        "ciso8601",
+        "cronsim",
+        "defusedxml",
+        "fnv-hash-fast",
+        "getmac",
+        "ical",
+        "ifaddr",
+        "lru-dict",
+        "mutagen",
+        "propcache",
+        "pyserial",
+        "python-slugify",
+        "PyTurboJPEG",
+        "securetar",
+        "standard-aifc",
+        "standard-telnetlib",
+        "ulid-transform",
+        "url-normalize",
+        "xmltodict"
+      ],
+      "enabled": true,
+      "labels": ["dependency"]
+    },
+    {
+      "description": "Home Assistant ecosystem packages (core-maintained, no cooldown)",
+      "matchPackageNames": [
+        "hassil",
+        "home-assistant-bluetooth",
+        "home-assistant-frontend",
+        "home-assistant-intents",
+        "infrared-protocols"
+      ],
+      "enabled": true,
+      "minimumReleaseAge": null,
+      "labels": ["dependency", "core"]
+    },
+    {
+      "description": "Test dependencies (allowlisted)",
+      "matchPackageNames": [
+        "pytest",
+        "pytest-asyncio",
+        "pytest-aiohttp",
+        "pytest-cov",
+        "pytest-freezer",
+        "pytest-github-actions-annotate-failures",
+        "pytest-socket",
+        "pytest-sugar",
+        "pytest-timeout",
+        "pytest-unordered",
+        "pytest-picked",
+        "pytest-xdist",
+        "pylint",
+        "pylint-per-file-ignores",
+        "astroid",
+        "coverage",
+        "freezegun",
+        "syrupy",
+        "respx",
+        "requests-mock",
+        "ruff",
+        "codespell",
+        "yamllint",
+        "zizmor"
+      ],
+      "enabled": true,
+      "labels": ["dependency"]
+    },
+    {
+      "description": "For types-* stubs, only allow patch updates. Major/minor bumps track the upstream runtime package version and must be manually coordinated with the corresponding pin.",
+      "matchPackageNames": ["/^types-/"],
+      "matchUpdateTypes": ["patch"],
+      "enabled": true,
+      "labels": ["dependency"]
+    },
+    {
+      "description": "Pre-commit hook repos (allowlisted, matched by owner/repo)",
+      "matchPackageNames": [
+        "astral-sh/ruff-pre-commit",
+        "codespell-project/codespell",
+        "adrienverge/yamllint",
+        "zizmorcore/zizmor-pre-commit"
+      ],
+      "enabled": true,
+      "labels": ["dependency"]
+    },
+    {
+      "description": "Group ruff pre-commit hook with its PyPI twin into one PR",
+      "matchPackageNames": ["astral-sh/ruff-pre-commit", "ruff"],
+      "groupName": "ruff",
+      "groupSlug": "ruff"
+    },
+    {
+      "description": "Group codespell pre-commit hook with its PyPI twin into one PR",
+      "matchPackageNames": ["codespell-project/codespell", "codespell"],
+      "groupName": "codespell",
+      "groupSlug": "codespell"
+    },
+    {
+      "description": "Group yamllint pre-commit hook with its PyPI twin into one PR",
+      "matchPackageNames": ["adrienverge/yamllint", "yamllint"],
+      "groupName": "yamllint",
+      "groupSlug": "yamllint"
+    },
+    {
+      "description": "Group zizmor pre-commit hook with its PyPI twin into one PR",
+      "matchPackageNames": ["zizmorcore/zizmor-pre-commit", "zizmor"],
+      "groupName": "zizmor",
+      "groupSlug": "zizmor"
+    },
+    {
+      "description": "Group pylint with astroid (their versions are linked and must move together)",
+      "matchPackageNames": ["pylint", "astroid"],
+      "groupName": "pylint",
+      "groupSlug": "pylint"
+    }
+  ]
+}

.github/workflows/builder.yml

@@ -47,10 +47,6 @@ jobs:
         with:
           python-version-file: ".python-version"
 
-      - name: Get information
-        id: info
-        uses: home-assistant/actions/helpers/info@master # zizmor: ignore[unpinned-uses]
-
       - name: Get version
         id: version
         uses: home-assistant/actions/helpers/version@master # zizmor: ignore[unpinned-uses]
@@ -112,7 +108,7 @@ jobs:
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+        uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/frontend
@@ -123,7 +119,7 @@ jobs:
 
       - name: Download nightly wheels of intents
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+        uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732 # v20
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: OHF-Voice/intents-package
@@ -342,19 +338,19 @@ jobs:
         registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
     steps:
       - name: Install Cosign
-        uses: sigstore/cosign-installer@ba7bc0a3fef59531c69a25acd34668d6d3fe6f22 # v4.1.0
+        uses: sigstore/cosign-installer@cad07c2e89fa2edd6e2d7bab4c1aa38e53f76003 # v4.1.1
         with:
           cosign-release: "v2.5.3"
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -503,7 +499,7 @@ jobs:
           python -m build
 
       - name: Upload package to PyPI
-        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
+        uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
         with:
           skip-existing: true
 
@@ -527,14 +523,14 @@ jobs:
           persist-credentials: false
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -547,7 +543,7 @@ jobs:
       - name: Push Docker image
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
         id: push
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile

.github/workflows/ci.yaml

@@ -50,9 +50,11 @@ env:
   # - 10.10.3 is the latest (as of 6 Feb 2023)
   # 10.11 is the latest long-term-support
   # - 10.11.2 is the version currently shipped with Synology (as of 11 Oct 2023)
+  # 11.4 is an LTS with support until May 2029
+  # - 11.4.9 is used in Alpine 3.23 (used in latest HA base images as of 11 Apr 2026)
   # mysql 8.0.32 does not always behave the same as MariaDB
   # and some queries that work on MariaDB do not work on MySQL
-  MARIADB_VERSIONS: "['mariadb:10.3.32','mariadb:10.6.10','mariadb:10.10.3','mariadb:10.11.2','mysql:8.0.32']"
+  MARIADB_VERSIONS: "['mariadb:10.3.32','mariadb:10.6.10','mariadb:10.10.3','mariadb:10.11.2','mariadb:11.4.9','mysql:8.0.32']"
   # 12 is the oldest supported version
   # - 12.14 is the latest (as of 9 Feb 2023)
   # 15 is the latest version
@@ -1062,7 +1064,9 @@ jobs:
           - 3306:3306
         env:
           MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping -uroot -ppassword" --health-interval=5s --health-timeout=2s --health-retries=3
+        options: >-
+          --health-cmd="if command -v mariadb-admin >/dev/null; then mariadb-admin ping -uroot -ppassword; else mysqladmin ping -uroot -ppassword; fi"
+          --health-interval=5s --health-timeout=2s --health-retries=3
     needs:
       - info
       - base
@@ -1392,7 +1396,7 @@ jobs:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
         with:
           fail_ci_if_error: true
           flags: full-suite
@@ -1563,7 +1567,7 @@ jobs:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }} # zizmor: ignore[secrets-outside-env]
@@ -1591,7 +1595,7 @@ jobs:
         with:
           pattern: test-results-*
       - name: Upload test results to Codecov
-        uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5.5.3
+        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
         with:
           report_type: test_results
           fail_ci_if_error: true

.github/workflows/codeql.yml

@@ -28,11 +28,11 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           category: "/language:python"

.gitignore

@@ -142,5 +142,6 @@ pytest_buckets.txt
 
 # AI tooling
 .claude/settings.local.json
+.claude/worktrees/
 .serena/
 

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: ruff-format
         files: ^((homeassistant|pylint|script|tests)/.+)?[^/]+\.(py|pyi)$
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
       - id: codespell
         args:
@@ -36,7 +36,7 @@ repos:
           - --branch=master
           - --branch=rc
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.37.1
+    rev: v1.38.0
     hooks:
       - id: yamllint
   - repo: https://github.com/rbubley/mirrors-prettier
@@ -87,6 +87,13 @@ repos:
         language: script
         types: [text]
         files: ^(homeassistant/.+/manifest\.json|homeassistant/brands/.+\.json|pyproject\.toml|\.pre-commit-config\.yaml|script/gen_requirements_all\.py)$
+      - id: gen_copilot_instructions
+        name: gen_copilot_instructions
+        entry: script/run-in-env.sh python3 -m script.gen_copilot_instructions
+        pass_filenames: false
+        language: script
+        types: [text]
+        files: ^(AGENTS\.md|\.claude/skills/(?!github-pr-reviewer/).+/SKILL\.md|\.github/copilot-instructions\.md|script/gen_copilot_instructions\.py)$
       - id: hassfest
         name: hassfest
         entry: script/run-in-env.sh python3 -m script.hassfest

.strict-typing

@@ -332,6 +332,7 @@ homeassistant.components.letpot.*
 homeassistant.components.lg_infrared.*
 homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
+homeassistant.components.liebherr.*
 homeassistant.components.lifx.*
 homeassistant.components.light.*
 homeassistant.components.linkplay.*

AGENTS.md

@@ -2,10 +2,9 @@
 
 This repository contains the core of Home Assistant, a Python 3 based home automation application.
 
-## Code Review Guidelines
+## Git Commit Guidelines
 
-**Git commit practices during review:**
-- **Do NOT amend, squash, or rebase commits after review has started** - Reviewers need to see what changed since their last review
+- **Do NOT amend, squash, or rebase commits that have already been pushed to the PR branch after the PR is opened** - Reviewers need to follow the commit history, as well as see what changed since their last review
 
 ## Development Commands
 

CODEOWNERS

@@ -37,6 +37,13 @@ build.json @home-assistant/supervisor
 # Other code
 /homeassistant/scripts/check_config.py @kellerza
 
+# Agent Configurations
+AGENTS.md @home-assistant/core
+CLAUDE.md @home-assistant/core
+/.agent/ @home-assistant/core
+/.claude/ @home-assistant/core
+/.gemini/ @home-assistant/core
+
 # Integrations
 /homeassistant/components/abode/ @shred86
 /tests/components/abode/ @shred86
@@ -355,6 +362,8 @@ build.json @home-assistant/supervisor
 /tests/components/deluge/ @tkdrob
 /homeassistant/components/demo/ @home-assistant/core
 /tests/components/demo/ @home-assistant/core
+/homeassistant/components/denon_rs232/ @balloob
+/tests/components/denon_rs232/ @balloob
 /homeassistant/components/denonavr/ @ol-iver @starkillerOG
 /tests/components/denonavr/ @ol-iver @starkillerOG
 /homeassistant/components/derivative/ @afaucogney @karwosts
@@ -411,6 +420,8 @@ build.json @home-assistant/supervisor
 /tests/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
 /homeassistant/components/duckdns/ @tr4nt0r
 /tests/components/duckdns/ @tr4nt0r
+/homeassistant/components/duco/ @ronaldvdmeer
+/tests/components/duco/ @ronaldvdmeer
 /homeassistant/components/duotecno/ @cereal2nd
 /tests/components/duotecno/ @cereal2nd
 /homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192
@@ -480,8 +491,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
 /homeassistant/components/ephember/ @ttroy50 @roberty99
-/homeassistant/components/epic_games_store/ @hacf-fr @Quentame
-/tests/components/epic_games_store/ @hacf-fr @Quentame
+/homeassistant/components/epic_games_store/ @Quentame
+/tests/components/epic_games_store/ @Quentame
 /homeassistant/components/epion/ @lhgravendeel
 /tests/components/epion/ @lhgravendeel
 /homeassistant/components/epson/ @pszafer
@@ -496,6 +507,8 @@ build.json @home-assistant/supervisor
 /tests/components/essent/ @jaapp
 /homeassistant/components/eufylife_ble/ @bdr99
 /tests/components/eufylife_ble/ @bdr99
+/homeassistant/components/eurotronic_cometblue/ @rikroe
+/tests/components/eurotronic_cometblue/ @rikroe
 /homeassistant/components/event/ @home-assistant/core
 /tests/components/event/ @home-assistant/core
 /homeassistant/components/evohome/ @zxdavb
@@ -555,8 +568,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/fortios/ @kimfrellsen
 /homeassistant/components/foscam/ @Foscam-wangzhengyu
 /tests/components/foscam/ @Foscam-wangzhengyu
-/homeassistant/components/freebox/ @hacf-fr @Quentame
-/tests/components/freebox/ @hacf-fr @Quentame
+/homeassistant/components/freebox/ @hacf-fr/reviewers @Quentame
+/tests/components/freebox/ @hacf-fr/reviewers @Quentame
 /homeassistant/components/freedompro/ @stefano055415
 /tests/components/freedompro/ @stefano055415
 /homeassistant/components/freshr/ @SierraNL
@@ -1046,8 +1059,8 @@ build.json @home-assistant/supervisor
 /tests/components/met/ @danielhiversen
 /homeassistant/components/met_eireann/ @DylanGore
 /tests/components/met_eireann/ @DylanGore
-/homeassistant/components/meteo_france/ @hacf-fr @oncleben31 @Quentame
-/tests/components/meteo_france/ @hacf-fr @oncleben31 @Quentame
+/homeassistant/components/meteo_france/ @hacf-fr/reviewers @oncleben31 @Quentame
+/tests/components/meteo_france/ @hacf-fr/reviewers @oncleben31 @Quentame
 /homeassistant/components/meteo_lt/ @xE1H
 /tests/components/meteo_lt/ @xE1H
 /homeassistant/components/meteoalarm/ @rolfberkenbosch
@@ -1139,8 +1152,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/netatmo/ @cgtobi
 /tests/components/netatmo/ @cgtobi
 /homeassistant/components/netdata/ @fabaff
-/homeassistant/components/netgear/ @hacf-fr @Quentame @starkillerOG
-/tests/components/netgear/ @hacf-fr @Quentame @starkillerOG
+/homeassistant/components/netgear/ @Quentame @starkillerOG
+/tests/components/netgear/ @Quentame @starkillerOG
 /homeassistant/components/netgear_lte/ @tkdrob
 /tests/components/netgear_lte/ @tkdrob
 /homeassistant/components/network/ @home-assistant/core
@@ -1256,8 +1269,8 @@ build.json @home-assistant/supervisor
 /tests/components/openuv/ @bachya
 /homeassistant/components/openweathermap/ @fabaff @freekode @nzapponi @wittypluck
 /tests/components/openweathermap/ @fabaff @freekode @nzapponi @wittypluck
-/homeassistant/components/opnsense/ @mtreinish
-/tests/components/opnsense/ @mtreinish
+/homeassistant/components/opnsense/ @HarlemSquirrel @Snuffy2
+/tests/components/opnsense/ @HarlemSquirrel @Snuffy2
 /homeassistant/components/opower/ @tronikos
 /tests/components/opower/ @tronikos
 /homeassistant/components/oralb/ @bdraco @Lash-L
@@ -1301,6 +1314,8 @@ build.json @home-assistant/supervisor
 /tests/components/pi_hole/ @shenxn
 /homeassistant/components/picnic/ @corneyl @codesalatdev
 /tests/components/picnic/ @corneyl @codesalatdev
+/homeassistant/components/picotts/ @rooggiieerr
+/tests/components/picotts/ @rooggiieerr
 /homeassistant/components/ping/ @jpbede
 /tests/components/ping/ @jpbede
 /homeassistant/components/plaato/ @JohNan
@@ -1681,8 +1696,8 @@ build.json @home-assistant/supervisor
 /tests/components/syncthing/ @zhulik
 /homeassistant/components/syncthru/ @nielstron
 /tests/components/syncthru/ @nielstron
-/homeassistant/components/synology_dsm/ @hacf-fr @Quentame @mib1185
-/tests/components/synology_dsm/ @hacf-fr @Quentame @mib1185
+/homeassistant/components/synology_dsm/ @Quentame @mib1185
+/tests/components/synology_dsm/ @Quentame @mib1185
 /homeassistant/components/synology_srm/ @aerialls
 /homeassistant/components/system_bridge/ @timmo001
 /tests/components/system_bridge/ @timmo001
@@ -1815,6 +1830,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/unifi_access/ @imhotep @RaHehl
 /tests/components/unifi_access/ @imhotep @RaHehl
 /homeassistant/components/unifi_direct/ @tofuSCHNITZEL
+/homeassistant/components/unifi_discovery/ @RaHehl
+/tests/components/unifi_discovery/ @RaHehl
 /homeassistant/components/unifiled/ @florisvdk
 /homeassistant/components/unifiprotect/ @RaHehl
 /tests/components/unifiprotect/ @RaHehl
@@ -1862,10 +1879,12 @@ build.json @home-assistant/supervisor
 /tests/components/version/ @ludeeus
 /homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
 /tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
-/homeassistant/components/vicare/ @CFenner
-/tests/components/vicare/ @CFenner
+/homeassistant/components/vicare/ @CFenner @lackas
+/tests/components/vicare/ @CFenner @lackas
 /homeassistant/components/victron_ble/ @rajlaud
 /tests/components/victron_ble/ @rajlaud
+/homeassistant/components/victron_gx/ @tomer-w
+/tests/components/victron_gx/ @tomer-w
 /homeassistant/components/victron_remote_monitoring/ @AndyTempel
 /tests/components/victron_remote_monitoring/ @AndyTempel
 /homeassistant/components/vilfo/ @ManneW

Dockerfile

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

homeassistant/auth/jwt_wrapper.py

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

homeassistant/brands/denon.json

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

homeassistant/brands/ubiquiti.json

@@ -6,6 +6,7 @@
     "unifi",
     "unifi_access",
     "unifi_direct",
+    "unifi_discovery",
     "unifiled",
     "unifiprotect"
   ]

homeassistant/brands/victron.json

@@ -1,5 +1,5 @@
 {
   "domain": "victron",
   "name": "Victron",
-  "integrations": ["victron_ble", "victron_remote_monitoring"]
+  "integrations": ["victron_gx", "victron_ble", "victron_remote_monitoring"]
 }

homeassistant/components/acer_projector/const.py

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

homeassistant/components/acer_projector/manifest.json

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

homeassistant/components/acer_projector/switch.py

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

homeassistant/components/actron_air/__init__.py

@@ -1,11 +1,7 @@
 """The Actron Air integration."""
 
-from actron_neo_api import (
-    ActronAirACSystem,
-    ActronAirAPI,
-    ActronAirAPIError,
-    ActronAirAuthError,
-)
+from actron_neo_api import ActronAirAPI, ActronAirAPIError, ActronAirAuthError
+from actron_neo_api.models.system import ActronAirSystemInfo
 
 from homeassistant.const import CONF_API_TOKEN, Platform
 from homeassistant.core import HomeAssistant
@@ -25,7 +21,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ActronAirConfigEntry) ->
     """Set up Actron Air integration from a config entry."""
 
     api = ActronAirAPI(refresh_token=entry.data[CONF_API_TOKEN])
-    systems: list[ActronAirACSystem] = []
+    systems: list[ActronAirSystemInfo] = []
 
     try:
         systems = await api.get_ac_systems()
@@ -36,14 +32,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: ActronAirConfigEntry) ->
             translation_key="auth_error",
         ) from err
     except ActronAirAPIError as err:
-        raise ConfigEntryNotReady from err
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="setup_connection_error",
+        ) from err
 
     system_coordinators: dict[str, ActronAirSystemCoordinator] = {}
     for system in systems:
         coordinator = ActronAirSystemCoordinator(hass, entry, api, system)
-        _LOGGER.debug("Setting up coordinator for system: %s", system["serial"])
+        _LOGGER.debug("Setting up coordinator for system: %s", system.serial)
         await coordinator.async_config_entry_first_refresh()
-        system_coordinators[system["serial"]] = coordinator
+        system_coordinators[system.serial] = coordinator
 
     entry.runtime_data = ActronAirRuntimeData(
         api=api,

homeassistant/components/actron_air/climate.py

@@ -18,7 +18,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ActronAirConfigEntry, ActronAirSystemCoordinator
-from .entity import ActronAirAcEntity, ActronAirZoneEntity, handle_actron_api_errors
+from .entity import ActronAirAcEntity, ActronAirZoneEntity, actron_air_command
 
 PARALLEL_UPDATES = 0
 
@@ -136,19 +136,19 @@ class ActronSystemClimate(ActronAirAcEntity, ActronAirClimateEntity):
         """Return the target temperature."""
         return self._status.user_aircon_settings.temperature_setpoint_cool_c
 
-    @handle_actron_api_errors
+    @actron_air_command
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set a new fan mode."""
         api_fan_mode = FAN_MODE_MAPPING_HA_TO_ACTRONAIR.get(fan_mode)
         await self._status.user_aircon_settings.set_fan_mode(api_fan_mode)
 
-    @handle_actron_api_errors
+    @actron_air_command
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set the HVAC mode."""
         ac_mode = HVAC_MODE_MAPPING_HA_TO_ACTRONAIR.get(hvac_mode)
         await self._status.ac_system.set_system_mode(ac_mode)
 
-    @handle_actron_api_errors
+    @actron_air_command
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set the temperature."""
         temp = kwargs.get(ATTR_TEMPERATURE)
@@ -212,13 +212,13 @@ class ActronZoneClimate(ActronAirZoneEntity, ActronAirClimateEntity):
         """Return the target temperature."""
         return self._zone.temperature_setpoint_cool_c
 
-    @handle_actron_api_errors
+    @actron_air_command
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set the HVAC mode."""
         is_enabled = hvac_mode != HVACMode.OFF
         await self._zone.enable(is_enabled)
 
-    @handle_actron_api_errors
+    @actron_air_command
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set the temperature."""
         await self._zone.set_temperature(temperature=kwargs.get(ATTR_TEMPERATURE))

homeassistant/components/actron_air/config_flow.py

@@ -38,10 +38,10 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):
                 _LOGGER.error("OAuth2 flow failed: %s", err)
                 return self.async_abort(reason="oauth2_error")
 
-            self._device_code = device_code_response["device_code"]
-            self._user_code = device_code_response["user_code"]
-            self._verification_uri = device_code_response["verification_uri_complete"]
-            self._expires_minutes = str(device_code_response["expires_in"] // 60)
+            self._device_code = device_code_response.device_code
+            self._user_code = device_code_response.user_code
+            self._verification_uri = device_code_response.verification_uri_complete
+            self._expires_minutes = str(device_code_response.expires_in // 60)
 
         async def _wait_for_authorization() -> None:
             """Wait for the user to authorize the device."""

homeassistant/components/actron_air/coordinator.py

@@ -6,12 +6,12 @@ from dataclasses import dataclass
 from datetime import timedelta
 
 from actron_neo_api import (
-    ActronAirACSystem,
     ActronAirAPI,
     ActronAirAPIError,
     ActronAirAuthError,
     ActronAirStatus,
 )
+from actron_neo_api.models.system import ActronAirSystemInfo
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -38,7 +38,7 @@ class ActronAirRuntimeData:
 type ActronAirConfigEntry = ConfigEntry[ActronAirRuntimeData]
 
 
-class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirACSystem]):
+class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirStatus]):
     """System coordinator for Actron Air integration."""
 
     def __init__(
@@ -46,7 +46,7 @@ class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirACSystem]):
         hass: HomeAssistant,
         entry: ActronAirConfigEntry,
         api: ActronAirAPI,
-        system: ActronAirACSystem,
+        system: ActronAirSystemInfo,
     ) -> None:
         """Initialize the coordinator."""
         super().__init__(
@@ -57,7 +57,7 @@ class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirACSystem]):
             config_entry=entry,
         )
         self.system = system
-        self.serial_number = system["serial"]
+        self.serial_number = system.serial
         self.api = api
         self.status = self.api.state_manager.get_status(self.serial_number)
         self.last_seen = dt_util.utcnow()

homeassistant/components/actron_air/diagnostics.py

@@ -0,0 +1,35 @@
+"""Diagnostics support for Actron Air."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_API_TOKEN
+from homeassistant.core import HomeAssistant
+
+from .coordinator import ActronAirConfigEntry
+
+TO_REDACT = {CONF_API_TOKEN, "master_serial", "serial_number", "serial"}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant,
+    entry: ActronAirConfigEntry,
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinators: dict[int, Any] = {}
+    for idx, coordinator in enumerate(entry.runtime_data.system_coordinators.values()):
+        coordinators[idx] = {
+            "system": async_redact_data(
+                coordinator.system.model_dump(mode="json"), TO_REDACT
+            ),
+            "status": async_redact_data(
+                coordinator.data.model_dump(mode="json", exclude={"last_known_state"}),
+                TO_REDACT,
+            ),
+        }
+    return {
+        "entry_data": async_redact_data(entry.data, TO_REDACT),
+        "coordinators": coordinators,
+    }

homeassistant/components/actron_air/entity.py

@@ -14,10 +14,14 @@ from .const import DOMAIN
 from .coordinator import ActronAirSystemCoordinator
 
 
-def handle_actron_api_errors[_EntityT: ActronAirEntity, **_P](
+def actron_air_command[_EntityT: ActronAirEntity, **_P](
     func: Callable[Concatenate[_EntityT, _P], Coroutine[Any, Any, Any]],
 ) -> Callable[Concatenate[_EntityT, _P], Coroutine[Any, Any, None]]:
-    """Decorate Actron Air API calls to handle ActronAirAPIError exceptions."""
+    """Decorator for Actron Air API calls.
+
+    Handles ActronAirAPIError exceptions, and requests a coordinator update
+    to update the status of the devices as soon as possible.
+    """
 
     @wraps(func)
     async def wrapper(self: _EntityT, *args: _P.args, **kwargs: _P.kwargs) -> None:
@@ -30,6 +34,7 @@ def handle_actron_api_errors[_EntityT: ActronAirEntity, **_P](
                 translation_key="api_error",
                 translation_placeholders={"error": str(err)},
             ) from err
+        self.coordinator.async_set_updated_data(self.coordinator.data)
 
     return wrapper
 

homeassistant/components/actron_air/manifest.json

@@ -13,5 +13,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "quality_scale": "silver",
-  "requirements": ["actron-neo-api==0.4.1"]
+  "requirements": ["actron-neo-api==0.5.0"]
 }

homeassistant/components/actron_air/quality_scale.yaml

@@ -41,7 +41,7 @@ rules:
 
   # Gold
   devices: done
-  diagnostics: todo
+  diagnostics: done
   discovery-update-info:
     status: exempt
     comment: This integration uses DHCP discovery, however is cloud polling. Therefore there is no information to update.
@@ -54,18 +54,12 @@ rules:
   docs-troubleshooting: done
   docs-use-cases: done
   dynamic-devices: todo
-  entity-category:
-    status: exempt
-    comment: This integration does not use entity categories.
-  entity-device-class:
-    status: exempt
-    comment: This integration does not use entity device classes.
-  entity-disabled-by-default:
-    status: exempt
-    comment: Not required for this integration at this stage.
-  entity-translations: todo
-  exception-translations: todo
-  icon-translations: todo
+  entity-category: done
+  entity-device-class: todo
+  entity-disabled-by-default: todo
+  entity-translations: done
+  exception-translations: done
+  icon-translations: done
   reconfiguration-flow: todo
   repair-issues:
     status: exempt

homeassistant/components/actron_air/strings.json

@@ -55,6 +55,9 @@
     "auth_error": {
       "message": "Authentication failed, please reauthenticate"
     },
+    "setup_connection_error": {
+      "message": "Failed to connect to the Actron Air API"
+    },
     "update_error": {
       "message": "An error occurred while retrieving data from the Actron Air API: {error}"
     }

homeassistant/components/actron_air/switch.py

@@ -10,7 +10,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .coordinator import ActronAirConfigEntry, ActronAirSystemCoordinator
-from .entity import ActronAirAcEntity, handle_actron_api_errors
+from .entity import ActronAirAcEntity, actron_air_command
 
 PARALLEL_UPDATES = 0
 
@@ -105,12 +105,12 @@ class ActronAirSwitch(ActronAirAcEntity, SwitchEntity):
         """Return true if the switch is on."""
         return self.entity_description.is_on_fn(self.coordinator)
 
-    @handle_actron_api_errors
+    @actron_air_command
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the switch on."""
         await self.entity_description.set_fn(self.coordinator, True)
 
-    @handle_actron_api_errors
+    @actron_air_command
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the switch off."""
         await self.entity_description.set_fn(self.coordinator, False)

homeassistant/components/ai_task/task.py

@@ -74,7 +74,8 @@ async def _resolve_attachments(
             resolved_attachments.append(
                 conversation.Attachment(
                     media_content_id=media_content_id,
-                    mime_type=image_data.content_type,
+                    mime_type=attachment.get("media_content_type")
+                    or image_data.content_type,
                     path=temp_filename,
                 )
             )
@@ -89,7 +90,7 @@ async def _resolve_attachments(
             resolved_attachments.append(
                 conversation.Attachment(
                     media_content_id=media_content_id,
-                    mime_type=media.mime_type,
+                    mime_type=attachment.get("media_content_type") or media.mime_type,
                     path=media.path,
                 )
             )

homeassistant/components/air_quality/strings.json

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

homeassistant/components/air_quality/triggers.yaml

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

homeassistant/components/alarm_control_panel/strings.json

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

homeassistant/components/alarm_control_panel/triggers.yaml

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

homeassistant/components/alexa_devices/coordinator.py

@@ -54,7 +54,16 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
             entry.data[CONF_PASSWORD],
             entry.data[CONF_LOGIN_DATA],
         )
-        self.previous_devices: set[str] = set()
+        device_registry = dr.async_get(hass)
+        self.previous_devices: set[str] = {
+            identifier
+            for device in device_registry.devices.get_devices_for_config_entry_id(
+                entry.entry_id
+            )
+            if device.entry_type != dr.DeviceEntryType.SERVICE
+            for identifier_domain, identifier in device.identifiers
+            if identifier_domain == DOMAIN
+        }
 
     async def _async_update_data(self) -> dict[str, AmazonDevice]:
         """Update device data."""

homeassistant/components/alexa_devices/manifest.json

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

homeassistant/components/anglian_water/coordinator.py

@@ -92,6 +92,7 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                 _LOGGER.debug("Updating statistics for the first time")
                 usage_sum = 0.0
                 last_stats_time = None
+                allow_update_last_stored_hour = False
             else:
                 if not meter.readings or len(meter.readings) == 0:
                     _LOGGER.debug("No recent usage statistics found, skipping update")
@@ -107,6 +108,7 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                     continue
                 start = dt_util.as_local(parsed_read_at) - timedelta(hours=1)
                 _LOGGER.debug("Getting statistics at %s", start)
+                stats: dict[str, list[Any]] = {}
                 for end in (start + timedelta(seconds=1), None):
                     stats = await get_instance(self.hass).async_add_executor_job(
                         statistics_during_period,
@@ -127,15 +129,28 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                             "Not found, trying to find oldest statistic after %s",
                             start,
                         )
-                assert stats
 
-                def _safe_get_sum(records: list[Any]) -> float:
-                    if records and "sum" in records[0]:
-                        return float(records[0]["sum"])
-                    return 0.0
+                if not stats or not stats.get(usage_statistic_id):
+                    _LOGGER.debug(
+                        "Could not find existing statistics during period lookup for %s, "
+                        "falling back to last stored statistic",
+                        usage_statistic_id,
+                    )
+                    allow_update_last_stored_hour = True
+                    last_records = last_stat[usage_statistic_id]
+                    usage_sum = float(last_records[0].get("sum") or 0.0)
+                    last_stats_time = last_records[0]["start"]
+                else:
+                    allow_update_last_stored_hour = False
+                    records = stats[usage_statistic_id]
 
-                usage_sum = _safe_get_sum(stats.get(usage_statistic_id, []))
-                last_stats_time = stats[usage_statistic_id][0]["start"]
+                    def _safe_get_sum(records: list[Any]) -> float:
+                        if records and "sum" in records[0]:
+                            return float(records[0]["sum"])
+                        return 0.0
+
+                    usage_sum = _safe_get_sum(records)
+                    last_stats_time = records[0]["start"]
 
             usage_statistics = []
 
@@ -148,7 +163,13 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
                     )
                     continue
                 start = dt_util.as_local(parsed_read_at) - timedelta(hours=1)
-                if last_stats_time is not None and start.timestamp() <= last_stats_time:
+                if last_stats_time is not None and (
+                    start.timestamp() < last_stats_time
+                    or (
+                        start.timestamp() == last_stats_time
+                        and not allow_update_last_stored_hour
+                    )
+                ):
                     continue
                 usage_state = max(0, read["consumption"] / 1000)
                 usage_sum = max(0, read["read"])

homeassistant/components/anthropic/__init__.py

@@ -37,6 +37,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AnthropicConfigEntry) ->
     coordinator = AnthropicCoordinator(hass, entry)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
+    LOGGER.debug("Available models: %s", coordinator.data)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 

homeassistant/components/anthropic/config_flow.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 from collections.abc import Mapping
 import json
 import logging
-import re
 from typing import TYPE_CHECKING, Any, cast
 
 import anthropic
@@ -48,10 +47,12 @@ from .const import (
     CONF_CODE_EXECUTION,
     CONF_MAX_TOKENS,
     CONF_PROMPT,
+    CONF_PROMPT_CACHING,
     CONF_RECOMMENDED,
     CONF_TEMPERATURE,
     CONF_THINKING_BUDGET,
     CONF_THINKING_EFFORT,
+    CONF_TOOL_SEARCH,
     CONF_WEB_SEARCH,
     CONF_WEB_SEARCH_CITY,
     CONF_WEB_SEARCH_COUNTRY,
@@ -65,8 +66,11 @@ from .const import (
     DOMAIN,
     NON_ADAPTIVE_THINKING_MODELS,
     NON_THINKING_MODELS,
+    TOOL_SEARCH_UNSUPPORTED_MODELS,
     WEB_SEARCH_UNSUPPORTED_MODELS,
+    PromptCaching,
 )
+from .coordinator import model_alias
 
 if TYPE_CHECKING:
     from . import AnthropicConfigEntry
@@ -101,34 +105,6 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None:
     await client.models.list(timeout=10.0)
 
 
-async def get_model_list(client: anthropic.AsyncAnthropic) -> list[SelectOptionDict]:
-    """Get list of available models."""
-    try:
-        models = (await client.models.list()).data
-    except anthropic.AnthropicError:
-        models = []
-    _LOGGER.debug("Available models: %s", models)
-    model_options: list[SelectOptionDict] = []
-    short_form = re.compile(r"[^\d]-\d$")
-    for model_info in models:
-        # Resolve alias from versioned model name:
-        model_alias = (
-            model_info.id[:-9]
-            if model_info.id != "claude-3-haiku-20240307"
-            and model_info.id[-2:-1] != "-"
-            else model_info.id
-        )
-        if short_form.search(model_alias):
-            model_alias += "-0"
-        model_options.append(
-            SelectOptionDict(
-                label=model_info.display_name,
-                value=model_alias,
-            )
-        )
-    return model_options
-
-
 class AnthropicConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Anthropic."""
 
@@ -225,6 +201,7 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
     """Flow for managing conversation subentries."""
 
     options: dict[str, Any]
+    model_info: anthropic.types.ModelInfo
 
     @property
     def _is_new(self) -> bool:
@@ -338,15 +315,14 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
     ) -> SubentryFlowResult:
         """Manage advanced options."""
         errors: dict[str, str] = {}
+        description_placeholders: dict[str, str] = {}
 
         step_schema: VolDictType = {
             vol.Optional(
                 CONF_CHAT_MODEL,
                 default=DEFAULT[CONF_CHAT_MODEL],
             ): SelectSelector(
-                SelectSelectorConfig(
-                    options=await self._get_model_list(), custom_value=True
-                )
+                SelectSelectorConfig(options=self._get_model_list(), custom_value=True)
             ),
             vol.Optional(
                 CONF_MAX_TOKENS,
@@ -356,11 +332,40 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
                 CONF_TEMPERATURE,
                 default=DEFAULT[CONF_TEMPERATURE],
             ): NumberSelector(NumberSelectorConfig(min=0, max=1, step=0.05)),
+            vol.Optional(
+                CONF_PROMPT_CACHING,
+                default=DEFAULT[CONF_PROMPT_CACHING],
+            ): SelectSelector(
+                SelectSelectorConfig(
+                    options=[x.value for x in PromptCaching],
+                    translation_key=CONF_PROMPT_CACHING,
+                    mode=SelectSelectorMode.DROPDOWN,
+                )
+            ),
         }
 
         if user_input is not None:
             self.options.update(user_input)
 
+            coordinator = self._get_entry().runtime_data
+            self.model_info, status = coordinator.get_model_info(
+                self.options[CONF_CHAT_MODEL]
+            )
+            if not status:
+                # Couldn't find the model in the cached list, try to fetch it directly
+                client = coordinator.client
+                try:
+                    self.model_info = await client.models.retrieve(
+                        self.options[CONF_CHAT_MODEL], timeout=10.0
+                    )
+                except anthropic.NotFoundError:
+                    errors[CONF_CHAT_MODEL] = "model_not_found"
+                except anthropic.AnthropicError as err:
+                    errors[CONF_CHAT_MODEL] = "api_error"
+                    description_placeholders["message"] = (
+                        err.message if isinstance(err, anthropic.APIError) else str(err)
+                    )
+
             if not errors:
                 return await self.async_step_model()
 
@@ -370,6 +375,7 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
                 vol.Schema(step_schema), self.options
             ),
             errors=errors,
+            description_placeholders=description_placeholders,
         )
 
     async def async_step_model(
@@ -454,6 +460,16 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
         self.options.pop(CONF_WEB_SEARCH_COUNTRY, None)
         self.options.pop(CONF_WEB_SEARCH_TIMEZONE, None)
 
+        if not model.startswith(tuple(TOOL_SEARCH_UNSUPPORTED_MODELS)):
+            step_schema[
+                vol.Optional(
+                    CONF_TOOL_SEARCH,
+                    default=DEFAULT[CONF_TOOL_SEARCH],
+                )
+            ] = bool
+        else:
+            self.options.pop(CONF_TOOL_SEARCH, None)
+
         if not step_schema:
             user_input = {}
 
@@ -489,13 +505,16 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
             last_step=True,
         )
 
-    async def _get_model_list(self) -> list[SelectOptionDict]:
+    def _get_model_list(self) -> list[SelectOptionDict]:
         """Get list of available models."""
-        client = anthropic.AsyncAnthropic(
-            api_key=self._get_entry().data[CONF_API_KEY],
-            http_client=get_async_client(self.hass),
-        )
-        return await get_model_list(client)
+        coordinator = self._get_entry().runtime_data
+        return [
+            SelectOptionDict(
+                label=model_info.display_name,
+                value=model_alias(model_info.id),
+            )
+            for model_info in coordinator.data or []
+        ]
 
     async def _get_location_data(self) -> dict[str, str]:
         """Get approximate location data of the user."""

homeassistant/components/anthropic/const.py

@@ -1,5 +1,6 @@
 """Constants for the Anthropic integration."""
 
+from enum import StrEnum
 import logging
 
 DOMAIN = "anthropic"
@@ -13,9 +14,11 @@ CONF_PROMPT = "prompt"
 CONF_CHAT_MODEL = "chat_model"
 CONF_CODE_EXECUTION = "code_execution"
 CONF_MAX_TOKENS = "max_tokens"
+CONF_PROMPT_CACHING = "prompt_caching"
 CONF_TEMPERATURE = "temperature"
 CONF_THINKING_BUDGET = "thinking_budget"
 CONF_THINKING_EFFORT = "thinking_effort"
+CONF_TOOL_SEARCH = "tool_search"
 CONF_WEB_SEARCH = "web_search"
 CONF_WEB_SEARCH_USER_LOCATION = "user_location"
 CONF_WEB_SEARCH_MAX_USES = "web_search_max_uses"
@@ -24,20 +27,31 @@ CONF_WEB_SEARCH_REGION = "region"
 CONF_WEB_SEARCH_COUNTRY = "country"
 CONF_WEB_SEARCH_TIMEZONE = "timezone"
 
+
+class PromptCaching(StrEnum):
+    """Prompt caching options."""
+
+    OFF = "off"
+    PROMPT = "prompt"
+    AUTOMATIC = "automatic"
+
+
+MIN_THINKING_BUDGET = 1024
+
 DEFAULT = {
     CONF_CHAT_MODEL: "claude-haiku-4-5",
     CONF_CODE_EXECUTION: False,
     CONF_MAX_TOKENS: 3000,
+    CONF_PROMPT_CACHING: PromptCaching.PROMPT.value,
     CONF_TEMPERATURE: 1.0,
-    CONF_THINKING_BUDGET: 0,
+    CONF_THINKING_BUDGET: MIN_THINKING_BUDGET,
     CONF_THINKING_EFFORT: "low",
+    CONF_TOOL_SEARCH: False,
     CONF_WEB_SEARCH: False,
     CONF_WEB_SEARCH_USER_LOCATION: False,
     CONF_WEB_SEARCH_MAX_USES: 5,
 }
 
-MIN_THINKING_BUDGET = 1024
-
 NON_THINKING_MODELS = [
     "claude-3-haiku",
 ]
@@ -81,6 +95,11 @@ PROGRAMMATIC_TOOL_CALLING_UNSUPPORTED_MODELS = [
     "claude-3-haiku",
 ]
 
+TOOL_SEARCH_UNSUPPORTED_MODELS = [
+    "claude-3",
+    "claude-haiku",
+]
+
 DEPRECATED_MODELS = [
     "claude-3",
 ]

homeassistant/components/anthropic/coordinator.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from datetime import timedelta
+import datetime
+import re
 
 import anthropic
 
@@ -15,13 +16,28 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DOMAIN, LOGGER
 
-UPDATE_INTERVAL_CONNECTED = timedelta(hours=12)
-UPDATE_INTERVAL_DISCONNECTED = timedelta(minutes=1)
+UPDATE_INTERVAL_CONNECTED = datetime.timedelta(hours=12)
+UPDATE_INTERVAL_DISCONNECTED = datetime.timedelta(minutes=1)
 
 type AnthropicConfigEntry = ConfigEntry[AnthropicCoordinator]
 
 
-class AnthropicCoordinator(DataUpdateCoordinator[None]):
+_model_short_form = re.compile(r"[^\d]-\d$")
+
+
+@callback
+def model_alias(model_id: str) -> str:
+    """Resolve alias from versioned model name."""
+    if model_id == "claude-3-haiku-20240307" or model_id.endswith("-preview"):
+        return model_id
+    if model_id[-2:-1] != "-":
+        model_id = model_id[:-9]
+    if _model_short_form.search(model_id):
+        return model_id + "-0"
+    return model_id
+
+
+class AnthropicCoordinator(DataUpdateCoordinator[list[anthropic.types.ModelInfo]]):
     """DataUpdateCoordinator which uses different intervals after successful and unsuccessful updates."""
 
     client: anthropic.AsyncAnthropic
@@ -42,16 +58,16 @@ class AnthropicCoordinator(DataUpdateCoordinator[None]):
         )
 
     @callback
-    def async_set_updated_data(self, data: None) -> None:
+    def async_set_updated_data(self, data: list[anthropic.types.ModelInfo]) -> None:
         """Manually update data, notify listeners and update refresh interval."""
         self.update_interval = UPDATE_INTERVAL_CONNECTED
         super().async_set_updated_data(data)
 
-    async def async_update_data(self) -> None:
+    async def async_update_data(self) -> list[anthropic.types.ModelInfo]:
         """Fetch data from the API."""
         try:
             self.update_interval = UPDATE_INTERVAL_DISCONNECTED
-            await self.client.models.list(timeout=10.0)
+            result = await self.client.models.list(timeout=10.0)
             self.update_interval = UPDATE_INTERVAL_CONNECTED
         except anthropic.APITimeoutError as err:
             raise TimeoutError(err.message or str(err)) from err
@@ -67,6 +83,7 @@ class AnthropicCoordinator(DataUpdateCoordinator[None]):
                 translation_key="api_error",
                 translation_placeholders={"message": err.message},
             ) from err
+        return result.data
 
     def mark_connection_error(self) -> None:
         """Mark the connection as having an error and reschedule background check."""
@@ -76,3 +93,23 @@ class AnthropicCoordinator(DataUpdateCoordinator[None]):
             self.async_update_listeners()
             if self._listeners and not self.hass.is_stopping:
                 self._schedule_refresh()
+
+    @callback
+    def get_model_info(self, model_id: str) -> tuple[anthropic.types.ModelInfo, bool]:
+        """Get model info for a given model ID."""
+        # First try: exact name match
+        for model in self.data or []:
+            if model.id == model_id:
+                return model, True
+        # Second try: match by alias
+        alias = model_alias(model_id)
+        for model in self.data or []:
+            if model_alias(model.id) == alias:
+                return model, True
+        # Model not found, return safe defaults
+        return anthropic.types.ModelInfo(
+            type="model",
+            id=model_id,
+            created_at=datetime.datetime(1970, 1, 1, tzinfo=datetime.UTC),
+            display_name=alias,
+        ), False

homeassistant/components/anthropic/entity.py

@@ -58,6 +58,8 @@ from anthropic.types import (
     ToolChoiceAutoParam,
     ToolChoiceToolParam,
     ToolParam,
+    ToolSearchToolBm25_20251119Param,
+    ToolSearchToolResultBlock,
     ToolUnionParam,
     ToolUseBlock,
     ToolUseBlockParam,
@@ -74,6 +76,9 @@ from anthropic.types.message_create_params import MessageCreateParamsStreaming
 from anthropic.types.text_editor_code_execution_tool_result_block_param import (
     Content as TextEditorCodeExecutionToolResultBlockParamContentParam,
 )
+from anthropic.types.tool_search_tool_result_block_param import (
+    Content as ToolSearchToolResultBlockParamContentParam,
+)
 import voluptuous as vol
 from voluptuous_openapi import convert
 
@@ -91,9 +96,11 @@ from .const import (
     CONF_CHAT_MODEL,
     CONF_CODE_EXECUTION,
     CONF_MAX_TOKENS,
+    CONF_PROMPT_CACHING,
     CONF_TEMPERATURE,
     CONF_THINKING_BUDGET,
     CONF_THINKING_EFFORT,
+    CONF_TOOL_SEARCH,
     CONF_WEB_SEARCH,
     CONF_WEB_SEARCH_CITY,
     CONF_WEB_SEARCH_COUNTRY,
@@ -109,6 +116,7 @@ from .const import (
     NON_THINKING_MODELS,
     PROGRAMMATIC_TOOL_CALLING_UNSUPPORTED_MODELS,
     UNSUPPORTED_STRUCTURED_OUTPUT_MODELS,
+    PromptCaching,
 )
 from .coordinator import AnthropicConfigEntry, AnthropicCoordinator
 
@@ -202,7 +210,7 @@ class ContentDetails:
         ]
 
 
-def _convert_content(
+def _convert_content(  # noqa: C901
     chat_content: Iterable[conversation.Content],
 ) -> tuple[list[MessageParam], str | None]:
     """Transform HA chat_log content into Anthropic API format."""
@@ -255,6 +263,15 @@ def _convert_content(
                         content.tool_result,
                     ),
                 }
+            elif content.tool_name == "tool_search":
+                tool_result_block = {
+                    "type": "tool_search_tool_result",
+                    "tool_use_id": content.tool_call_id,
+                    "content": cast(
+                        ToolSearchToolResultBlockParamContentParam,
+                        content.tool_result,
+                    ),
+                }
             else:
                 tool_result_block = {
                     "type": "tool_result",
@@ -385,6 +402,7 @@ def _convert_content(
                                     "code_execution",
                                     "bash_code_execution",
                                     "text_editor_code_execution",
+                                    "tool_search_tool_bm25",
                                 ],
                                 tool_call.tool_name,
                             ),
@@ -397,6 +415,7 @@ def _convert_content(
                             "code_execution",
                             "bash_code_execution",
                             "text_editor_code_execution",
+                            "tool_search_tool_bm25",
                         ]
                         else ToolUseBlockParam(
                             type="tool_use",
@@ -558,6 +577,7 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                     CodeExecutionToolResultBlock,
                     BashCodeExecutionToolResultBlock,
                     TextEditorCodeExecutionToolResultBlock,
+                    ToolSearchToolResultBlock,
                 ),
             ):
                 if content_details:
@@ -669,16 +689,21 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
         super().__init__(entry.runtime_data)
         self.entry = entry
         self.subentry = subentry
+        coordinator = entry.runtime_data
+        self.model_info, _ = coordinator.get_model_info(
+            subentry.data.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL])
+        )
         self._attr_unique_id = subentry.subentry_id
         self._attr_device_info = dr.DeviceInfo(
             identifiers={(DOMAIN, subentry.subentry_id)},
             name=subentry.title,
             manufacturer="Anthropic",
-            model=subentry.data.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL]),
+            model=self.model_info.display_name,
+            model_id=self.model_info.id,
             entry_type=dr.DeviceEntryType.SERVICE,
         )
 
-    async def _async_handle_chat_log(
+    async def _async_handle_chat_log(  # noqa: C901
         self,
         chat_log: conversation.ChatLog,
         structure_name: str | None = None,
@@ -688,21 +713,20 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
         """Generate an answer for the chat log."""
         options = self.subentry.data
 
+        preloaded_tools = [
+            "HassTurnOn",
+            "HassTurnOff",
+            "GetLiveContext",
+            "code_execution",
+            "web_search",
+        ]
+
         system = chat_log.content[0]
         if not isinstance(system, conversation.SystemContent):
             raise HomeAssistantError(
                 translation_domain=DOMAIN, translation_key="system_message_not_found"
             )
 
-        # System prompt with caching enabled
-        system_prompt: list[TextBlockParam] = [
-            TextBlockParam(
-                type="text",
-                text=system.content,
-                cache_control={"type": "ephemeral"},
-            )
-        ]
-
         messages, container_id = _convert_content(chat_log.content[1:])
 
         model = options.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL])
@@ -711,11 +735,28 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
             model=model,
             messages=messages,
             max_tokens=options.get(CONF_MAX_TOKENS, DEFAULT[CONF_MAX_TOKENS]),
-            system=system_prompt,
+            system=system.content,
             stream=True,
             container=container_id,
         )
 
+        if (
+            options.get(CONF_PROMPT_CACHING, DEFAULT[CONF_PROMPT_CACHING])
+            == PromptCaching.PROMPT
+        ):
+            model_args["system"] = [
+                {
+                    "type": "text",
+                    "text": system.content,
+                    "cache_control": {"type": "ephemeral"},
+                }
+            ]
+        elif (
+            options.get(CONF_PROMPT_CACHING, DEFAULT[CONF_PROMPT_CACHING])
+            == PromptCaching.AUTOMATIC
+        ):
+            model_args["cache_control"] = {"type": "ephemeral"}
+
         if not model.startswith(tuple(NON_ADAPTIVE_THINKING_MODELS)):
             thinking_effort = options.get(
                 CONF_THINKING_EFFORT, DEFAULT[CONF_THINKING_EFFORT]
@@ -874,8 +915,23 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                         ),
                     )
                 )
+                preloaded_tools.append(structure_name)
 
         if tools:
+            if (
+                options.get(CONF_TOOL_SEARCH, DEFAULT[CONF_TOOL_SEARCH])
+                and len(tools) > len(preloaded_tools) + 1
+            ):
+                for tool in tools:
+                    if not tool["name"].endswith(tuple(preloaded_tools)):
+                        tool["defer_loading"] = True
+                tools.append(
+                    ToolSearchToolBm25_20251119Param(
+                        type="tool_search_tool_bm25_20251119",
+                        name="tool_search_tool_bm25",
+                    )
+                )
+
             model_args["tools"] = tools
 
         coordinator = self.entry.runtime_data
@@ -918,7 +974,8 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                 ) from err
             except anthropic.AnthropicError as err:
                 # Non-connection error, mark connection as healthy
-                coordinator.async_set_updated_data(None)
+                coordinator.async_set_updated_data(coordinator.data)
+                LOGGER.error("Error while talking to Anthropic: %s", err)
                 raise HomeAssistantError(
                     translation_domain=DOMAIN,
                     translation_key="api_error",
@@ -930,7 +987,7 @@ class AnthropicBaseLLMEntity(CoordinatorEntity[AnthropicCoordinator]):
                 ) from err
 
             if not chat_log.unresponded_tool_results:
-                coordinator.async_set_updated_data(None)
+                coordinator.async_set_updated_data(coordinator.data)
                 break
 
 

homeassistant/components/anthropic/manifest.json

@@ -8,6 +8,6 @@
   "documentation": "https://www.home-assistant.io/integrations/anthropic",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "quality_scale": "bronze",
-  "requirements": ["anthropic==0.83.0"]
+  "quality_scale": "silver",
+  "requirements": ["anthropic==0.92.0"]
 }

homeassistant/components/anthropic/quality_scale.yaml

@@ -81,7 +81,10 @@ rules:
     status: exempt
     comment: |
       No entities disabled by default.
-  entity-translations: todo
+  entity-translations:
+    status: exempt
+    comment: |
+      Entities explicitly set `_attr_name` to `None`, so entity name translations are not used.
   exception-translations: done
   icon-translations: done
   reconfiguration-flow: done

homeassistant/components/anthropic/repairs.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from collections.abc import Iterator
 from typing import TYPE_CHECKING
 
+import anthropic
 import voluptuous as vol
 
 from homeassistant import data_entry_flow
@@ -18,8 +19,8 @@ from homeassistant.helpers.selector import (
     SelectSelectorConfig,
 )
 
-from .config_flow import get_model_list
 from .const import CONF_CHAT_MODEL, DEPRECATED_MODELS, DOMAIN
+from .coordinator import model_alias
 
 if TYPE_CHECKING:
     from . import AnthropicConfigEntry
@@ -61,7 +62,7 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
             client = entry.runtime_data.client
             model_list = [
                 model_option
-                for model_option in await get_model_list(client)
+                for model_option in await self.get_model_list(client)
                 if not model_option["value"].startswith(tuple(DEPRECATED_MODELS))
             ]
             self._model_list_cache[entry.entry_id] = model_list
@@ -107,6 +108,22 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
             },
         )
 
+    async def get_model_list(
+        self, client: anthropic.AsyncAnthropic
+    ) -> list[SelectOptionDict]:
+        """Get list of available models."""
+        try:
+            models = (await client.models.list(timeout=10.0)).data
+        except anthropic.AnthropicError:
+            models = []
+        return [
+            SelectOptionDict(
+                label=model_info.display_name,
+                value=model_alias(model_info.id),
+            )
+            for model_info in models
+        ]
+
     def _iter_deprecated_subentries(self) -> Iterator[tuple[str, str]]:
         """Yield entry/subentry pairs that use deprecated models."""
         for entry in self.hass.config_entries.async_entries(DOMAIN):

homeassistant/components/anthropic/strings.json

@@ -38,6 +38,10 @@
         "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
       },
       "entry_type": "AI task",
+      "error": {
+        "api_error": "[%key:component::anthropic::config_subentries::conversation::error::api_error%]",
+        "model_not_found": "[%key:component::anthropic::config_subentries::conversation::error::model_not_found%]"
+      },
       "initiate_flow": {
         "reconfigure": "Reconfigure AI task",
         "user": "Add AI task"
@@ -47,11 +51,13 @@
           "data": {
             "chat_model": "[%key:common::generic::model%]",
             "max_tokens": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data::max_tokens%]",
+            "prompt_caching": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data::prompt_caching%]",
             "temperature": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data::temperature%]"
           },
           "data_description": {
             "chat_model": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::chat_model%]",
             "max_tokens": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::max_tokens%]",
+            "prompt_caching": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::prompt_caching%]",
             "temperature": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::temperature%]"
           },
           "title": "[%key:component::anthropic::config_subentries::conversation::step::advanced::title%]"
@@ -72,6 +78,7 @@
             "code_execution": "[%key:component::anthropic::config_subentries::conversation::step::model::data::code_execution%]",
             "thinking_budget": "[%key:component::anthropic::config_subentries::conversation::step::model::data::thinking_budget%]",
             "thinking_effort": "[%key:component::anthropic::config_subentries::conversation::step::model::data::thinking_effort%]",
+            "tool_search": "[%key:component::anthropic::config_subentries::conversation::step::model::data::tool_search%]",
             "user_location": "[%key:component::anthropic::config_subentries::conversation::step::model::data::user_location%]",
             "web_search": "[%key:component::anthropic::config_subentries::conversation::step::model::data::web_search%]",
             "web_search_max_uses": "[%key:component::anthropic::config_subentries::conversation::step::model::data::web_search_max_uses%]"
@@ -80,6 +87,7 @@
             "code_execution": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::code_execution%]",
             "thinking_budget": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::thinking_budget%]",
             "thinking_effort": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::thinking_effort%]",
+            "tool_search": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::tool_search%]",
             "user_location": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::user_location%]",
             "web_search": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::web_search%]",
             "web_search_max_uses": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::web_search_max_uses%]"
@@ -94,6 +102,10 @@
         "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
       },
       "entry_type": "Conversation agent",
+      "error": {
+        "api_error": "Unable to get model info: {message}",
+        "model_not_found": "Model not found"
+      },
       "initiate_flow": {
         "reconfigure": "Reconfigure conversation agent",
         "user": "Add conversation agent"
@@ -103,11 +115,13 @@
           "data": {
             "chat_model": "[%key:common::generic::model%]",
             "max_tokens": "Maximum tokens to return in response",
+            "prompt_caching": "Caching strategy",
             "temperature": "Temperature"
           },
           "data_description": {
             "chat_model": "The model to serve the responses.",
             "max_tokens": "Limit the number of response tokens.",
+            "prompt_caching": "Optimize your API cost and response times based on your usage.",
             "temperature": "Control the randomness of the response, trading off between creativity and coherence."
           },
           "title": "Advanced settings"
@@ -132,6 +146,7 @@
             "code_execution": "Code execution",
             "thinking_budget": "Thinking budget",
             "thinking_effort": "Thinking effort",
+            "tool_search": "Enable tool search tool",
             "user_location": "Include home location",
             "web_search": "Enable web search",
             "web_search_max_uses": "Maximum web searches"
@@ -140,6 +155,7 @@
             "code_execution": "Allow the model to execute code in a secure sandbox environment, enabling it to analyze data and perform complex calculations.",
             "thinking_budget": "The number of tokens the model can use to think about the response out of the total maximum number of tokens. Set to 1024 or greater to enable extended thinking.",
             "thinking_effort": "Control how many tokens Claude uses when responding, trading off between response thoroughness and token efficiency",
+            "tool_search": "Enable dynamic tool discovery instead of preloading all tools into the context",
             "user_location": "Localize search results based on home location",
             "web_search": "The web search tool gives Claude direct access to real-time web content, allowing it to answer questions with up-to-date information beyond its knowledge cutoff",
             "web_search_max_uses": "Limit the number of searches performed per response"
@@ -210,6 +226,13 @@
     }
   },
   "selector": {
+    "prompt_caching": {
+      "options": {
+        "automatic": "Full",
+        "off": "Disabled",
+        "prompt": "System prompt"
+      }
+    },
     "thinking_effort": {
       "options": {
         "high": "[%key:common::state::high%]",

homeassistant/components/apple_tv/binary_sensor.py

@@ -14,6 +14,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from . import SIGNAL_CONNECTED, AppleTvConfigEntry
 from .entity import AppleTVEntity
 
+PARALLEL_UPDATES = 0
+
 
 async def async_setup_entry(
     hass: HomeAssistant,

homeassistant/components/arcam_fmj/manifest.json

@@ -7,7 +7,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["arcam"],
-  "requirements": ["arcam-fmj==1.8.2"],
+  "requirements": ["arcam-fmj==1.8.3"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1",

homeassistant/components/arcam_fmj/sensor.py

@@ -91,6 +91,7 @@ SENSORS: tuple[ArcamFmjSensorEntityDescription, ...] = (
         value_fn=lambda state: (
             vp.colorspace.name.lower()
             if (vp := state.get_incoming_video_parameters()) is not None
+            and vp.colorspace is not None
             else None
         ),
     ),

homeassistant/components/assist_satellite/strings.json

@@ -1,7 +1,8 @@
 {
   "common": {
     "condition_behavior_name": "Condition passes if",
-    "trigger_behavior_name": "Trigger when"
+    "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least"
   },
   "conditions": {
     "is_idle": {
@@ -75,7 +76,7 @@
   },
   "services": {
     "announce": {
-      "description": "Lets a satellite announce a message.",
+      "description": "Lets an Assist satellite announce a message.",
       "fields": {
         "media_id": {
           "description": "The media ID to announce instead of using text-to-speech.",
@@ -94,10 +95,10 @@
           "name": "Preannounce media ID"
         }
       },
-      "name": "Announce"
+      "name": "Announce on satellite"
     },
     "ask_question": {
-      "description": "Asks a question and gets the user's response.",
+      "description": "Lets an Assist satellite ask a question and get the user's response.",
       "fields": {
         "answers": {
           "description": "Possible answers to the question.",
@@ -124,10 +125,10 @@
           "name": "Question media ID"
         }
       },
-      "name": "Ask question"
+      "name": "Ask question on satellite"
     },
     "start_conversation": {
-      "description": "Starts a conversation from a satellite.",
+      "description": "Starts a conversation from an Assist satellite.",
       "fields": {
         "extra_system_prompt": {
           "description": "Provide background information to the AI about the request.",
@@ -150,43 +151,55 @@
           "name": "Message"
         }
       },
-      "name": "Start conversation"
+      "name": "Start conversation on satellite"
     }
   },
   "title": "Assist satellite",
   "triggers": {
     "idle": {
-      "description": "Triggers after one or more voice assistant satellites become idle after having processed a command.",
+      "description": "Triggers after one or more Assist satellites become idle after having processed a command.",
       "fields": {
         "behavior": {
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::assist_satellite::common::trigger_for_name%]"
         }
       },
       "name": "Satellite became idle"
     },
     "listening": {
-      "description": "Triggers after one or more voice assistant satellites start listening for a command from someone.",
+      "description": "Triggers after one or more Assist satellites start listening for a command from someone.",
       "fields": {
         "behavior": {
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::assist_satellite::common::trigger_for_name%]"
         }
       },
       "name": "Satellite started listening"
     },
     "processing": {
-      "description": "Triggers after one or more voice assistant satellites start processing a command after having heard it.",
+      "description": "Triggers after one or more Assist satellites start processing a command after having heard it.",
       "fields": {
         "behavior": {
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::assist_satellite::common::trigger_for_name%]"
         }
       },
       "name": "Satellite started processing"
     },
     "responding": {
-      "description": "Triggers after one or more voice assistant satellites start responding to a command after having processed it, or start announcing something.",
+      "description": "Triggers after one or more Assist satellites start responding to a command after having processed it, or start announcing something.",
       "fields": {
         "behavior": {
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::assist_satellite::common::trigger_for_name%]"
         }
       },
       "name": "Satellite started responding"

homeassistant/components/assist_satellite/triggers.yaml

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

homeassistant/components/aurora_abb_powerone/config_flow.py

@@ -7,9 +7,9 @@ import logging
 from typing import TYPE_CHECKING, Any
 
 from aurorapy.client import AuroraError, AuroraSerialClient
-import serial.tools.list_ports
 import voluptuous as vol
 
+from homeassistant.components import usb
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import ATTR_SERIAL_NUMBER, CONF_ADDRESS, CONF_PORT
 from homeassistant.core import HomeAssistant
@@ -57,9 +57,11 @@ def validate_and_connect(
     return ret
 
 
-def scan_comports() -> tuple[list[str] | None, str | None]:
+async def async_scan_comports(
+    hass: HomeAssistant,
+) -> tuple[list[str] | None, str | None]:
     """Find and store available com ports for the GUI dropdown."""
-    com_ports = serial.tools.list_ports.comports(include_links=True)
+    com_ports = await usb.async_scan_serial_ports(hass)
     com_ports_list = []
     for port in com_ports:
         com_ports_list.append(port.device)
@@ -87,7 +89,7 @@ class AuroraABBConfigFlow(ConfigFlow, domain=DOMAIN):
 
         errors = {}
         if self._com_ports_list is None:
-            result = await self.hass.async_add_executor_job(scan_comports)
+            result = await async_scan_comports(self.hass)
             self._com_ports_list, self._default_com_port = result
             if self._default_com_port is None:
                 return self.async_abort(reason="no_serial_ports")

homeassistant/components/aurora_abb_powerone/manifest.json

@@ -3,6 +3,7 @@
   "name": "Aurora ABB PowerOne Solar PV",
   "codeowners": ["@davet2001"],
   "config_flow": true,
+  "dependencies": ["usb"],
   "documentation": "https://www.home-assistant.io/integrations/aurora_abb_powerone",
   "integration_type": "device",
   "iot_class": "local_polling",

homeassistant/components/auth/__init__.py

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

homeassistant/components/automation/__init__.py

@@ -83,7 +83,6 @@ from homeassistant.helpers.trace import (
     trace_path,
 )
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
 from homeassistant.util.dt import parse_datetime
 from homeassistant.util.hass_dict import HassKey
 
@@ -143,6 +142,7 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "occupancy",
     "person",
     "power",
+    "remote",
     "schedule",
     "select",
     "siren",
@@ -150,6 +150,8 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "temperature",
     "text",
     "timer",
+    "todo",
+    "update",
     "vacuum",
     "valve",
     "water_heater",
@@ -235,7 +237,6 @@ class IfAction(Protocol):
         """AND all conditions."""
 
 
-@bind_hass
 def is_on(hass: HomeAssistant, entity_id: str) -> bool:
     """Return true if specified automation entity_id is on.
 

homeassistant/components/autoskope/__init__.py

@@ -8,7 +8,7 @@ from autoskope_client.models import CannotConnect, InvalidAuth
 
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 
 from .const import DEFAULT_HOST
@@ -31,8 +31,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AutoskopeConfigEntry) ->
     try:
         await api.connect()
     except InvalidAuth as err:
-        # Raise ConfigEntryError until reauth flow is implemented (then ConfigEntryAuthFailed)
-        raise ConfigEntryError(
+        raise ConfigEntryAuthFailed(
             "Authentication failed, please check credentials"
         ) from err
     except CannotConnect as err:

homeassistant/components/autoskope/config_flow.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections.abc import Mapping
 from typing import Any
 
 from autoskope_client.api import AutoskopeApi
@@ -39,12 +40,39 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
     }
 )
 
+STEP_REAUTH_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_PASSWORD): TextSelector(
+            TextSelectorConfig(type=TextSelectorType.PASSWORD)
+        ),
+    }
+)
+
 
 class AutoskopeConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Autoskope."""
 
     VERSION = 1
 
+    async def _async_validate_credentials(
+        self, host: str, username: str, password: str, errors: dict[str, str]
+    ) -> bool:
+        """Validate credentials against the Autoskope API."""
+        try:
+            async with AutoskopeApi(
+                host=host,
+                username=username,
+                password=password,
+            ):
+                pass
+        except CannotConnect:
+            errors["base"] = "cannot_connect"
+        except InvalidAuth:
+            errors["base"] = "invalid_auth"
+        else:
+            return True
+        return False
+
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -63,18 +91,9 @@ class AutoskopeConfigFlow(ConfigFlow, domain=DOMAIN):
                 await self.async_set_unique_id(f"{username}@{host}")
                 self._abort_if_unique_id_configured()
 
-                try:
-                    async with AutoskopeApi(
-                        host=host,
-                        username=username,
-                        password=user_input[CONF_PASSWORD],
-                    ):
-                        pass
-                except CannotConnect:
-                    errors["base"] = "cannot_connect"
-                except InvalidAuth:
-                    errors["base"] = "invalid_auth"
-                else:
+                if await self._async_validate_credentials(
+                    host, username, user_input[CONF_PASSWORD], errors
+                ):
                     return self.async_create_entry(
                         title=f"Autoskope ({username})",
                         data={
@@ -87,3 +106,35 @@ class AutoskopeConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_show_form(
             step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
         )
+
+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Handle initiation of re-authentication."""
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle re-authentication with new credentials."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            reauth_entry = self._get_reauth_entry()
+
+            if await self._async_validate_credentials(
+                reauth_entry.data[CONF_HOST],
+                reauth_entry.data[CONF_USERNAME],
+                user_input[CONF_PASSWORD],
+                errors,
+            ):
+                return self.async_update_reload_and_abort(
+                    reauth_entry,
+                    data_updates={CONF_PASSWORD: user_input[CONF_PASSWORD]},
+                )
+
+        return self.async_show_form(
+            step_id="reauth_confirm",
+            data_schema=STEP_REAUTH_DATA_SCHEMA,
+            errors=errors,
+        )

homeassistant/components/autoskope/quality_scale.yaml

@@ -39,10 +39,7 @@ rules:
   integration-owner: done
   log-when-unavailable: todo
   parallel-updates: done
-  reauthentication-flow:
-    status: todo
-    comment: |
-      Reauthentication flow removed for initial PR, will be added in follow-up.
+  reauthentication-flow: done
   test-coverage: done
   # Gold
   devices: done

homeassistant/components/autoskope/strings.json

@@ -1,7 +1,8 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -10,6 +11,15 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "step": {
+      "reauth_confirm": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "The new password for your Autoskope account."
+        },
+        "description": "Please re-enter your password for your Autoskope account."
+      },
       "user": {
         "data": {
           "password": "[%key:common::config_flow::data::password%]",

homeassistant/components/axis/manifest.json

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

homeassistant/components/backblaze_b2/__init__.py

@@ -74,6 +74,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: BackblazeConfigEntry) ->
             translation_domain=DOMAIN,
             translation_key="invalid_bucket_name",
         ) from err
+    except exception.BadRequest as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="bad_request",
+            translation_placeholders={"error_message": str(err)},
+        ) from err
     except (
         exception.B2ConnectionError,
         exception.B2RequestTimeout,

homeassistant/components/backblaze_b2/backup.py

@@ -101,8 +101,7 @@ def handle_b2_errors[T](
         try:
             return await func(*args, **kwargs)
         except B2Error as err:
-            error_msg = f"Failed during {func.__name__}"
-            raise BackupAgentError(error_msg) from err
+            raise BackupAgentError(f"Failed during {func.__name__}: {err}") from err
 
     return wrapper
 
@@ -170,8 +169,7 @@ class BackblazeBackupAgent(BackupAgent):
     async def _cleanup_failed_upload(self, filename: str) -> None:
         """Clean up a partially uploaded file after upload failure."""
         _LOGGER.warning(
-            "Attempting to delete partially uploaded main backup file %s "
-            "due to metadata upload failure",
+            "Attempting to delete partially uploaded backup file %s",
             filename,
         )
         try:
@@ -180,11 +178,10 @@ class BackblazeBackupAgent(BackupAgent):
             )
             await self._hass.async_add_executor_job(uploaded_main_file_info.delete)
         except B2Error:
-            _LOGGER.debug(
-                "Failed to clean up partially uploaded main backup file %s. "
-                "Manual intervention may be required to delete it from Backblaze B2",
+            _LOGGER.warning(
+                "Failed to clean up partially uploaded backup file %s;"
+                " manual deletion from Backblaze B2 may be required",
                 filename,
-                exc_info=True,
             )
         else:
             _LOGGER.debug(
@@ -256,9 +253,10 @@ class BackblazeBackupAgent(BackupAgent):
             prefixed_metadata_filename,
         )
 
-        upload_successful = False
+        tar_uploaded = False
         try:
             await self._upload_backup_file(prefixed_tar_filename, open_stream, {})
+            tar_uploaded = True
             _LOGGER.debug(
                 "Main backup file upload finished for %s", prefixed_tar_filename
             )
@@ -270,15 +268,14 @@ class BackblazeBackupAgent(BackupAgent):
             _LOGGER.debug(
                 "Metadata file upload finished for %s", prefixed_metadata_filename
             )
-            upload_successful = True
-        finally:
-            if upload_successful:
-                _LOGGER.debug("Backup upload complete: %s", prefixed_tar_filename)
-                self._invalidate_caches(
-                    backup.backup_id, prefixed_tar_filename, prefixed_metadata_filename
-                )
-            else:
+            _LOGGER.debug("Backup upload complete: %s", prefixed_tar_filename)
+            self._invalidate_caches(
+                backup.backup_id, prefixed_tar_filename, prefixed_metadata_filename
+            )
+        except B2Error:
+            if tar_uploaded:
                 await self._cleanup_failed_upload(prefixed_tar_filename)
+            raise
 
     def _upload_metadata_file_sync(
         self, metadata_content: bytes, filename: str

homeassistant/components/backblaze_b2/config_flow.py

@@ -174,6 +174,14 @@ class BackblazeConfigFlow(ConfigFlow, domain=DOMAIN):
                 "Backblaze B2 bucket '%s' does not exist", user_input[CONF_BUCKET]
             )
             errors[CONF_BUCKET] = "invalid_bucket_name"
+        except exception.BadRequest as err:
+            _LOGGER.error(
+                "Backblaze B2 API rejected the request for Key ID '%s': %s",
+                user_input[CONF_KEY_ID],
+                err,
+            )
+            errors["base"] = "bad_request"
+            placeholders["error_message"] = str(err)
         except (
             exception.B2ConnectionError,
             exception.B2RequestTimeout,

homeassistant/components/backblaze_b2/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_push",
   "loggers": ["b2sdk"],
   "quality_scale": "bronze",
-  "requirements": ["b2sdk==2.10.1"]
+  "requirements": ["b2sdk==2.10.4"]
 }

homeassistant/components/backblaze_b2/strings.json

@@ -6,6 +6,7 @@
       "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
     },
     "error": {
+      "bad_request": "The Backblaze B2 API rejected the request: {error_message}",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_bucket_name": "[%key:component::backblaze_b2::exceptions::invalid_bucket_name::message%]",
       "invalid_capability": "[%key:component::backblaze_b2::exceptions::invalid_capability::message%]",
@@ -60,6 +61,9 @@
     }
   },
   "exceptions": {
+    "bad_request": {
+      "message": "The Backblaze B2 API rejected the request: {error_message}"
+    },
     "cannot_connect": {
       "message": "Cannot connect to endpoint"
     },

homeassistant/components/backup/http.py

@@ -23,7 +23,7 @@ from . import util
 from .agent import BackupAgent
 from .const import DATA_MANAGER
 from .manager import BackupManager
-from .models import AgentBackup, BackupNotFound
+from .models import AgentBackup, BackupNotFound, InvalidBackupFilename
 
 
 @callback
@@ -195,6 +195,11 @@ class UploadBackupView(HomeAssistantView):
             backup_id = await manager.async_receive_backup(
                 contents=contents, agent_ids=agent_ids
             )
+        except InvalidBackupFilename as err:
+            return Response(
+                body=str(err),
+                status=HTTPStatus.BAD_REQUEST,
+            )
         except OSError as err:
             return Response(
                 body=f"Can't write backup file: {err}",

homeassistant/components/backup/manager.py

@@ -68,6 +68,7 @@ from .models import (
     BackupReaderWriterError,
     BaseBackup,
     Folder,
+    InvalidBackupFilename,
 )
 from .store import BackupStore
 from .util import (
@@ -1006,6 +1007,14 @@ class BackupManager:
     ) -> str:
         """Receive and store a backup file from upload."""
         contents.chunk_size = BUF_SIZE
+        suggested_filename = contents.filename or "backup.tar"
+        safe_filename = PureWindowsPath(suggested_filename).name
+        if (
+            not safe_filename
+            or safe_filename != suggested_filename
+            or safe_filename == ".."
+        ):
+            raise InvalidBackupFilename(f"Invalid filename: {suggested_filename}")
         self.async_on_backup_event(
             ReceiveBackupEvent(
                 reason=None,
@@ -1016,7 +1025,7 @@ class BackupManager:
         written_backup = await self._reader_writer.async_receive_backup(
             agent_ids=agent_ids,
             stream=contents,
-            suggested_filename=contents.filename or "backup.tar",
+            suggested_filename=suggested_filename,
         )
         self.async_on_backup_event(
             ReceiveBackupEvent(
@@ -1957,10 +1966,7 @@ class CoreBackupReaderWriter(BackupReaderWriter):
         suggested_filename: str,
     ) -> WrittenBackup:
         """Receive a backup."""
-        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)
+        temp_file = Path(self.temp_backup_dir, suggested_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/backup/manifest.json

@@ -8,6 +8,6 @@
   "integration_type": "service",
   "iot_class": "calculated",
   "quality_scale": "internal",
-  "requirements": ["cronsim==2.7", "securetar==2026.2.0"],
+  "requirements": ["cronsim==2.7", "securetar==2026.4.1"],
   "single_config_entry": true
 }

homeassistant/components/backup/models.py

@@ -95,6 +95,12 @@ class BackupReaderWriterError(BackupError):
     error_code = "backup_reader_writer_error"
 
 
+class InvalidBackupFilename(BackupManagerError):
+    """Raised when a backup filename is invalid."""
+
+    error_code = "invalid_backup_filename"
+
+
 class BackupNotFound(BackupAgentError, BackupManagerError):
     """Raised when a backup is not found."""
 

homeassistant/components/backup/util.py

@@ -22,6 +22,7 @@ from securetar import (
     SecureTarFile,
     SecureTarReadError,
     SecureTarRootKeyContext,
+    get_archive_max_ciphertext_size,
 )
 
 from homeassistant.core import HomeAssistant
@@ -383,9 +384,12 @@ def _encrypt_backup(
         if prefix not in expected_archives:
             LOGGER.debug("Unknown inner tar file %s will not be encrypted", obj.name)
             continue
-        output_archive.import_tar(
-            input_tar.extractfile(obj), obj, derived_key_id=inner_tar_idx
-        )
+        if (fileobj := input_tar.extractfile(obj)) is None:
+            LOGGER.debug(
+                "Non regular inner tar file %s will not be encrypted", obj.name
+            )
+            continue
+        output_archive.import_tar(fileobj, obj, derived_key_id=inner_tar_idx)
         inner_tar_idx += 1
 
 
@@ -419,7 +423,7 @@ class _CipherBackupStreamer:
         hass: HomeAssistant,
         backup: AgentBackup,
         open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-        password: str | None,
+        password: str,
     ) -> None:
         """Initialize."""
         self._workers: list[_CipherWorkerStatus] = []
@@ -431,7 +435,9 @@ class _CipherBackupStreamer:
 
     def size(self) -> int:
         """Return the maximum size of the decrypted or encrypted backup."""
-        return self._backup.size + self._num_tar_files() * tarfile.RECORDSIZE
+        return get_archive_max_ciphertext_size(
+            self._backup.size, SECURETAR_CREATE_VERSION, self._num_tar_files()
+        )
 
     def _num_tar_files(self) -> int:
         """Return the number of inner tar files."""

homeassistant/components/battery/strings.json

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

homeassistant/components/battery/triggers.yaml

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

homeassistant/components/bluetooth/manifest.json

@@ -20,7 +20,7 @@
     "bluetooth-adapters==2.1.0",
     "bluetooth-auto-recovery==1.5.3",
     "bluetooth-data-tools==1.28.4",
-    "dbus-fast==3.1.2",
-    "habluetooth==5.11.1"
+    "dbus-fast==4.0.4",
+    "habluetooth==6.0.0"
   ]
 }

homeassistant/components/bond/button.py

@@ -260,6 +260,14 @@ BUTTONS: tuple[BondButtonEntityDescription, ...] = (
     ),
 )
 
+PRESET_BUTTON = BondButtonEntityDescription(
+    key=Action.PRESET,
+    name="Preset",
+    translation_key="preset",
+    mutually_exclusive=None,
+    argument=None,
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -285,6 +293,8 @@ async def async_setup_entry(
             # we only add the stop action button if we add actions
             # since its not so useful if there are no actions to stop
             device_entities.append(BondButtonEntity(data, device, STOP_BUTTON))
+        if device.has_action(PRESET_BUTTON.key):
+            device_entities.append(BondButtonEntity(data, device, PRESET_BUTTON))
         entities.extend(device_entities)
 
     async_add_entities(entities)

homeassistant/components/brother/manifest.json

@@ -9,7 +9,7 @@
   "iot_class": "local_polling",
   "loggers": ["brother", "pyasn1", "pysmi", "pysnmp"],
   "quality_scale": "platinum",
-  "requirements": ["brother==6.0.0"],
+  "requirements": ["brother==6.1.0"],
   "zeroconf": [
     {
       "name": "brother*",

homeassistant/components/bsblan/coordinator.py

@@ -10,6 +10,7 @@ from bsblan import (
     BSBLAN,
     BSBLANAuthError,
     BSBLANConnectionError,
+    BSBLANError,
     HotWaterConfig,
     HotWaterSchedule,
     HotWaterState,
@@ -50,7 +51,7 @@ class BSBLanFastData:
 
     state: State
     sensor: Sensor
-    dhw: HotWaterState
+    dhw: HotWaterState | None = None
 
 
 @dataclass
@@ -111,7 +112,6 @@ class BSBLanFastCoordinator(BSBLanCoordinator[BSBLanFastData]):
             # This reduces response time significantly (~0.2s per parameter)
             state = await self.client.state(include=STATE_INCLUDE)
             sensor = await self.client.sensor(include=SENSOR_INCLUDE)
-            dhw = await self.client.hot_water_state(include=DHW_STATE_INCLUDE)
 
         except BSBLANAuthError as err:
             raise ConfigEntryAuthFailed(
@@ -126,6 +126,19 @@ class BSBLanFastCoordinator(BSBLanCoordinator[BSBLanFastData]):
                 translation_placeholders={"host": host},
             ) from err
 
+        # Fetch DHW state separately - device may not support hot water
+        dhw: HotWaterState | None = None
+        try:
+            dhw = await self.client.hot_water_state(include=DHW_STATE_INCLUDE)
+        except BSBLANError:
+            # Preserve last known DHW state if available (entity may depend on it)
+            if self.data:
+                dhw = self.data.dhw
+            LOGGER.debug(
+                "DHW (Domestic Hot Water) state not available on device at %s",
+                self.config_entry.data[CONF_HOST],
+            )
+
         return BSBLanFastData(
             state=state,
             sensor=sensor,
@@ -159,13 +172,6 @@ class BSBLanSlowCoordinator(BSBLanCoordinator[BSBLanSlowData]):
             dhw_config = await self.client.hot_water_config(include=DHW_CONFIG_INCLUDE)
             dhw_schedule = await self.client.hot_water_schedule()
 
-        except AttributeError:
-            # Device does not support DHW functionality
-            LOGGER.debug(
-                "DHW (Domestic Hot Water) not available on device at %s",
-                self.config_entry.data[CONF_HOST],
-            )
-            return BSBLanSlowData()
         except (BSBLANConnectionError, BSBLANAuthError) as err:
             # If config update fails, keep existing data
             LOGGER.debug(
@@ -177,6 +183,13 @@ class BSBLanSlowCoordinator(BSBLanCoordinator[BSBLanSlowData]):
                 return self.data
             # First fetch failed, return empty data
             return BSBLanSlowData()
+        except BSBLANError, AttributeError:
+            # Device does not support DHW functionality
+            LOGGER.debug(
+                "DHW (Domestic Hot Water) not available on device at %s",
+                self.config_entry.data[CONF_HOST],
+            )
+            return BSBLanSlowData()
 
         return BSBLanSlowData(
             dhw_config=dhw_config,

homeassistant/components/bsblan/diagnostics.py

@@ -22,7 +22,9 @@ async def async_get_config_entry_diagnostics(
         "fast_coordinator_data": {
             "state": data.fast_coordinator.data.state.model_dump(),
             "sensor": data.fast_coordinator.data.sensor.model_dump(),
-            "dhw": data.fast_coordinator.data.dhw.model_dump(),
+            "dhw": data.fast_coordinator.data.dhw.model_dump()
+            if data.fast_coordinator.data.dhw
+            else None,
         },
         "static": data.static.model_dump() if data.static is not None else None,
     }

homeassistant/components/bsblan/entity.py

@@ -2,6 +2,9 @@
 
 from __future__ import annotations
 
+from yarl import URL
+
+from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.helpers.device_registry import (
     CONNECTION_NETWORK_MAC,
     DeviceInfo,
@@ -10,7 +13,7 @@ from homeassistant.helpers.device_registry import (
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import BSBLanData
-from .const import DOMAIN
+from .const import DEFAULT_PORT, DOMAIN
 from .coordinator import BSBLanCoordinator, BSBLanFastCoordinator, BSBLanSlowCoordinator
 
 
@@ -22,7 +25,8 @@ class BSBLanEntityBase[_T: BSBLanCoordinator](CoordinatorEntity[_T]):
     def __init__(self, coordinator: _T, data: BSBLanData) -> None:
         """Initialize BSBLan entity with device info."""
         super().__init__(coordinator)
-        host = coordinator.config_entry.data["host"]
+        host = coordinator.config_entry.data[CONF_HOST]
+        port = coordinator.config_entry.data.get(CONF_PORT, DEFAULT_PORT)
         mac = data.device.MAC
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, mac)},
@@ -44,7 +48,7 @@ class BSBLanEntityBase[_T: BSBLanCoordinator](CoordinatorEntity[_T]):
                 else None
             ),
             sw_version=data.device.version,
-            configuration_url=f"http://{host}",
+            configuration_url=str(URL.build(scheme="http", host=host, port=port)),
         )
 
 

homeassistant/components/bsblan/manifest.json

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

homeassistant/components/bsblan/water_heater.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from bsblan import BSBLANError, SetHotWaterParam
+from bsblan import BSBLANError, HotWaterState, SetHotWaterParam
 
 from homeassistant.components.water_heater import (
     STATE_ECO,
@@ -46,8 +46,10 @@ async def async_setup_entry(
     data = entry.runtime_data
 
     # Only create water heater entity if DHW (Domestic Hot Water) is available
-    # Check if we have any DHW-related data indicating water heater support
     dhw_data = data.fast_coordinator.data.dhw
+    if dhw_data is None:
+        # Device does not support DHW, skip water heater setup
+        return
     if (
         dhw_data.operating_mode is None
         and dhw_data.nominal_setpoint is None
@@ -107,11 +109,21 @@ class BSBLANWaterHeater(BSBLanDualCoordinatorEntity, WaterHeaterEntity):
         else:
             self._attr_max_temp = 65.0  # Default maximum
 
+    @property
+    def _dhw(self) -> HotWaterState:
+        """Return DHW state data.
+
+        This entity is only created when DHW data is available.
+        """
+        dhw = self.coordinator.data.dhw
+        assert dhw is not None
+        return dhw
+
     @property
     def current_operation(self) -> str | None:
         """Return current operation."""
         if (
-            operating_mode := self.coordinator.data.dhw.operating_mode
+            operating_mode := self._dhw.operating_mode
         ) is None or operating_mode.value is None:
             return None
         return BSBLAN_TO_HA_OPERATION_MODE.get(operating_mode.value)
@@ -119,16 +131,14 @@ class BSBLANWaterHeater(BSBLanDualCoordinatorEntity, WaterHeaterEntity):
     @property
     def current_temperature(self) -> float | None:
         """Return the current temperature."""
-        if (
-            current_temp := self.coordinator.data.dhw.dhw_actual_value_top_temperature
-        ) is None:
+        if (current_temp := self._dhw.dhw_actual_value_top_temperature) is None:
             return None
         return current_temp.value
 
     @property
     def target_temperature(self) -> float | None:
         """Return the temperature we try to reach."""
-        if (target_temp := self.coordinator.data.dhw.nominal_setpoint) is None:
+        if (target_temp := self._dhw.nominal_setpoint) is None:
             return None
         return target_temp.value
 

homeassistant/components/calendar/__init__.py

@@ -17,6 +17,7 @@ import voluptuous as vol
 
 from homeassistant.components import frontend, http, websocket_api
 from homeassistant.components.websocket_api import (
+    ERR_INVALID_FORMAT,
     ERR_NOT_FOUND,
     ERR_NOT_SUPPORTED,
     ActiveConnection,
@@ -33,6 +34,7 @@ from homeassistant.core import (
 )
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv, entity_registry as er
+from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import async_track_point_in_time
@@ -76,6 +78,7 @@ ENTITY_ID_FORMAT = DOMAIN + ".{}"
 PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA
 PLATFORM_SCHEMA_BASE = cv.PLATFORM_SCHEMA_BASE
 SCAN_INTERVAL = datetime.timedelta(seconds=60)
+EVENT_LISTENER_DEBOUNCE_COOLDOWN = 1.0  # seconds
 
 # Don't support rrules more often than daily
 VALID_FREQS = {"DAILY", "WEEKLY", "MONTHLY", "YEARLY"}
@@ -320,6 +323,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     websocket_api.async_register_command(hass, handle_calendar_event_create)
     websocket_api.async_register_command(hass, handle_calendar_event_delete)
     websocket_api.async_register_command(hass, handle_calendar_event_update)
+    websocket_api.async_register_command(hass, handle_calendar_event_subscribe)
 
     component.async_register_entity_service(
         CREATE_EVENT_SERVICE,
@@ -517,6 +521,17 @@ class CalendarEntity(Entity):
     _entity_component_unrecorded_attributes = frozenset({"description"})
 
     _alarm_unsubs: list[CALLBACK_TYPE] | None = None
+    _event_listeners: (
+        list[
+            tuple[
+                datetime.datetime,
+                datetime.datetime,
+                Callable[[list[JsonValueType] | None], None],
+            ]
+        ]
+        | None
+    ) = None
+    _event_listener_debouncer: Debouncer[None] | None = None
 
     _attr_initial_color: str | None
 
@@ -585,6 +600,10 @@ class CalendarEntity(Entity):
         the current or upcoming event.
         """
         super()._async_write_ha_state()
+
+        # Notify websocket subscribers of event changes (debounced)
+        if self._event_listeners and self._event_listener_debouncer:
+            self._event_listener_debouncer.async_schedule_call()
         if self._alarm_unsubs is None:
             self._alarm_unsubs = []
         _LOGGER.debug(
@@ -625,6 +644,13 @@ class CalendarEntity(Entity):
             event.end_datetime_local,
         )
 
+    @callback
+    def _async_cancel_event_listener_debouncer(self) -> None:
+        """Cancel and clear the event listener debouncer."""
+        if self._event_listener_debouncer:
+            self._event_listener_debouncer.async_cancel()
+            self._event_listener_debouncer = None
+
     async def async_will_remove_from_hass(self) -> None:
         """Run when entity will be removed from hass.
 
@@ -633,6 +659,90 @@ class CalendarEntity(Entity):
         for unsub in self._alarm_unsubs or ():
             unsub()
         self._alarm_unsubs = None
+        self._async_cancel_event_listener_debouncer()
+
+    @final
+    @callback
+    def async_subscribe_events(
+        self,
+        start_date: datetime.datetime,
+        end_date: datetime.datetime,
+        event_listener: Callable[[list[JsonValueType] | None], None],
+    ) -> CALLBACK_TYPE:
+        """Subscribe to calendar event updates.
+
+        Called by websocket API.
+        """
+        if self._event_listeners is None:
+            self._event_listeners = []
+
+        if self._event_listener_debouncer is None:
+            self._event_listener_debouncer = Debouncer(
+                self.hass,
+                _LOGGER,
+                cooldown=EVENT_LISTENER_DEBOUNCE_COOLDOWN,
+                immediate=True,
+                function=self.async_update_event_listeners,
+            )
+
+        listener_data = (start_date, end_date, event_listener)
+        self._event_listeners.append(listener_data)
+
+        @callback
+        def unsubscribe() -> None:
+            if self._event_listeners:
+                self._event_listeners.remove(listener_data)
+            if not self._event_listeners:
+                self._async_cancel_event_listener_debouncer()
+
+        return unsubscribe
+
+    @final
+    @callback
+    def async_update_event_listeners(self) -> None:
+        """Push updated calendar events to all listeners."""
+        if not self._event_listeners:
+            return
+
+        for start_date, end_date, listener in self._event_listeners:
+            self.async_update_single_event_listener(start_date, end_date, listener)
+
+    @final
+    @callback
+    def async_update_single_event_listener(
+        self,
+        start_date: datetime.datetime,
+        end_date: datetime.datetime,
+        listener: Callable[[list[JsonValueType] | None], None],
+    ) -> None:
+        """Schedule an event fetch and push to a single listener."""
+        self.hass.async_create_task(
+            self._async_update_listener(start_date, end_date, listener)
+        )
+
+    async def _async_update_listener(
+        self,
+        start_date: datetime.datetime,
+        end_date: datetime.datetime,
+        listener: Callable[[list[JsonValueType] | None], None],
+    ) -> None:
+        """Fetch events and push to a single listener."""
+        try:
+            events = await self.async_get_events(self.hass, start_date, end_date)
+        except HomeAssistantError as err:
+            _LOGGER.debug(
+                "Error fetching calendar events for %s: %s",
+                self.entity_id,
+                err,
+            )
+            listener(None)
+            return
+
+        event_list: list[JsonValueType] = [
+            dataclasses.asdict(event, dict_factory=_list_events_dict_factory)
+            for event in events
+        ]
+        listener(event_list)
 
     async def async_get_events(
         self,
@@ -867,6 +977,65 @@ async def handle_calendar_event_update(
         connection.send_result(msg["id"])
 
 
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "calendar/event/subscribe",
+        vol.Required("entity_id"): cv.entity_domain(DOMAIN),
+        vol.Required("start"): cv.datetime,
+        vol.Required("end"): cv.datetime,
+    }
+)
+@websocket_api.async_response
+async def handle_calendar_event_subscribe(
+    hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
+) -> None:
+    """Subscribe to calendar event updates."""
+    entity_id: str = msg["entity_id"]
+
+    if not (entity := hass.data[DATA_COMPONENT].get_entity(entity_id)):
+        connection.send_error(
+            msg["id"],
+            ERR_NOT_FOUND,
+            f"Calendar entity not found: {entity_id}",
+        )
+        return
+
+    start_date = dt_util.as_local(msg["start"])
+    end_date = dt_util.as_local(msg["end"])
+
+    if start_date >= end_date:
+        connection.send_error(
+            msg["id"],
+            ERR_INVALID_FORMAT,
+            "Start must be before end",
+        )
+        return
+
+    subscription_id = msg["id"]
+
+    @callback
+    def event_listener(events: list[JsonValueType] | None) -> None:
+        """Push updated calendar events to websocket."""
+        if subscription_id not in connection.subscriptions:
+            return
+        connection.send_message(
+            websocket_api.event_message(
+                subscription_id,
+                {
+                    "events": events,
+                },
+            )
+        )
+
+    connection.subscriptions[subscription_id] = entity.async_subscribe_events(
+        start_date, end_date, event_listener
+    )
+    connection.send_result(subscription_id)
+
+    # Push initial events only to the new subscriber
+    entity.async_update_single_event_listener(start_date, end_date, event_listener)
+
+
 def _validate_timespan(
     values: dict[str, Any],
 ) -> tuple[datetime.datetime | datetime.date, datetime.datetime | datetime.date]:

homeassistant/components/camera/__init__.py

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

homeassistant/components/camera/manifest.json

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

homeassistant/components/casper_glow/quality_scale.yaml

@@ -51,18 +51,24 @@ rules:
   docs-supported-functions: done
   docs-troubleshooting: done
   docs-use-cases: todo
-  dynamic-devices: todo
+  dynamic-devices:
+    status: exempt
+    comment: Each config entry represents a single device.
   entity-category: done
   entity-device-class: done
-  entity-disabled-by-default: todo
+  entity-disabled-by-default: done
   entity-translations: done
   exception-translations: done
   icon-translations: done
-  reconfiguration-flow: todo
+  reconfiguration-flow:
+    status: exempt
+    comment: No user-configurable settings in the configuration flow.
   repair-issues:
     status: exempt
     comment: Integration does not register repair issues.
-  stale-devices: todo
+  stale-devices:
+    status: exempt
+    comment: Each config entry represents a single device.
 
   # Platinum
   async-dependency: done

homeassistant/components/casper_glow/sensor.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from datetime import datetime, timedelta
+
 from pycasperglow import GlowState
 
 from homeassistant.components.sensor import (
@@ -13,6 +15,8 @@ from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.util.dt import utcnow
+from homeassistant.util.variance import ignore_variance
 
 from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
 from .entity import CasperGlowEntity
@@ -26,7 +30,12 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the sensor platform for Casper Glow."""
-    async_add_entities([CasperGlowBatterySensor(entry.runtime_data)])
+    async_add_entities(
+        [
+            CasperGlowBatterySensor(entry.runtime_data),
+            CasperGlowDimmingEndTimeSensor(entry.runtime_data),
+        ]
+    )
 
 
 class CasperGlowBatterySensor(CasperGlowEntity, SensorEntity):
@@ -59,3 +68,67 @@ class CasperGlowBatterySensor(CasperGlowEntity, SensorEntity):
             if new_value != self._attr_native_value:
                 self._attr_native_value = new_value
                 self.async_write_ha_state()
+
+
+class CasperGlowDimmingEndTimeSensor(CasperGlowEntity, SensorEntity):
+    """Sensor entity for Casper Glow dimming end time."""
+
+    _attr_translation_key = "dimming_end_time"
+    _attr_device_class = SensorDeviceClass.TIMESTAMP
+    _attr_entity_registry_enabled_default = False
+
+    def __init__(self, coordinator: CasperGlowCoordinator) -> None:
+        """Initialize the dimming end time sensor."""
+        super().__init__(coordinator)
+        self._attr_unique_id = (
+            f"{format_mac(coordinator.device.address)}_dimming_end_time"
+        )
+        self._is_paused = False
+        self._projected_end_time = ignore_variance(
+            self._calculate_end_time,
+            timedelta(minutes=1, seconds=30),
+        )
+        self._update_from_state(coordinator.device.state)
+
+    @staticmethod
+    def _calculate_end_time(remaining_ms: int) -> datetime:
+        """Calculate projected dimming end time from remaining milliseconds."""
+        return utcnow() + timedelta(milliseconds=remaining_ms)
+
+    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)
+        )
+
+    def _reset_projected_end_time(self) -> None:
+        """Clear the projected end time and reset the variance filter."""
+        self._attr_native_value = None
+        self._projected_end_time = ignore_variance(
+            self._calculate_end_time,
+            timedelta(minutes=1, seconds=30),
+        )
+
+    @callback
+    def _update_from_state(self, state: GlowState) -> None:
+        """Update entity attributes from device state."""
+        if state.is_paused is not None:
+            self._is_paused = state.is_paused
+
+        if self._is_paused:
+            self._reset_projected_end_time()
+            return
+
+        remaining_ms = state.dimming_time_remaining_ms
+        if not remaining_ms:
+            if remaining_ms == 0 or state.is_on is False:
+                self._reset_projected_end_time()
+            return
+        self._attr_native_value = self._projected_end_time(remaining_ms)
+
+    @callback
+    def _async_handle_state_update(self, state: GlowState) -> None:
+        """Handle a state update from the device."""
+        self._update_from_state(state)
+        self.async_write_ha_state()

homeassistant/components/casper_glow/strings.json

@@ -44,6 +44,11 @@
       "dimming_time": {
         "name": "Dimming time"
       }
+    },
+    "sensor": {
+      "dimming_end_time": {
+        "name": "Dimming end time"
+      }
     }
   },
   "exceptions": {

homeassistant/components/cast/strings.json

@@ -44,10 +44,10 @@
   },
   "services": {
     "show_lovelace_view": {
-      "description": "Shows a dashboard view on a Chromecast device.",
+      "description": "Shows a dashboard view on a Google Cast device.",
       "fields": {
         "dashboard_path": {
-          "description": "The URL path of the dashboard to show, defaults to lovelace if not specified.",
+          "description": "The URL path of the dashboard to show, defaults to `lovelace` if not specified.",
           "name": "Dashboard path"
         },
         "entity_id": {
@@ -59,7 +59,7 @@
           "name": "View path"
         }
       },
-      "name": "Show dashboard view"
+      "name": "Show dashboard view via Google Cast"
     }
   }
 }

homeassistant/components/chess_com/config_flow.py

@@ -39,7 +39,9 @@ class ChessConfigFlow(ConfigFlow, domain=DOMAIN):
             else:
                 await self.async_set_unique_id(str(user.player_id))
                 self._abort_if_unique_id_configured()
-                return self.async_create_entry(title=user.name, data=user_input)
+                return self.async_create_entry(
+                    title=user.name or user.username, data=user_input
+                )
 
         return self.async_show_form(
             step_id="user",

homeassistant/components/climate/strings.json

@@ -3,6 +3,7 @@
     "condition_behavior_name": "Condition passes if",
     "condition_threshold_name": "Threshold type",
     "trigger_behavior_name": "Trigger when",
+    "trigger_for_name": "For at least",
     "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
@@ -239,7 +240,7 @@
       "message": "Provided humidity {humidity} is not valid. Accepted range is {min_humidity} to {max_humidity}."
     },
     "low_temp_higher_than_high_temp": {
-      "message": "'Lower target temperature' can not be higher than 'Upper target temperature'."
+      "message": "'Lower target temperature' cannot be higher than 'Upper target temperature'."
     },
     "missing_target_temperature_entity_feature": {
       "message": "Set temperature action was used with the 'Target temperature' parameter but the entity does not support it."
@@ -385,6 +386,9 @@
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
+        },
         "hvac_mode": {
           "description": "The HVAC modes to trigger on.",
           "name": "Modes"
@@ -397,6 +401,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
         }
       },
       "name": "Climate-control device started cooling"
@@ -406,6 +413,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
         }
       },
       "name": "Climate-control device started drying"
@@ -415,6 +425,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
         }
       },
       "name": "Climate-control device started heating"
@@ -434,6 +447,9 @@
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
@@ -455,6 +471,9 @@
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
+        },
         "threshold": {
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
@@ -466,6 +485,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
         }
       },
       "name": "Climate-control device turned off"
@@ -475,6 +497,9 @@
       "fields": {
         "behavior": {
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
+        },
+        "for": {
+          "name": "[%key:component::climate::common::trigger_for_name%]"
         }
       },
       "name": "Climate-control device turned on"

homeassistant/components/climate/triggers.yaml

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

homeassistant/components/cloud/__init__.py

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

homeassistant/components/comelit/alarm_control_panel.py

@@ -112,7 +112,7 @@ class ComelitAlarmEntity(
     @property
     def available(self) -> bool:
         """Return True if alarm is available."""
-        if self._area.human_status in [AlarmAreaState.ANOMALY, AlarmAreaState.UNKNOWN]:
+        if self._area.human_status == AlarmAreaState.UNKNOWN:
             return False
         return super().available
 
@@ -151,7 +151,7 @@ class ComelitAlarmEntity(
         if code != str(self.coordinator.api.device_pin):
             return
         await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[DISABLE]
+            self._area.index, ALARM_ACTIONS[DISABLE], self._area.anomaly
         )
         await self._async_update_state(
             AlarmAreaState.DISARMED, ALARM_AREA_ARMED_STATUS[DISABLE]
@@ -160,7 +160,7 @@ class ComelitAlarmEntity(
     async def async_alarm_arm_away(self, code: str | None = None) -> None:
         """Send arm away command."""
         await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[AWAY]
+            self._area.index, ALARM_ACTIONS[AWAY], self._area.anomaly
         )
         await self._async_update_state(
             AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[AWAY]
@@ -169,7 +169,7 @@ class ComelitAlarmEntity(
     async def async_alarm_arm_home(self, code: str | None = None) -> None:
         """Send arm home command."""
         await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[HOME]
+            self._area.index, ALARM_ACTIONS[HOME], self._area.anomaly
         )
         await self._async_update_state(
             AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[HOME_P1]
@@ -178,7 +178,7 @@ class ComelitAlarmEntity(
     async def async_alarm_arm_night(self, code: str | None = None) -> None:
         """Send arm night command."""
         await self.coordinator.api.set_zone_status(
-            self._area.index, ALARM_ACTIONS[NIGHT]
+            self._area.index, ALARM_ACTIONS[NIGHT], self._area.anomaly
         )
         await self._async_update_state(
             AlarmAreaState.ARMED, ALARM_AREA_ARMED_STATUS[NIGHT]

homeassistant/components/comelit/binary_sensor.py

@@ -1,15 +1,18 @@
-"""Support for sensors."""
+"""Support for binary sensors."""
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, cast
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Final, cast
 
-from aiocomelit.api import ComelitVedoZoneObject
-from aiocomelit.const import ALARM_ZONE, AlarmZoneState
+from aiocomelit.api import ComelitVedoAreaObject, ComelitVedoZoneObject
+from aiocomelit.const import ALARM_AREA, ALARM_ZONE, AlarmAreaState, AlarmZoneState
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
+    BinarySensorEntityDescription,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -23,12 +26,68 @@ from .utils import new_device_listener
 PARALLEL_UPDATES = 0
 
 
+@dataclass(frozen=True, kw_only=True)
+class ComelitBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """Comelit binary sensor entity description."""
+
+    object_type: str
+    is_on_fn: Callable[[ComelitVedoAreaObject | ComelitVedoZoneObject], bool]
+    available_fn: Callable[[ComelitVedoAreaObject | ComelitVedoZoneObject], bool] = (
+        lambda obj: True
+    )
+
+
+BINARY_SENSOR_TYPES: Final[tuple[ComelitBinarySensorEntityDescription, ...]] = (
+    ComelitBinarySensorEntityDescription(
+        key="anomaly",
+        translation_key="anomaly",
+        object_type=ALARM_AREA,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        is_on_fn=lambda obj: cast(ComelitVedoAreaObject, obj).anomaly,
+        available_fn=lambda obj: (
+            cast(ComelitVedoAreaObject, obj).human_status != AlarmAreaState.UNKNOWN
+        ),
+    ),
+    ComelitBinarySensorEntityDescription(
+        key="presence",
+        translation_key="motion",
+        object_type=ALARM_ZONE,
+        device_class=BinarySensorDeviceClass.MOTION,
+        is_on_fn=lambda obj: cast(ComelitVedoZoneObject, obj).status_api == "0001",
+        available_fn=lambda obj: (
+            cast(ComelitVedoZoneObject, obj).human_status
+            not in {
+                AlarmZoneState.FAULTY,
+                AlarmZoneState.UNAVAILABLE,
+                AlarmZoneState.UNKNOWN,
+            }
+        ),
+    ),
+    ComelitBinarySensorEntityDescription(
+        key="faulty",
+        translation_key="faulty",
+        object_type=ALARM_ZONE,
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        is_on_fn=lambda obj: (
+            cast(ComelitVedoZoneObject, obj).human_status == AlarmZoneState.FAULTY
+        ),
+        available_fn=lambda obj: (
+            cast(ComelitVedoZoneObject, obj).human_status
+            not in {
+                AlarmZoneState.UNAVAILABLE,
+                AlarmZoneState.UNKNOWN,
+            }
+        ),
+    ),
+)
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ComelitConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
-    """Set up Comelit VEDO presence sensors."""
+    """Set up Comelit VEDO binary sensors."""
 
     coordinator = config_entry.runtime_data
     is_bridge = isinstance(coordinator, ComelitSerialBridge)
@@ -42,13 +101,23 @@ async def async_setup_entry(
     def _add_new_entities(new_devices: list[ObjectClassType], dev_type: str) -> None:
         """Add entities for new monitors."""
         entities = [
-            ComelitVedoBinarySensorEntity(coordinator, device, config_entry.entry_id)
+            ComelitVedoBinarySensorEntity(
+                coordinator,
+                device,
+                config_entry.entry_id,
+                description,
+            )
+            for description in BINARY_SENSOR_TYPES
             for device in coordinator.data[dev_type].values()
+            if description.object_type == dev_type
             if device in new_devices
         ]
         if entities:
             async_add_entities(entities)
 
+    config_entry.async_on_unload(
+        new_device_listener(coordinator, _add_new_entities, ALARM_AREA)
+    )
     config_entry.async_on_unload(
         new_device_listener(coordinator, _add_new_entities, ALARM_ZONE)
     )
@@ -59,42 +128,47 @@ class ComelitVedoBinarySensorEntity(
 ):
     """Sensor device."""
 
+    entity_description: ComelitBinarySensorEntityDescription
+
     _attr_has_entity_name = True
-    _attr_device_class = BinarySensorDeviceClass.MOTION
 
     def __init__(
         self,
         coordinator: ComelitVedoSystem | ComelitSerialBridge,
-        zone: ComelitVedoZoneObject,
+        object_data: ComelitVedoAreaObject | ComelitVedoZoneObject,
         config_entry_entry_id: str,
+        description: ComelitBinarySensorEntityDescription,
     ) -> None:
         """Init sensor entity."""
-        self._zone_index = zone.index
+        self.entity_description = description
+        self._object_index = object_data.index
+        self._object_type = description.object_type
         super().__init__(coordinator)
         # Use config_entry.entry_id as base for unique_id
         # because no serial number or mac is available
-        self._attr_unique_id = f"{config_entry_entry_id}-presence-{zone.index}"
-        self._attr_device_info = coordinator.platform_device_info(zone, "zone")
+        self._attr_unique_id = (
+            f"{config_entry_entry_id}-{description.key}-{self._object_index}"
+        )
+        self._attr_device_info = coordinator.platform_device_info(
+            object_data, "area" if self._object_type == ALARM_AREA else "zone"
+        )
 
     @property
-    def _zone(self) -> ComelitVedoZoneObject:
-        """Return zone object."""
+    def _object(self) -> ComelitVedoAreaObject | ComelitVedoZoneObject:
+        """Return alarm object."""
         return cast(
-            ComelitVedoZoneObject, self.coordinator.data[ALARM_ZONE][self._zone_index]
+            ComelitVedoAreaObject | ComelitVedoZoneObject,
+            self.coordinator.data[self._object_type][self._object_index],
         )
 
     @property
     def available(self) -> bool:
-        """Return True if alarm is available."""
-        if self._zone.human_status in [
-            AlarmZoneState.FAULTY,
-            AlarmZoneState.UNAVAILABLE,
-            AlarmZoneState.UNKNOWN,
-        ]:
+        """Return True if object is available."""
+        if not self.entity_description.available_fn(self._object):
             return False
         return super().available
 
     @property
     def is_on(self) -> bool:
-        """Presence detected."""
-        return self._zone.status_api == "0001"
+        """Return object binary sensor state."""
+        return self.entity_description.is_on_fn(self._object)

homeassistant/components/comelit/coordinator.py

@@ -65,6 +65,7 @@ class ComelitBaseCoordinator(DataUpdateCoordinator[T]):
         )
         device_registry = dr.async_get(self.hass)
         device_registry.async_get_or_create(
+            configuration_url=self.api.base_url,
             config_entry_id=entry.entry_id,
             identifiers={(DOMAIN, entry.entry_id)},
             model=device,

homeassistant/components/comelit/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["aiocomelit"],
   "quality_scale": "platinum",
-  "requirements": ["aiocomelit==2.0.1"]
+  "requirements": ["aiocomelit==2.0.2"]
 }

homeassistant/components/comelit/strings.json

@@ -64,6 +64,17 @@
     }
   },
   "entity": {
+    "binary_sensor": {
+      "anomaly": {
+        "name": "Anomaly"
+      },
+      "faulty": {
+        "name": "Faulty"
+      },
+      "motion": {
+        "name": "Motion"
+      }
+    },
     "climate": {
       "thermostat": {
         "state_attributes": {

homeassistant/components/configurator/__init__.py

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

homeassistant/components/conversation/__init__.py

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

homeassistant/components/counter/strings.json

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

homeassistant/components/counter/triggers.yaml

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