ProxmoxVE add typing to auth kwargs (#174930 )

ProxmoxVE add stale device removal (#174932 )
Use async coordinator in stiebel_eltron integration (#174850 )
2026-06-27 00:55:26 +02:00 · 2026-06-26 23:56:55 +02:00 · 2026-06-26 23:51:13 +02:00 · 2026-06-26 17:32:25 -04:00 · 2026-06-26 17:29:02 -04:00 · 2026-06-26 22:28:43 +02:00
207 changed files with 4151 additions and 2230 deletions
@@ -12,6 +12,7 @@ on:
    types: [opened, synchronize, reopened]
    paths:
      - "requirements*.txt"
+      - "**/requirements*.txt"
      - "homeassistant/package_constraints.txt"
  workflow_dispatch:
    inputs:
@@ -58,6 +59,7 @@ jobs:
          echo "head_sha=${HEAD_SHA}" >> "${GITHUB_OUTPUT}"
      - name: Run deterministic checks
        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          PR_NUMBER: ${{ inputs.pull_request_number || github.event.pull_request.number }}
          HEAD_SHA: ${{ steps.pr.outputs.head_sha }}
        run: |
@@ -1,5 +1,5 @@
-# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"7b142e96e0f8b454cdcc9c0c25070cf9a52c44d83a6b1fbc3ad6725b6567337c","body_hash":"3894ded07d5934ac5f29d160ffb1f9115cf72b6da8a7e453a4d4f69e8641a48e","compiler_version":"v0.79.6","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.60"}}
-# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"df4cb1c069e1874edd31b4311f1884172cec0e10","version":"v6.0.3"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"v0.79.6","version":"v0.79.6"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.27.2","digest":"sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.27.2@sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.2","digest":"sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.2@sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.27.2","digest":"sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.27.2@sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.25","digest":"sha256:c10331ad17668ef89f38f5e356678788a40b0cd5fef96e8f92e1d9c1de47cbaa","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.25@sha256:c10331ad17668ef89f38f5e356678788a40b0cd5fef96e8f92e1d9c1de47cbaa"},{"image":"ghcr.io/github/github-mcp-server:v1.1.2","digest":"sha256:30197479d8036c7811892bc07e06f9a05c9ef3cdd79bc59f256d50647f95788c","pinned_image":"ghcr.io/github/github-mcp-server:v1.1.2@sha256:30197479d8036c7811892bc07e06f9a05c9ef3cdd79bc59f256d50647f95788c"}]}
+# gh-aw-metadata: {"schema_version":"v4","frontmatter_hash":"36a7fc263a2ce868d74a266f23eb7772d82fd397806464384fe087479ddd4a70","body_hash":"bba8c011f2b82bb4d9847a359f43f0e7d91245b280678c20e5112b3c9e77d5cd","compiler_version":"v0.79.6","strict":true,"agent_id":"copilot","engine_versions":{"copilot":"1.0.60"}}
+# gh-aw-manifest: {"version":1,"secrets":["COPILOT_GITHUB_TOKEN","GH_AW_GITHUB_MCP_SERVER_TOKEN","GH_AW_GITHUB_TOKEN","GITHUB_TOKEN"],"actions":[{"repo":"actions/checkout","sha":"df4cb1c069e1874edd31b4311f1884172cec0e10","version":"v6.0.3"},{"repo":"actions/download-artifact","sha":"3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c","version":"v8.0.1"},{"repo":"actions/github-script","sha":"3a2844b7e9c422d3c10d287c895573f7108da1b3","version":"v9.0.0"},{"repo":"actions/setup-node","sha":"48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e","version":"v6.4.0"},{"repo":"actions/upload-artifact","sha":"043fb46d1a93c77aae656e7c1c64a875d1fc6a0a","version":"v7.0.1"},{"repo":"github/gh-aw-actions/setup","sha":"5c2fe865bb4dc46e1450f6ee0d0541d759aea73a","version":"v0.79.6"}],"containers":[{"image":"ghcr.io/github/gh-aw-firewall/agent:0.27.2","digest":"sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6","pinned_image":"ghcr.io/github/gh-aw-firewall/agent:0.27.2@sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6"},{"image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.2","digest":"sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4","pinned_image":"ghcr.io/github/gh-aw-firewall/api-proxy:0.27.2@sha256:ee39841d980878ebbb87592903b06d31a1af500c71525c9616f7e8e2a27041a4"},{"image":"ghcr.io/github/gh-aw-firewall/squid:0.27.2","digest":"sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591","pinned_image":"ghcr.io/github/gh-aw-firewall/squid:0.27.2@sha256:2e3a717e5f19a654cd9a2263beb52012b56bcb68562ec5ae2e42f9d156b49591"},{"image":"ghcr.io/github/gh-aw-mcpg:v0.3.25","digest":"sha256:c10331ad17668ef89f38f5e356678788a40b0cd5fef96e8f92e1d9c1de47cbaa","pinned_image":"ghcr.io/github/gh-aw-mcpg:v0.3.25@sha256:c10331ad17668ef89f38f5e356678788a40b0cd5fef96e8f92e1d9c1de47cbaa"},{"image":"ghcr.io/github/github-mcp-server:v1.1.2","digest":"sha256:30197479d8036c7811892bc07e06f9a05c9ef3cdd79bc59f256d50647f95788c","pinned_image":"ghcr.io/github/github-mcp-server:v1.1.2@sha256:30197479d8036c7811892bc07e06f9a05c9ef3cdd79bc59f256d50647f95788c"}]}
 #    ___                   _   _      
 #   / _ \                 | | (_)     
 #  | |_| | __ _  ___ _ __ | |_ _  ___ 
@@ -36,7 +36,7 @@
 #   - actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
 #   - actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
 #   - actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-#   - github/gh-aw-actions/setup@v0.79.6
+#   - github/gh-aw-actions/setup@5c2fe865bb4dc46e1450f6ee0d0541d759aea73a # v0.79.6
 #
 # Container images used:
 #   - ghcr.io/github/gh-aw-firewall/agent:0.27.2@sha256:f88e5b17b6b7a600117bc121114d6ce2155c88c983c0c939c5df884f730fa1d6
@@ -92,7 +92,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@v0.79.6
+        uses: github/gh-aw-actions/setup@5c2fe865bb4dc46e1450f6ee0d0541d759aea73a # v0.79.6
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -344,9 +344,8 @@ jobs:
  agent:
    needs:
      - activation
-      - extract_pr_number
-      - gate
-    if: needs.activation.outputs.daily_effective_workflow_exceeded != 'true'
+      - prepare
+    if: (needs.prepare.outputs.skip != 'true') && (needs.activation.outputs.daily_effective_workflow_exceeded != 'true')
    runs-on: ubuntu-latest
    permissions:
      actions: read
@@ -383,7 +382,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@v0.79.6
+        uses: github/gh-aw-actions/setup@5c2fe865bb4dc46e1450f6ee0d0541d759aea73a # v0.79.6
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -489,15 +488,15 @@ jobs:
          mkdir -p "${RUNNER_TEMP}/gh-aw/safeoutputs"
          mkdir -p /tmp/gh-aw/safeoutputs
          mkdir -p /tmp/gh-aw/mcp-logs/safeoutputs
-          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_f496a449c5dccca1_EOF'
-          {"add_comment":{"max":1,"target":"${{ needs.extract_pr_number.outputs.pr_number }}"},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
-          GH_AW_SAFE_OUTPUTS_CONFIG_f496a449c5dccca1_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/safeoutputs/config.json" << 'GH_AW_SAFE_OUTPUTS_CONFIG_823c5547a5e52957_EOF'
+          {"add_comment":{"max":1,"target":"${{ needs.prepare.outputs.pr_number }}"},"create_report_incomplete_issue":{},"missing_data":{},"missing_tool":{},"noop":{"max":1,"report-as-issue":"true"},"report_incomplete":{}}
+          GH_AW_SAFE_OUTPUTS_CONFIG_823c5547a5e52957_EOF
      - name: Generate Safe Outputs Tools
        env:
          GH_AW_TOOLS_META_JSON: |
            {
              "description_suffixes": {
-                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added. Target: ${{ needs.extract_pr_number.outputs.pr_number }}. Supports reply_to_id for discussion threading."
+                "add_comment": " CONSTRAINTS: Maximum 1 comment(s) can be added. Target: ${{ needs.prepare.outputs.pr_number }}. Supports reply_to_id for discussion threading."
              },
              "repo_params": {},
              "dynamic_tools": []
@@ -994,8 +993,7 @@ jobs:
      - activation
      - agent
      - detection
-      - extract_pr_number
-      - gate
+      - prepare
      - safe_outputs
    if: >
      always() && (needs.agent.result != 'skipped' || needs.activation.outputs.lockdown_check_failed == 'true' ||
@@ -1018,7 +1016,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@v0.79.6
+        uses: github/gh-aw-actions/setup@5c2fe865bb4dc46e1450f6ee0d0541d759aea73a # v0.79.6
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -1208,7 +1206,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@v0.79.6
+        uses: github/gh-aw-actions/setup@5c2fe865bb4dc46e1450f6ee0d0541d759aea73a # v0.79.6
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -1429,111 +1427,6 @@ jobs:
              }
            }

-  extract_pr_number:
-    needs: gate
-    if: needs.gate.outputs.skip != 'true' && github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-
-    outputs:
-      pr_number: ${{ steps.extract.outputs.pr_number }}
-    steps:
-      - name: Configure GH_HOST for enterprise compatibility
-        id: ghes-host-config
-        shell: bash
-        # zizmor: ignore[github-env] - GITHUB_SERVER_URL is set by GitHub Actions, not user input.
-        run: |
-          # Derive GH_HOST from GITHUB_SERVER_URL so the gh CLI targets the correct
-          # GitHub instance (GHES/GHEC). On github.com this is a harmless no-op.
-          GH_HOST="${GITHUB_SERVER_URL#https://}"
-          GH_HOST="${GH_HOST#http://}"
-          echo "GH_HOST=${GH_HOST}" >> "$GITHUB_ENV"
-      - name: Download deterministic-results artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          name: check-requirements-deterministic
-          path: /tmp/deterministic
-          run-id: ${{ github.event.workflow_run.id }}
-      - name: Extract PR number from artifact
-        id: extract
-        run: |
-          PR=$(jq -r '.pr_number' /tmp/deterministic/results.json)
-          echo "pr_number=${PR}" >> "${GITHUB_OUTPUT}"
-
-  gate:
-    needs: activation
-    if: github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      pull-requests: read
-
-    outputs:
-      skip: ${{ steps.gate.outputs.skip }}
-    steps:
-      - name: Configure GH_HOST for enterprise compatibility
-        id: ghes-host-config
-        shell: bash
-        # zizmor: ignore[github-env] - GITHUB_SERVER_URL is set by GitHub Actions, not user input.
-        run: |
-          # Derive GH_HOST from GITHUB_SERVER_URL so the gh CLI targets the correct
-          # GitHub instance (GHES/GHEC). On github.com this is a harmless no-op.
-          GH_HOST="${GITHUB_SERVER_URL#https://}"
-          GH_HOST="${GH_HOST#http://}"
-          echo "GH_HOST=${GH_HOST}" >> "$GITHUB_ENV"
-      - name: Download deterministic-results artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          name: check-requirements-deterministic
-          path: /tmp/gate
-          run-id: ${{ github.event.workflow_run.id }}
-      - name: Decide whether requirements changed since the last comment
-        id: gate
-        run: |
-          PR=$(jq -r '.pr_number' /tmp/gate/results.json)
-          HEAD=$(jq -r '.head_sha // empty' /tmp/gate/results.json)
-          if [ -z "${HEAD}" ]; then
-            echo "Artifact has no head_sha; running the agent."
-            exit 0
-          fi
-          # Recover the commit recorded in the most recent requirements-check
-          # comment from the "Checked at commit" link
-          PRIOR=$(gh api --paginate "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" \
-            --jq '.[] | select(.body | contains("<!-- requirements-check -->")) | .body' \
-            | grep -oiE '/commit/[0-9a-f]{40}' \
-            | grep -oiE '[0-9a-f]{40}' | tail -1 || true)
-          if [ -z "${PRIOR}" ]; then
-            echo "No previous comment with a recorded commit; running the agent."
-            exit 0
-          fi
-          if [ "${PRIOR}" = "${HEAD}" ]; then
-            echo "Head ${HEAD} unchanged since the last comment; skipping the agent."
-            echo "skip=true" >> "${GITHUB_OUTPUT}"
-            exit 0
-          fi
-          # List files changed between the recorded commit and the current head.
-          # Tracked patterns mirror script/check_requirements/diff.py TRACKED_PATTERNS.
-          CHANGED=$(gh api "repos/${GITHUB_REPOSITORY}/compare/${PRIOR}...${HEAD}" \
-            --jq '.files[].filename' 2>/dev/null) || {
-            echo "Could not compare ${PRIOR}...${HEAD}; running the agent."
-            exit 0
-          }
-          TRACKED=$(printf '%s\n' "${CHANGED}" \
-            | grep -Ex 'requirements.*\.txt|homeassistant/package_constraints\.txt' || true)
-          if [ -z "${TRACKED}" ]; then
-            echo "No tracked requirement files changed since ${PRIOR}; skipping the agent."
-            echo "skip=true" >> "${GITHUB_OUTPUT}"
-          else
-            echo "Tracked requirement files changed since ${PRIOR}; running the agent:"
-            printf '%s\n' "${TRACKED}"
-          fi
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
  pre_activation:
    runs-on: ubuntu-slim
    outputs:
@@ -1545,7 +1438,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@v0.79.6
+        uses: github/gh-aw-actions/setup@5c2fe865bb4dc46e1450f6ee0d0541d759aea73a # v0.79.6
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -1568,12 +1461,48 @@ jobs:
            const { main } = require('${{ runner.temp }}/gh-aw/actions/check_membership.cjs');
            await main();

+  prepare:
+    needs: activation
+    if: github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+
+    outputs:
+      pr_number: ${{ steps.prepare.outputs.pr_number }}
+      skip: ${{ steps.prepare.outputs.skip }}
+    steps:
+      - name: Configure GH_HOST for enterprise compatibility
+        id: ghes-host-config
+        shell: bash
+        # zizmor: ignore[github-env] - GITHUB_SERVER_URL is set by GitHub Actions, not user input.
+        run: |
+          # Derive GH_HOST from GITHUB_SERVER_URL so the gh CLI targets the correct
+          # GitHub instance (GHES/GHEC). On github.com this is a harmless no-op.
+          GH_HOST="${GITHUB_SERVER_URL#https://}"
+          GH_HOST="${GH_HOST#http://}"
+          echo "GH_HOST=${GH_HOST}" >> "$GITHUB_ENV"
+      - name: Download deterministic-results artifact
+        id: download
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          name: check-requirements-deterministic
+          path: /tmp/deterministic
+          run-id: ${{ github.event.workflow_run.id }}
+      - name: Resolve skip and PR number from the artifact
+        id: prepare
+        run: |
+          echo "skip=$(jq -r '.skip_aw' /tmp/deterministic/results.json)" >> "${GITHUB_OUTPUT}"
+          echo "pr_number=$(jq -r '.pr_number' /tmp/deterministic/results.json)" >> "${GITHUB_OUTPUT}"
+
  safe_outputs:
    needs:
      - activation
      - agent
      - detection
-      - extract_pr_number
+      - prepare
    if: (!cancelled()) && needs.agent.result != 'skipped' && needs.detection.result == 'success'
    runs-on: ubuntu-slim
    permissions:
@@ -1609,7 +1538,7 @@ jobs:
    steps:
      - name: Setup Scripts
        id: setup
-        uses: github/gh-aw-actions/setup@v0.79.6
+        uses: github/gh-aw-actions/setup@5c2fe865bb4dc46e1450f6ee0d0541d759aea73a # v0.79.6
        with:
          destination: ${{ runner.temp }}/gh-aw/actions
          job-name: ${{ github.job }}
@@ -1654,7 +1583,7 @@ jobs:
          GH_AW_ALLOWED_DOMAINS: "*.pythonhosted.org,anaconda.org,api.business.githubcopilot.com,api.enterprise.githubcopilot.com,api.github.com,api.githubcopilot.com,api.individual.githubcopilot.com,binstar.org,bootstrap.pypa.io,conda.anaconda.org,conda.binstar.org,files.pythonhosted.org,github.com,host.docker.internal,pip.pypa.io,pypi.org,pypi.python.org,raw.githubusercontent.com,registry.npmjs.org,repo.anaconda.com,repo.continuum.io,telemetry.enterprise.githubcopilot.com"
          GITHUB_SERVER_URL: ${{ github.server_url }}
          GITHUB_API_URL: ${{ github.api_url }}
-          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"max\":1,\"target\":\"${{ needs.extract_pr_number.outputs.pr_number }}\"},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"true\"},\"report_incomplete\":{}}"
+          GH_AW_SAFE_OUTPUTS_HANDLER_CONFIG: "{\"add_comment\":{\"max\":1,\"target\":\"${{ needs.prepare.outputs.pr_number }}\"},\"create_report_incomplete_issue\":{},\"missing_data\":{},\"missing_tool\":{},\"noop\":{\"max\":1,\"report-as-issue\":\"true\"},\"report_incomplete\":{}}"
        with:
          github-token: ${{ secrets.GH_AW_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
          script: |
@@ -15,94 +15,41 @@ tools:
  github:
    toolsets: [repos, pull_requests]
    min-integrity: unapproved
+if: needs.prepare.outputs.skip != 'true'
 safe-outputs:
  add-comment:
    max: 1
-    target: "${{ needs.extract_pr_number.outputs.pr_number }}"
+    target: "${{ needs.prepare.outputs.pr_number }}"
  needs:
-    - extract_pr_number
+    - prepare
 jobs:
-  gate:
-    # Skip the (token-spending) agent when no tracked requirement file changed
+  prepare:
+    # The deterministic stage always uploads an artifact; its `skip_aw` flag is
+    # true when no tracked requirement file changed since the last comment,
+    # which is our cue to skip the (token-spending) agent. Recover the PR number
+    # to comment on either way.
    if: github.event.workflow_run.conclusion == 'success'
    runs-on: ubuntu-latest
    permissions:
      actions: read
      contents: read
-      pull-requests: read
    outputs:
-      skip: ${{ steps.gate.outputs.skip }}
-    steps:
-      - name: Download deterministic-results artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: check-requirements-deterministic
-          path: /tmp/gate
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Decide whether requirements changed since the last comment
-        id: gate
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          PR=$(jq -r '.pr_number' /tmp/gate/results.json)
-          HEAD=$(jq -r '.head_sha // empty' /tmp/gate/results.json)
-          if [ -z "${HEAD}" ]; then
-            echo "Artifact has no head_sha; running the agent."
-            exit 0
-          fi
-          # Recover the commit recorded in the most recent requirements-check
-          # comment from the "Checked at commit" link
-          PRIOR=$(gh api --paginate "repos/${GITHUB_REPOSITORY}/issues/${PR}/comments" \
-            --jq '.[] | select(.body | contains("<!-- requirements-check -->")) | .body' \
-            | grep -oiE '/commit/[0-9a-f]{40}' \
-            | grep -oiE '[0-9a-f]{40}' | tail -1 || true)
-          if [ -z "${PRIOR}" ]; then
-            echo "No previous comment with a recorded commit; running the agent."
-            exit 0
-          fi
-          if [ "${PRIOR}" = "${HEAD}" ]; then
-            echo "Head ${HEAD} unchanged since the last comment; skipping the agent."
-            echo "skip=true" >> "${GITHUB_OUTPUT}"
-            exit 0
-          fi
-          # List files changed between the recorded commit and the current head.
-          # Tracked patterns mirror script/check_requirements/diff.py TRACKED_PATTERNS.
-          CHANGED=$(gh api "repos/${GITHUB_REPOSITORY}/compare/${PRIOR}...${HEAD}" \
-            --jq '.files[].filename' 2>/dev/null) || {
-            echo "Could not compare ${PRIOR}...${HEAD}; running the agent."
-            exit 0
-          }
-          TRACKED=$(printf '%s\n' "${CHANGED}" \
-            | grep -Ex 'requirements.*\.txt|homeassistant/package_constraints\.txt' || true)
-          if [ -z "${TRACKED}" ]; then
-            echo "No tracked requirement files changed since ${PRIOR}; skipping the agent."
-            echo "skip=true" >> "${GITHUB_OUTPUT}"
-          else
-            echo "Tracked requirement files changed since ${PRIOR}; running the agent:"
-            printf '%s\n' "${TRACKED}"
-          fi
-  extract_pr_number:
-    needs: gate
-    if: needs.gate.outputs.skip != 'true' && github.event.workflow_run.conclusion == 'success'
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-    outputs:
-      pr_number: ${{ steps.extract.outputs.pr_number }}
+      skip: ${{ steps.prepare.outputs.skip }}
+      pr_number: ${{ steps.prepare.outputs.pr_number }}
    steps:
      - name: Download deterministic-results artifact
+        id: download
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        with:
          name: check-requirements-deterministic
          path: /tmp/deterministic
          run-id: ${{ github.event.workflow_run.id }}
          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract PR number from artifact
-        id: extract
+      - name: Resolve skip and PR number from the artifact
+        id: prepare
        run: |
-          PR=$(jq -r '.pr_number' /tmp/deterministic/results.json)
-          echo "pr_number=${PR}" >> "${GITHUB_OUTPUT}"
+          echo "skip=$(jq -r '.skip_aw' /tmp/deterministic/results.json)" >> "${GITHUB_OUTPUT}"
+          echo "pr_number=$(jq -r '.pr_number' /tmp/deterministic/results.json)" >> "${GITHUB_OUTPUT}"
 concurrency:
  group: ${{ github.workflow }}-${{ github.event.workflow_run.id }}
  cancel-in-progress: true
@@ -39,7 +39,7 @@ on:
 env:
  CACHE_VERSION: 3
  MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.7"
+  HA_SHORT_VERSION: "2026.8"
  ADDITIONAL_PYTHON_VERSIONS: "[]"
  # 10.3 is the oldest supported version
  # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
@@ -790,8 +790,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/html5/ @alexyao2015 @tr4nt0r
 /homeassistant/components/http/ @home-assistant/core
 /tests/components/http/ @home-assistant/core
-/homeassistant/components/huawei_lte/ @scop @fphammerle
-/tests/components/huawei_lte/ @scop @fphammerle
+/homeassistant/components/huawei_lte/ @fphammerle
+/tests/components/huawei_lte/ @fphammerle
 /homeassistant/components/hue/ @marcelveldt
 /tests/components/hue/ @marcelveldt
 /homeassistant/components/hue_ble/ @flip-dots
@@ -66,6 +66,7 @@ from .const import (
    BASE_PLATFORMS,
    FORMAT_DATETIME,
    KEY_DATA_LOGGING as DATA_LOGGING,
+    KEY_DATA_LOGGING_DISABLED_REASON as DATA_LOGGING_DISABLED_REASON,
    SIGNAL_BOOTSTRAP_INTEGRATIONS,
 )
 from .core_config import async_process_ha_core_config
@@ -129,6 +130,11 @@ SETUP_ORDER_SORT_KEY = partial(contains, BASE_PLATFORMS)


 ERROR_LOG_FILENAME = "home-assistant.log"
+ENV_DISABLE_LOG_FILE = "HA_DISABLE_LOG_FILE"
+ENV_DUPLICATE_LOG_FILE = "HA_DUPLICATE_LOG_FILE"
+ENV_SUPERVISOR = "SUPERVISOR"
+LOG_FILE_DISABLED_REASON_ENVIRONMENT = "environment"
+LOG_FILE_DISABLED_REASON_SUPERVISOR = "supervisor"

 # hass.data key for logging information.
 DATA_REGISTRIES_LOADED: HassKey[None] = HassKey("bootstrap_registries_loaded")
@@ -642,10 +648,12 @@ async def async_enable_logging(
    logger.setLevel(logging.INFO if verbose else logging.WARNING)

    if log_file is None:
+        disabled_log_file_reason = _log_file_disabled_reason()
        default_log_path = hass.config.path(ERROR_LOG_FILENAME)
-        if "SUPERVISOR" in os.environ and "HA_DUPLICATE_LOG_FILE" not in os.environ:
+        if disabled_log_file_reason:
            # Rename the default log file if it exists, since previous versions created
-            # it even on Supervisor
+            # it before Supervisor disabled duplicate file logging or
+            # HA_DISABLE_LOG_FILE disabled the log file.
            def rename_old_file() -> None:
                """Rename old log file in executor."""
                if os.path.isfile(default_log_path):
@@ -657,6 +665,7 @@ async def async_enable_logging(
        else:
            err_log_path = default_log_path
    else:
+        disabled_log_file_reason = None
        err_log_path = os.path.abspath(log_file)

    if err_log_path:
@@ -669,10 +678,34 @@ async def async_enable_logging(

        # Save the log file location for access by other components.
        hass.data[DATA_LOGGING] = err_log_path
+    elif disabled_log_file_reason == LOG_FILE_DISABLED_REASON_ENVIRONMENT:
+        hass.data[DATA_LOGGING_DISABLED_REASON] = disabled_log_file_reason

    async_activate_log_queue_handler(hass)


+def _log_file_disabled_reason() -> str | None:
+    """Return why the log file is disabled."""
+    if ENV_SUPERVISOR in os.environ and ENV_DUPLICATE_LOG_FILE not in os.environ:
+        return LOG_FILE_DISABLED_REASON_SUPERVISOR
+
+    disable_log_file = os.environ.get(ENV_DISABLE_LOG_FILE)
+    if disable_log_file is None:
+        return None
+
+    try:
+        if cv.boolean(disable_log_file):
+            return LOG_FILE_DISABLED_REASON_ENVIRONMENT
+    except vol.Invalid:
+        _LOGGER.warning(
+            "Ignoring invalid %s value: %s. Expected a boolean value: "
+            "1/0, true/false, yes/no, on/off, or enable/disable",
+            ENV_DISABLE_LOG_FILE,
+            disable_log_file,
+        )
+    return None
+
+
 def _create_log_file(
    err_log_path: str, log_rotate_days: int | None
 ) -> RotatingFileHandler | TimedRotatingFileHandler:
@@ -734,7 +767,7 @@ def _get_domains(hass: core.HomeAssistant, config: dict[str, Any]) -> set[str]:
        domains.update(DEFAULT_INTEGRATIONS_RECOVERY_MODE)

    # Add domains depending on if the Supervisor is used or not
-    if "SUPERVISOR" in os.environ:
+    if ENV_SUPERVISOR in os.environ:
        domains.update(DEFAULT_INTEGRATIONS_SUPERVISOR)

    return domains
@@ -27,7 +27,7 @@ from .const import CONDITIONS_MAP, DOMAIN, FORECAST_MAP
 _LOGGER = logging.getLogger(__name__)

 API_TIMEOUT: Final[int] = 120
-WEATHER_UPDATE_INTERVAL = timedelta(minutes=10)
+WEATHER_UPDATE_INTERVAL = timedelta(minutes=20)

 type AemetConfigEntry = ConfigEntry[AemetData]

@@ -11,10 +11,10 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
    CONF_NAME,
-    PERCENTAGE,
+    UnitOfDensity,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -76,14 +76,14 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_PM1,
        device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
    ),
    AirlySensorEntityDescription(
        key=ATTR_API_PM25,
        device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -94,7 +94,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_PM10,
        device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -105,7 +105,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_HUMIDITY,
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=1,
    ),
@@ -126,7 +126,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_CO,
        device_class=SensorDeviceClass.CO,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -137,7 +137,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_NO2,
        device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -148,7 +148,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_SO2,
        device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -159,7 +159,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_O3,
        device_class=SensorDeviceClass.OZONE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -12,11 +12,7 @@ from homeassistant.components.sensor import (
    SensorEntityDescription,
    SensorStateClass,
 )
-from homeassistant.const import (
-    ATTR_TIME,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
-)
+from homeassistant.const import ATTR_TIME, UnitOfDensity, UnitOfRatio
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -95,7 +91,7 @@ SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
    AirNowEntityDescription(
        key=ATTR_API_PM10,
        translation_key="pm10",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        device_class=SensorDeviceClass.PM10,
        value_fn=lambda data: data.get(ATTR_API_PM10),
@@ -104,7 +100,7 @@ SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
    AirNowEntityDescription(
        key=ATTR_API_PM25,
        translation_key="pm25",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        device_class=SensorDeviceClass.PM25,
        value_fn=lambda data: data.get(ATTR_API_PM25),
@@ -113,7 +109,7 @@ SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
    AirNowEntityDescription(
        key=ATTR_API_O3,
        translation_key="o3",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
        value_fn=lambda data: data.get(ATTR_API_O3),
        extra_state_attributes_fn=None,
@@ -8,7 +8,7 @@ from typing import override
 from aioairq.core import AirQ

 from homeassistant.components.number import NumberEntity, NumberEntityDescription
-from homeassistant.const import PERCENTAGE
+from homeassistant.const import UnitOfRatio
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -32,7 +32,7 @@ AIRQ_LED_BRIGHTNESS = AirQBrightnessDescription(
    native_min_value=0.0,
    native_max_value=100.0,
    native_step=1.0,
-    native_unit_of_measurement=PERCENTAGE,
+    native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
    value=lambda data: data["brightness"],
    set_value=lambda device, value: device.set_current_brightness(value),
 )
@@ -12,13 +12,9 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_GRAMS_PER_CUBIC_METER,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
+    UnitOfDensity,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfSoundPressure,
    UnitOfTemperature,
 )
@@ -44,70 +40,70 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    AirQEntityDescription(
        key="c2h4o",
        translation_key="acetaldehyde",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("c2h4o"),
    ),
    AirQEntityDescription(
        key="nh3_MR100",
        translation_key="ammonia",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("nh3_MR100"),
    ),
    AirQEntityDescription(
        key="ash3",
        translation_key="arsine",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("ash3"),
    ),
    AirQEntityDescription(
        key="br2",
        translation_key="bromine",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("br2"),
    ),
    AirQEntityDescription(
        key="ch4s",
        translation_key="methanethiol",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("ch4s"),
    ),
    AirQEntityDescription(
        key="cl2_M20",
        translation_key="chlorine",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("cl2_M20"),
    ),
    AirQEntityDescription(
        key="clo2",
        translation_key="chlorine_dioxide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("clo2"),
    ),
    AirQEntityDescription(
        key="co",
        translation_key="carbon_monoxide",
-        native_unit_of_measurement=CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("co"),
    ),
    AirQEntityDescription(
        key="co2",
        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("co2"),
    ),
    AirQEntityDescription(
        key="cs2",
        translation_key="carbon_disulfide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("cs2"),
    ),
@@ -122,182 +118,182 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    AirQEntityDescription(
        key="ethanol",
        translation_key="ethanol",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("ethanol"),
    ),
    AirQEntityDescription(
        key="c2h4",
        translation_key="ethylene",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("c2h4"),
    ),
    AirQEntityDescription(
        key="ch2o_M10",
        translation_key="formaldehyde",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("ch2o_M10"),
    ),
    AirQEntityDescription(
        key="f2",
        translation_key="fluorine",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("f2"),
    ),
    AirQEntityDescription(
        key="h2s",
        translation_key="hydrogen_sulfide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("h2s"),
    ),
    AirQEntityDescription(
        key="hcl",
        translation_key="hydrochloric_acid",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("hcl"),
    ),
    AirQEntityDescription(
        key="hcn",
        translation_key="hydrogen_cyanide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("hcn"),
    ),
    AirQEntityDescription(
        key="hf",
        translation_key="hydrogen_fluoride",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("hf"),
    ),
    AirQEntityDescription(
        key="health",
        translation_key="health_index",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("health", 0.0) / 10.0,
    ),
    AirQEntityDescription(
        key="humidity",
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("humidity"),
    ),
    AirQEntityDescription(
        key="humidity_abs",
        device_class=SensorDeviceClass.ABSOLUTE_HUMIDITY,
-        native_unit_of_measurement=CONCENTRATION_GRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.GRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("humidity_abs"),
    ),
    AirQEntityDescription(
        key="h2_M1000",
        translation_key="hydrogen",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("h2_M1000"),
    ),
    AirQEntityDescription(
        key="h2o2",
        translation_key="hydrogen_peroxide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("h2o2"),
    ),
    AirQEntityDescription(
        key="ch4_MIPEX",
        translation_key="methane",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("ch4_MIPEX"),
    ),
    AirQEntityDescription(
        key="mold",
        translation_key="mold",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("mold"),
    ),
    AirQEntityDescription(
        key="n2o",
        device_class=SensorDeviceClass.NITROUS_OXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("n2o"),
    ),
    AirQEntityDescription(
        key="no_M250",
        device_class=SensorDeviceClass.NITROGEN_MONOXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("no_M250"),
    ),
    AirQEntityDescription(
        key="no2",
        device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("no2"),
    ),
    AirQEntityDescription(
        key="acid_M100",
        translation_key="organic_acid",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("acid_M100"),
    ),
    AirQEntityDescription(
        key="oxygen",
        translation_key="oxygen",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("oxygen"),
    ),
    AirQEntityDescription(
        key="o3",
        device_class=SensorDeviceClass.OZONE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("o3"),
    ),
    AirQEntityDescription(
        key="performance",
        translation_key="performance_index",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("performance", 0.0) / 10.0,
    ),
    AirQEntityDescription(
        key="ph3",
        translation_key="hydrogen_phosphide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("ph3"),
    ),
    AirQEntityDescription(
        key="pm1",
        device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("pm1"),
    ),
    AirQEntityDescription(
        key="pm2_5",
        device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("pm2_5"),
    ),
    AirQEntityDescription(
        key="pm10",
        device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("pm10"),
    ),
@@ -319,42 +315,42 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    AirQEntityDescription(
        key="c3h8_MIPEX",
        translation_key="propane",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("c3h8_MIPEX"),
    ),
    AirQEntityDescription(
        key="r32",
        translation_key="r32",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("r32"),
    ),
    AirQEntityDescription(
        key="r454b",
        translation_key="r454b",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("r454b"),
    ),
    AirQEntityDescription(
        key="r454c",
        translation_key="r454c",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("r454c"),
    ),
    AirQEntityDescription(
        key="sih4",
        translation_key="silicon_hydride",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("sih4"),
    ),
    AirQEntityDescription(
        key="so2",
        device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("so2"),
    ),
@@ -391,7 +387,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    AirQEntityDescription(
        key="tvoc",
        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("tvoc"),
    ),
@@ -399,14 +395,14 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
        key="tvoc_ionsc",
        translation_key="industrial_volatile_organic_compounds",
        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("tvoc_ionsc"),
    ),
    AirQEntityDescription(
        key="virus",
        translation_key="virus_index",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("virus", 0.0),
    ),
@@ -1,6 +1,8 @@
 """Support for airthings ble sensors."""

+from collections.abc import Callable
 import dataclasses
+from dataclasses import dataclass
 import logging
 from typing import override

@@ -13,13 +15,11 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    EntityCategory,
    Platform,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfSoundPressure,
    UnitOfTemperature,
 )
@@ -46,87 +46,108 @@ CONNECTIVITY_MODE_MAP = {
    AirthingsConnectivityMode.NOT_CONFIGURED.value: "not_configured",
 }

-SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
-    "radon_1day_avg": SensorEntityDescription(
+
+def get_connectivity_mode(value: str | float | None) -> str | None:
+    """Get connectivity mode."""
+    if not isinstance(value, str):
+        return None
+    return CONNECTIVITY_MODE_MAP.get(value)
+
+
+@dataclass(frozen=True, kw_only=True)
+class AirthingsBLESensorEntityDescription(SensorEntityDescription):
+    """Describes Airthings BLE sensor entity."""
+
+    value_fn: Callable[[str | float | None], str | float | None] = lambda x: x
+
+
+SENSORS_MAPPING_TEMPLATE: dict[str, AirthingsBLESensorEntityDescription] = {
+    "radon_1day_avg": AirthingsBLESensorEntityDescription(
        key="radon_1day_avg",
        translation_key="radon_1day_avg",
        native_unit_of_measurement=VOLUME_BECQUEREL,
        suggested_display_precision=0,
        state_class=SensorStateClass.MEASUREMENT,
    ),
-    "radon_longterm_avg": SensorEntityDescription(
+    "radon_longterm_avg": AirthingsBLESensorEntityDescription(
        key="radon_longterm_avg",
        translation_key="radon_longterm_avg",
        native_unit_of_measurement=VOLUME_BECQUEREL,
        suggested_display_precision=0,
        state_class=SensorStateClass.MEASUREMENT,
    ),
-    "radon_1day_level": SensorEntityDescription(
+    "radon_1day_level": AirthingsBLESensorEntityDescription(
        key="radon_1day_level",
        translation_key="radon_1day_level",
+        device_class=SensorDeviceClass.ENUM,
+        options=["good", "fair", "poor"],
+        value_fn=lambda value: value if value != "unknown" else None,
    ),
-    "radon_longterm_level": SensorEntityDescription(
+    "radon_longterm_level": AirthingsBLESensorEntityDescription(
        key="radon_longterm_level",
        translation_key="radon_longterm_level",
+        device_class=SensorDeviceClass.ENUM,
+        options=["good", "fair", "poor"],
+        value_fn=lambda value: value if value != "unknown" else None,
    ),
-    "temperature": SensorEntityDescription(
+    "temperature": AirthingsBLESensorEntityDescription(
        key="temperature",
        device_class=SensorDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=1,
    ),
-    "humidity": SensorEntityDescription(
+    "humidity": AirthingsBLESensorEntityDescription(
        key="humidity",
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=1,
    ),
-    "pressure": SensorEntityDescription(
+    "pressure": AirthingsBLESensorEntityDescription(
        key="pressure",
        device_class=SensorDeviceClass.ATMOSPHERIC_PRESSURE,
        native_unit_of_measurement=UnitOfPressure.MBAR,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=1,
    ),
-    "battery": SensorEntityDescription(
+    "battery": AirthingsBLESensorEntityDescription(
        key="battery",
        device_class=SensorDeviceClass.BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        entity_category=EntityCategory.DIAGNOSTIC,
        suggested_display_precision=0,
    ),
-    "co2": SensorEntityDescription(
+    "co2": AirthingsBLESensorEntityDescription(
        key="co2",
        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
    ),
-    "voc": SensorEntityDescription(
+    "voc": AirthingsBLESensorEntityDescription(
        key="voc",
        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
    ),
-    "illuminance": SensorEntityDescription(
+    "illuminance": AirthingsBLESensorEntityDescription(
        key="illuminance",
        translation_key="illuminance",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
    ),
-    "lux": SensorEntityDescription(
+    "lux": AirthingsBLESensorEntityDescription(
        key="lux",
        device_class=SensorDeviceClass.ILLUMINANCE,
        native_unit_of_measurement=LIGHT_LUX,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
    ),
-    "noise": SensorEntityDescription(
+    "noise": AirthingsBLESensorEntityDescription(
        key="noise",
        translation_key="ambient_noise",
        device_class=SensorDeviceClass.SOUND_PRESSURE,
@@ -134,13 +155,14 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
    ),
-    "connectivity_mode": SensorEntityDescription(
+    "connectivity_mode": AirthingsBLESensorEntityDescription(
        key="connectivity_mode",
        translation_key="connectivity_mode",
        device_class=SensorDeviceClass.ENUM,
        options=list(CONNECTIVITY_MODE_MAP.values()),
        entity_category=EntityCategory.DIAGNOSTIC,
        entity_registry_enabled_default=False,
+        value_fn=get_connectivity_mode,
    ),
 }

@@ -228,12 +250,13 @@ class AirthingsSensor(
    """Airthings BLE sensors for the device."""

    _attr_has_entity_name = True
+    entity_description: AirthingsBLESensorEntityDescription

    def __init__(
        self,
        coordinator: AirthingsBLEDataUpdateCoordinator,
        airthings_device: AirthingsDevice,
-        entity_description: SensorEntityDescription,
+        entity_description: AirthingsBLESensorEntityDescription,
    ) -> None:
        """Populate the airthings entity with relevant data."""
        super().__init__(coordinator)
@@ -272,11 +295,4 @@ class AirthingsSensor(
    def native_value(self) -> StateType:
        """Return the value reported by the sensor."""
        value = self.coordinator.data.sensors[self.entity_description.key]
-
-        # Map connectivity mode to enum values
-        if self.entity_description.key == "connectivity_mode":
-            if not isinstance(value, str):
-                return None
-            return CONNECTIVITY_MODE_MAP.get(value)
-
-        return value
+        return self.entity_description.value_fn(value)
@@ -45,13 +45,23 @@
        "name": "Radon 1-day average"
      },
      "radon_1day_level": {
-        "name": "Radon 1-day level"
+        "name": "Radon 1-day level",
+        "state": {
+          "fair": "Fair",
+          "good": "Good",
+          "poor": "Poor"
+        }
      },
      "radon_longterm_avg": {
        "name": "Radon longterm average"
      },
      "radon_longterm_level": {
-        "name": "Radon longterm level"
+        "name": "Radon longterm level",
+        "state": {
+          "fair": "[%key:component::airthings_ble::entity::sensor::radon_1day_level::state::fair%]",
+          "good": "[%key:component::airthings_ble::entity::sensor::radon_1day_level::state::good%]",
+          "poor": "[%key:component::airthings_ble::entity::sensor::radon_1day_level::state::poor%]"
+        }
      }
    }
  },
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
    BinarySensorEntity,
    BinarySensorEntityDescription,
 )
-from homeassistant.const import EntityCategory
+from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 import homeassistant.helpers.entity_registry as er
@@ -118,7 +118,7 @@ async def async_setup_entry(
        for serial_num in coordinator.data:
            unique_id = f"{serial_num}-{sensor_desc.key}"
            if entity_id := entity_registry.async_get_entity_id(
-                BINARY_SENSOR_DOMAIN, DOMAIN, unique_id
+                Platform.BINARY_SENSOR, DOMAIN, unique_id
            ):
                _LOGGER.debug("Removing deprecated entity %s", entity_id)
                entity_registry.async_remove(entity_id)
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["aioamazondevices"],
  "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==14.1.3"]
+  "requirements": ["aioamazondevices==14.1.8"]
 }
@@ -7,7 +7,7 @@ from aioamazondevices.const.schedules import (
    NOTIFICATION_TIMER,
 )

-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.entity_registry as er

@@ -28,7 +28,7 @@ async def async_update_unique_id(
    for serial_num in coordinator.data:
        unique_id = f"{serial_num}-{old_key}"
        if entity_id := entity_registry.async_get_entity_id(
-            DOMAIN, platform, unique_id
+            platform, DOMAIN, unique_id
        ):
            _LOGGER.debug("Updating unique_id for %s", entity_id)
            new_unique_id = unique_id.replace(old_key, new_key)
@@ -48,7 +48,7 @@ async def async_remove_entity_from_virtual_group(

    for serial_num in coordinator.data:
        unique_id = f"{serial_num}-{key}"
-        entity_id = entity_registry.async_get_entity_id(DOMAIN, platform, unique_id)
+        entity_id = entity_registry.async_get_entity_id(platform, DOMAIN, unique_id)
        is_group = coordinator.data[serial_num].device_family == SPEAKER_GROUP_FAMILY
        if entity_id and is_group:
            entity_registry.async_remove(entity_id)
@@ -70,7 +70,7 @@ async def async_remove_unsupported_notification_sensors(
        ):
            unique_id = f"{serial_num}-{notification_key}"
            entity_id = entity_registry.async_get_entity_id(
-                DOMAIN, SENSOR_DOMAIN, unique_id=unique_id
+                Platform.SENSOR, DOMAIN, unique_id=unique_id
            )
            is_unsupported = not coordinator.data[serial_num].notifications_supported

@@ -11,15 +11,14 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import (
    ATTR_NAME,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
    DEGREE,
    LIGHT_LUX,
-    PERCENTAGE,
+    UnitOfDensity,
    UnitOfIrradiance,
    UnitOfLength,
    UnitOfPrecipitationDepth,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfSpeed,
    UnitOfTemperature,
    UnitOfVolumetricFlux,
@@ -157,13 +156,13 @@ SENSOR_DESCRIPTIONS = (
    SensorEntityDescription(
        key=TYPE_PM25_IN_AQIN,
        translation_key="pm25_indoor_aqin",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM25,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_PM25_IN_24H_AQIN,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        translation_key="pm25_indoor_24h_aqin",
        device_class=SensorDeviceClass.PM25,
        state_class=SensorStateClass.MEASUREMENT,
@@ -171,28 +170,28 @@ SENSOR_DESCRIPTIONS = (
    SensorEntityDescription(
        key=TYPE_PM10_IN_AQIN,
        translation_key="pm10_indoor_aqin",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM10,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_PM10_IN_24H_AQIN,
        translation_key="pm10_indoor_24h_aqin",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM10,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_CO2_IN_AQIN,
        translation_key="co2_indoor_aqin",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        device_class=SensorDeviceClass.CO2,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_CO2_IN_24H_AQIN,
        translation_key="co2_indoor_24h_aqin",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        device_class=SensorDeviceClass.CO2,
        state_class=SensorStateClass.MEASUREMENT,
    ),
@@ -206,7 +205,7 @@ SENSOR_DESCRIPTIONS = (
    SensorEntityDescription(
        key=TYPE_PM_IN_HUMIDITY_AQIN,
        translation_key="pm_indoor_humidity_aqin",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
@@ -250,7 +249,7 @@ SENSOR_DESCRIPTIONS = (
    ),
    SensorEntityDescription(
        key=TYPE_CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        device_class=SensorDeviceClass.CO2,
        state_class=SensorStateClass.MEASUREMENT,
    ),
@@ -291,83 +290,83 @@ SENSOR_DESCRIPTIONS = (
    SensorEntityDescription(
        key=TYPE_HUMIDITY10,
        translation_key="humidity_10",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITY1,
        translation_key="humidity_1",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITY2,
        translation_key="humidity_2",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITY3,
        translation_key="humidity_3",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITY4,
        translation_key="humidity_4",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITY5,
        translation_key="humidity_5",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITY6,
        translation_key="humidity_6",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITY7,
        translation_key="humidity_7",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITY8,
        translation_key="humidity_8",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITY9,
        translation_key="humidity_9",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_HUMIDITYIN,
        translation_key="humidity_indoor",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
@@ -417,95 +416,95 @@ SENSOR_DESCRIPTIONS = (
    SensorEntityDescription(
        key=TYPE_PM25_24H,
        translation_key="pm25_24h_average",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM25,
    ),
    SensorEntityDescription(
        key=TYPE_PM25_IN,
        translation_key="pm25_indoor",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM25,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_PM25_IN_24H,
        translation_key="pm25_indoor_24h_average",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM25,
    ),
    SensorEntityDescription(
        key=TYPE_PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM25,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_SOILHUM10,
        translation_key="soil_humidity_10",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_SOILHUM1,
        translation_key="soil_humidity_1",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_SOILHUM2,
        translation_key="soil_humidity_2",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_SOILHUM3,
        translation_key="soil_humidity_3",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_SOILHUM4,
        translation_key="soil_humidity_4",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_SOILHUM5,
        translation_key="soil_humidity_5",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_SOILHUM6,
        translation_key="soil_humidity_6",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_SOILHUM7,
        translation_key="soil_humidity_7",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_SOILHUM8,
        translation_key="soil_humidity_8",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorEntityDescription(
        key=TYPE_SOILHUM9,
        translation_key="soil_humidity_9",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
    ),
@@ -9,5 +9,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["pyanglianwater"],
  "quality_scale": "bronze",
-  "requirements": ["pyanglianwater==3.2.2"]
+  "requirements": ["pyanglianwater==3.2.3"]
 }
@@ -731,17 +731,32 @@ class AutomationEntity(BaseAutomationEntity, RestoreEntity):
            trace_element = TraceElement(variables, trigger_path)
            trace_append_element(trace_element)

-            if (
-                not skip_condition
-                and self._condition is not None
-                and not self._condition.async_check(variables=variables)
-            ):
-                self._logger.debug(
-                    "Conditions not met, aborting automation. Condition summary: %s",
-                    trace_get(clear=False),
-                )
-                script_execution_set("failed_conditions")
-                return None
+            if not skip_condition and self._condition is not None:
+                try:
+                    conditions_pass = self._condition.async_check(variables=variables)
+                except (vol.Invalid, HomeAssistantError) as err:
+                    self._logger.error(
+                        "Error while checking conditions of automation %s: %s",
+                        self.entity_id,
+                        err,
+                    )
+                    automation_trace.set_error(err)
+                    return None
+                except Exception as err:
+                    self._logger.exception(
+                        "Unexpected error while checking conditions of automation %s",
+                        self.entity_id,
+                    )
+                    automation_trace.set_error(err)
+                    return None
+
+                if not conditions_pass:
+                    self._logger.debug(
+                        "Conditions not met, aborting automation. Condition summary: %s",
+                        trace_get(clear=False),
+                    )
+                    script_execution_set("failed_conditions")
+                    return None

            self.async_set_context(trigger_context)
            event_data = {
@@ -794,7 +809,9 @@ class AutomationEntity(BaseAutomationEntity, RestoreEntity):
                )
                automation_trace.set_error(err)
            except Exception as err:
-                self._logger.exception("While executing automation %s", self.entity_id)
+                self._logger.exception(
+                    "Unexpected error while executing automation %s", self.entity_id
+                )
                automation_trace.set_error(err)

            return None
@@ -15,16 +15,15 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    UnitOfApparentPower,
+    UnitOfDensity,
    UnitOfElectricCurrent,
    UnitOfElectricPotential,
    UnitOfEnergy,
    UnitOfFrequency,
    UnitOfPower,
+    UnitOfRatio,
    UnitOfReactiveEnergy,
    UnitOfReactivePower,
    UnitOfSpeed,
@@ -53,19 +52,19 @@ SENSOR_TYPES: tuple[BleBoxSensorEntityDescription, ...] = (
    BleBoxSensorEntityDescription(
        key="pm1",
        device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    BleBoxSensorEntityDescription(
        key="pm2_5",
        device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    BleBoxSensorEntityDescription(
        key="pm10",
        device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    BleBoxSensorEntityDescription(
@@ -84,7 +83,7 @@ SENSOR_TYPES: tuple[BleBoxSensorEntityDescription, ...] = (
    BleBoxSensorEntityDescription(
        key="humidity",
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    BleBoxSensorEntityDescription(
@@ -179,7 +178,7 @@ SENSOR_TYPES: tuple[BleBoxSensorEntityDescription, ...] = (
    BleBoxSensorEntityDescription(
        key="co2",
        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    BleBoxSensorEntityDescription(
@@ -21,6 +21,6 @@
    "bluetooth-auto-recovery==1.6.4",
    "bluetooth-data-tools==1.29.18",
    "dbus-fast==5.0.22",
-    "habluetooth==6.23.1"
+    "habluetooth==6.25.1"
  ]
 }
@@ -805,6 +805,10 @@ class DefaultAgent(ConversationEntity):
                else:
                    num_unmatched_entities += 1

+            # Literal text matched is the dominant signal
+            same_text_matched = (maybe_result is not None) and (
+                result.text_chunks_matched == maybe_result.text_chunks_matched
+            )
            if (
                (maybe_result is None)  # first result
                or (
@@ -813,22 +817,25 @@ class DefaultAgent(ConversationEntity):
                )
                or (
                    # More entities matched
-                    num_matched_entities > best_num_matched_entities
+                    same_text_matched
+                    and (num_matched_entities > best_num_matched_entities)
                )
                or (
                    # Fewer unmatched entities
-                    (num_matched_entities == best_num_matched_entities)
+                    same_text_matched
+                    and (num_matched_entities == best_num_matched_entities)
                    and (num_unmatched_entities < best_num_unmatched_entities)
                )
                or (
                    # Prefer unmatched ranges
-                    (num_matched_entities == best_num_matched_entities)
+                    same_text_matched
+                    and (num_matched_entities == best_num_matched_entities)
                    and (num_unmatched_entities == best_num_unmatched_entities)
                    and (num_unmatched_ranges > best_num_unmatched_ranges)
                )
                or (
                    # Prefer match failures with entities
-                    (result.text_chunks_matched == maybe_result.text_chunks_matched)
+                    same_text_matched
                    and (num_unmatched_entities == best_num_unmatched_entities)
                    and (num_unmatched_ranges == best_num_unmatched_ranges)
                    and (
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/conversation",
  "integration_type": "entity",
  "quality_scale": "internal",
-  "requirements": ["hassil==3.8.0", "home-assistant-intents==2026.6.1"]
+  "requirements": ["hassil==3.8.0", "home-assistant-intents==2026.6.24"]
 }
@@ -17,7 +17,7 @@ from homeassistant.helpers.config_entry_oauth2_flow import (
 )

 from .auth import DropboxConfigEntryAuth
-from .const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+from .const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN, OAUTH2_SCOPES

 type DropboxConfigEntry = ConfigEntry[DropboxAPIClient]

@@ -31,6 +31,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: DropboxConfigEntry) -> b
            translation_domain=DOMAIN,
            translation_key="oauth2_implementation_unavailable",
        ) from err
+
+    token = entry.data["token"]
+    if not set(token.get("scope", "").split()).issuperset(OAUTH2_SCOPES):
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN,
+            translation_key="missing_scopes",
+        )
+    if "refresh_token" not in token:
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN,
+            translation_key="missing_refresh_token",
+        )
+
    oauth2_session = OAuth2Session(hass, entry, oauth2_implementation)

    auth = DropboxConfigEntryAuth(
@@ -1,7 +1,5 @@
 """Application credentials platform for the Dropbox integration."""

-from typing import override
-
 from homeassistant.components.application_credentials import ClientCredential
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.config_entry_oauth2_flow import (
@@ -9,14 +7,14 @@ from homeassistant.helpers.config_entry_oauth2_flow import (
    LocalOAuth2ImplementationWithPkce,
 )

-from .const import OAUTH2_AUTHORIZE, OAUTH2_SCOPES, OAUTH2_TOKEN
+from .const import OAUTH2_AUTHORIZE, OAUTH2_TOKEN


 async def async_get_auth_implementation(
    hass: HomeAssistant, auth_domain: str, credential: ClientCredential
 ) -> AbstractOAuth2Implementation:
-    """Return custom auth implementation."""
-    return DropboxOAuth2Implementation(
+    """Return auth implementation."""
+    return LocalOAuth2ImplementationWithPkce(
        hass,
        auth_domain,
        credential.client_id,
@@ -24,21 +22,3 @@ async def async_get_auth_implementation(
        OAUTH2_TOKEN,
        credential.client_secret,
    )
-
-
-class DropboxOAuth2Implementation(LocalOAuth2ImplementationWithPkce):
-    """Custom Dropbox OAuth2 implementation.
-
-    Adds the necessary authorize url parameters.
-    """
-
-    @property
-    @override
-    def extra_authorize_data(self) -> dict:
-        """Extra data that needs to be appended to the authorize url."""
-        data: dict = {
-            "token_access_type": "offline",
-            "scope": " ".join(OAUTH2_SCOPES),
-        }
-        data.update(super().extra_authorize_data)
-        return data
@@ -12,7 +12,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHandler

 from .auth import DropboxConfigFlowAuth
-from .const import DOMAIN
+from .const import DOMAIN, OAUTH2_SCOPES


 class DropboxConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
@@ -26,6 +26,15 @@ class DropboxConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
        """Return logger."""
        return logging.getLogger(__name__)

+    @property
+    @override
+    def extra_authorize_data(self) -> dict:
+        """Extra data that needs to be appended to the authorize url."""
+        return {
+            "token_access_type": "offline",
+            "scope": " ".join(OAUTH2_SCOPES),
+        }
+
    @override
    async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:
        """Create an entry for the flow, or update existing entry."""
@@ -51,6 +60,9 @@ class DropboxConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
        self, entry_data: Mapping[str, Any]
    ) -> ConfigFlowResult:
        """Perform reauth upon an API authentication error."""
+        token = entry_data[CONF_TOKEN]
+        if not set(token.get("scope", "").split()).issuperset(OAUTH2_SCOPES):
+            return await self.async_step_reauth_permissions()
        return await self.async_step_reauth_confirm()

    async def async_step_reauth_confirm(
@@ -60,3 +72,11 @@ class DropboxConfigFlow(AbstractOAuth2FlowHandler, domain=DOMAIN):
        if user_input is None:
            return self.async_show_form(step_id="reauth_confirm")
        return await self.async_step_user()
+
+    async def async_step_reauth_permissions(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Dialog that informs the user that additional permissions are required."""
+        if user_input is None:
+            return self.async_show_form(step_id="reauth_permissions")
+        return await self.async_step_user()
@@ -12,6 +12,7 @@ OAUTH2_SCOPES = [
    "account_info.read",
    "files.content.read",
    "files.content.write",
+    "files.metadata.read",
 ]

 DATA_BACKUP_AGENT_LISTENERS: HassKey[list[Callable[[], None]]] = HassKey(
@@ -8,6 +8,6 @@
  "documentation": "https://www.home-assistant.io/integrations/dropbox",
  "integration_type": "service",
  "iot_class": "cloud_polling",
-  "quality_scale": "bronze",
+  "quality_scale": "silver",
  "requirements": ["python-dropbox-api==0.1.4"]
 }
@@ -52,7 +52,9 @@ rules:
    status: exempt
    comment: Integration does not have any entities.
  integration-owner: done
-  log-when-unavailable: todo
+  log-when-unavailable:
+    status: exempt
+    comment: Integration does not have any entities.
  parallel-updates:
    status: exempt
    comment: Integration does not make any entity updates.
@@ -24,10 +24,20 @@
      "reauth_confirm": {
        "description": "The Dropbox integration needs to re-authenticate your account.",
        "title": "[%key:common::config_flow::title::reauth%]"
+      },
+      "reauth_permissions": {
+        "description": "The Dropbox integration requires additional permissions to function correctly.",
+        "title": "[%key:common::config_flow::title::reauth%]"
      }
    }
  },
  "exceptions": {
+    "missing_refresh_token": {
+      "message": "[%key:component::dropbox::config::step::reauth_confirm::description%]"
+    },
+    "missing_scopes": {
+      "message": "[%key:component::dropbox::config::step::reauth_permissions::description%]"
+    },
    "oauth2_implementation_unavailable": {
      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
    }
@@ -27,6 +27,19 @@ _LOGGER = logging.getLogger(__name__)

 PARALLEL_UPDATES = 1

+SUPPORTED_SELECT_NODE_TYPES = {
+    NodeType.BOX,
+    NodeType.VLV,
+    NodeType.VLVRH,
+    NodeType.VLVVOC,
+    NodeType.VLVCO2,
+    NodeType.VLVCO2RH,
+    NodeType.EAV,
+    NodeType.EAVRH,
+    NodeType.EAVVOC,
+    NodeType.EAVCO2,
+}
+

 def _get_ventilation_options(action: ActionItem) -> tuple[str, ...] | None:
    """Return ventilation options advertised by a node action."""
@@ -71,7 +84,9 @@ async def async_setup_entry(
            if node.node_id in known_nodes:
                continue

-            if node.general.node_type is not NodeType.BOX:
+            # Duco advertises SetVentilationState broadly, so keep the select
+            # limited to the box and known valve node families.
+            if node.general.node_type not in SUPPORTED_SELECT_NODE_TYPES:
                continue

            options = options_by_node.get(node.node_id)
@@ -15,10 +15,9 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
    EntityCategory,
+    UnitOfRatio,
    UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -72,7 +71,7 @@ SENSOR_DESCRIPTIONS: tuple[DucoSensorEntityDescription, ...] = (
        key="target_flow_level",
        translation_key="target_flow_level",
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        suggested_display_precision=0,
        value_fn=lambda node: (
            node.ventilation.flow_lvl_tgt if node.ventilation else None
@@ -96,7 +95,7 @@ SENSOR_DESCRIPTIONS: tuple[DucoSensorEntityDescription, ...] = (
        key="co2",
        device_class=SensorDeviceClass.CO2,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        value_fn=lambda node: node.sensor.co2 if node.sensor else None,
        node_types=(
            NodeType.BSCO2,
@@ -108,7 +107,7 @@ SENSOR_DESCRIPTIONS: tuple[DucoSensorEntityDescription, ...] = (
    DucoSensorEntityDescription(
        key="iaq_co2",
        translation_key="iaq_co2",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        entity_registry_enabled_default=False,
        value_fn=lambda node: node.sensor.iaq_co2 if node.sensor else None,
@@ -123,14 +122,14 @@ SENSOR_DESCRIPTIONS: tuple[DucoSensorEntityDescription, ...] = (
        key="humidity",
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        value_fn=lambda node: node.sensor.rh if node.sensor else None,
        node_types=(NodeType.BSRH, NodeType.UCRH, NodeType.VLVRH, NodeType.VLVCO2RH),
    ),
    DucoSensorEntityDescription(
        key="iaq_rh",
        translation_key="iaq_rh",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        entity_registry_enabled_default=False,
        value_fn=lambda node: node.sensor.iaq_rh if node.sensor else None,
@@ -14,18 +14,17 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
    DEGREE,
    LIGHT_LUX,
-    PERCENTAGE,
    UV_INDEX,
    EntityCategory,
+    UnitOfDensity,
    UnitOfElectricPotential,
    UnitOfIrradiance,
    UnitOfLength,
    UnitOfPrecipitationDepth,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfSpeed,
    UnitOfTemperature,
    UnitOfVolumetricFlux,
@@ -99,7 +98,7 @@ ECOWITT_SENSORS_MAPPING: Final = {
    EcoWittSensorTypes.HUMIDITY: SensorEntityDescription(
        key="HUMIDITY",
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    EcoWittSensorTypes.DEGREE: SensorEntityDescription(
@@ -122,19 +121,19 @@ ECOWITT_SENSORS_MAPPING: Final = {
    EcoWittSensorTypes.PM25: SensorEntityDescription(
        key="PM25",
        device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    EcoWittSensorTypes.PM10: SensorEntityDescription(
        key="PM10",
        device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    EcoWittSensorTypes.BATTERY_PERCENTAGE: SensorEntityDescription(
        key="BATTERY_PERCENTAGE",
        device_class=SensorDeviceClass.BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        entity_category=EntityCategory.DIAGNOSTIC,
    ),
@@ -149,7 +148,7 @@ ECOWITT_SENSORS_MAPPING: Final = {
    EcoWittSensorTypes.CO2_PPM: SensorEntityDescription(
        key="CO2_PPM",
        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    EcoWittSensorTypes.LUX: SensorEntityDescription(
@@ -263,13 +262,13 @@ ECOWITT_SENSORS_MAPPING: Final = {
    ),
    EcoWittSensorTypes.PERCENTAGE: SensorEntityDescription(
        key="PERCENTAGE",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    EcoWittSensorTypes.SOIL_MOISTURE: SensorEntityDescription(
        key="SOIL_MOISTURE",
        device_class=SensorDeviceClass.MOISTURE,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    EcoWittSensorTypes.DISTANCE_MM: SensorEntityDescription(
@@ -286,13 +285,13 @@ ECOWITT_SENSORS_MAPPING: Final = {
    EcoWittSensorTypes.PM1: SensorEntityDescription(
        key="PM1",
        device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    EcoWittSensorTypes.PM4: SensorEntityDescription(
        key="PM4",
        device_class=SensorDeviceClass.PM4,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
 }
@@ -65,6 +65,14 @@ async def _get_fixture_collection(envoy: Envoy, serial: str) -> dict[str, Any]:
        "/ivp/meters/readings",
        "/ivp/pdm/device_data",
        "/home",
+        "/inventory.json?deleted=1",
+        "/admin/lib/acb_config",
+        "/ivp/sc/sched",
+        "/admin/lib/network_display",
+        "/admin/lib/wireless_display",
+        "/ivp/ensemble/relay",
+        "/ivp/livedata/status",
+        "/ivp/pdm/energy",
    ]

    for end_point in end_points:
@@ -134,16 +142,15 @@ async def async_get_config_entry_diagnostics(
        "encharge_power": envoy_data.encharge_power,
        "encharge_aggregate": envoy_data.encharge_aggregate,
        "enpower": envoy_data.enpower,
+        "acb_power": envoy_data.acb_power,
+        "acb_inventory": envoy_data.acb_inventory,
+        "battery_aggregate": envoy_data.battery_aggregate,
+        "collar": envoy_data.collar,
+        "c6cc": envoy_data.c6cc,
        "system_consumption": envoy_data.system_consumption,
        "system_production": envoy_data.system_production,
        "system_consumption_phases": envoy_data.system_consumption_phases,
        "system_production_phases": envoy_data.system_production_phases,
-        "ctmeter_production": envoy_data.ctmeter_production,
-        "ctmeter_consumption": envoy_data.ctmeter_consumption,
-        "ctmeter_storage": envoy_data.ctmeter_storage,
-        "ctmeter_production_phases": envoy_data.ctmeter_production_phases,
-        "ctmeter_consumption_phases": envoy_data.ctmeter_consumption_phases,
-        "ctmeter_storage_phases": envoy_data.ctmeter_storage_phases,
        "ctmeters": envoy_data.ctmeters,
        "ctmeters_phases": envoy_data.ctmeters_phases,
        "dry_contact_status": envoy_data.dry_contact_status,
@@ -17,7 +17,7 @@
  "mqtt": ["esphome/discover/#"],
  "quality_scale": "platinum",
  "requirements": [
-    "aioesphomeapi==45.3.1",
+    "aioesphomeapi==45.5.2",
    "esphome-dashboard-api==1.3.0",
    "bleak-esphome==3.9.4"
  ],
@@ -10,7 +10,7 @@ from homeassistant.components.button import (
    ButtonEntity,
    ButtonEntityDescription,
 )
-from homeassistant.const import EntityCategory
+from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er, issue_registry as ir
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
@@ -75,7 +75,7 @@ def repair_issue_cleanup(hass: HomeAssistant, avm_wrapper: AvmWrapper) -> None:
    if (
        (
            entity_button := entity_registry.async_get_entity_id(
-                "button", DOMAIN, f"{avm_wrapper.unique_id}-cleanup"
+                Platform.BUTTON, DOMAIN, f"{avm_wrapper.unique_id}-cleanup"
            )
        )
        and (entity_entry := entity_registry.async_get(entity_button))
@@ -102,7 +102,7 @@ def repair_issue_firmware_update(hass: HomeAssistant, avm_wrapper: AvmWrapper) -
    if (
        (
            entity_button := entity_registry.async_get_entity_id(
-                "button", DOMAIN, f"{avm_wrapper.unique_id}-firmware_update"
+                Platform.BUTTON, DOMAIN, f"{avm_wrapper.unique_id}-firmware_update"
            )
        )
        and (entity_entry := entity_registry.async_get(entity_button))
@@ -7,13 +7,13 @@ from typing import override
 from requests.exceptions import RequestException

 from homeassistant.components.image import ImageEntity
-from homeassistant.const import EntityCategory
+from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util, slugify

-from .const import DOMAIN, Platform
+from .const import DOMAIN
 from .coordinator import AvmWrapper, FritzConfigEntry
 from .entity import FritzBoxBaseEntity

@@ -21,5 +21,5 @@
  "integration_type": "system",
  "preview_features": { "winter_mode": {} },
  "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20260624.0"]
+  "requirements": ["home-assistant-frontend==20260624.1"]
 }
@@ -14,7 +14,7 @@ from homeassistant.components.sensor import (
    SensorEntityDescription,
    SensorStateClass,
 )
-from homeassistant.const import CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
+from homeassistant.const import UnitOfDensity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -63,7 +63,7 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
        key=ATTR_C6H6,
        value=lambda sensors: sensors.c6h6.value if sensors.c6h6 else None,
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        translation_key="c6h6",
    ),
@@ -72,7 +72,7 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
        value=lambda sensors: sensors.co.value if sensors.co else None,
        suggested_display_precision=0,
        device_class=SensorDeviceClass.CO,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    GiosSensorEntityDescription(
@@ -80,7 +80,7 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
        value=lambda sensors: sensors.no.value if sensors.no else None,
        suggested_display_precision=0,
        device_class=SensorDeviceClass.NITROGEN_MONOXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    GiosSensorEntityDescription(
@@ -88,7 +88,7 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
        value=lambda sensors: sensors.no2.value if sensors.no2 else None,
        suggested_display_precision=0,
        device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    GiosSensorEntityDescription(
@@ -104,7 +104,7 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
        translation_key=ATTR_NOX,
        value=lambda sensors: sensors.nox.value if sensors.nox else None,
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    GiosSensorEntityDescription(
@@ -112,7 +112,7 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
        value=lambda sensors: sensors.o3.value if sensors.o3 else None,
        suggested_display_precision=0,
        device_class=SensorDeviceClass.OZONE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    GiosSensorEntityDescription(
@@ -128,7 +128,7 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
        value=lambda sensors: sensors.pm10.value if sensors.pm10 else None,
        suggested_display_precision=0,
        device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    GiosSensorEntityDescription(
@@ -144,7 +144,7 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
        value=lambda sensors: sensors.pm25.value if sensors.pm25 else None,
        suggested_display_precision=0,
        device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    GiosSensorEntityDescription(
@@ -160,7 +160,7 @@ SENSOR_TYPES: tuple[GiosSensorEntityDescription, ...] = (
        value=lambda sensors: sensors.so2.value if sensors.so2 else None,
        suggested_display_precision=0,
        device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    GiosSensorEntityDescription(
@@ -1 +0,0 @@
-"""The greenwave component."""
@@ -1,123 +0,0 @@
-"""Support for Greenwave Reality (TCP Connected) lights."""
-
-from datetime import timedelta
-import logging
-import os
-from typing import Any, override
-
-import greenwavereality as greenwave
-import voluptuous as vol
-
-from homeassistant.components.light import (
-    ATTR_BRIGHTNESS,
-    PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA,
-    ColorMode,
-    LightEntity,
-)
-from homeassistant.const import CONF_HOST
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import Throttle
-
-_LOGGER = logging.getLogger(__name__)
-
-CONF_VERSION = "version"
-
-PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
-    {vol.Required(CONF_HOST): cv.string, vol.Required(CONF_VERSION): cv.positive_int}
-)
-
-MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=1)
-
-
-def setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Greenwave Reality Platform."""
-    host = config.get(CONF_HOST)
-    tokenfilename = hass.config.path(".greenwave")
-    if config.get(CONF_VERSION) == 3:
-        if os.path.exists(tokenfilename):
-            with open(tokenfilename, encoding="utf8") as tokenfile:
-                token = tokenfile.read()
-        else:
-            try:
-                token = greenwave.grab_token(host, "hass", "homeassistant")
-            except PermissionError:
-                _LOGGER.error("The Gateway Is Not In Sync Mode")
-                raise
-            with open(tokenfilename, "w+", encoding="utf8") as tokenfile:
-                tokenfile.write(token)
-    else:
-        token = None
-    bulbs = greenwave.grab_bulbs(host, token)
-    add_entities(
-        GreenwaveLight(device, host, token, GatewayData(host, token))
-        for device in bulbs.values()
-    )
-
-
-class GreenwaveLight(LightEntity):
-    """Representation of an Greenwave Reality Light."""
-
-    _attr_color_mode = ColorMode.BRIGHTNESS
-    _attr_supported_color_modes = {ColorMode.BRIGHTNESS}
-
-    def __init__(self, light, host, token, gatewaydata):
-        """Initialize a Greenwave Reality Light."""
-        self._did = int(light["did"])
-        self._attr_name = light["name"]
-        self._attr_is_on = bool(int(light["state"]))
-        self._attr_brightness = greenwave.hass_brightness(light)
-        self._host = host
-        self._attr_available = greenwave.check_online(light)
-        self._token = token
-        self._gatewaydata = gatewaydata
-
-    @override
-    def turn_on(self, **kwargs: Any) -> None:
-        """Instruct the light to turn on."""
-        temp_brightness = int((kwargs.get(ATTR_BRIGHTNESS, 255) / 255) * 100)
-        greenwave.set_brightness(self._host, self._did, temp_brightness, self._token)
-        greenwave.turn_on(self._host, self._did, self._token)
-
-    @override
-    def turn_off(self, **kwargs: Any) -> None:
-        """Instruct the light to turn off."""
-        greenwave.turn_off(self._host, self._did, self._token)
-
-    def update(self) -> None:
-        """Fetch new state data for this light."""
-        self._gatewaydata.update()
-        bulbs = self._gatewaydata.greenwave
-
-        self._attr_is_on = bool(int(bulbs[self._did]["state"]))
-        self._attr_brightness = greenwave.hass_brightness(bulbs[self._did])
-        self._attr_available = greenwave.check_online(bulbs[self._did])
-        self._attr_name = bulbs[self._did]["name"]
-
-
-class GatewayData:
-    """Handle Gateway data and limit updates."""
-
-    def __init__(self, host, token):
-        """Initialize the data object."""
-        self._host = host
-        self._token = token
-        self._greenwave = greenwave.grab_bulbs(host, token)
-
-    @property
-    def greenwave(self):
-        """Return Gateway API object."""
-        return self._greenwave
-
-    @Throttle(MIN_TIME_BETWEEN_UPDATES)
-    def update(self):
-        """Get the latest data from the gateway."""
-        self._greenwave = greenwave.grab_bulbs(self._host, self._token)
-        return self._greenwave
@@ -1,10 +0,0 @@
-{
-  "domain": "greenwave",
-  "name": "Greenwave Reality",
-  "codeowners": [],
-  "documentation": "https://www.home-assistant.io/integrations/greenwave",
-  "iot_class": "local_polling",
-  "loggers": ["greenwavereality"],
-  "quality_scale": "legacy",
-  "requirements": ["greenwavereality==0.5.1"]
-}
@@ -92,7 +92,7 @@ class SupervisorJobs:
        # We catch all errors to prevent an error in one from stopping the others
        for match in [job for job in self._jobs.values() if subscription.matches(job)]:
            try:
-                return subscription.event_callback(match)
+                subscription.event_callback(match)
            except Exception as err:  # noqa: BLE001
                _LOGGER.error(
                    "Error encountered processing Supervisor Job (%s %s %s) - %s",
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
    SensorEntityDescription,
    SensorStateClass,
 )
-from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfVolume
+from homeassistant.const import EntityCategory, UnitOfRatio, UnitOfVolume
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util import dt as dt_util, slugify
@@ -67,7 +67,7 @@ BSH_PROGRAM_SENSORS = (
    ),
    HomeConnectSensorEntityDescription(
        key=EventKey.BSH_COMMON_OPTION_PROGRAM_PROGRESS,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        translation_key="program_progress",
        appliance_types=APPLIANCES_WITH_PROGRAMS,
    ),
@@ -158,6 +158,7 @@ SENSORS = (
    HomeConnectSensorEntityDescription(
        key=StatusKey.BSH_COMMON_BATTERY_LEVEL,
        device_class=SensorDeviceClass.BATTERY,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
    ),
    HomeConnectSensorEntityDescription(
        key=StatusKey.BSH_COMMON_VIDEO_CAMERA_STATE,
@@ -26,18 +26,17 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
    EntityCategory,
    Platform,
+    UnitOfDensity,
    UnitOfElectricCurrent,
    UnitOfElectricPotential,
    UnitOfEnergy,
    UnitOfPower,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfSoundPressure,
    UnitOfTemperature,
 )
@@ -254,7 +253,7 @@ SIMPLE_SENSOR: dict[str, HomeKitSensorEntityDescription] = {
        name="Current Humidity",
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        # This sensor is only for humidity characteristics that are not part
        # of a humidity sensor service.
        probe=(lambda char: char.service.type != ServicesTypes.HUMIDITY_SENSOR),
@@ -270,42 +269,42 @@ SIMPLE_SENSOR: dict[str, HomeKitSensorEntityDescription] = {
        name="PM2.5 Density",
        device_class=SensorDeviceClass.PM25,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
    ),
    CharacteristicsTypes.DENSITY_PM10: HomeKitSensorEntityDescription(
        key=CharacteristicsTypes.DENSITY_PM10,
        name="PM10 Density",
        device_class=SensorDeviceClass.PM10,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
    ),
    CharacteristicsTypes.DENSITY_OZONE: HomeKitSensorEntityDescription(
        key=CharacteristicsTypes.DENSITY_OZONE,
        name="Ozone Density",
        device_class=SensorDeviceClass.OZONE,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
    ),
    CharacteristicsTypes.DENSITY_NO2: HomeKitSensorEntityDescription(
        key=CharacteristicsTypes.DENSITY_NO2,
        name="Nitrogen Dioxide Density",
        device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
    ),
    CharacteristicsTypes.DENSITY_SO2: HomeKitSensorEntityDescription(
        key=CharacteristicsTypes.DENSITY_SO2,
        name="Sulphur Dioxide Density",
        device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
    ),
    CharacteristicsTypes.DENSITY_VOC: HomeKitSensorEntityDescription(
        key=CharacteristicsTypes.DENSITY_VOC,
        name="Volatile Organic Compound Density",
        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
    ),
    CharacteristicsTypes.THREAD_NODE_CAPABILITIES: HomeKitSensorEntityDescription(
        key=CharacteristicsTypes.THREAD_NODE_CAPABILITIES,
@@ -363,13 +362,13 @@ SIMPLE_SENSOR: dict[str, HomeKitSensorEntityDescription] = {
        key=CharacteristicsTypes.FILTER_LIFE_LEVEL,
        name="Filter lifetime",
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
    ),
    CharacteristicsTypes.WATER_LEVEL: HomeKitSensorEntityDescription(
        key=CharacteristicsTypes.WATER_LEVEL,
        name="Water level",
        translation_key="water_level",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    CharacteristicsTypes.VENDOR_EVE_THERMO_VALVE_POSITION: (
@@ -379,7 +378,7 @@ SIMPLE_SENSOR: dict[str, HomeKitSensorEntityDescription] = {
            translation_key="valve_position",
            entity_category=EntityCategory.DIAGNOSTIC,
            state_class=SensorStateClass.MEASUREMENT,
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        )
    ),
 }
@@ -409,7 +408,7 @@ class HomeKitHumiditySensor(HomeKitSensor):
    """Representation of a Homekit humidity sensor."""

    _attr_device_class = SensorDeviceClass.HUMIDITY
-    _attr_native_unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = UnitOfRatio.PERCENTAGE

    @override
    def get_characteristic_types(self) -> list[str]:
@@ -481,7 +480,7 @@ class HomeKitCarbonDioxideSensor(HomeKitSensor):
    """Representation of a Homekit Carbon Dioxide sensor."""

    _attr_device_class = SensorDeviceClass.CO2
-    _attr_native_unit_of_measurement = CONCENTRATION_PARTS_PER_MILLION
+    _attr_native_unit_of_measurement = UnitOfRatio.PARTS_PER_MILLION

    @override
    def get_characteristic_types(self) -> list[str]:
@@ -505,7 +504,7 @@ class HomeKitBatterySensor(HomeKitSensor):
    """Representation of a Homekit battery sensor."""

    _attr_device_class = SensorDeviceClass.BATTERY
-    _attr_native_unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = UnitOfRatio.PERCENTAGE
    _attr_entity_category = EntityCategory.DIAGNOSTIC

    @override
@@ -7,5 +7,5 @@
  "integration_type": "hub",
  "iot_class": "cloud_push",
  "loggers": ["homematicip"],
-  "requirements": ["homematicip==2.13.1"]
+  "requirements": ["homematicip==2.13.2"]
 }
@@ -50,14 +50,13 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_GRAMS_PER_CUBIC_METER,
-    CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
    DEGREE,
    LIGHT_LUX,
-    PERCENTAGE,
+    UnitOfDensity,
    UnitOfEnergy,
    UnitOfPower,
    UnitOfPrecipitationDepth,
+    UnitOfRatio,
    UnitOfSpeed,
    UnitOfTemperature,
    UnitOfVolume,
@@ -84,7 +83,7 @@ SMOKE_DETECTOR_SENSORS: tuple[HmipSmokeDetectorSensorDescription, ...] = (
    HmipSmokeDetectorSensorDescription(
        key="dirt_level",
        translation_key="smoke_detector_dirt_level",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        entity_registry_enabled_default=False,
        channel_field="dirtLevel",
@@ -532,7 +531,7 @@ class HomematicipFloorTerminalBlockMechanicChannelValve(
 ):
    """Representation of the HomematicIP floor terminal block."""

-    _attr_native_unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = UnitOfRatio.PERCENTAGE
    _attr_state_class = SensorStateClass.MEASUREMENT

    def __init__(
@@ -581,7 +580,7 @@ class HomematicipAccesspointDutyCycle(HomematicipGenericEntity, SensorEntity):
    """Representation of then HomeMaticIP access point."""

    _attr_icon = "mdi:access-point-network"
-    _attr_native_unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = UnitOfRatio.PERCENTAGE
    _attr_state_class = SensorStateClass.MEASUREMENT

    def __init__(self, hap: HomematicipHAP, device) -> None:
@@ -600,7 +599,7 @@ class HomematicipAccesspointDutyCycle(HomematicipGenericEntity, SensorEntity):
 class HomematicipHeatingThermostat(HomematicipGenericEntity, SensorEntity):
    """Representation of the HomematicIP heating thermostat."""

-    _attr_native_unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = UnitOfRatio.PERCENTAGE

    def __init__(self, hap: HomematicipHAP, device) -> None:
        """Initialize heating thermostat device."""
@@ -629,7 +628,7 @@ class HomematicipHumiditySensor(HomematicipGenericEntity, SensorEntity):
    """Representation of the HomematicIP humidity sensor."""

    _attr_device_class = SensorDeviceClass.HUMIDITY
-    _attr_native_unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = UnitOfRatio.PERCENTAGE
    _attr_state_class = SensorStateClass.MEASUREMENT

    def __init__(self, hap: HomematicipHAP, device) -> None:
@@ -680,9 +679,9 @@ class HomematicipAbsoluteHumiditySensor(HomematicipGenericEntity, SensorEntity):
    """Representation of the HomematicIP absolute humidity sensor."""

    _attr_device_class = SensorDeviceClass.ABSOLUTE_HUMIDITY
-    _attr_native_unit_of_measurement = CONCENTRATION_GRAMS_PER_CUBIC_METER
+    _attr_native_unit_of_measurement = UnitOfDensity.GRAMS_PER_CUBIC_METER
    _attr_suggested_display_precision = 1
-    _attr_suggested_unit_of_measurement = CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER
+    _attr_suggested_unit_of_measurement = UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER
    _attr_state_class = SensorStateClass.MEASUREMENT

    def __init__(self, hap: HomematicipHAP, device) -> None:
@@ -1143,7 +1142,7 @@ class HomematicipSoilMoistureSensor(HomematicipGenericEntity, SensorEntity):
    """Representation of the HomematicIP soil moisture sensor."""

    _attr_device_class = SensorDeviceClass.MOISTURE
-    _attr_native_unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = UnitOfRatio.PERCENTAGE
    _attr_state_class = SensorStateClass.MEASUREMENT

    def __init__(self, hap: HomematicipHAP, device) -> None:
@@ -245,11 +245,14 @@ class HuaweiLteConfigFlow(ConfigFlow, domain=DOMAIN):
            )
        assert conn

+        def _get_info_and_disconnect() -> tuple[dict, dict]:
+            result = get_device_info(conn)
+            self._disconnect(conn)
+            return result
+
        info, wlan_settings = await self.hass.async_add_executor_job(
-            get_device_info, conn
+            _get_info_and_disconnect
        )
-        # pylint: disable-next=home-assistant-sequential-executor-jobs
-        await self.hass.async_add_executor_job(self._disconnect, conn)

        user_input.update(
            {
@@ -1,7 +1,7 @@
 {
  "domain": "huawei_lte",
  "name": "Huawei LTE",
-  "codeowners": ["@scop", "@fphammerle"],
+  "codeowners": ["@fphammerle"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/huawei_lte",
  "integration_type": "device",
@@ -161,5 +161,7 @@ SENSOR_KEYS: Final[dict[int, list[str]]] = {
        IndevoltSolar.CUMULATIVE_PRODUCTION,
        IndevoltBattery.GEN_2_CYCLE_COUNT,
        IndevoltBattery.GEN_2_TRANSFORMER_TEMPERATURE,
+        IndevoltBattery.REMAINING_CHARGING_TIME,
+        IndevoltBattery.REMAINING_DISCHARGING_TIME,
    ],
 }
@@ -27,6 +27,7 @@ from homeassistant.const import (
    UnitOfFrequency,
    UnitOfPower,
    UnitOfTemperature,
+    UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -45,6 +46,7 @@ class IndevoltSensorEntityDescription(SensorEntityDescription):
    state_mapping: dict[str | int, str] = field(default_factory=dict)
    generation: tuple[int, ...] = (1, 2)
    energy_mode: IndevoltEnergyMode | None = None
+    charge_discharge_state: int | None = None


 SENSORS: Final = (
@@ -242,6 +244,26 @@ SENSORS: Final = (
        state_mapping={1000: "static", 1001: "charging", 1002: "discharging"},
        device_class=SensorDeviceClass.ENUM,
    ),
+    IndevoltSensorEntityDescription(
+        key=IndevoltBattery.REMAINING_CHARGING_TIME,
+        generation=(2,),
+        translation_key="remaining_charging_time",
+        native_unit_of_measurement=UnitOfTime.MINUTES,
+        device_class=SensorDeviceClass.DURATION,
+        state_class=SensorStateClass.MEASUREMENT,
+        charge_discharge_state=1001,
+        entity_registry_enabled_default=False,
+    ),
+    IndevoltSensorEntityDescription(
+        key=IndevoltBattery.REMAINING_DISCHARGING_TIME,
+        generation=(2,),
+        translation_key="remaining_discharging_time",
+        native_unit_of_measurement=UnitOfTime.MINUTES,
+        device_class=SensorDeviceClass.DURATION,
+        state_class=SensorStateClass.MEASUREMENT,
+        charge_discharge_state=1002,
+        entity_registry_enabled_default=False,
+    ),
    IndevoltSensorEntityDescription(
        key=IndevoltBattery.SOC,
        translation_key="battery_soc",
@@ -948,6 +970,14 @@ class IndevoltSensorEntity(IndevoltEntity, SensorEntity):
            if energy_mode != self.entity_description.energy_mode:
                return False

+        # Check whether the battery is not in the required charge/discharge state
+        if (
+            self.entity_description.charge_discharge_state is not None
+            and self.coordinator.data.get(IndevoltBattery.CHARGE_DISCHARGE_STATE)
+            != self.entity_description.charge_discharge_state
+        ):
+            return False
+
        # Check whether inverter is reporting 0 degrees with heater not active (thus reporting to indicate "idle")
        # Pending fix by Indevolt: https://discord.com/channels/1417471269942591571/1510277757689659522
        if self.entity_description.key == IndevoltBattery.GEN_1_INVERTER_TEMPERATURE:
@@ -365,6 +365,12 @@
      "realtime_target_soc": {
        "name": "Real-time target SOC"
      },
+      "remaining_charging_time": {
+        "name": "Remaining charging time"
+      },
+      "remaining_discharging_time": {
+        "name": "Remaining discharging time"
+      },
      "serial_number": {
        "name": "Serial number"
      },
@@ -12,11 +12,9 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -32,7 +30,7 @@ SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
    SensorType.AIR_HUMIDITY: SensorEntityDescription(
        key="air_humidity",
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorType.AIR_PRESSURE: SensorEntityDescription(
@@ -49,7 +47,7 @@ SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
    SensorType.ECO2: SensorEntityDescription(
        key="eco2",
        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorType.LIGHT: SensorEntityDescription(
@@ -67,7 +65,7 @@ SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
    SensorType.VOC: SensorEntityDescription(
        key="voc",
        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
        state_class=SensorStateClass.MEASUREMENT,
    ),
 }
@@ -22,20 +22,19 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    REVOLUTIONS_PER_MINUTE,
    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
    EntityCategory,
    Platform,
    UnitOfApparentPower,
+    UnitOfDensity,
    UnitOfElectricCurrent,
    UnitOfElectricPotential,
    UnitOfEnergy,
    UnitOfPower,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfReactivePower,
    UnitOfTemperature,
    UnitOfTime,
@@ -444,7 +443,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="HumiditySensor",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            device_class=SensorDeviceClass.HUMIDITY,
            device_to_ha=lambda x: x / HUMIDITY_SCALING_FACTOR,
            state_class=SensorStateClass.MEASUREMENT,
@@ -459,7 +458,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="SoilMoistureSensor",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            device_class=SensorDeviceClass.MOISTURE,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -484,7 +483,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="PowerSource",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            device_class=SensorDeviceClass.BATTERY,
            entity_category=EntityCategory.DIAGNOSTIC,
            # value has double precision
@@ -625,7 +624,7 @@ DISCOVERY_SCHEMAS = [
        entity_description=MatterSensorEntityDescription(
            key="EveThermoValvePosition",
            translation_key="valve_position",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        ),
        entity_class=MatterSensor,
        required_attributes=(EveCluster.Attributes.ValvePosition,),
@@ -658,7 +657,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="CarbonDioxideSensor",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
            device_class=SensorDeviceClass.CO2,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -671,7 +670,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="TotalVolatileOrganicCompoundsSensor",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
            device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -699,7 +698,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="PM1Sensor",
-            native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
            device_class=SensorDeviceClass.PM1,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -712,7 +711,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="PM25Sensor",
-            native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
            device_class=SensorDeviceClass.PM25,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -725,7 +724,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="PM10Sensor",
-            native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
            device_class=SensorDeviceClass.PM10,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -750,7 +749,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="CarbonMonoxideSensor",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
            device_class=SensorDeviceClass.CO,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -763,7 +762,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="NitrogenDioxideSensor",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
            device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -776,7 +775,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="OzoneConcentrationSensor",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
            device_class=SensorDeviceClass.OZONE,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -802,7 +801,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="HepaFilterCondition",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            state_class=SensorStateClass.MEASUREMENT,
            translation_key="hepa_filter_condition",
        ),
@@ -813,7 +812,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="ActivatedCarbonFilterCondition",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            state_class=SensorStateClass.MEASUREMENT,
            translation_key="activated_carbon_filter_condition",
        ),
@@ -1297,7 +1296,7 @@ DISCOVERY_SCHEMAS = [
        entity_description=MatterSensorEntityDescription(
            key="ThermostatPIHeatingDemand",
            translation_key="pi_heating_demand",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            entity_category=EntityCategory.DIAGNOSTIC,
        ),
        entity_class=MatterSensor,
@@ -1379,7 +1378,7 @@ DISCOVERY_SCHEMAS = [
            entity_registry_enabled_default=False,
            translation_key="window_covering_target_position",
            device_to_ha=lambda x: round((10000 - x) / 100),
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        ),
        entity_class=MatterSensor,
        required_attributes=(
@@ -1464,7 +1463,7 @@ DISCOVERY_SCHEMAS = [
        entity_description=MatterSensorEntityDescription(
            key="EnergyEvseStateOfCharge",
            translation_key="evse_soc",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            device_class=SensorDeviceClass.BATTERY,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -1488,7 +1487,7 @@ DISCOVERY_SCHEMAS = [
        entity_description=MatterSensorEntityDescription(
            key="WaterHeaterManagementTankPercentage",
            translation_key="tank_percentage",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            state_class=SensorStateClass.MEASUREMENT,
        ),
        entity_class=MatterSensor,
@@ -11,6 +11,7 @@ from homeassistant.components.sensor import (
    SensorEntityDescription,
    SensorStateClass,
 )
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
@@ -73,6 +74,7 @@ async def async_setup_entry(
 class MealieStatisticSensors(MealieEntity, SensorEntity):
    """Defines a Mealie sensor."""

+    _attr_entity_category = EntityCategory.DIAGNOSTIC
    entity_description: MealieStatisticsSensorEntityDescription
    coordinator: MealieStatisticsCoordinator

@@ -1,21 +0,0 @@
-"""Support for Mycroft AI."""
-
-import voluptuous as vol
-
-from homeassistant.const import CONF_HOST, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv, discovery
-from homeassistant.helpers.typing import ConfigType
-
-DOMAIN = "mycroft"
-
-CONFIG_SCHEMA = vol.Schema(
-    {DOMAIN: vol.Schema({vol.Required(CONF_HOST): cv.string})}, extra=vol.ALLOW_EXTRA
-)
-
-
-def setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Mycroft component."""
-    hass.data[DOMAIN] = config[DOMAIN][CONF_HOST]
-    discovery.load_platform(hass, Platform.NOTIFY, DOMAIN, {}, config)
-    return True
@@ -1,11 +0,0 @@
-{
-  "domain": "mycroft",
-  "name": "Mycroft",
-  "codeowners": [],
-  "disabled": "Dependencies not compatible with the new pip resolver",
-  "documentation": "https://www.home-assistant.io/integrations/mycroft",
-  "iot_class": "local_push",
-  "loggers": ["mycroftapi"],
-  "quality_scale": "legacy",
-  "requirements": ["mycroftapi==2.0"]
-}
@@ -1,42 +0,0 @@
-"""Mycroft AI notification platform."""
-
-import logging
-from typing import Any, override
-
-from mycroftapi import MycroftAPI
-
-from homeassistant.components.notify import BaseNotificationService
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-
-from . import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def get_service(
-    hass: HomeAssistant,
-    config: ConfigType,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> MycroftNotificationService:
-    """Get the Mycroft notification service."""
-    return MycroftNotificationService(hass.data[DOMAIN])
-
-
-class MycroftNotificationService(BaseNotificationService):
-    """The Mycroft Notification Service."""
-
-    def __init__(self, mycroft_ip: str) -> None:
-        """Initialize the service."""
-        self.mycroft_ip = mycroft_ip
-
-    @override
-    def send_message(self, message: str = "", **kwargs: Any) -> None:
-        """Send a message mycroft to speak on instance."""
-
-        text = message
-        mycroft = MycroftAPI(self.mycroft_ip)
-        if mycroft is not None:
-            mycroft.speak_text(text)
-        else:
-            _LOGGER.warning("Could not reach this instance of mycroft")
@@ -16,13 +16,12 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
    EntityCategory,
+    UnitOfDensity,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -97,7 +96,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_BME280_HUMIDITY,
        translation_key="bme280_humidity",
        suggested_display_precision=1,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.bme280_humidity,
@@ -169,7 +168,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_HECA_HUMIDITY,
        translation_key="heca_humidity",
        suggested_display_precision=1,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.heca_humidity,
@@ -187,7 +186,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_MHZ14A_CARBON_DIOXIDE,
        translation_key="mhz14a_carbon_dioxide",
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        device_class=SensorDeviceClass.CO2,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.mhz14a_carbon_dioxide,
@@ -208,7 +207,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_PMSX003_P0,
        translation_key="pmsx003_pm1",
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM1,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.pms_p0,
@@ -217,7 +216,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_PMSX003_P1,
        translation_key="pmsx003_pm10",
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM10,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.pms_p1,
@@ -226,7 +225,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_PMSX003_P2,
        translation_key="pmsx003_pm25",
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM25,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.pms_p2,
@@ -247,7 +246,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_SDS011_P1,
        translation_key="sds011_pm10",
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM10,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.sds011_p1,
@@ -256,7 +255,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_SDS011_P2,
        translation_key="sds011_pm25",
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM25,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.sds011_p2,
@@ -265,7 +264,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_SHT3X_HUMIDITY,
        translation_key="sht3x_humidity",
        suggested_display_precision=1,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.sht3x_humidity,
@@ -295,7 +294,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_SPS30_P0,
        translation_key="sps30_pm1",
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM1,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.sps30_p0,
@@ -304,7 +303,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_SPS30_P1,
        translation_key="sps30_pm10",
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM10,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.sps30_p1,
@@ -313,7 +312,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_SPS30_P2,
        translation_key="sps30_pm25",
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM25,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.sps30_p2,
@@ -322,7 +321,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_SPS30_P4,
        translation_key="sps30_pm4",
        suggested_display_precision=0,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM4,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.sps30_p4,
@@ -331,7 +330,7 @@ SENSORS: tuple[NAMSensorEntityDescription, ...] = (
        key=ATTR_DHT22_HUMIDITY,
        translation_key="dht22_humidity",
        suggested_display_precision=1,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda sensors: sensors.dht22_humidity,
@@ -165,7 +165,7 @@ class NexiaZone(NexiaThermostatZoneEntity, ClimateEntity):
        self, coordinator: NexiaDataUpdateCoordinator, zone: NexiaThermostatZone
    ) -> None:
        """Initialize the thermostat."""
-        super().__init__(coordinator, zone, zone.zone_id)
+        super().__init__(coordinator, zone, zone.zone_id)  # type: ignore[arg-type] # until fix issue #139773
        thermostat = self._thermostat
        unit = thermostat.get_unit()
        min_humidity, max_humidity = thermostat.get_humidity_setpoint_limits()
@@ -198,7 +198,7 @@ class NexiaZone(NexiaThermostatZoneEntity, ClimateEntity):

    @property
    @override
-    def current_temperature(self) -> int:
+    def current_temperature(self) -> float:
        """Return the current temperature."""
        return self._zone.get_temperature()

@@ -288,7 +288,7 @@ class NexiaZone(NexiaThermostatZoneEntity, ClimateEntity):

    @property
    @override
-    def target_temperature(self) -> int | None:
+    def target_temperature(self) -> float | None:
        """Temperature we try to reach."""
        current_mode = self._zone.get_current_mode()

@@ -300,7 +300,7 @@ class NexiaZone(NexiaThermostatZoneEntity, ClimateEntity):

    @property
    @override
-    def target_temperature_high(self) -> int | None:
+    def target_temperature_high(self) -> float | None:
        """Highest temperature we are trying to reach."""
        current_mode = self._zone.get_current_mode()

@@ -310,7 +310,7 @@ class NexiaZone(NexiaThermostatZoneEntity, ClimateEntity):

    @property
    @override
-    def target_temperature_low(self) -> int | None:
+    def target_temperature_low(self) -> float | None:
        """Lowest temperature we are trying to reach."""
        current_mode = self._zone.get_current_mode()

@@ -40,4 +40,6 @@ class NexiaDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
    @override
    async def _async_update_data(self) -> dict[str, Any]:
        """Fetch data from API endpoint."""
-        return await self.nexia_home.update()
+        update_data = await self.nexia_home.update()  # can return None
+
+        return update_data or {}
@@ -56,7 +56,7 @@ class NexiaThermostatEntity(NexiaEntity):
        thermostat_id = thermostat.thermostat_id
        self._attr_device_info = DeviceInfo(
            configuration_url=self.coordinator.nexia_home.root_url,
-            identifiers={(DOMAIN, thermostat_id)},
+            identifiers={(DOMAIN, thermostat_id)},  # type: ignore[arg-type] # until fix issue #139773
            manufacturer=MANUFACTURER,
            model=thermostat.get_model(),
            name=thermostat.get_name(),
@@ -110,10 +110,10 @@ class NexiaThermostatZoneEntity(NexiaThermostatEntity):
        if TYPE_CHECKING:
            assert self._attr_device_info is not None
        self._attr_device_info |= {
-            ATTR_IDENTIFIERS: {(DOMAIN, zone.zone_id)},
+            ATTR_IDENTIFIERS: {(DOMAIN, zone.zone_id)},  # type: ignore[arg-type] # until fix issue #139773
            ATTR_NAME: zone_name,
            ATTR_SUGGESTED_AREA: zone_name,
-            ATTR_VIA_DEVICE: (DOMAIN, zone.thermostat.thermostat_id),
+            ATTR_VIA_DEVICE: (DOMAIN, zone.thermostat.thermostat_id),  # type: ignore[typeddict-item] # until fix issue #139773
        }
        self._zone_signal = f"{SIGNAL_ZONE_UPDATE}-{zone.zone_id}"

@@ -13,5 +13,5 @@
  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["nexia"],
-  "requirements": ["nexia==2.11.1"]
+  "requirements": ["nexia==2.13.0"]
 }
@@ -42,7 +42,7 @@ class NexiaAutomationScene(NexiaEntity, Scene):
        self, coordinator: NexiaDataUpdateCoordinator, automation: NexiaAutomation
    ) -> None:
        """Initialize the automation scene."""
-        super().__init__(coordinator, automation.automation_id)
+        super().__init__(coordinator, automation.automation_id)  # type: ignore[arg-type] # until fix issue #139773
        self._attr_name = automation.name
        self._automation = automation
        self._attr_extra_state_attributes = {ATTR_DESCRIPTION: automation.description}
@@ -37,7 +37,7 @@ async def async_setup_entry(
    coordinator = config_entry.runtime_data
    nexia_home = coordinator.nexia_home
    entities: list[SwitchEntity] = []
-    room_iq_zones: dict[int, NexiaRoomIQHarmonizer] = {}
+    room_iq_zones: dict[str | int, NexiaRoomIQHarmonizer] = {}
    for thermostat_id in nexia_home.get_thermostat_ids():
        thermostat: NexiaThermostat = nexia_home.get_thermostat_by_id(thermostat_id)
        if thermostat.has_emergency_heat():
@@ -69,7 +69,7 @@ class NexiaHoldSwitch(NexiaThermostatZoneEntity, SwitchEntity):
    ) -> None:
        """Initialize the hold mode switch."""
        zone_id = zone.zone_id
-        super().__init__(coordinator, zone, zone_id)
+        super().__init__(coordinator, zone, zone_id)  # type: ignore[arg-type] # until fix issue #139773

    @property
    @override
@@ -103,7 +103,7 @@ class NexiaRoomIQSwitch(NexiaThermostatZoneEntity, SwitchEntity):
        coordinator: NexiaDataUpdateCoordinator,
        zone: NexiaThermostatZone,
        sensor: NexiaSensor,
-        room_iq_zones: dict[int, NexiaRoomIQHarmonizer],
+        room_iq_zones: dict[str | int, NexiaRoomIQHarmonizer],
    ) -> None:
        """Initialize the RoomIQ sensor switch."""
        super().__init__(coordinator, zone, f"{sensor.id}_room_iq_sensor")
@@ -15,16 +15,29 @@ from homeassistant.const import (
    CONF_PASSWORD,
    CONF_USERNAME,
 )
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.selector import (
+    TextSelector,
+    TextSelectorConfig,
+    TextSelectorType,
+)
 from homeassistant.helpers.service_info import zeroconf

 from .const import CONF_SERIAL, DOMAIN

-USER_SCHEMA = vol.Schema({vol.Required(CONF_HOST): cv.string})
+USER_SCHEMA = vol.Schema({vol.Required(CONF_HOST): TextSelector()})

 AUTH_SCHEMA = vol.Schema(
-    {vol.Required(CONF_USERNAME): cv.string, vol.Required(CONF_PASSWORD): cv.string}
+    {
+        vol.Required(CONF_USERNAME): TextSelector(
+            TextSelectorConfig(autocomplete="username")
+        ),
+        vol.Required(CONF_PASSWORD): TextSelector(
+            TextSelectorConfig(
+                type=TextSelectorType.PASSWORD, autocomplete="current-password"
+            )
+        ),
+    }
 )


@@ -365,5 +365,7 @@ async def create_rexel_client(
            gateway_id=entry.data[CONF_GATEWAY_ID],
        ),
        session=async_create_clientsession(hass),
-        settings=OverkizClientSettings(action_queue=ActionQueueSettings()),
+        settings=OverkizClientSettings(
+            action_queue=ActionQueueSettings(), default_rts_command_duration=0
+        ),
    )
@@ -15,13 +15,12 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    SIGNAL_STRENGTH_DECIBELS,
    EntityCategory,
    UnitOfEnergy,
    UnitOfPower,
+    UnitOfRatio,
    UnitOfSpeed,
    UnitOfTemperature,
    UnitOfTime,
@@ -55,7 +54,7 @@ SENSOR_DESCRIPTIONS: list[OverkizSensorDescription] = [
    OverkizSensorDescription(
        key=OverkizState.CORE_BATTERY_LEVEL,
        name="Battery level",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.BATTERY,
        state_class=SensorStateClass.MEASUREMENT,
        entity_category=EntityCategory.DIAGNOSTIC,
@@ -329,7 +328,7 @@ SENSOR_DESCRIPTIONS: list[OverkizSensorDescription] = [
        native_value=lambda value: round(cast(float, value), 2),
        device_class=SensorDeviceClass.HUMIDITY,
        # core:MeasuredValueType = core:RelativeValueInPercentage
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    # TemperatureSensor/TemperatureSensor
@@ -369,7 +368,7 @@ SENSOR_DESCRIPTIONS: list[OverkizSensorDescription] = [
        key=OverkizState.CORE_CO_CONCENTRATION,
        name="CO concentration",
        device_class=SensorDeviceClass.CO,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    # AirSensor/CO2Sensor
@@ -377,7 +376,7 @@ SENSOR_DESCRIPTIONS: list[OverkizSensorDescription] = [
        key=OverkizState.CORE_CO2_CONCENTRATION,
        name="CO2 concentration",
        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    # SunSensor/SunEnergySensor
@@ -489,7 +488,7 @@ SENSOR_DESCRIPTIONS: list[OverkizSensorDescription] = [
    OverkizSensorDescription(
        key=OverkizState.CORE_TARGET_CLOSURE,
        name="Target closure",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        entity_registry_enabled_default=False,
    ),
    # ThreeWayWindowHandle/WindowHandle
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
    SensorStateClass,
    StateType,
 )
-from homeassistant.const import PERCENTAGE, UnitOfInformation
+from homeassistant.const import UnitOfInformation, UnitOfRatio
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

@@ -122,7 +122,7 @@ CONTAINER_SENSORS: tuple[PortainerContainerSensorEntityDescription, ...] = (
            and data.stats.memory_stats.usage > 0
            else 0.0
        ),
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        entity_category=EntityCategory.DIAGNOSTIC,
        suggested_display_precision=2,
        state_class=SensorStateClass.MEASUREMENT,
@@ -151,7 +151,7 @@ CONTAINER_SENSORS: tuple[PortainerContainerSensorEntityDescription, ...] = (
            and data.stats.cpu_stats.online_cpus > 0
            else 0.0
        ),
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        entity_category=EntityCategory.DIAGNOSTIC,
        suggested_display_precision=2,
        state_class=SensorStateClass.MEASUREMENT,
@@ -12,13 +12,7 @@ from homeassistant.components.sensor import (
    SensorStateClass,
    StateType,
 )
-from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
-    UnitOfPressure,
-    UnitOfTemperature,
-)
+from homeassistant.const import UnitOfPressure, UnitOfRatio, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

@@ -54,13 +48,13 @@ ENTITIES: tuple[PranaSensorEntityDescription, ...] = (
    PranaSensorEntityDescription(
        key=PranaSensorType.HUMIDITY,
        value_fn=lambda coord: coord.data.humidity,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.HUMIDITY,
    ),
    PranaSensorEntityDescription(
        key=PranaSensorType.VOC,
        value_fn=lambda coord: coord.data.voc,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
    ),
    PranaSensorEntityDescription(
@@ -72,7 +66,7 @@ ENTITIES: tuple[PranaSensorEntityDescription, ...] = (
    PranaSensorEntityDescription(
        key=PranaSensorType.CO2,
        value_fn=lambda coord: coord.data.co2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        device_class=SensorDeviceClass.CO2,
    ),
    PranaSensorEntityDescription(
@@ -20,8 +20,9 @@ from homeassistant.const import (
    CONF_USERNAME,
    CONF_VERIFY_SSL,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryError
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

 from .common import sanitize_config_entry
@@ -201,7 +202,7 @@ class ProxmoxCoordinator(DataUpdateCoordinator[dict[str, ProxmoxNodeData]]):
    def _init_proxmox(self) -> None:
        """Initialize ProxmoxAPI instance."""
        data = sanitize_config_entry(self.config_entry.data)
-        auth_kwargs = {
+        auth_kwargs: dict[str, Any] = {
            "password": data.get(CONF_PASSWORD),
        }
        if data.get(CONF_TOKEN):
@@ -331,6 +332,41 @@ class ProxmoxCoordinator(DataUpdateCoordinator[dict[str, ProxmoxNodeData]]):
            for storages_callback in self.new_storages_callbacks:
                storages_callback(new_storage_data)

+        self._async_remove_stale_devices(data)
+
+    @callback
+    def _async_remove_stale_devices(self, data: dict[str, ProxmoxNodeData]) -> None:
+        """Remove devices for nodes/VMs/containers/storages no longer present."""
+        valid_identifiers: set[str] = set()
+        for node_data in data.values():
+            valid_identifiers.add(
+                f"{self.config_entry.entry_id}_node_{node_data.node['id']}"
+            )
+            valid_identifiers.update(
+                f"{self.config_entry.entry_id}_vm_{vmid}" for vmid in node_data.vms
+            )
+            valid_identifiers.update(
+                f"{self.config_entry.entry_id}_container_{vmid}"
+                for vmid in node_data.containers
+            )
+            valid_identifiers.update(
+                f"{self.config_entry.entry_id}_storage_{storage}"
+                for storage in node_data.storages
+            )
+
+        registry = dr.async_get(self.hass)
+        for device in dr.async_entries_for_config_entry(
+            registry, self.config_entry.entry_id
+        ):
+            if not any(
+                identifier[0] == DOMAIN and identifier[1] in valid_identifiers
+                for identifier in device.identifiers
+            ):
+                _LOGGER.debug("Removing stale device: %s", device.identifiers)
+                registry.async_update_device(
+                    device.id, remove_config_entry_id=self.config_entry.entry_id
+                )
+

 class ProxmoxSetupError(Exception):
    """Base exception for Proxmox setup issues."""
@@ -77,7 +77,7 @@ rules:
  icon-translations: done
  reconfiguration-flow: done
  repair-issues: todo
-  stale-devices: todo
+  stale-devices: done

  # Platinum
  async-dependency:
@@ -22,15 +22,14 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    UnitOfElectricCurrent,
    UnitOfElectricPotential,
    UnitOfEnergy,
    UnitOfLength,
    UnitOfPower,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfSoundPressure,
    UnitOfSpeed,
    UnitOfTemperature,
@@ -126,7 +125,7 @@ _GAUGE_VARIANT_DESCRIPTIONS = {
    "AIRQUALITY": SensorEntityDescription(
        key="airquality",
        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    "CURRENT": SensorEntityDescription(
@@ -156,7 +155,7 @@ _GAUGE_VARIANT_DESCRIPTIONS = {
    "HUMIDITY": SensorEntityDescription(
        key="humidity",
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    "LIGHT": SensorEntityDescription(
@@ -353,7 +352,7 @@ class QbusHumiditySensor(QbusEntity, SensorEntity):

    _attr_device_class = SensorDeviceClass.HUMIDITY
    _attr_name = None
-    _attr_native_unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = UnitOfRatio.PERCENTAGE
    _attr_state_class = SensorStateClass.MEASUREMENT

    @override
@@ -382,7 +381,7 @@ class QbusVentilationSensor(QbusEntity, SensorEntity):

    _attr_device_class = SensorDeviceClass.CO2
    _attr_name = None
-    _attr_native_unit_of_measurement = CONCENTRATION_PARTS_PER_MILLION
+    _attr_native_unit_of_measurement = UnitOfRatio.PARTS_PER_MILLION
    _attr_state_class = SensorStateClass.MEASUREMENT
    _attr_suggested_display_precision = 0

@@ -30,6 +30,7 @@ from homeassistant.util.event_type import EventType
 # startup
 from . import (
    backup,  # noqa: F401
+    entity_options,
    entity_registry,
    websocket_api,
 )
@@ -42,6 +43,7 @@ from .const import (  # noqa: F401
    SupportedDialect,
 )
 from .core import Recorder
+from .entity_options import is_entity_recorded  # noqa: F401
 from .services import async_setup_services
 from .tasks import AddRecorderPlatformTask
 from .util import get_instance
@@ -125,15 +127,6 @@ CONFIG_SCHEMA = vol.Schema(
 )


-def is_entity_recorded(hass: HomeAssistant, entity_id: str) -> bool:
-    """Check if an entity is being recorded.
-
-    Async friendly.
-    """
-    instance = get_instance(hass)
-    return instance.entity_filter is None or instance.entity_filter(entity_id)
-
-
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
    """Set up the recorder."""
    conf = config[DOMAIN]
@@ -167,6 +160,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
    )
    get_instance.cache_clear()
    entity_registry.async_setup(hass)
+    entity_options.async_setup(hass)
    instance.async_initialize()
    instance.async_register()
    instance.start()
@@ -0,0 +1,68 @@
+"""Control recorder entity options."""
+
+import dataclasses
+from enum import StrEnum
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant.components import websocket_api
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
+
+from .util import get_instance
+
+
+def is_entity_recorded(hass: HomeAssistant, entity_id: str) -> bool:
+    """Check if an entity is being recorded.
+
+    Async friendly.
+    """
+    instance = get_instance(hass)
+    return instance.entity_filter is None or instance.entity_filter(entity_id)
+
+
+@callback
+def async_setup(hass: HomeAssistant) -> None:
+    """Set up the recorder entity options."""
+    websocket_api.async_register_command(hass, ws_get_entity_options)
+
+
+class EntityRecordingDisabler(StrEnum):
+    """What disabled recording of an entity."""
+
+    USER = "user"
+
+
+@dataclasses.dataclass(frozen=True)
+class RecorderEntityOptions:
+    """Recorder options for an entity."""
+
+    recording_disabled_by: EntityRecordingDisabler | None = None
+
+    def to_json(self) -> dict[str, Any]:
+        """Return a JSON serializable representation for storage."""
+        return {
+            "recording_disabled_by": self.recording_disabled_by,
+        }
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "recorder/entity_options/get",
+        vol.Required("entity_id"): cv.strict_entity_id,
+    }
+)
+@callback
+def ws_get_entity_options(
+    hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
+) -> None:
+    """Get recorder settings for a single entity."""
+    entity_id: str = msg["entity_id"]
+    recording_disabled = (
+        None if is_entity_recorded(hass, entity_id) else EntityRecordingDisabler.USER
+    )
+
+    options = RecorderEntityOptions(recording_disabled_by=recording_disabled)
+    connection.send_result(msg["id"], options.to_json())
@@ -321,6 +321,7 @@ SENSOR_TYPES: tuple[RenaultSensorEntityDescription[Any], ...] = (
        options=[
            "always",
            "delayed",
+            "delegated",
            "scheduled",
        ],
        value_lambda=_get_charging_settings_mode_formatted,
@@ -157,6 +157,7 @@
        "state": {
          "always": "Always",
          "delayed": "Delayed",
+          "delegated": "Delegated",
          "scheduled": "Scheduled"
        }
      },
@@ -286,7 +286,10 @@ async def register_callbacks(
        return async_camera_wake

    host.api.baichuan.register_callback(
-        "privacy_mode_change", async_privacy_mode_change, 623
+        "privacy_mode_change_623", async_privacy_mode_change, 623
+    )
+    host.api.baichuan.register_callback(
+        "privacy_mode_change_574", async_privacy_mode_change, 574
    )
    for channel in host.api.channels:
        if host.api.supported(channel, "battery"):
@@ -306,7 +309,8 @@ async def async_unload_entry(

    await host.stop()

-    host.api.baichuan.unregister_callback("privacy_mode_change")
+    host.api.baichuan.unregister_callback("privacy_mode_change_623")
+    host.api.baichuan.unregister_callback("privacy_mode_change_574")
    for channel in host.api.channels:
        if host.api.supported(channel, "battery"):
            host.api.baichuan.unregister_callback(f"camera_{channel}_wake")
@@ -75,6 +75,7 @@ LIGHT_ENTITIES = (
    ReolinkLightEntityDescription(
        key="status_led",
        cmd_key="GetPowerLed",
+        cmd_id=208,
        translation_key="status_led",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api, ch: api.supported(ch, "power_led"),
@@ -20,5 +20,5 @@
  "iot_class": "local_push",
  "loggers": ["reolink_aio"],
  "quality_scale": "platinum",
-  "requirements": ["reolink-aio==0.21.2"]
+  "requirements": ["reolink-aio==0.21.3"]
 }
@@ -195,6 +195,7 @@ NUMBER_ENTITIES = (
        key="volume",
        cmd_key="GetAudioCfg",
        translation_key="volume",
+        cmd_id=264,
        entity_category=EntityCategory.CONFIG,
        native_step=1,
        native_min_value=0,
@@ -206,6 +207,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="volume_speak",
        cmd_key="GetAudioCfg",
+        cmd_id=264,
        translation_key="volume_speak",
        entity_category=EntityCategory.CONFIG,
        native_step=1,
@@ -218,6 +220,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="volume_doorbell",
        cmd_key="GetAudioCfg",
+        cmd_id=264,
        translation_key="volume_doorbell",
        entity_category=EntityCategory.CONFIG,
        native_step=1,
@@ -269,6 +272,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="pir_sensitivity",
        cmd_key="GetPirInfo",
+        cmd_id=212,
        translation_key="pir_sensitivity",
        entity_category=EntityCategory.CONFIG,
        native_step=1,
@@ -281,6 +285,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="pir_interval",
        cmd_key="GetPirInfo",
+        cmd_id=212,
        translation_key="pir_interval",
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.DURATION,
@@ -296,6 +301,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_face_sensititvity",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_face_sensitivity",
        entity_category=EntityCategory.CONFIG,
        native_step=1,
@@ -310,6 +316,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_person_sensititvity",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_person_sensitivity",
        entity_category=EntityCategory.CONFIG,
        native_step=1,
@@ -324,6 +331,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_vehicle_sensititvity",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_vehicle_sensitivity",
        entity_category=EntityCategory.CONFIG,
        native_step=1,
@@ -338,6 +346,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_non_motor_vehicle_sensitivity",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_non_motor_vehicle_sensitivity",
        entity_category=EntityCategory.CONFIG,
        native_step=1,
@@ -355,6 +364,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_package_sensititvity",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_package_sensitivity",
        entity_category=EntityCategory.CONFIG,
        native_step=1,
@@ -369,6 +379,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_pet_sensititvity",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_pet_sensitivity",
        entity_category=EntityCategory.CONFIG,
        native_step=1,
@@ -385,6 +396,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_pet_sensititvity",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_animal_sensitivity",
        entity_category=EntityCategory.CONFIG,
        native_step=1,
@@ -411,6 +423,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_face_delay",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_face_delay",
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.DURATION,
@@ -428,6 +441,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_person_delay",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_person_delay",
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.DURATION,
@@ -445,6 +459,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_non_motor_vehicle_delay",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_non_motor_vehicle_delay",
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.DURATION,
@@ -464,6 +479,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_vehicle_delay",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_vehicle_delay",
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.DURATION,
@@ -481,6 +497,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_package_delay",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_package_delay",
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.DURATION,
@@ -498,6 +515,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_pet_delay",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_pet_delay",
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.DURATION,
@@ -517,6 +535,7 @@ NUMBER_ENTITIES = (
    ReolinkNumberEntityDescription(
        key="ai_pet_delay",
        cmd_key="GetAiAlarm",
+        cmd_id=342,
        translation_key="ai_animal_delay",
        entity_category=EntityCategory.CONFIG,
        device_class=NumberDeviceClass.DURATION,
@@ -185,6 +185,7 @@ SELECT_ENTITIES = (
    ReolinkSelectEntityDescription(
        key="status_led",
        cmd_key="GetPowerLed",
+        cmd_id=208,
        translation_key="doorbell_led",
        entity_category=EntityCategory.CONFIG,
        get_options=lambda api, ch: api.doorbell_led_list(ch),
@@ -232,6 +233,7 @@ SELECT_ENTITIES = (
    ReolinkSelectEntityDescription(
        key="main_frame_rate",
        cmd_key="GetEnc",
+        cmd_id=56,
        translation_key="main_frame_rate",
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
@@ -244,6 +246,7 @@ SELECT_ENTITIES = (
    ReolinkSelectEntityDescription(
        key="sub_frame_rate",
        cmd_key="GetEnc",
+        cmd_id=56,
        translation_key="sub_frame_rate",
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
@@ -256,6 +259,7 @@ SELECT_ENTITIES = (
    ReolinkSelectEntityDescription(
        key="main_bit_rate",
        cmd_key="GetEnc",
+        cmd_id=56,
        translation_key="main_bit_rate",
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
@@ -268,6 +272,7 @@ SELECT_ENTITIES = (
    ReolinkSelectEntityDescription(
        key="sub_bit_rate",
        cmd_key="GetEnc",
+        cmd_id=56,
        translation_key="sub_bit_rate",
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
@@ -280,6 +285,7 @@ SELECT_ENTITIES = (
    ReolinkSelectEntityDescription(
        key="main_encoding",
        cmd_key="GetEnc",
+        cmd_id=56,
        translation_key="main_encoding",
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
@@ -291,6 +297,7 @@ SELECT_ENTITIES = (
    ReolinkSelectEntityDescription(
        key="sub_encoding",
        cmd_key="GetEnc",
+        cmd_id=56,
        translation_key="sub_encoding",
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
@@ -316,6 +323,7 @@ SELECT_ENTITIES = (
    ReolinkSelectEntityDescription(
        key="post_rec_time",
        cmd_key="GetRec",
+        cmd_id=54,
        translation_key="post_rec_time",
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
@@ -340,6 +348,7 @@ HOST_SELECT_ENTITIES = (
    ReolinkHostSelectEntityDescription(
        key="packing_time",
        cmd_key="GetRec",
+        cmd_id=54,
        translation_key="packing_time",
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
@@ -74,6 +74,7 @@ SWITCH_ENTITIES = (
    ReolinkSwitchEntityDescription(
        key="ir_lights",
        cmd_key="GetIrLights",
+        cmd_id=208,
        translation_key="ir_lights",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api, ch: api.supported(ch, "ir_lights"),
@@ -83,6 +84,7 @@ SWITCH_ENTITIES = (
    ReolinkSwitchEntityDescription(
        key="record_audio",
        cmd_key="GetEnc",
+        cmd_id=56,
        translation_key="record_audio",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api, ch: api.supported(ch, "audio"),
@@ -92,6 +94,7 @@ SWITCH_ENTITIES = (
    ReolinkSwitchEntityDescription(
        key="siren_on_event",
        cmd_key="GetAudioAlarm",
+        cmd_id=232,
        translation_key="siren_on_event",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api, ch: api.supported(ch, "siren"),
@@ -136,6 +139,7 @@ SWITCH_ENTITIES = (
    ReolinkSwitchEntityDescription(
        key="email",
        cmd_key="GetEmail",
+        cmd_id=217,
        translation_key="email",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api, ch: api.supported(ch, "email") and api.is_nvr,
@@ -145,6 +149,7 @@ SWITCH_ENTITIES = (
    ReolinkSwitchEntityDescription(
        key="ftp_upload",
        cmd_key="GetFtp",
+        cmd_id=70,
        translation_key="ftp_upload",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api, ch: api.supported(ch, "ftp") and api.is_nvr,
@@ -163,6 +168,7 @@ SWITCH_ENTITIES = (
    ReolinkSwitchEntityDescription(
        key="record",
        cmd_key="GetRec",
+        cmd_id=81,
        translation_key="record",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api, ch: api.supported(ch, "rec_enable") and api.is_nvr,
@@ -200,6 +206,7 @@ SWITCH_ENTITIES = (
    ReolinkSwitchEntityDescription(
        key="doorbell_button_sound",
        cmd_key="GetAudioCfg",
+        cmd_id=264,
        translation_key="doorbell_button_sound",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api, ch: api.supported(ch, "doorbell_button_sound"),
@@ -209,6 +216,7 @@ SWITCH_ENTITIES = (
    ReolinkSwitchEntityDescription(
        key="pir_enabled",
        cmd_key="GetPirInfo",
+        cmd_id=212,
        translation_key="pir_enabled",
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
@@ -219,6 +227,7 @@ SWITCH_ENTITIES = (
    ReolinkSwitchEntityDescription(
        key="pir_reduce_alarm",
        cmd_key="GetPirInfo",
+        cmd_id=212,
        translation_key="pir_reduce_alarm",
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
@@ -260,6 +269,7 @@ HOST_SWITCH_ENTITIES = (
    ReolinkHostSwitchEntityDescription(
        key="email",
        cmd_key="GetEmail",
+        cmd_id=217,
        translation_key="email",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api: api.supported(None, "email") and not api.is_hub,
@@ -269,6 +279,7 @@ HOST_SWITCH_ENTITIES = (
    ReolinkHostSwitchEntityDescription(
        key="ftp_upload",
        cmd_key="GetFtp",
+        cmd_id=70,
        translation_key="ftp_upload",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api: api.supported(None, "ftp") and not api.is_hub,
@@ -287,6 +298,7 @@ HOST_SWITCH_ENTITIES = (
    ReolinkHostSwitchEntityDescription(
        key="record",
        cmd_key="GetRec",
+        cmd_id=81,
        translation_key="record",
        entity_category=EntityCategory.CONFIG,
        supported=lambda api: api.supported(None, "rec_enable") and not api.is_hub,
@@ -15,14 +15,12 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
    CONF_DEVICES,
    CONF_NAME,
    CONF_SENSOR_TYPE,
    CONF_UNIT_OF_MEASUREMENT,
    DEGREE,
    LIGHT_LUX,
-    PERCENTAGE,
    UV_INDEX,
    UnitOfElectricCurrent,
    UnitOfElectricPotential,
@@ -30,6 +28,7 @@ from homeassistant.const import (
    UnitOfPower,
    UnitOfPrecipitationDepth,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfSpeed,
    UnitOfTemperature,
    UnitOfVolumetricFlux,
@@ -85,7 +84,7 @@ SENSOR_TYPES = (
        name="CO2 air quality",
        device_class=SensorDeviceClass.CO2,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
    ),
    SensorEntityDescription(
        key="command",
@@ -140,7 +139,7 @@ SENSOR_TYPES = (
        name="Humidity",
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
    ),
    SensorEntityDescription(
        key="humidity_status",
@@ -20,7 +20,7 @@
  "loggers": ["roborock"],
  "quality_scale": "silver",
  "requirements": [
-    "python-roborock==5.14.2",
+    "python-roborock==5.21.0",
    "vacuum-map-parser-roborock==0.1.5"
  ]
 }
@@ -35,7 +35,7 @@ class RoborockNumberDescription(NumberEntityDescription):
    trait: Callable[[PropertiesApi], Any | None]
    """Function to determine if number entity is supported by the device."""

-    get_value: Callable[[Any], float]
+    get_value: Callable[[Any], float | None]
    """Function to get the value from the trait."""

    set_value: Callable[[Any, float], Coroutine[Any, Any, None]]
@@ -51,7 +51,9 @@ NUMBER_DESCRIPTIONS: list[RoborockNumberDescription] = [
        native_unit_of_measurement=PERCENTAGE,
        entity_category=EntityCategory.CONFIG,
        trait=lambda api: api.sound_volume,
-        get_value=lambda trait: float(trait.volume),
+        get_value=lambda trait: (
+            float(trait.volume) if trait.volume is not None else None
+        ),
        set_value=lambda trait, value: trait.set_volume(int(value)),
    )
 ]
@@ -37,7 +37,7 @@ class RoborockTimeDescription(TimeEntityDescription):
    trait: Callable[[Any], Any | None]
    """Function to determine if time entity is supported by the device."""

-    get_value: Callable[[Any], datetime.time]
+    get_value: Callable[[Any], datetime.time | None]
    """Function to get the value from the trait."""

    update_value: Callable[[Any, datetime.time], Coroutine[Any, Any, None]]
@@ -58,9 +58,7 @@ TIME_DESCRIPTIONS: list[RoborockTimeDescription] = [
                end_minute=trait.end_minute,
            )
        ),
-        get_value=lambda trait: datetime.time(
-            hour=trait.start_hour, minute=trait.start_minute
-        ),
+        get_value=lambda trait: trait.start_time,
        entity_category=EntityCategory.CONFIG,
    ),
    RoborockTimeDescription(
@@ -76,9 +74,7 @@ TIME_DESCRIPTIONS: list[RoborockTimeDescription] = [
                end_minute=desired_time.minute,
            )
        ),
-        get_value=lambda trait: datetime.time(
-            hour=trait.end_hour, minute=trait.end_minute
-        ),
+        get_value=lambda trait: trait.end_time,
        entity_category=EntityCategory.CONFIG,
    ),
    RoborockTimeDescription(
@@ -94,9 +90,7 @@ TIME_DESCRIPTIONS: list[RoborockTimeDescription] = [
                end_minute=trait.end_minute,
            )
        ),
-        get_value=lambda trait: datetime.time(
-            hour=trait.start_hour, minute=trait.start_minute
-        ),
+        get_value=lambda trait: trait.start_time,
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
    ),
@@ -113,9 +107,7 @@ TIME_DESCRIPTIONS: list[RoborockTimeDescription] = [
                end_minute=desired_time.minute,
            )
        ),
-        get_value=lambda trait: datetime.time(
-            hour=trait.end_hour, minute=trait.end_minute
-        ),
+        get_value=lambda trait: trait.end_time,
        entity_category=EntityCategory.CONFIG,
        entity_registry_enabled_default=False,
    ),
@@ -17,7 +17,7 @@ from homeassistant.components.number import (
    NumberMode,
    RestoreNumber,
 )
-from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTemperature
+from homeassistant.const import EntityCategory, UnitOfRatio, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -183,7 +183,7 @@ BLOCK_NUMBERS: dict[tuple[str, str], BlockNumberDescription] = {
    ("device", "valvePos"): BlockNumberDescription(
        key="device|valvepos",
        translation_key="valve_position",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        available=lambda block: cast(int, block.valveError) != 1,
        entity_category=EntityCategory.CONFIG,
        native_min_value=0,
@@ -291,7 +291,7 @@ RPC_NUMBERS: Final = {
        native_max_value=100,
        native_step=1,
        mode=NumberMode.SLIDER,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        method="blu_trv_set_valve_position",
        removal_condition=lambda config, _, key: (
            config[key].get("enable", True) is True
@@ -307,7 +307,7 @@ RPC_NUMBERS: Final = {
        native_max_value=100,
        native_step=1,
        mode=NumberMode.SLIDER,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        method="cury_set",
        slot="left",
        available=lambda status: (
@@ -325,7 +325,7 @@ RPC_NUMBERS: Final = {
        native_max_value=100,
        native_step=1,
        mode=NumberMode.SLIDER,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        method="cury_set",
        slot="right",
        available=lambda status: (
@@ -17,10 +17,8 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
    DEGREE,
    LIGHT_LUX,
-    PERCENTAGE,
    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
    EntityCategory,
    UnitOfApparentPower,
@@ -30,6 +28,7 @@ from homeassistant.const import (
    UnitOfFrequency,
    UnitOfPower,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfTemperature,
    UnitOfTime,
    UnitOfVolume,
@@ -203,7 +202,7 @@ class RpcBluTrvSensor(RpcSensor):
 BLOCK_SENSORS: dict[tuple[str, str], BlockSensorDescription] = {
    ("device", "battery"): BlockSensorDescription(
        key="device|battery",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.BATTERY,
        state_class=SensorStateClass.MEASUREMENT,
        removal_condition=lambda settings, _: settings.get("external_power") == 1,
@@ -350,7 +349,7 @@ BLOCK_SENSORS: dict[tuple[str, str], BlockSensorDescription] = {
    ("sensor", "concentration"): BlockSensorDescription(
        key="sensor|concentration",
        translation_key="gas_concentration",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    ("sensor", "temp"): BlockSensorDescription(
@@ -373,7 +372,7 @@ BLOCK_SENSORS: dict[tuple[str, str], BlockSensorDescription] = {
    ),
    ("sensor", "humidity"): BlockSensorDescription(
        key="sensor|humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        suggested_display_precision=1,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
@@ -398,7 +397,7 @@ BLOCK_SENSORS: dict[tuple[str, str], BlockSensorDescription] = {
    ("relay", "totalWorkTime"): BlockSensorDescription(
        key="relay|totalWorkTime",
        translation_key="lamp_life",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        value=get_shelly_air_lamp_life,
        suggested_display_precision=1,
        entity_category=EntityCategory.DIAGNOSTIC,
@@ -1255,7 +1254,7 @@ RPC_SENSORS: Final = {
    "humidity_rh": RpcSensorDescription(
        key="humidity",
        sub_key="rh",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        suggested_display_precision=1,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
@@ -1266,7 +1265,7 @@ RPC_SENSORS: Final = {
    "battery": RpcSensorDescription(
        key="devicepower",
        sub_key="battery",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        value=lambda status, _: status["percent"],
        device_class=SensorDeviceClass.BATTERY,
        state_class=SensorStateClass.MEASUREMENT,
@@ -1296,7 +1295,7 @@ RPC_SENSORS: Final = {
        key="input",
        sub_key="percent",
        translation_key="analog",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        removal_condition=lambda config, _, key: (
            config[key]["type"] != "analog" or config[key]["enable"] is False
@@ -1389,7 +1388,7 @@ RPC_SENSORS: Final = {
        key="blutrv",
        sub_key="pos",
        translation_key="valve_position",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        entity_category=EntityCategory.DIAGNOSTIC,
        removal_condition=lambda config, _, key: (
@@ -1400,7 +1399,7 @@ RPC_SENSORS: Final = {
    "blutrv_battery": RpcSensorDescription(
        key="blutrv",
        sub_key="battery",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.BATTERY,
        state_class=SensorStateClass.MEASUREMENT,
        entity_category=EntityCategory.DIAGNOSTIC,
@@ -1448,7 +1447,7 @@ RPC_SENSORS: Final = {
    "number_current_humidity": RpcSensorDescription(
        key="number",
        sub_key="value",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        suggested_display_precision=1,
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
@@ -1686,7 +1685,7 @@ RPC_SENSORS: Final = {
        translation_key="left_slot_level",
        value=lambda status, _: status["left"]["vial"]["level"],
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        entity_category=EntityCategory.DIAGNOSTIC,
        available=lambda status: (
            (left := status["left"]) is not None
@@ -1710,7 +1709,7 @@ RPC_SENSORS: Final = {
        translation_key="right_slot_level",
        value=lambda status, _: status["right"]["vial"]["level"],
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        entity_category=EntityCategory.DIAGNOSTIC,
        available=lambda status: (
            (right := status["right"]) is not None
@@ -1,7 +1,8 @@
 """The Steam integration."""

 from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er

 from .coordinator import SteamConfigEntry, SteamDataUpdateCoordinator

@@ -21,3 +22,22 @@ async def async_setup_entry(hass: HomeAssistant, entry: SteamConfigEntry) -> boo
 async def async_unload_entry(hass: HomeAssistant, entry: SteamConfigEntry) -> bool:
    """Unload a config entry."""
    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def async_migrate_entry(hass: HomeAssistant, entry: SteamConfigEntry) -> bool:
+    """Migrate old entry."""
+
+    if entry.version < 2:
+        # Migrate entity unique id
+
+        @callback
+        def migrate_unique_id(entity_entry: er.RegistryEntry) -> dict[str, str] | None:
+            if entity_entry.unique_id.startswith("sensor.steam_"):
+                new = entity_entry.unique_id.removeprefix("sensor.steam_") + "_account"
+                return {"new_unique_id": new}
+            return None
+
+        await er.async_migrate_entries(hass, entry.entry_id, migrate_unique_id)
+        hass.config_entries.async_update_entry(entry, version=2)
+
+    return True
@@ -7,11 +7,13 @@ import steam.api
 import voluptuous as vol

 from homeassistant.config_entries import (
+    SOURCE_REAUTH,
+    SOURCE_RECONFIGURE,
    ConfigFlow,
    ConfigFlowResult,
    OptionsFlowWithReload,
 )
-from homeassistant.const import CONF_API_KEY, Platform
+from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform
 from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er

@@ -41,6 +43,8 @@ def validate_input(user_input: dict[str, str]) -> dict[str, str | int]:
 class SteamFlowHandler(ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Steam."""

+    VERSION = 2
+
    @staticmethod
    @callback
    @override
@@ -94,12 +98,22 @@ class SteamFlowHandler(ConfigFlow, domain=DOMAIN):
        """Handle a reauthorization flow request."""
        return await self.async_step_reauth_confirm()

+    async def async_step_reconfigure(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle reconfigure flow."""
+        return await self.async_step_reauth_confirm(user_input)
+
    async def async_step_reauth_confirm(
        self, user_input: dict[str, str] | None = None
    ) -> ConfigFlowResult:
        """Confirm reauth dialog."""
        errors: dict[str, str] = {}
-        entry = self._get_reauth_entry()
+        entry = (
+            self._get_reauth_entry()
+            if self.source == SOURCE_REAUTH
+            else self._get_reconfigure_entry()
+        )

        if user_input is not None:
            try:
@@ -120,12 +134,14 @@ class SteamFlowHandler(ConfigFlow, domain=DOMAIN):
                    entry, data_updates=user_input
                )
        return self.async_show_form(
-            step_id="reauth_confirm",
+            step_id=(
+                "reauth_confirm" if self.source == SOURCE_REAUTH else SOURCE_RECONFIGURE
+            ),
            data_schema=self.add_suggested_values_to_schema(
                data_schema=STEP_REAUTH_DATA_SCHEMA, suggested_values=user_input
            ),
            errors=errors,
-            description_placeholders=PLACEHOLDERS,
+            description_placeholders={CONF_NAME: entry.title, **PLACEHOLDERS},
        )


@@ -150,7 +166,7 @@ class SteamOptionsFlowHandler(OptionsFlowWithReload):
            for _id in self.options[CONF_ACCOUNTS]:
                if _id not in user_input[CONF_ACCOUNTS] and (
                    entity_id := er.async_get(self.hass).async_get_entity_id(
-                        Platform.SENSOR, DOMAIN, f"sensor.steam_{_id}"
+                        Platform.SENSOR, DOMAIN, f"{_id}_account"
                    )
                ):
                    er.async_get(self.hass).async_remove(entity_id)
@@ -1,5 +1,6 @@
 """Entity classes for the Steam integration."""

+from homeassistant.components.sensor import SensorEntityDescription
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity

@@ -12,9 +13,17 @@ class SteamEntity(CoordinatorEntity[SteamDataUpdateCoordinator]):

    _attr_has_entity_name = True

-    def __init__(self, coordinator: SteamDataUpdateCoordinator) -> None:
+    def __init__(
+        self,
+        coordinator: SteamDataUpdateCoordinator,
+        steamid: str,
+        description: SensorEntityDescription,
+    ) -> None:
        """Initialize a Steam entity."""
        super().__init__(coordinator)
+        self._steamid = steamid
+        self.entity_description = description
+        self._attr_unique_id = f"{steamid}_{description.key}"
        self._attr_device_info = DeviceInfo(
            configuration_url="https://store.steampowered.com",
            entry_type=DeviceEntryType.SERVICE,
@@ -80,10 +80,7 @@ class SteamSensorEntity(SteamEntity, SensorEntity):
        description: SteamSensorEntityDescription,
    ) -> None:
        """Initialize the sensor."""
-        super().__init__(coordinator)
-        self._steamid = steamid
-        self.entity_description = description
-        self._attr_unique_id = f"sensor.steam_{steamid}"
+        super().__init__(coordinator, steamid, description)
        self._attr_name = self.entity_description.name_fn(coordinator.data[steamid])

    @property
@@ -2,7 +2,8 @@
  "config": {
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -21,6 +22,16 @@
        "description": "The Steam integration requires re-authentication.\n\nYou can find your Steam Web API key [**here**]({api_key_url}).",
        "title": "[%key:common::config_flow::title::reauth%]"
      },
+      "reconfigure": {
+        "data": {
+          "api_key": "[%key:component::steam_online::config::step::user::data::api_key%]"
+        },
+        "data_description": {
+          "api_key": "[%key:component::steam_online::config::step::user::data_description::api_key%]"
+        },
+        "description": "You can find your Steam Web API key [**here**]({api_key_url}).",
+        "title": "Reconfigure {name}"
+      },
      "user": {
        "data": {
          "account": "Steam ID",
@@ -2,42 +2,49 @@

 import logging

-from pymodbus.client import ModbusTcpClient
-from pystiebeleltron.pystiebeleltron import StiebelEltronAPI
+from pymodbus.exceptions import ModbusException
+from pystiebeleltron import StiebelEltronModbusError, get_controller_model

-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
+
+from .const import DEFAULT_PORT
+from .coordinator import StiebelEltronConfigEntry, StiebelEltronDataCoordinator

 _LOGGER = logging.getLogger(__name__)
 _PLATFORMS: list[Platform] = [Platform.CLIMATE]


-type StiebelEltronConfigEntry = ConfigEntry[StiebelEltronAPI]
-
-
 async def async_setup_entry(
    hass: HomeAssistant, entry: StiebelEltronConfigEntry
 ) -> bool:
    """Set up STIEBEL ELTRON from a config entry."""
-    client = StiebelEltronAPI(
-        ModbusTcpClient(entry.data[CONF_HOST], port=entry.data[CONF_PORT]), 1
-    )

-    success = await hass.async_add_executor_job(client.update)
-    if not success:
-        raise ConfigEntryNotReady("Could not connect to device")
+    host = entry.data[CONF_HOST]
+    port = entry.data.get(CONF_PORT, DEFAULT_PORT)

-    entry.runtime_data = client
+    try:
+        model = await get_controller_model(host, port)
+    except ModbusException as exception:
+        raise ConfigEntryNotReady("Could not connect to device") from exception
+    except StiebelEltronModbusError as exception:
+        raise ConfigEntryError(exception) from exception
+
+    coordinator = StiebelEltronDataCoordinator(hass, entry, model, host, port)
+
+    entry.runtime_data = coordinator
+    await coordinator.async_config_entry_first_refresh()

    await hass.config_entries.async_forward_entry_setups(entry, _PLATFORMS)
-
    return True


 async def async_unload_entry(
-    hass: HomeAssistant, entry: StiebelEltronConfigEntry
+    hass: HomeAssistant,
+    entry: StiebelEltronConfigEntry,
 ) -> bool:
    """Unload a config entry."""
+    coordinator = entry.runtime_data
+    await coordinator.close()
    return await hass.config_entries.async_unload_platforms(entry, _PLATFORMS)
@@ -3,56 +3,73 @@
 import logging
 from typing import Any, override

-from pystiebeleltron.pystiebeleltron import StiebelEltronAPI
+from pymodbus.exceptions import ModbusException
+from pystiebeleltron.lwz import OperatingMode

 from homeassistant.components.climate import (
+    PRESET_COMFORT,
    PRESET_ECO,
    ClimateEntity,
    ClimateEntityFeature,
    HVACMode,
 )
-from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from homeassistant.const import ATTR_TEMPERATURE, PRECISION_TENTHS, UnitOfTemperature
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity

 from . import StiebelEltronConfigEntry
-
-DEPENDENCIES = ["stiebel_eltron"]
+from .coordinator import StiebelEltronDataCoordinator

 _LOGGER = logging.getLogger(__name__)

-PRESET_DAY = "day"
-PRESET_SETBACK = "setback"
-PRESET_EMERGENCY = "emergency"
-
-SUPPORT_HVAC = [HVACMode.AUTO, HVACMode.HEAT, HVACMode.OFF]
-SUPPORT_PRESET = [PRESET_ECO, PRESET_DAY, PRESET_EMERGENCY, PRESET_SETBACK]
+CLIMATE_HK_1 = "climate_hk_1"

 # Mapping STIEBEL ELTRON states to homeassistant states/preset.
-STE_TO_HA_HVAC = {
-    "AUTOMATIC": HVACMode.AUTO,
-    "MANUAL MODE": HVACMode.HEAT,
-    "STANDBY": HVACMode.AUTO,
-    "DAY MODE": HVACMode.AUTO,
-    "SETBACK MODE": HVACMode.AUTO,
-    "DHW": HVACMode.OFF,
-    "EMERGENCY OPERATION": HVACMode.AUTO,
+LWZ_TO_HA_HVAC = {
+    OperatingMode.AUTOMATIC: HVACMode.AUTO,
+    OperatingMode.MANUAL_MODE: HVACMode.HEAT,
+    OperatingMode.STANDBY: HVACMode.AUTO,
+    OperatingMode.DAY_MODE: HVACMode.AUTO,
+    OperatingMode.SETBACK_MODE: HVACMode.AUTO,
+    OperatingMode.DHW: HVACMode.OFF,
+    OperatingMode.EMERGENCY_OPERATION: HVACMode.AUTO,
 }

-STE_TO_HA_PRESET = {
-    "STANDBY": PRESET_ECO,
-    "DAY MODE": PRESET_DAY,
-    "SETBACK MODE": PRESET_SETBACK,
-    "EMERGENCY OPERATION": PRESET_EMERGENCY,
+HA_TO_LWZ_HVAC = {
+    HVACMode.AUTO: OperatingMode.AUTOMATIC,
+    HVACMode.OFF: OperatingMode.DHW,
+    HVACMode.HEAT: OperatingMode.MANUAL_MODE,
 }

-HA_TO_STE_HVAC = {
-    HVACMode.AUTO: "AUTOMATIC",
-    HVACMode.HEAT: "MANUAL MODE",
-    HVACMode.OFF: "DHW",
+# Custom presets
+PRESET_PROGRAM = "program"
+PRESET_WATER_HEATING = "water_heating"
+PRESET_EMERGENCY = "emergency"
+PRESET_READY = "ready"
+PRESET_MANUAL = "manual"
+PRESET_AUTO = "auto"
+
+LWZ_TO_HA_PRESET = {
+    OperatingMode.STANDBY: PRESET_READY,
+    OperatingMode.DAY_MODE: PRESET_COMFORT,
+    OperatingMode.SETBACK_MODE: PRESET_ECO,
+    OperatingMode.DHW: PRESET_WATER_HEATING,
+    OperatingMode.AUTOMATIC: PRESET_AUTO,
+    OperatingMode.MANUAL_MODE: PRESET_MANUAL,
+    OperatingMode.EMERGENCY_OPERATION: PRESET_EMERGENCY,
 }

-HA_TO_STE_PRESET = {k: i for i, k in STE_TO_HA_PRESET.items()}
+HA_TO_LWZ_PRESET = {
+    PRESET_READY: OperatingMode.STANDBY,
+    PRESET_COMFORT: OperatingMode.DAY_MODE,
+    PRESET_ECO: OperatingMode.SETBACK_MODE,
+    PRESET_WATER_HEATING: OperatingMode.DHW,
+    PRESET_AUTO: OperatingMode.AUTOMATIC,
+    PRESET_MANUAL: OperatingMode.MANUAL_MODE,
+    PRESET_EMERGENCY: OperatingMode.EMERGENCY_OPERATION,
+}


 async def async_setup_entry(
@@ -62,13 +79,16 @@ async def async_setup_entry(
 ) -> None:
    """Set up STIEBEL ELTRON climate platform."""

-    async_add_entities([StiebelEltron(entry.title, entry.runtime_data)], True)
+    async_add_entities([StiebelEltron(entry.entry_id, entry.runtime_data)])


-class StiebelEltron(ClimateEntity):
+class StiebelEltron(CoordinatorEntity[StiebelEltronDataCoordinator], ClimateEntity):
    """Representation of a STIEBEL ELTRON heat pump."""

-    _attr_hvac_modes = SUPPORT_HVAC
+    _attr_has_entity_name = True
+    _attr_name = None
+    _attr_hvac_modes = list(HA_TO_LWZ_HVAC)
+    _attr_preset_modes = list(HA_TO_LWZ_PRESET)
    _attr_supported_features = (
        ClimateEntityFeature.TARGET_TEMPERATURE
        | ClimateEntityFeature.PRESET_MODE
@@ -76,119 +96,76 @@ class StiebelEltron(ClimateEntity):
        | ClimateEntityFeature.TURN_ON
    )
    _attr_temperature_unit = UnitOfTemperature.CELSIUS
+    _attr_target_temperature_step = PRECISION_TENTHS
+    _attr_min_temp = 10.0
+    _attr_max_temp = 30.0

-    def __init__(self, name: str, client: StiebelEltronAPI) -> None:
+    def __init__(
+        self, unique_id: str, coordinator: StiebelEltronDataCoordinator
+    ) -> None:
        """Initialize the unit."""
-        self._name = name
-        self._target_temperature: float | int | None = None
-        self._current_temperature: float | int | None = None
-        self._current_humidity: float | int | None = None
-        self._operation: str | None = None
-        self._filter_alarm: bool | None = None
-        self._client = client
-
-    def update(self) -> None:
-        """Update unit attributes."""
-        self._client.update()
-
-        self._target_temperature = self._client.get_target_temp()
-        self._current_temperature = self._client.get_current_temp()
-        self._current_humidity = self._client.get_current_humidity()
-        self._filter_alarm = self._client.get_filter_alarm_status()
-        self._operation = self._client.get_operation()
-
-        _LOGGER.debug(
-            "Update %s, current temp: %s", self._name, self._current_temperature
-        )
-
-    @property
-    @override
-    def extra_state_attributes(self) -> dict[str, bool | None]:
-        """Return device specific state attributes."""
-        return {"filter_alarm": self._filter_alarm}
-
-    @property
-    @override
-    def name(self) -> str:
-        """Return the name of the climate device."""
-        return self._name
-
-    # Handle ClimateEntityFeature.TARGET_TEMPERATURE
-
-    @property
-    @override
-    def current_temperature(self) -> float | None:
-        """Return the current temperature."""
-        return self._current_temperature
-
-    @property
-    @override
-    def target_temperature(self) -> float | None:
-        """Return the temperature we try to reach."""
-        return self._target_temperature
-
-    @property
-    @override
-    def target_temperature_step(self) -> float:
-        """Return the supported step of target temperature."""
-        return 0.1
-
-    @property
-    @override
-    def min_temp(self) -> float:
-        """Return the minimum temperature."""
-        return 10.0
-
-    @property
-    @override
-    def max_temp(self) -> float:
-        """Return the maximum temperature."""
-        return 30.0
-
-    @property
-    @override
-    def current_humidity(self) -> float | None:
-        """Return the current humidity."""
-        return float(f"{self._current_humidity:.1f}")
-
-    @property
-    @override
-    def hvac_mode(self) -> HVACMode | None:
-        """Return current operation ie. heat, cool, idle."""
-        return STE_TO_HA_HVAC.get(self._operation) if self._operation else None
-
-    @property
-    @override
-    def preset_mode(self) -> str | None:
-        """Return the current preset mode, e.g., home, away, temp."""
-        return STE_TO_HA_PRESET.get(self._operation) if self._operation else None
-
-    @property
-    @override
-    def preset_modes(self) -> list[str]:
-        """Return a list of available preset modes."""
-        return SUPPORT_PRESET
+        super().__init__(coordinator)
+        self._attr_device_info = coordinator.device_info
+        self._attr_unique_id = f"{unique_id}-{CLIMATE_HK_1}"
+        # Initialize runtime attributes to avoid attribute errors
+        self._set_attr()

    @override
-    def set_hvac_mode(self, hvac_mode: HVACMode) -> None:
+    def _handle_coordinator_update(self) -> None:
+        """Handle entity update."""
+        self._set_attr()
+        super()._handle_coordinator_update()
+
+    def _set_attr(self) -> None:
+        lwz_api_client = self.coordinator.api_client
+
+        self._attr_target_temperature = lwz_api_client.get_target_temp()
+        self._attr_current_temperature = lwz_api_client.get_current_temp()
+        self._attr_current_humidity = lwz_api_client.get_current_humidity()
+        operation = lwz_api_client.get_operation()
+        self._attr_hvac_mode = LWZ_TO_HA_HVAC.get(operation)
+        self._attr_preset_mode = LWZ_TO_HA_PRESET.get(operation)
+        self._attr_extra_state_attributes = {
+            "filter_alarm": lwz_api_client.get_filter_alarm_status()
+        }
+
+    @override
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
        """Set new operation mode."""
        if self.preset_mode:
            return
-        new_mode = HA_TO_STE_HVAC.get(hvac_mode)
-        _LOGGER.debug("set_hvac_mode: %s -> %s", self._operation, new_mode)
-        self._client.set_operation(new_mode)
+        new_mode = HA_TO_LWZ_HVAC[hvac_mode]
+        _LOGGER.debug("async_set_hvac_mode: %s -> %s", self._attr_hvac_mode, new_mode)
+        try:
+            await self.coordinator.api_client.set_operation(new_mode)
+        except ModbusException as e:
+            _LOGGER.error("Error setting HVAC mode: %s", e)
+            raise HomeAssistantError("Failed to set HVAC mode") from e
+        await self.coordinator.async_request_refresh()

    @override
-    def set_temperature(self, **kwargs: Any) -> None:
+    async def async_set_temperature(self, **kwargs: Any) -> None:
        """Set new target temperature."""
-        target_temperature = kwargs.get(ATTR_TEMPERATURE)
-        if target_temperature is not None:
-            _LOGGER.debug("set_temperature: %s", target_temperature)
-            self._client.set_target_temp(target_temperature)
+        if (target_temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
+            raise HomeAssistantError("target temperature must be provided")
+        _LOGGER.debug("async_set_temperature: %s", target_temperature)
+        try:
+            await self.coordinator.api_client.set_target_temp(target_temperature)
+        except ModbusException as e:
+            _LOGGER.error("Error setting target temperature: %s", e)
+            raise HomeAssistantError("Failed to set target temperature") from e
+        await self.coordinator.async_request_refresh()

    @override
-    def set_preset_mode(self, preset_mode: str) -> None:
+    async def async_set_preset_mode(self, preset_mode: str) -> None:
        """Set new preset mode."""
-        new_mode = HA_TO_STE_PRESET.get(preset_mode)
-        _LOGGER.debug("set_hvac_mode: %s -> %s", self._operation, new_mode)
-        self._client.set_operation(new_mode)
+        new_preset = HA_TO_LWZ_PRESET[preset_mode]
+        _LOGGER.debug(
+            "async_set_preset_mode: %s -> %s", self._attr_preset_mode, new_preset
+        )
+        try:
+            await self.coordinator.api_client.set_operation(new_preset)
+        except ModbusException as e:
+            _LOGGER.error("Error setting preset mode: %s", e)
+            raise HomeAssistantError("Failed to set preset mode") from e
+        await self.coordinator.async_request_refresh()
@@ -1,8 +1,7 @@
 """Constants for the STIEBEL ELTRON integration."""

+ATTR_MANUFACTURER = "Stiebel Eltron"
 DOMAIN = "stiebel_eltron"

-CONF_HUB = "hub"
-
-DEFAULT_HUB = "modbus_hub"
 DEFAULT_PORT = 502
+DEFAULT_SCAN_INTERVAL = 30
@@ -0,0 +1,91 @@
+"""Data Coordinator base class for the STIEBEL ELTRON heat pumps."""
+
+from datetime import timedelta
+import logging
+from typing import override
+
+from pymodbus.exceptions import ModbusException
+from pystiebeleltron import ControllerModel
+from pystiebeleltron.lwz import LwzStiebelEltronAPI
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import ATTR_MANUFACTURER, DEFAULT_SCAN_INTERVAL, DOMAIN
+
+_LOGGER: logging.Logger = logging.getLogger(__package__)
+
+type StiebelEltronConfigEntry = ConfigEntry[StiebelEltronDataCoordinator]
+
+
+class StiebelEltronDataCoordinator(DataUpdateCoordinator[None]):
+    """Data coordinator base class for stiebel eltron isg."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        entry: StiebelEltronConfigEntry,
+        model: ControllerModel,
+        host: str,
+        port: int,
+    ) -> None:
+        """Initialize the StiebelEltronDataCoordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=f"Stiebel Eltron {model.name}",
+            config_entry=entry,
+            update_interval=timedelta(seconds=DEFAULT_SCAN_INTERVAL),
+            # The coordinator holds no data of its own (the API client caches
+            # the register values), so there is nothing to diff against.
+            always_update=True,
+        )
+        self._model = model
+        self.api_client = LwzStiebelEltronAPI(host=host, port=port)
+        self.device_info = DeviceInfo(
+            identifiers={(DOMAIN, entry.entry_id)},
+            configuration_url=f"http://{self.host}",
+            name=self.name,
+            model=model.name,
+            model_id=str(model.value),
+            manufacturer=ATTR_MANUFACTURER,
+        )
+
+    async def close(self) -> None:
+        """Disconnect client."""
+        _LOGGER.debug("Closing connection to %s", self.host)
+        await self.api_client.close()
+
+    async def connect(self) -> None:
+        """Connect client."""
+        _LOGGER.debug("Connecting to %s", self.host)
+        await self.api_client.connect()
+
+    @property
+    def is_connected(self) -> bool:
+        """Check modbus client connection status."""
+        if self.api_client is None:
+            return False
+        return self.api_client.is_connected
+
+    @property
+    def host(self) -> str:
+        """Return the host address of the Stiebel Eltron ISG."""
+        return self.api_client.host
+
+    @property
+    def model(self) -> str:
+        """Return the controller model name of the Stiebel Eltron ISG."""
+        return self._model.name
+
+    @override
+    async def _async_update_data(self) -> None:
+        """Fetch the latest data from the source."""
+        try:
+            if not self.api_client.is_connected:
+                await self.api_client.connect()
+            await self.api_client.async_update()
+        except ModbusException as exception:
+            raise UpdateFailed(exception) from exception
@@ -22,6 +22,24 @@
      }
    }
  },
+  "entity": {
+    "climate": {
+      "climate": {
+        "state_attributes": {
+          "preset_mode": {
+            "state": {
+              "auto": "Auto",
+              "emergency": "Emergency",
+              "manual": "Manual",
+              "program": "Program",
+              "ready": "Ready",
+              "water_heating": "Water heating"
+            }
+          }
+        }
+      }
+    }
+  },
  "issues": {
    "deprecated_yaml": {
      "description": "Configuring {integration_title} using YAML is being removed.\n\nYour existing YAML configuration has been imported into the UI automatically.\n\nRemove both the `{domain}` and the relevant Modbus configuration from your configuration.yaml file and restart Home Assistant to fix this issue.",
@@ -85,34 +85,18 @@ def sun(
    has_sunrise_condition = SUN_EVENT_SUNRISE in (before, after)
    has_sunset_condition = SUN_EVENT_SUNSET in (before, after)

-    after_sunrise = today > dt_util.as_local(cast(datetime, sunrise)).date()
+    after_sunrise = sunrise is not None and today > dt_util.as_local(sunrise).date()
    if after_sunrise and has_sunrise_condition:
        tomorrow = today + timedelta(days=1)
        sunrise = get_astral_event_date(hass, SUN_EVENT_SUNRISE, tomorrow)

-    after_sunset = today > dt_util.as_local(cast(datetime, sunset)).date()
+    after_sunset = sunset is not None and today > dt_util.as_local(sunset).date()
    if after_sunset and has_sunset_condition:
        tomorrow = today + timedelta(days=1)
        sunset = get_astral_event_date(hass, SUN_EVENT_SUNSET, tomorrow)

-    # Special case: before sunrise OR after sunset
-    # This will handle the very rare case in the polar region when the sun rises/sets
-    # but does not set/rise.
-    # However this entire condition does not handle those full days of darkness
-    # or light, the following should be used instead:
-    #
-    #    condition:
-    #      condition: state
-    #      entity_id: sun.sun
-    #      state: 'above_horizon' (or 'below_horizon')
-    #
-    if before == SUN_EVENT_SUNRISE and after == SUN_EVENT_SUNSET:
-        wanted_time_before = cast(datetime, sunrise) + before_offset
-        condition_trace_update_result(wanted_time_before=wanted_time_before)
-        wanted_time_after = cast(datetime, sunset) + after_offset
-        condition_trace_update_result(wanted_time_after=wanted_time_after)
-        return utcnow < wanted_time_before or utcnow > wanted_time_after
-
+    # A missing sunrise/sunset means the sun doesn't rise/set on this day, which
+    # happens in polar regions.
    if sunrise is None and has_sunrise_condition:
        # There is no sunrise today
        condition_trace_set_result(False, message="no sunrise today")
@@ -123,6 +107,16 @@ def sun(
        condition_trace_set_result(False, message="no sunset today")
        return False

+    # "before: sunrise" combined with "after: sunset" describes the dark period
+    # around midnight, so it is evaluated as an OR (true before sunrise or after
+    # sunset) rather than the usual AND of the two bounds.
+    if before == SUN_EVENT_SUNRISE and after == SUN_EVENT_SUNSET:
+        wanted_time_before = cast(datetime, sunrise) + before_offset
+        condition_trace_update_result(wanted_time_before=wanted_time_before)
+        wanted_time_after = cast(datetime, sunset) + after_offset
+        condition_trace_update_result(wanted_time_after=wanted_time_after)
+        return utcnow < wanted_time_before or utcnow > wanted_time_after
+
    if before == SUN_EVENT_SUNRISE:
        wanted_time_before = cast(datetime, sunrise) + before_offset
        condition_trace_update_result(wanted_time_before=wanted_time_before)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Erwin Douna	c9bc041cac	ProxmoxVE add typing to auth kwargs (#174930 )	2026-06-26 23:56:55 +02:00
Erwin Douna	2047042803	ProxmoxVE add stale device removal (#174932 )	2026-06-26 23:51:13 +02:00
Manuel Stahl	9f92c8438e	Use async coordinator in stiebel_eltron integration (#174850 ) Co-authored-by: Paulus Schoutsen <balloob@gmail.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-26 17:32:25 -04:00
Allen Porter	a0c6d4fb52	Refactor Roborock time platform to use library property APIs (#174921 )	2026-06-26 17:29:02 -04:00
Manu	f315273404	Remove Greenwave Reality (#174929 )	2026-06-26 22:28:43 +02:00
Michael	38baeba81c	Check for supported fan speed modes in Synology DSM (#174925 )	2026-06-26 21:45:32 +02:00
Raphael Hehl	d246a7a7e5	Bump uiprotect to 15.2.0 (#174922 )	2026-06-26 21:44:09 +02:00
Simone Chemelli	29f12d6e80	Bump aioamazondevices to 14.1.8 (#174924 )	2026-06-26 20:47:21 +02:00
Jordan Harvey	e01ed866d9	Bump pyanglianwater to 3.2.3 (#174902 )	2026-06-26 18:30:37 +02:00
Arie Catsman	3ce5630809	remove enphase_envoy test for to-be-deprecated pyenphase library data (#174908 )	2026-06-26 18:29:24 +02:00
Ronald van der Meer	344ae6f604	Fix Duco ventilation state select not being created for valve nodes (#174901 )	2026-06-26 18:28:28 +02:00
Simone Chemelli	e8b1acea6c	Clarify and align domain/platform usage in Alexa Devices (#174914 )	2026-06-26 18:27:08 +02:00
Simone Chemelli	24d6a0420c	Clarify and align domain/platform usage in Fritz (#174915 )	2026-06-26 18:26:40 +02:00
TheOtherAdam	393424fa88	Allow disabling managed log file (#170374 ) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-06-26 16:45:55 +01:00
Manu	585dd72366	Add reconfigure to Steam integration (#174696 )	2026-06-26 17:01:36 +02:00
A. Gideonse	7e2343243d	Add charge/discharge remaining time to Indevolt (#174600 )	2026-06-26 16:42:47 +02:00
Simone Chemelli	de8ed15ea8	Handle all login exceptions in Vodafone Station (#174852 ) Co-authored-by: Erwin Douna <e.douna@gmail.com>	2026-06-26 16:34:52 +02:00
Allen Porter	9a21d92908	Bump voluptuous-openapi to 0.4.1 (#174912 )	2026-06-26 16:12:28 +02:00
GSzabados	12ea0c4d77	Update units UnitOfDensity / UnitOfRatio for airnow (#174905 )	2026-06-26 14:57:50 +02:00
prana-dev-official	94c4483735	Update units UnitOfRatio enums for Prana (#174907 ) Co-authored-by: yuriipopow <yurapopov522@gmail.com>	2026-06-26 14:23:04 +02:00
GSzabados	053efdf662	Update units UnitOfDensity / UnitOfRatio for airthings_ble (#174906 )	2026-06-26 14:16:49 +02:00
GSzabados	3c9f55f7b2	Update units UnitOfDensity / UnitOfRatio for ambient_station (#174900 )	2026-06-26 12:53:23 +02:00
GSzabados	a46b434930	Update measurement units UnitOfDensity / UnitOfRatio for Tomorrow.io (#174899 )	2026-06-26 12:42:49 +02:00
Renat Sibgatulin	031e764957	Migrate the airq to the new enums (UnitOfDensity / UnitOfRatio) (#174896 )	2026-06-26 12:26:52 +02:00
Paulus Schoutsen	d9f0faf365	Fix Roborock time entity crash when timer value is missing (#174873 ) Co-authored-by: Claude <noreply@anthropic.com>	2026-06-26 06:25:55 -04:00
Joost Lekkerkerker	a14e5d8a0c	Change Airthings BLE level entities in enum device class (#174815 )	2026-06-26 12:14:49 +02:00
Manu	f356a1cd0d	Remove ThermoWorks Smoke (#174845 )	2026-06-26 11:39:56 +02:00
starkillerOG	50c12d85f8	Add Reolink push command IDs (#174876 )	2026-06-26 11:38:48 +02:00
javicalle	a88b43d845	Migrate rflink to UnitOfRatio enum (#174886 )	2026-06-26 11:21:21 +02:00
GSzabados	b9e59522e3	Update measurement units UnitOfDensity / UnitOfRatio for EcoWitt sensors (#174887 )	2026-06-26 11:19:21 +02:00
Ludovic BOUÉ	1484384d63	Bump roborock dependencies to 5.21.0 (#174841 )	2026-06-26 11:06:00 +02:00
Paulus Schoutsen	1d1ab798df	Fix Roborock number entity crash when volume is None (#174872 ) Co-authored-by: Claude <noreply@anthropic.com>	2026-06-26 11:05:12 +02:00
Erwin Douna	926d2f1e21	Shelly refactor UnitsOf (#174883 )	2026-06-26 11:01:23 +02:00
dependabot[bot]	b341228b4b	Bump actions/checkout from 6.0.3 to 7.0.0 (#174875 ) Signed-off-by: dependabot[bot] <support@github.com>	2026-06-26 10:58:47 +02:00
renovate[bot]	241f850e90	Update pytest-github-actions-annotate-failures to 0.4.1 (#174868 )	2026-06-26 10:34:57 +02:00
Rafa PA	257040ac51	[aemet] Increase weather update interval to 20 minutes (#174803 )	2026-06-26 10:01:09 +02:00
Arie Catsman	e3c17026d0	Update enphase_envoy diagnostics for pyenphase lib v3.0.0 (#174524 )	2026-06-26 10:00:35 +02:00
Stefan Agner	9e4550dd14	Fix hassio job subscribe returning None instead of unsubscribe callback (#174063 ) Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-06-26 09:56:50 +02:00
starkillerOG	37f441d3da	Bump reolink_aio to 0.21.3 (#174879 )	2026-06-26 09:53:04 +02:00
Maciej Bieniek	0099100d14	Use UnitOfDensity enum in GIOS (#174855 )	2026-06-26 07:59:40 +02:00
Maciej Bieniek	e20f74dac5	Use new unit enums in NAM (#174856 )	2026-06-26 07:59:37 +02:00
John Hillery	f7aa6ef384	Bump nexia to 2.13.0 (#174652 )	2026-06-26 07:07:25 +02:00
Raphael Hehl	71342ef1f6	Bump uiprotect to 15.1.0 (#174846 )	2026-06-25 22:27:17 -04:00
Simone Chemelli	544dccd50b	Bump aioamazondevices to 14.1.6 (#174848 )	2026-06-25 22:26:39 -04:00
Manu	5f6508c424	Remove Mycroft integration (#174849 )	2026-06-25 22:25:47 -04:00
Maciej Bieniek	70f3526be3	Use UnitOfDensity / UnitOfRatio enums in Airly (#174854 )	2026-06-25 22:25:28 -04:00
Mick Vleeshouwer	f5f2ecadfd	Migrate to UnitOfRatio enum in Overkiz (#174862 )	2026-06-25 22:25:11 -04:00
Mick Vleeshouwer	a8de57a1c6	Set RTS command duration for Overkiz Rexel client (#174863 )	2026-06-25 22:24:43 -04:00
Erwin Douna	8b08f10f78	Tuya refactor UnitOfs (#174835 )	2026-06-25 20:33:07 +02:00
Erik Montnemery	34679b033a	Improve tests of entity limits (#174793 )	2026-06-25 20:23:50 +02:00
Paul Bottein	014f785050	Fix missing translated names for Xiaomi Miio select entities (#174810 )	2026-06-25 20:23:13 +02:00
epenet	1c53ada438	Bump tuya-device-handlers to 0.0.24 (#174840 ) Co-authored-by: Franck Nijhof <git@frenck.dev>	2026-06-25 20:22:42 +02:00
Erwin Douna	a88de3efab	Matter refactor to UnitOfs (#174824 )	2026-06-25 19:54:53 +02:00
Nicolas Mowen	10ce428387	Handle case where GetLiveContext includes an entity with StrEnum key (#174822 )	2026-06-25 19:53:32 +02:00
Erwin Douna	dae8b60ec4	Tradfri refactor UnitOfs (#174834 )	2026-06-25 19:08:12 +02:00
Bram Kragten	e098cc384c	Update frontend to 20260624.1 (#174831 )	2026-06-25 18:47:17 +02:00
J. Nick Koston	6007bfa1cd	Bump aioesphomeapi to 45.5.2 (#174826 )	2026-06-25 18:31:51 +02:00
epenet	16262362e1	Bump tuya-device-sharing-sdk to 0.2.10 (#174827 )	2026-06-25 17:57:33 +02:00
Erik Montnemery	01350e8f15	Fix exception in legacy sun condition (#174811 )	2026-06-25 17:40:36 +02:00
Manu	8977fc6f67	Migrate entity unique_id in Steam integration (#174701 )	2026-06-25 16:54:53 +02:00
Robert Resch	6411cc5c48	Improve the gate on check requirements aw to avoid useless runs (#174599 )	2026-06-25 16:48:51 +02:00
Erik Montnemery	9ce56183ea	Add WS command recorder/entity_options/get (#174134 )	2026-06-25 15:59:29 +02:00
MoonDevLT	5117c0b964	Migrate lunatone to UnitOfRatio enums (#174817 )	2026-06-25 15:01:10 +02:00
Christian Lackas	7dd5e188bb	Migrate homematicip_cloud to UnitOfDensity / UnitOfRatio enums (#174813 )	2026-06-25 14:15:36 +02:00
Christian Lackas	ec80260c4c	Migrate vicare to UnitOfDensity / UnitOfRatio enums (#174812 )	2026-06-25 14:14:30 +02:00
Erwin Douna	10ceac63f6	Homekit controller refactor UnitOf (#174806 )	2026-06-25 13:35:51 +02:00
Franck Nijhof	847f4dc287	Add missing unit of measurement to Home Connect battery sensor (#174694 ) Co-authored-by: Erwin Douna <e.douna@gmail.com>	2026-06-25 13:35:30 +02:00
Michael Hansen	8d4c8114d4	Bump intents and fix broken tests (#174689 )	2026-06-25 12:58:39 +02:00
Erik Montnemery	b6b165fd00	Improve tests of sun conditions and triggers (#174805 ) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-06-25 12:56:49 +02:00
Simone Chemelli	7c99cf6385	Fix async_get_entity_id() params for Alexa Devices (#174641 )	2026-06-25 12:32:55 +02:00
Erik Montnemery	d6b743b93e	Catch errors when evaluating automation conditions (#174799 )	2026-06-25 11:15:01 +02:00
Joost Lekkerkerker	0cae5e41b4	Add entity category to Mealie item count sensors (#174795 )	2026-06-25 10:57:06 +02:00
Erwin Douna	6fce245dfa	Portainer refactor to UnitOfRatio (#174801 )	2026-06-25 10:50:12 +02:00
Thomas D	44ba231bf6	Migrate to UnitOfRatio in the Qbus integration (#174800 )	2026-06-25 10:49:56 +02:00
Ronald van der Meer	2be55a06cc	Migrate Duco sensor units to UnitOfRatio (#174791 )	2026-06-25 10:09:55 +02:00
bkobus-bbx	d786fb16a0	Migrate blebox to UnitOfDensity / UnitOfRatio enums (#174790 )	2026-06-25 10:08:56 +02:00
J. Nick Koston	f78dd797b1	Bump habluetooth to 6.25.1 (#174700 )	2026-06-25 09:40:43 +02:00
davidrule1969	0d957a971d	Bump pySwitchbot to 2.3.0 (#174678 )	2026-06-25 08:51:22 +02:00
Raphael Hehl	cff3a711f3	Bump uiprotect to 15.0.0 (#174709 )	2026-06-25 08:42:32 +02:00
Brandon Rothweiler	177c4a4fb5	Bump dropbox to silver quality (#174706 )	2026-06-25 07:39:05 +02:00
Samuel Xiao	7d8204f5e7	Bump switchbot-api to 2.12.0 (#174705 )	2026-06-25 07:37:59 +02:00
Franck Nijhof	9aed167f71	Bump version to 2026.8.0.dev0 (#174693 )	2026-06-25 00:44:19 +02:00
Franck Nijhof	a8630f5570	Add delegated charging mode to Renault integration (#174687 )	2026-06-24 23:35:13 +02:00
J. Nick Koston	2a75b0e2fb	Bump habluetooth to 6.24.0 (#174688 )	2026-06-24 23:34:38 +02:00
Brandon Rothweiler	9c4ad761c4	Add missing scope and authorize param to Dropbox OAuth (#174587 )	2026-06-24 22:26:30 +02:00
Erwin Douna	8e3e1044a1	Tami4 group executor job (#174668 )	2026-06-24 22:01:24 +02:00
Colin	bec6c94e32	openevse: Convert config to textselector (#174675 )	2026-06-24 21:50:41 +02:00
Colin	c9729df69a	openevse: Add missing callback test (#174560 )	2026-06-24 21:33:30 +02:00
Christian Lackas	70ff0fd682	Bump homematicip to 2.13.2 (#174673 )	2026-06-24 20:43:23 +02:00
Erwin Douna	258ae6d506	Vera core group executor job (#174669 )	2026-06-24 20:37:08 +02:00
Ville Skyttä	4f93afd6ae	Remove myself from huawei_lte codeowners (#174671 )	2026-06-24 19:57:24 +02:00
Erwin Douna	7968fc4809	Huawei group executor job (#174666 )	2026-06-24 19:43:54 +02:00
TheJulianJES	975f2a831e	Bump zha-quirks to 2.1.0 (#174662 )	2026-06-24 18:42:41 +02:00