Update bootstrap snapshot for timer_list base platform

timer_list is a base platform, so it is set up by default with the other base platforms and now appears in the bootstrap components snapshot. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Add timer_list integration
2026-06-26 16:45:29 +02:00 · 2026-06-25 15:13:02 -05:00 · 2026-06-25 14:25:48 -05:00 · 2026-06-25 16:54:53 +02:00 · 2026-06-25 16:48:51 +02:00 · 2026-06-25 15:59:29 +02:00
112 changed files with 3657 additions and 765 deletions
@@ -51,6 +51,7 @@ base_platforms: &base_platforms
  - homeassistant/components/switch/**
  - homeassistant/components/text/**
  - homeassistant/components/time/**
+  - homeassistant/components/timer_list/**
  - homeassistant/components/todo/**
  - homeassistant/components/tts/**
  - homeassistant/components/update/**
@@ -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"}]}
 #    ___                   _   _      
 #   / _ \                 | | (_)     
 #  | |_| | __ _  ___ _ __ | |_ _  ___ 
@@ -31,12 +31,12 @@
 #   - GITHUB_TOKEN
 #
 # Custom actions used:
-#   - actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+#   - actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 #   - actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
 #   - 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 }}
@@ -155,7 +155,7 @@ jobs:
        env:
          COPILOT_GITHUB_TOKEN: ${{ secrets.COPILOT_GITHUB_TOKEN }}
      - name: Checkout .github and .agents folders
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
          sparse-checkout: |
@@ -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 }}
@@ -404,7 +403,7 @@ jobs:
            echo "GH_AW_SAFE_OUTPUTS_TOOLS_PATH=${RUNNER_TEMP}/gh-aw/safeoutputs/tools.json"
          } >> "$GITHUB_OUTPUT"
      - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
      - name: Create gh-aw temp directory
@@ -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 }}
@@ -1236,7 +1234,7 @@ jobs:
          echo "GH_AW_AGENT_OUTPUT=/tmp/gh-aw/agent_output.json" >> "$GITHUB_OUTPUT"
      - name: Checkout repository for patch context
        if: needs.agent.outputs.has_patch == 'true'
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
      # --- Threat Detection ---
@@ -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
@@ -1031,6 +1031,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/local_calendar/ @allenporter
 /homeassistant/components/local_ip/ @issacg
 /tests/components/local_ip/ @issacg
+/homeassistant/components/local_timer_list/ @home-assistant/core @synesthesiam
+/tests/components/local_timer_list/ @home-assistant/core @synesthesiam
 /homeassistant/components/local_todo/ @allenporter
 /tests/components/local_todo/ @allenporter
 /homeassistant/components/lock/ @home-assistant/core
@@ -1832,6 +1834,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/time/ @home-assistant/core
 /homeassistant/components/time_date/ @fabaff
 /tests/components/time_date/ @fabaff
+/homeassistant/components/timer_list/ @home-assistant/core @synesthesiam
+/tests/components/timer_list/ @home-assistant/core @synesthesiam
 /homeassistant/components/tmb/ @alemuro
 /homeassistant/components/todo/ @home-assistant/core
 /tests/components/todo/ @home-assistant/core
@@ -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
+                SENSOR_DOMAIN, DOMAIN, unique_id=unique_id
            )
            is_unsupported = not coordinator.data[serial_num].notifications_supported

@@ -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%]"
    }
@@ -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,
@@ -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",
@@ -0,0 +1,22 @@
+"""The Local Timer list integration.
+
+Creates an in-memory timer list entity (provided by the ``timer_list`` base
+platform) for each config entry, so users can create timer lists from the UI.
+"""
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+
+PLATFORMS = [Platform.TIMER_LIST]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Local Timer list from a config entry."""
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
@@ -0,0 +1,33 @@
+"""Config flow for the Local Timer list integration."""
+
+from typing import Any, override
+
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+
+from .const import CONF_TIMER_LIST_NAME, DOMAIN
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_TIMER_LIST_NAME): str,
+    }
+)
+
+
+class LocalTimerListConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Local Timer list."""
+
+    VERSION = 1
+
+    @override
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        if user_input is not None:
+            return self.async_create_entry(
+                title=user_input[CONF_TIMER_LIST_NAME], data=user_input
+            )
+
+        return self.async_show_form(step_id="user", data_schema=STEP_USER_DATA_SCHEMA)
@@ -0,0 +1,5 @@
+"""Constants for the Local Timer list integration."""
+
+DOMAIN = "local_timer_list"
+
+CONF_TIMER_LIST_NAME = "timer_list_name"
@@ -0,0 +1,10 @@
+{
+  "domain": "local_timer_list",
+  "name": "Local Timer list",
+  "codeowners": ["@home-assistant/core", "@synesthesiam"],
+  "config_flow": true,
+  "dependencies": ["timer_list"],
+  "documentation": "https://www.home-assistant.io/integrations/local_timer_list",
+  "integration_type": "helper",
+  "iot_class": "local_push"
+}
@@ -0,0 +1,13 @@
+{
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "timer_list_name": "Name"
+        },
+        "description": "Choose a name for the new timer list. The entity ID is derived from this name.",
+        "submit": "Create"
+      }
+    }
+  }
+}
@@ -0,0 +1,34 @@
+"""Local timer list platform."""
+
+from homeassistant.components.timer_list import TimerListEntity, TimerListEntityFeature
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .const import CONF_TIMER_LIST_NAME
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the local timer list entity from a config entry."""
+    async_add_entities([LocalTimerListEntity(config_entry)])
+
+
+class LocalTimerListEntity(TimerListEntity):
+    """A local, in-memory timer list."""
+
+    _attr_supported_features = (
+        TimerListEntityFeature.START_TIMER
+        | TimerListEntityFeature.PAUSE_TIMER
+        | TimerListEntityFeature.CANCEL_TIMER
+        | TimerListEntityFeature.ADD_TIME
+    )
+
+    def __init__(self, config_entry: ConfigEntry) -> None:
+        """Initialize the timer list."""
+        super().__init__()
+        self._attr_name = config_entry.data[CONF_TIMER_LIST_NAME]
+        self._attr_unique_id = config_entry.entry_id
@@ -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,
    ),
 }
@@ -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

@@ -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"
+            )
+        ),
+    }
 )


@@ -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,
@@ -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"
        }
      },
@@ -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
@@ -41,6 +41,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
@@ -150,7 +152,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
@@ -42,5 +42,5 @@
  "iot_class": "local_push",
  "loggers": ["switchbot"],
  "quality_scale": "gold",
-  "requirements": ["PySwitchbot==2.2.0"]
+  "requirements": ["PySwitchbot==2.3.0"]
 }
@@ -14,5 +14,5 @@
  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["switchbot_api"],
-  "requirements": ["switchbot-api==2.11.1"]
+  "requirements": ["switchbot-api==2.12.0"]
 }
@@ -67,12 +67,13 @@ class Tami4ConfigFlow(ConfigFlow, domain=DOMAIN):
        if user_input is not None:
            otp = user_input["otp"]
            try:
-                refresh_token = await self.hass.async_add_executor_job(
-                    Tami4EdgeAPI.submit_otp, self.phone, otp
-                )
-                # pylint: disable-next=home-assistant-sequential-executor-jobs
-                api = await self.hass.async_add_executor_job(
-                    Tami4EdgeAPI, refresh_token
+
+                def _submit_otp_and_create_api() -> tuple[str, Tami4EdgeAPI]:
+                    refresh_token = Tami4EdgeAPI.submit_otp(self.phone, otp)
+                    return refresh_token, Tami4EdgeAPI(refresh_token)
+
+                refresh_token, api = await self.hass.async_add_executor_job(
+                    _submit_otp_and_create_api
                )
            except exceptions.OTPFailedException:
                errors["base"] = "invalid_auth"
@@ -0,0 +1,547 @@
+"""The Timer list integration.
+
+A timer list entity holds many independent countdown timers (its *items*),
+mirroring how a to-do list holds many to-do items. The entity state is the
+number of active timers. Timers are kept in memory only: they do not survive a
+restart of Home Assistant in this first version (see the module-level notes on
+``async_will_remove_from_hass``).
+"""
+
+from collections.abc import Callable
+import copy
+import dataclasses
+from datetime import datetime, timedelta
+from functools import partial
+import logging
+from typing import Any, final, override
+
+import voluptuous as vol
+
+from homeassistant.components import websocket_api
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import ATTR_NAME
+from homeassistant.core import (
+    CALLBACK_TYPE,
+    HomeAssistant,
+    ServiceCall,
+    SupportsResponse,
+    callback,
+)
+from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.helpers.event import async_track_point_in_utc_time
+from homeassistant.helpers.typing import ConfigType
+from homeassistant.util import dt as dt_util, ulid as ulid_util
+
+from .const import (
+    ATTR_DURATION,
+    ATTR_FINISH_ACTION,
+    ATTR_STATUS,
+    ATTR_TIMER_ID,
+    DATA_COMPONENT,
+    DOMAIN,
+    TimerFinishAction,
+    TimerListEntityFeature,
+    TimerListEventType,
+    TimerListServices,
+    TimerStatus,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+ENTITY_ID_FORMAT = DOMAIN + ".{}"
+PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA
+PLATFORM_SCHEMA_BASE = cv.PLATFORM_SCHEMA_BASE
+
+_FINISHED_STATUSES = (TimerStatus.FINISHED, TimerStatus.CANCELLED)
+
+
+@dataclasses.dataclass
+class TimerItem:
+    """A single timer within a timer list."""
+
+    timer_id: str
+    """Generated unique id of the timer."""
+
+    name: str | None
+    """Optional user-provided name."""
+
+    status: TimerStatus
+    """Current status of the timer."""
+
+    finish_action: TimerFinishAction
+    """What happens to the timer once it finishes."""
+
+    duration: timedelta
+    """Original duration the timer was created with (used by ``restart``)."""
+
+    created_at: datetime
+    """When the timer was (re)started, in UTC."""
+
+    finishes_at: datetime | None = None
+    """Absolute time the timer will finish, in UTC. ``None`` unless active."""
+
+    remaining: timedelta | None = None
+    """Remaining time captured while paused. ``None`` unless paused."""
+
+    finished_at: datetime | None = None
+    """When the timer finished or was cancelled, in UTC."""
+
+    def remaining_at(self, now: datetime) -> timedelta:
+        """Return the time left on the timer relative to ``now``."""
+        if self.status == TimerStatus.ACTIVE and self.finishes_at is not None:
+            return max(timedelta(0), self.finishes_at - now)
+        if self.status == TimerStatus.PAUSED and self.remaining is not None:
+            return self.remaining
+        return timedelta(0)
+
+
+@dataclasses.dataclass(frozen=True)
+class TimerListEvent:
+    """A change to a timer, pushed to subscribers and triggers."""
+
+    event_type: TimerListEventType
+    item: TimerItem
+
+
+@callback
+def timer_to_dict(item: TimerItem, now: datetime) -> dict[str, Any]:
+    """Serialize a timer item for the websocket API and triggers."""
+    return {
+        ATTR_TIMER_ID: item.timer_id,
+        ATTR_NAME: item.name,
+        ATTR_STATUS: item.status.value,
+        ATTR_FINISH_ACTION: item.finish_action.value,
+        "duration": item.duration.total_seconds(),
+        "created_at": item.created_at.isoformat(),
+        "finishes_at": item.finishes_at.isoformat() if item.finishes_at else None,
+        "finished_at": item.finished_at.isoformat() if item.finished_at else None,
+        "remaining": item.remaining_at(now).total_seconds(),
+    }
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Timer list component."""
+    component = hass.data[DATA_COMPONENT] = EntityComponent[TimerListEntity](
+        _LOGGER, DOMAIN, hass
+    )
+
+    websocket_api.async_register_command(hass, websocket_handle_subscribe)
+    websocket_api.async_register_command(hass, websocket_handle_list)
+
+    component.async_register_entity_service(
+        TimerListServices.START_TIMER,
+        {
+            vol.Optional(ATTR_NAME): cv.string,
+            vol.Required(ATTR_DURATION): cv.positive_time_period,
+            vol.Optional(
+                ATTR_FINISH_ACTION, default=TimerFinishAction.REMOVE
+            ): vol.Coerce(TimerFinishAction),
+        },
+        _async_start_timer,
+        required_features=[TimerListEntityFeature.START_TIMER],
+        supports_response=SupportsResponse.OPTIONAL,
+    )
+    component.async_register_entity_service(
+        TimerListServices.PAUSE_TIMER,
+        {vol.Required(ATTR_TIMER_ID): cv.string},
+        "async_pause_timer",
+        required_features=[TimerListEntityFeature.PAUSE_TIMER],
+    )
+    component.async_register_entity_service(
+        TimerListServices.UNPAUSE_TIMER,
+        {vol.Required(ATTR_TIMER_ID): cv.string},
+        "async_unpause_timer",
+        required_features=[TimerListEntityFeature.PAUSE_TIMER],
+    )
+    component.async_register_entity_service(
+        TimerListServices.CANCEL_TIMER,
+        {vol.Required(ATTR_TIMER_ID): cv.string},
+        "async_cancel_timer",
+        required_features=[TimerListEntityFeature.CANCEL_TIMER],
+    )
+    component.async_register_entity_service(
+        TimerListServices.CANCEL_ALL_TIMERS,
+        None,
+        "async_cancel_all_timers",
+        required_features=[TimerListEntityFeature.CANCEL_TIMER],
+    )
+    component.async_register_entity_service(
+        TimerListServices.ADD_TIME,
+        {
+            vol.Required(ATTR_TIMER_ID): cv.string,
+            vol.Required(ATTR_DURATION): cv.positive_time_period,
+        },
+        _async_add_time,
+        required_features=[TimerListEntityFeature.ADD_TIME],
+    )
+    component.async_register_entity_service(
+        TimerListServices.REMOVE_TIME,
+        {
+            vol.Required(ATTR_TIMER_ID): cv.string,
+            vol.Required(ATTR_DURATION): cv.positive_time_period,
+        },
+        _async_remove_time,
+        required_features=[TimerListEntityFeature.ADD_TIME],
+    )
+    component.async_register_entity_service(
+        TimerListServices.REMOVE_TIMER,
+        {vol.Required(ATTR_TIMER_ID): cv.string},
+        "async_remove_timer",
+    )
+    component.async_register_entity_service(
+        TimerListServices.CLEAR_FINISHED_TIMERS,
+        None,
+        "async_clear_finished_timers",
+    )
+    component.async_register_entity_service(
+        TimerListServices.GET_TIMERS,
+        {vol.Optional(ATTR_STATUS): vol.All(cv.ensure_list, [vol.Coerce(TimerStatus)])},
+        _async_get_timers,
+        supports_response=SupportsResponse.ONLY,
+    )
+
+    await component.async_setup(config)
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up a config entry."""
+    return await hass.data[DATA_COMPONENT].async_setup_entry(entry)
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    return await hass.data[DATA_COMPONENT].async_unload_entry(entry)
+
+
+class TimerListEntity(Entity):
+    """An entity that holds a list of independent countdown timers."""
+
+    _attr_should_poll = False
+
+    def __init__(self) -> None:
+        """Initialize the timer list."""
+        self._timers: dict[str, TimerItem] = {}
+        self._cancel_callbacks: dict[str, CALLBACK_TYPE] = {}
+        self._update_listeners: list[Callable[[TimerListEvent], None]] = []
+
+    @property
+    @override
+    def state(self) -> int:
+        """Return the number of active timers."""
+        return sum(
+            timer.status == TimerStatus.ACTIVE for timer in self._timers.values()
+        )
+
+    @property
+    def timers(self) -> list[TimerItem]:
+        """Return the timers in the list."""
+        return list(self._timers.values())
+
+    async def async_start_timer(
+        self,
+        *,
+        name: str | None,
+        duration: timedelta,
+        finish_action: TimerFinishAction,
+    ) -> str:
+        """Create and start a new timer, returning its id."""
+        now = dt_util.utcnow()
+        timer_id = ulid_util.ulid_now()
+        timer = TimerItem(
+            timer_id=timer_id,
+            name=name,
+            status=TimerStatus.ACTIVE,
+            finish_action=finish_action,
+            duration=duration,
+            created_at=now,
+            finishes_at=now + duration,
+        )
+        self._timers[timer_id] = timer
+        self._schedule(timer)
+        self._notify(TimerListEventType.STARTED, timer)
+        return timer_id
+
+    async def async_pause_timer(self, timer_id: str) -> None:
+        """Pause an active timer."""
+        timer = self._get_timer(timer_id)
+        if timer.status != TimerStatus.ACTIVE or timer.finishes_at is None:
+            return
+        timer.remaining = max(timedelta(0), timer.finishes_at - dt_util.utcnow())
+        timer.finishes_at = None
+        timer.status = TimerStatus.PAUSED
+        self._unschedule(timer_id)
+        self._notify(TimerListEventType.UPDATED, timer)
+
+    async def async_unpause_timer(self, timer_id: str) -> None:
+        """Resume a paused timer."""
+        timer = self._get_timer(timer_id)
+        if timer.status != TimerStatus.PAUSED or timer.remaining is None:
+            return
+        timer.finishes_at = dt_util.utcnow() + timer.remaining
+        timer.remaining = None
+        timer.status = TimerStatus.ACTIVE
+        self._schedule(timer)
+        self._notify(TimerListEventType.UPDATED, timer)
+
+    async def async_cancel_timer(self, timer_id: str) -> None:
+        """Cancel a timer.
+
+        The timer is retained in the ``cancelled`` state only when its finish
+        action is ``archive``; otherwise it is removed.
+        """
+        timer = self._get_timer(timer_id)
+        self._unschedule(timer_id)
+        timer.status = TimerStatus.CANCELLED
+        timer.finishes_at = None
+        timer.remaining = None
+        timer.finished_at = dt_util.utcnow()
+        self._notify(TimerListEventType.CANCELLED, timer)
+        if timer.finish_action != TimerFinishAction.ARCHIVE:
+            del self._timers[timer_id]
+            self._notify(TimerListEventType.REMOVED, timer)
+
+    async def async_cancel_all_timers(self) -> None:
+        """Cancel every active or paused timer."""
+        for timer_id in [
+            timer.timer_id
+            for timer in self._timers.values()
+            if timer.status in (TimerStatus.ACTIVE, TimerStatus.PAUSED)
+        ]:
+            await self.async_cancel_timer(timer_id)
+
+    async def async_add_time(self, timer_id: str, duration: timedelta) -> None:
+        """Add (or, with a negative duration, remove) time on a timer."""
+        timer = self._get_timer(timer_id)
+        if timer.status == TimerStatus.ACTIVE and timer.finishes_at is not None:
+            now = dt_util.utcnow()
+            finishes_at = timer.finishes_at + duration
+            if finishes_at <= now:
+                self._unschedule(timer_id)
+                self._async_timer_finished(timer_id, now)
+                return
+            timer.finishes_at = finishes_at
+            self._schedule(timer)
+        elif timer.status == TimerStatus.PAUSED and timer.remaining is not None:
+            timer.remaining = max(timedelta(0), timer.remaining + duration)
+        else:
+            return
+        self._notify(TimerListEventType.UPDATED, timer)
+
+    async def async_remove_timer(self, timer_id: str) -> None:
+        """Remove a timer from the list regardless of its status."""
+        timer = self._get_timer(timer_id)
+        self._unschedule(timer_id)
+        del self._timers[timer_id]
+        self._notify(TimerListEventType.REMOVED, timer)
+
+    async def async_clear_finished_timers(self) -> None:
+        """Remove all finished and cancelled (archived) timers."""
+        for timer_id in [
+            timer.timer_id
+            for timer in self._timers.values()
+            if timer.status in _FINISHED_STATUSES
+        ]:
+            timer = self._timers.pop(timer_id)
+            self._notify(TimerListEventType.REMOVED, timer)
+
+    def _get_timer(self, timer_id: str) -> TimerItem:
+        """Return a timer by id or raise if it does not exist."""
+        if (timer := self._timers.get(timer_id)) is None:
+            raise ServiceValidationError(
+                translation_domain=DOMAIN,
+                translation_key="timer_not_found",
+                translation_placeholders={"timer_id": timer_id},
+            )
+        return timer
+
+    @callback
+    def _schedule(self, timer: TimerItem) -> None:
+        """Schedule (or reschedule) the finish callback for a timer."""
+        self._unschedule(timer.timer_id)
+        assert timer.finishes_at is not None
+        self._cancel_callbacks[timer.timer_id] = async_track_point_in_utc_time(
+            self.hass,
+            partial(self._async_timer_finished, timer.timer_id),
+            timer.finishes_at,
+        )
+
+    @callback
+    def _unschedule(self, timer_id: str) -> None:
+        """Cancel a pending finish callback, if any."""
+        if cancel := self._cancel_callbacks.pop(timer_id, None):
+            cancel()
+
+    @callback
+    def _async_timer_finished(self, timer_id: str, now: datetime) -> None:
+        """Handle a timer reaching its finish time."""
+        self._cancel_callbacks.pop(timer_id, None)
+        if (timer := self._timers.get(timer_id)) is None:
+            return
+
+        timer.status = TimerStatus.FINISHED
+        timer.finishes_at = None
+        timer.remaining = None
+        timer.finished_at = dt_util.utcnow()
+        self._notify(TimerListEventType.FINISHED, timer)
+
+        if timer.finish_action == TimerFinishAction.REMOVE:
+            self._timers.pop(timer_id, None)
+            self._notify(TimerListEventType.REMOVED, timer)
+        elif timer.finish_action == TimerFinishAction.RESTART:
+            restarted_at = dt_util.utcnow()
+            timer.status = TimerStatus.ACTIVE
+            timer.created_at = restarted_at
+            timer.finishes_at = restarted_at + timer.duration
+            timer.finished_at = None
+            self._schedule(timer)
+            self._notify(TimerListEventType.STARTED, timer)
+
+    @final
+    @callback
+    def async_subscribe_updates(
+        self, listener: Callable[[TimerListEvent], None]
+    ) -> CALLBACK_TYPE:
+        """Subscribe to timer change events.
+
+        Only future changes are pushed; the current set of timers is not
+        replayed on subscribe.
+        """
+        self._update_listeners.append(listener)
+
+        @callback
+        def unsubscribe() -> None:
+            self._update_listeners.remove(listener)
+
+        return unsubscribe
+
+    @callback
+    def _notify(self, event_type: TimerListEventType, timer: TimerItem) -> None:
+        """Push a change event to subscribers and write entity state."""
+        event = TimerListEvent(event_type=event_type, item=copy.copy(timer))
+        for listener in list(self._update_listeners):
+            listener(event)
+        self.async_write_ha_state()
+
+    @override
+    async def async_will_remove_from_hass(self) -> None:
+        """Cancel all pending finish callbacks."""
+        for cancel in self._cancel_callbacks.values():
+            cancel()
+        self._cancel_callbacks.clear()
+
+
+async def _async_start_timer(
+    entity: TimerListEntity, call: ServiceCall
+) -> dict[str, Any]:
+    """Handle the start_timer service."""
+    timer_id = await entity.async_start_timer(
+        name=call.data.get(ATTR_NAME),
+        duration=call.data[ATTR_DURATION],
+        finish_action=call.data[ATTR_FINISH_ACTION],
+    )
+    return {ATTR_TIMER_ID: timer_id}
+
+
+async def _async_add_time(entity: TimerListEntity, call: ServiceCall) -> None:
+    """Handle the add_time service."""
+    await entity.async_add_time(call.data[ATTR_TIMER_ID], call.data[ATTR_DURATION])
+
+
+async def _async_remove_time(entity: TimerListEntity, call: ServiceCall) -> None:
+    """Handle the remove_time service."""
+    await entity.async_add_time(call.data[ATTR_TIMER_ID], -call.data[ATTR_DURATION])
+
+
+async def _async_get_timers(
+    entity: TimerListEntity, call: ServiceCall
+) -> dict[str, Any]:
+    """Handle the get_timers service."""
+    now = dt_util.utcnow()
+    statuses: list[TimerStatus] | None = call.data.get(ATTR_STATUS)
+    return {
+        "timers": [
+            timer_to_dict(timer, now)
+            for timer in entity.timers
+            if not statuses or timer.status in statuses
+        ]
+    }
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "timer_list/item/subscribe",
+        vol.Required("entity_id"): cv.entity_domain(DOMAIN),
+    }
+)
+@websocket_api.async_response
+async def websocket_handle_subscribe(
+    hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
+) -> None:
+    """Subscribe to timer changes for a timer list, with an initial snapshot."""
+    entity_id: str = msg["entity_id"]
+    if not (entity := hass.data[DATA_COMPONENT].get_entity(entity_id)):
+        connection.send_error(
+            msg["id"],
+            websocket_api.ERR_NOT_FOUND,
+            f"Timer list entity not found: {entity_id}",
+        )
+        return
+
+    @callback
+    def forward_event(event: TimerListEvent) -> None:
+        """Forward a timer change event to the websocket connection."""
+        connection.send_message(
+            websocket_api.event_message(
+                msg["id"],
+                {
+                    "type": "change",
+                    "event_type": event.event_type.value,
+                    "timer": timer_to_dict(event.item, dt_util.utcnow()),
+                },
+            )
+        )
+
+    connection.subscriptions[msg["id"]] = entity.async_subscribe_updates(forward_event)
+    connection.send_result(msg["id"])
+
+    now = dt_util.utcnow()
+    connection.send_message(
+        websocket_api.event_message(
+            msg["id"],
+            {
+                "type": "timers",
+                "timers": [timer_to_dict(timer, now) for timer in entity.timers],
+            },
+        )
+    )
+
+
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "timer_list/item/list",
+        vol.Required("entity_id"): cv.entity_domain(DOMAIN),
+    }
+)
+@websocket_api.async_response
+async def websocket_handle_list(
+    hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
+) -> None:
+    """Return the current timers for a timer list."""
+    entity_id: str = msg["entity_id"]
+    if not (entity := hass.data[DATA_COMPONENT].get_entity(entity_id)):
+        connection.send_error(
+            msg["id"],
+            websocket_api.ERR_NOT_FOUND,
+            f"Timer list entity not found: {entity_id}",
+        )
+        return
+
+    now = dt_util.utcnow()
+    connection.send_result(
+        msg["id"],
+        {"timers": [timer_to_dict(timer, now) for timer in entity.timers]},
+    )
@@ -0,0 +1,76 @@
+"""Constants for the Timer list integration."""
+
+from enum import IntFlag, StrEnum
+from typing import TYPE_CHECKING
+
+from homeassistant.util.hass_dict import HassKey
+
+if TYPE_CHECKING:
+    from homeassistant.helpers.entity_component import EntityComponent
+
+    from . import TimerListEntity
+
+DOMAIN = "timer_list"
+DATA_COMPONENT: HassKey[EntityComponent[TimerListEntity]] = HassKey(DOMAIN)
+
+ATTR_TIMER_ID = "timer_id"
+ATTR_DURATION = "duration"
+ATTR_FINISH_ACTION = "finish_action"
+ATTR_FINISHES_AT = "finishes_at"
+ATTR_CREATED_AT = "created_at"
+ATTR_FINISHED_AT = "finished_at"
+ATTR_REMAINING = "remaining"
+ATTR_STATUS = "status"
+ATTR_TIMER = "timer"
+ATTR_TIMERS = "timers"
+
+
+class TimerListServices(StrEnum):
+    """Services for the Timer list integration."""
+
+    START_TIMER = "start_timer"
+    PAUSE_TIMER = "pause_timer"
+    UNPAUSE_TIMER = "unpause_timer"
+    CANCEL_TIMER = "cancel_timer"
+    CANCEL_ALL_TIMERS = "cancel_all_timers"
+    ADD_TIME = "add_time"
+    REMOVE_TIME = "remove_time"
+    REMOVE_TIMER = "remove_timer"
+    CLEAR_FINISHED_TIMERS = "clear_finished_timers"
+    GET_TIMERS = "get_timers"
+
+
+class TimerStatus(StrEnum):
+    """Status of a single timer in a timer list."""
+
+    ACTIVE = "active"
+    PAUSED = "paused"
+    FINISHED = "finished"
+    CANCELLED = "cancelled"
+
+
+class TimerFinishAction(StrEnum):
+    """What happens to a timer once it finishes."""
+
+    REMOVE = "remove"
+    ARCHIVE = "archive"
+    RESTART = "restart"
+
+
+class TimerListEventType(StrEnum):
+    """Type of change pushed to timer list subscribers."""
+
+    STARTED = "started"
+    UPDATED = "updated"
+    FINISHED = "finished"
+    CANCELLED = "cancelled"
+    REMOVED = "removed"
+
+
+class TimerListEntityFeature(IntFlag):
+    """Supported features of a timer list entity."""
+
+    START_TIMER = 1
+    PAUSE_TIMER = 2
+    CANCEL_TIMER = 4
+    ADD_TIME = 8
@@ -0,0 +1,53 @@
+{
+  "entity_component": {
+    "_": {
+      "default": "mdi:timer-outline"
+    }
+  },
+  "services": {
+    "add_time": {
+      "service": "mdi:timer-plus-outline"
+    },
+    "cancel_all_timers": {
+      "service": "mdi:timer-cancel-outline"
+    },
+    "cancel_timer": {
+      "service": "mdi:timer-cancel-outline"
+    },
+    "clear_finished_timers": {
+      "service": "mdi:timer-remove-outline"
+    },
+    "get_timers": {
+      "service": "mdi:timer-outline"
+    },
+    "pause_timer": {
+      "service": "mdi:timer-pause-outline"
+    },
+    "remove_time": {
+      "service": "mdi:timer-minus-outline"
+    },
+    "remove_timer": {
+      "service": "mdi:timer-remove-outline"
+    },
+    "start_timer": {
+      "service": "mdi:timer-plus-outline"
+    },
+    "unpause_timer": {
+      "service": "mdi:timer-play-outline"
+    }
+  },
+  "triggers": {
+    "timer_cancelled": {
+      "trigger": "mdi:timer-cancel-outline"
+    },
+    "timer_finished": {
+      "trigger": "mdi:timer-check-outline"
+    },
+    "timer_started": {
+      "trigger": "mdi:timer-play-outline"
+    },
+    "timer_updated": {
+      "trigger": "mdi:timer-edit-outline"
+    }
+  }
+}
@@ -0,0 +1,9 @@
+{
+  "domain": "timer_list",
+  "name": "Timer list",
+  "codeowners": ["@home-assistant/core", "@synesthesiam"],
+  "dependencies": ["websocket_api"],
+  "documentation": "https://www.home-assistant.io/integrations/timer_list",
+  "integration_type": "entity",
+  "quality_scale": "internal"
+}
@@ -0,0 +1,131 @@
+start_timer:
+  target:
+    entity:
+      domain: timer_list
+      supported_features:
+        - timer_list.TimerListEntityFeature.START_TIMER
+  fields:
+    name:
+      example: "Pasta"
+      selector:
+        text:
+    duration:
+      required: true
+      example: "00:05:00"
+      selector:
+        duration:
+    finish_action:
+      default: remove
+      selector:
+        select:
+          translation_key: finish_action
+          options:
+            - remove
+            - archive
+            - restart
+pause_timer:
+  target:
+    entity:
+      domain: timer_list
+      supported_features:
+        - timer_list.TimerListEntityFeature.PAUSE_TIMER
+  fields:
+    timer_id:
+      required: true
+      example: "01HZ8ABCDEF0123456789ABCDE"
+      selector:
+        text:
+unpause_timer:
+  target:
+    entity:
+      domain: timer_list
+      supported_features:
+        - timer_list.TimerListEntityFeature.PAUSE_TIMER
+  fields:
+    timer_id:
+      required: true
+      example: "01HZ8ABCDEF0123456789ABCDE"
+      selector:
+        text:
+cancel_timer:
+  target:
+    entity:
+      domain: timer_list
+      supported_features:
+        - timer_list.TimerListEntityFeature.CANCEL_TIMER
+  fields:
+    timer_id:
+      required: true
+      example: "01HZ8ABCDEF0123456789ABCDE"
+      selector:
+        text:
+cancel_all_timers:
+  target:
+    entity:
+      domain: timer_list
+      supported_features:
+        - timer_list.TimerListEntityFeature.CANCEL_TIMER
+add_time:
+  target:
+    entity:
+      domain: timer_list
+      supported_features:
+        - timer_list.TimerListEntityFeature.ADD_TIME
+  fields:
+    timer_id:
+      required: true
+      example: "01HZ8ABCDEF0123456789ABCDE"
+      selector:
+        text:
+    duration:
+      required: true
+      example: "00:01:00"
+      selector:
+        duration:
+remove_time:
+  target:
+    entity:
+      domain: timer_list
+      supported_features:
+        - timer_list.TimerListEntityFeature.ADD_TIME
+  fields:
+    timer_id:
+      required: true
+      example: "01HZ8ABCDEF0123456789ABCDE"
+      selector:
+        text:
+    duration:
+      required: true
+      example: "00:01:00"
+      selector:
+        duration:
+remove_timer:
+  target:
+    entity:
+      domain: timer_list
+  fields:
+    timer_id:
+      required: true
+      example: "01HZ8ABCDEF0123456789ABCDE"
+      selector:
+        text:
+clear_finished_timers:
+  target:
+    entity:
+      domain: timer_list
+get_timers:
+  target:
+    entity:
+      domain: timer_list
+  fields:
+    status:
+      example: "active"
+      selector:
+        select:
+          translation_key: status
+          multiple: true
+          options:
+            - active
+            - paused
+            - finished
+            - cancelled
@@ -0,0 +1,154 @@
+{
+  "entity_component": {
+    "_": {
+      "name": "[%key:component::timer_list::title%]"
+    }
+  },
+  "exceptions": {
+    "timer_not_found": {
+      "message": "Unable to find timer with id: {timer_id}"
+    }
+  },
+  "selector": {
+    "finish_action": {
+      "options": {
+        "archive": "Archive",
+        "remove": "Remove",
+        "restart": "Restart"
+      }
+    },
+    "status": {
+      "options": {
+        "active": "Active",
+        "cancelled": "Cancelled",
+        "finished": "Finished",
+        "paused": "Paused"
+      }
+    }
+  },
+  "services": {
+    "add_time": {
+      "description": "Adds time to a timer.",
+      "fields": {
+        "duration": {
+          "description": "How much time to add to the timer.",
+          "name": "Duration"
+        },
+        "timer_id": {
+          "description": "The id of the timer to add time to.",
+          "name": "Timer ID"
+        }
+      },
+      "name": "Add time"
+    },
+    "cancel_all_timers": {
+      "description": "Cancels every active and paused timer on a timer list.",
+      "name": "Cancel all timers"
+    },
+    "cancel_timer": {
+      "description": "Cancels a timer.",
+      "fields": {
+        "timer_id": {
+          "description": "The id of the timer to cancel.",
+          "name": "Timer ID"
+        }
+      },
+      "name": "Cancel timer"
+    },
+    "clear_finished_timers": {
+      "description": "Removes all finished and cancelled timers from a timer list.",
+      "name": "Clear finished timers"
+    },
+    "get_timers": {
+      "description": "Gets the timers on a timer list.",
+      "fields": {
+        "status": {
+          "description": "Only return timers with the specified statuses.",
+          "name": "Status"
+        }
+      },
+      "name": "Get timers"
+    },
+    "pause_timer": {
+      "description": "Pauses an active timer.",
+      "fields": {
+        "timer_id": {
+          "description": "The id of the timer to pause.",
+          "name": "Timer ID"
+        }
+      },
+      "name": "Pause timer"
+    },
+    "remove_time": {
+      "description": "Removes time from a timer.",
+      "fields": {
+        "duration": {
+          "description": "How much time to remove from the timer.",
+          "name": "Duration"
+        },
+        "timer_id": {
+          "description": "The id of the timer to remove time from.",
+          "name": "Timer ID"
+        }
+      },
+      "name": "Remove time"
+    },
+    "remove_timer": {
+      "description": "Removes a timer from a timer list.",
+      "fields": {
+        "timer_id": {
+          "description": "The id of the timer to remove.",
+          "name": "Timer ID"
+        }
+      },
+      "name": "Remove timer"
+    },
+    "start_timer": {
+      "description": "Creates and starts a new timer on a timer list.",
+      "fields": {
+        "duration": {
+          "description": "How long the timer should run for.",
+          "name": "Duration"
+        },
+        "finish_action": {
+          "description": "What happens to the timer once it finishes.",
+          "name": "Finish action"
+        },
+        "name": {
+          "description": "Optional name for the timer.",
+          "name": "Name"
+        }
+      },
+      "name": "Start timer"
+    },
+    "unpause_timer": {
+      "description": "Resumes a paused timer.",
+      "fields": {
+        "timer_id": {
+          "description": "The id of the timer to resume.",
+          "name": "Timer ID"
+        }
+      },
+      "name": "Resume timer"
+    }
+  },
+  "title": "Timer list",
+  "triggers": {
+    "timer_cancelled": {
+      "description": "Triggers when a timer is cancelled on a timer list.",
+      "name": "Timer cancelled"
+    },
+    "timer_finished": {
+      "description": "Triggers when a timer finishes on a timer list.",
+      "name": "Timer finished"
+    },
+    "timer_started": {
+      "description": "Triggers when a timer is started on a timer list.",
+      "name": "Timer started"
+    },
+    "timer_updated": {
+      "description": "Triggers when a timer is paused, resumed, or has time added or removed.",
+      "name": "Timer updated"
+    }
+  }
+}
@@ -0,0 +1,163 @@
+"""Provides triggers for timer lists."""
+
+from collections.abc import Callable
+from functools import partial
+from typing import TYPE_CHECKING, cast, override
+
+import voluptuous as vol
+
+from homeassistant.const import ATTR_ENTITY_ID, CONF_OPTIONS, CONF_TARGET
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback, split_entity_id
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.target import TargetEntityChangeTracker, TargetSelection
+from homeassistant.helpers.trigger import (
+    Trigger,
+    TriggerActionRunner,
+    TriggerConfig,
+    TriggerNotTriggeredReporter,
+)
+from homeassistant.helpers.typing import ConfigType
+from homeassistant.util import dt as dt_util
+
+from . import TimerListEvent, timer_to_dict
+from .const import ATTR_TIMER, DATA_COMPONENT, DOMAIN, TimerListEventType
+
+TRIGGER_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_TARGET): cv.TARGET_FIELDS,
+        vol.Required(CONF_OPTIONS, default={}): {},
+    }
+)
+
+
+class TimerEventListener(TargetEntityChangeTracker):
+    """Subscribe to timer change events for the targeted timer list entities."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        target_selection: TargetSelection,
+        listener: Callable[[str, TimerListEvent], None],
+    ) -> None:
+        """Initialize the listener."""
+
+        def entity_filter(entities: set[str]) -> set[str]:
+            return {
+                entity_id
+                for entity_id in entities
+                if split_entity_id(entity_id)[0] == DOMAIN
+            }
+
+        super().__init__(hass, target_selection, entity_filter)
+        self._listener = listener
+        self._unsubscribe_listeners: list[CALLBACK_TYPE] = []
+
+    @override
+    @callback
+    def _handle_entities_update(self, tracked_entities: set[str]) -> None:
+        """Resubscribe when the set of tracked entities changes."""
+        for unsub in self._unsubscribe_listeners:
+            unsub()
+        self._unsubscribe_listeners = []
+
+        component = self._hass.data[DATA_COMPONENT]
+        for entity_id in tracked_entities:
+            if (entity := component.get_entity(entity_id)) is None:
+                continue
+            self._unsubscribe_listeners.append(
+                entity.async_subscribe_updates(partial(self._listener, entity_id))
+            )
+
+    @override
+    @callback
+    def _unsubscribe(self) -> None:
+        """Unsubscribe from all events."""
+        super()._unsubscribe()
+        for unsub in self._unsubscribe_listeners:
+            unsub()
+        self._unsubscribe_listeners = []
+
+
+class TimerEventTrigger(Trigger):
+    """Trigger that fires on a specific timer change event type."""
+
+    _event_type: TimerListEventType
+
+    @override
+    @classmethod
+    async def async_validate_config(
+        cls, hass: HomeAssistant, config: ConfigType
+    ) -> ConfigType:
+        """Validate config."""
+        return cast(ConfigType, TRIGGER_SCHEMA(config))
+
+    def __init__(self, hass: HomeAssistant, config: TriggerConfig) -> None:
+        """Initialize the trigger."""
+        super().__init__(hass, config)
+        if TYPE_CHECKING:
+            assert config.target is not None
+        self._target = config.target
+
+    @override
+    async def async_attach_runner(
+        self,
+        run_action: TriggerActionRunner,
+        did_not_trigger: TriggerNotTriggeredReporter | None = None,
+    ) -> CALLBACK_TYPE:
+        """Attach the trigger to an action runner."""
+        target_selection = TargetSelection(self._target)
+        if not target_selection.has_any_target:
+            raise HomeAssistantError(f"No target defined in {self._target}")
+
+        @callback
+        def handle_event(entity_id: str, event: TimerListEvent) -> None:
+            if event.event_type != self._event_type:
+                return
+            run_action(
+                {
+                    ATTR_ENTITY_ID: entity_id,
+                    ATTR_TIMER: timer_to_dict(event.item, dt_util.utcnow()),
+                },
+                f"timer {self._event_type.value} on {entity_id}",
+            )
+
+        listener = TimerEventListener(self._hass, target_selection, handle_event)
+        return await listener.async_setup()
+
+
+class TimerStartedTrigger(TimerEventTrigger):
+    """Trigger when a timer starts."""
+
+    _event_type = TimerListEventType.STARTED
+
+
+class TimerUpdatedTrigger(TimerEventTrigger):
+    """Trigger when a timer is paused, resumed, or has time added/removed."""
+
+    _event_type = TimerListEventType.UPDATED
+
+
+class TimerFinishedTrigger(TimerEventTrigger):
+    """Trigger when a timer finishes."""
+
+    _event_type = TimerListEventType.FINISHED
+
+
+class TimerCancelledTrigger(TimerEventTrigger):
+    """Trigger when a timer is cancelled."""
+
+    _event_type = TimerListEventType.CANCELLED
+
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    "timer_started": TimerStartedTrigger,
+    "timer_updated": TimerUpdatedTrigger,
+    "timer_finished": TimerFinishedTrigger,
+    "timer_cancelled": TimerCancelledTrigger,
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for timer lists."""
+    return TRIGGERS
@@ -0,0 +1,9 @@
+.trigger_common: &trigger_common
+  target:
+    entity:
+      domain: timer_list
+
+timer_started: *trigger_common
+timer_updated: *trigger_common
+timer_finished: *trigger_common
+timer_cancelled: *trigger_common
@@ -9,5 +9,5 @@
  "iot_class": "local_push",
  "loggers": ["uiprotect"],
  "quality_scale": "platinum",
-  "requirements": ["uiprotect==14.0.0"]
+  "requirements": ["uiprotect==15.0.0"]
 }
@@ -62,10 +62,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: VeraConfigEntry) -> bool
    controller = veraApi.VeraController(base_url, subscription_registry)

    try:
-        all_devices = await hass.async_add_executor_job(controller.get_devices)

-        # pylint: disable-next=home-assistant-sequential-executor-jobs
-        all_scenes = await hass.async_add_executor_job(controller.get_scenes)
+        def _get_devices_and_scenes():
+            """Get devices and scenes from the Vera controller."""
+            return controller.get_devices(), controller.get_scenes()
+
+        all_devices, all_scenes = await hass.async_add_executor_job(
+            _get_devices_and_scenes
+        )
    except RequestException as exception:
        # There was a network related error connecting to the Vera controller.
        _LOGGER.exception("Error communicating with Vera API")
@@ -20,16 +20,16 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    PERCENTAGE,
    REVOLUTIONS_PER_MINUTE,
    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
    EntityCategory,
+    UnitOfDensity,
    UnitOfElectricCurrent,
    UnitOfEnergy,
    UnitOfMass,
    UnitOfPower,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfTemperature,
    UnitOfTime,
    UnitOfVolume,
@@ -80,7 +80,7 @@ VICARE_UNIT_TO_HA_UNIT = {
    VICARE_CUBIC_METER: UnitOfVolume.CUBIC_METERS,
    VICARE_KW: UnitOfPower.KILO_WATT,
    VICARE_KWH: UnitOfEnergy.KILO_WATT_HOUR,
-    VICARE_PERCENT: PERCENTAGE,
+    VICARE_PERCENT: UnitOfRatio.PERCENTAGE,
    VICARE_W: UnitOfPower.WATT,
    VICARE_WH: UnitOfEnergy.WATT_HOUR,
 }
@@ -117,7 +117,7 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
    ViCareSensorEntityDescription(
        key="outside_humidity",
        translation_key="outside_humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        value_getter=lambda api: api.getOutsideHumidity(),
        device_class=SensorDeviceClass.HUMIDITY,
        state_class=SensorStateClass.MEASUREMENT,
@@ -165,7 +165,7 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
    ViCareSensorEntityDescription(
        key="primary_circuit_pump_rotation",
        translation_key="primary_circuit_pump_rotation",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        value_getter=lambda api: api.getPrimaryCircuitPumpRotation(),
        unit_getter=lambda api: api.getPrimaryCircuitPumpRotationUnit(),
        state_class=SensorStateClass.MEASUREMENT,
@@ -799,7 +799,7 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
    ViCareSensorEntityDescription(
        key="ess_state_of_charge",
        translation_key="ess_state_of_charge",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.BATTERY,
        state_class=SensorStateClass.MEASUREMENT,
        value_getter=lambda api: api.getElectricalEnergySystemSOC(),
@@ -996,7 +996,7 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
    ViCareSensorEntityDescription(
        key="room_humidity",
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value_getter=lambda api: api.getHumidity(),
    ),
@@ -1122,7 +1122,7 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
    ),
    ViCareSensorEntityDescription(
        key="battery_level",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        device_class=SensorDeviceClass.BATTERY,
        entity_category=EntityCategory.DIAGNOSTIC,
@@ -1142,7 +1142,7 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
        translation_key="zigbee_signal_strength",
        state_class=SensorStateClass.MEASUREMENT,
        entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        value_getter=lambda api: api.getZigbeeSignalStrength(),
        entity_registry_enabled_default=False,
    ),
@@ -1150,7 +1150,7 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
        key="valve_position",
        translation_key="valve_position",
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        value_getter=lambda api: api.getValvePosition(),
        entity_registry_enabled_default=False,
    ),
@@ -1177,7 +1177,7 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
        key="supply_humidity",
        translation_key="supply_humidity",
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value_getter=lambda api: api.getSupplyHumidity(),
    ),
@@ -1229,28 +1229,28 @@ GLOBAL_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
    ViCareSensorEntityDescription(
        key="pm01",
        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_getter=lambda api: api.getAirborneDustPM1(),
    ),
    ViCareSensorEntityDescription(
        key="pm02",
        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_getter=lambda api: api.getAirborneDustPM2d5(),
    ),
    ViCareSensorEntityDescription(
        key="pm04",
        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,
        value_getter=lambda api: api.getAirborneDustPM4(),
    ),
    ViCareSensorEntityDescription(
        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_getter=lambda api: api.getAirborneDustPM10(),
    ),
@@ -1293,7 +1293,7 @@ BURNER_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
    ViCareSensorEntityDescription(
        key="burner_modulation",
        translation_key="burner_modulation",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        value_getter=lambda api: api.getModulation(),
        state_class=SensorStateClass.MEASUREMENT,
    ),
@@ -1312,7 +1312,7 @@ COMPRESSOR_SENSORS: tuple[ViCareSensorEntityDescription, ...] = (
    ViCareSensorEntityDescription(
        key="compressor_modulation",
        translation_key="compressor_modulation",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        value_getter=lambda api: api.getModulation(),
        unit_getter=lambda api: api.getModulationUnit(),
        state_class=SensorStateClass.MEASUREMENT,
@@ -23,7 +23,7 @@
    "universal_silabs_flasher",
    "serialx"
  ],
-  "requirements": ["zha==2.0.0", "zha-quirks==2.0.0"],
+  "requirements": ["zha==2.0.0", "zha-quirks==2.1.0"],
  "usb": [
    {
      "description": "*2652*",
@@ -407,6 +407,9 @@
      "reset_alarm": {
        "name": "Reset alarm"
      },
+      "reset_energy": {
+        "name": "Reset energy"
+      },
      "reset_frost_lock": {
        "name": "Frost lock reset"
      },
@@ -1387,6 +1390,12 @@
      "status_indication": {
        "name": "Status indication"
      },
+      "switch_action_l1": {
+        "name": "Switch action L1"
+      },
+      "switch_action_l2": {
+        "name": "Switch action L2"
+      },
      "switch_actions": {
        "name": "Switch actions"
      },
@@ -1399,6 +1408,12 @@
      "switch_type": {
        "name": "Switch type"
      },
+      "switch_type_l1": {
+        "name": "Switch type L1"
+      },
+      "switch_type_l2": {
+        "name": "Switch type L2"
+      },
      "temperature_display_mode": {
        "name": "Temperature display mode"
      },
@@ -21,7 +21,7 @@ if TYPE_CHECKING:

 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2026
-MINOR_VERSION: Final = 7
+MINOR_VERSION: Final = 8
 PATCH_VERSION: Final = "0.dev0"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
@@ -12,6 +12,7 @@ FLOWS = {
        "group",
        "history_stats",
        "integration",
+        "local_timer_list",
        "min_max",
        "mold_indicator",
        "otp",
@@ -46,6 +46,7 @@ class EntityPlatforms(StrEnum):
    SWITCH = "switch"
    TEXT = "text"
    TIME = "time"
+    TIMER_LIST = "timer_list"
    TODO = "todo"
    TTS = "tts"
    UPDATE = "update"
@@ -8448,6 +8448,12 @@
      "config_flow": true,
      "iot_class": "local_push"
    },
+    "local_timer_list": {
+      "name": "Local Timer list",
+      "integration_type": "helper",
+      "config_flow": true,
+      "iot_class": "local_push"
+    },
    "manual": {
      "name": "Manual Alarm Control Panel",
      "integration_type": "helper",
@@ -35,12 +35,12 @@ file-read-backwards==2.0.0
 fnv-hash-fast==2.0.3
 go2rtc-client==0.4.0
 ha-ffmpeg==3.2.2
-habluetooth==6.23.1
+habluetooth==6.25.1
 hass-nabucasa==2.2.0
 hassil==3.8.0
 home-assistant-bluetooth==2.0.0
 home-assistant-frontend==20260624.0
-home-assistant-intents==2026.6.1
+home-assistant-intents==2026.6.24
 httpx==0.28.1
 ifaddr==0.2.0
 Jinja2==3.1.6
@@ -101,6 +101,7 @@ _ENTITY_COMPONENTS: set[str] = set(ENTITY_COMPONENTS).union(
        "script",
        "tag",
        "timer",
+        "timer_list",
    }
 )

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "homeassistant"
-version = "2026.7.0.dev0"
+version = "2026.8.0.dev0"
 license = "Apache-2.0"
 license-files = ["LICENSE*", "homeassistant/backports/LICENSE*"]
 description = "Open-source home automation platform running on Python 3."
@@ -27,7 +27,7 @@ ha-ffmpeg==3.2.2
 hass-nabucasa==2.2.0
 hassil==3.8.0
 home-assistant-bluetooth==2.0.0
-home-assistant-intents==2026.6.1
+home-assistant-intents==2026.6.24
 httpx==0.28.1
 ifaddr==0.2.0
 infrared-protocols==6.3.0
@@ -83,7 +83,7 @@ PyRMVtransport==0.3.3
 PySrDaliGateway==0.21.0

 # homeassistant.components.switchbot
-PySwitchbot==2.2.0
+PySwitchbot==2.3.0

 # homeassistant.components.switchmate
 PySwitchmate==0.5.1
@@ -1219,7 +1219,7 @@ ha-xthings-cloud==1.0.5
 habiticalib==0.4.7

 # homeassistant.components.bluetooth
-habluetooth==6.23.1
+habluetooth==6.25.1

 # homeassistant.components.hanna
 hanna-cloud==0.0.7
@@ -1275,7 +1275,7 @@ holidays==0.99
 home-assistant-frontend==20260624.0

 # homeassistant.components.conversation
-home-assistant-intents==2026.6.1
+home-assistant-intents==2026.6.24

 # homeassistant.components.homekit
 homekit-audio-proxy==1.2.1
@@ -1284,7 +1284,7 @@ homekit-audio-proxy==1.2.1
 homelink-integration-api==0.0.5

 # homeassistant.components.homematicip_cloud
-homematicip==2.13.1
+homematicip==2.13.2

 # homeassistant.components.homevolt
 homevolt==0.5.0
@@ -3114,7 +3114,7 @@ surepy==0.9.0
 swisshydrodata==0.1.0

 # homeassistant.components.switchbot_cloud
-switchbot-api==2.11.1
+switchbot-api==2.12.0

 # homeassistant.components.synology_srm
 synology-srm==0.2.0
@@ -3245,7 +3245,7 @@ uasiren==0.0.1
 uhooapi==1.2.8

 # homeassistant.components.unifiprotect
-uiprotect==14.0.0
+uiprotect==15.0.0

 # homeassistant.components.landisgyr_heat_meter
 ultraheat-api==0.6.1
@@ -3453,7 +3453,7 @@ zeroconf==0.150.0
 zeversolar==0.3.2

 # homeassistant.components.zha
-zha-quirks==2.0.0
+zha-quirks==2.1.0

 # homeassistant.components.zha
 zha==2.0.0
@@ -19,6 +19,7 @@ mock-open==1.4.0
 mypy==2.1.0
 prek==0.2.28
 pydantic==2.13.4
+PyGithub==2.9.1
 pylint==4.0.6
 pylint-per-file-ignores==3.2.1
 pipdeptree==2.26.1
@@ -2,12 +2,28 @@

 import argparse
 import json
+import os
 from pathlib import Path
 import sys

+from .gate import GateDecision, decide_skip
+from .models import CheckRunResult
 from .runner import run_checks


+def _resolve_skip(pr_number: int, head_sha: str | None) -> GateDecision:
+    """Decide whether this run can skip re-checking the PR.
+
+    Needs the repo and a token (from the Actions environment) to read prior
+    comments; without them it falls open and runs the checks.
+    """
+    repo = os.environ.get("GITHUB_REPOSITORY")
+    token = os.environ.get("GITHUB_TOKEN")
+    if not head_sha or not repo or not token:
+        return GateDecision(False, "Gate inputs unavailable; running checks.")
+    return decide_skip(pr_number, head_sha, repo, token)
+
+
 def main(argv: list[str] | None = None) -> int:
    """Run the deterministic check_requirements stage and write its artifact."""
    parser = argparse.ArgumentParser(prog="python -m script.check_requirements")
@@ -31,24 +47,32 @@ def main(argv: list[str] | None = None) -> int:
    )
    args = parser.parse_args(argv)

-    try:
-        diff_text = args.diff.read_text(encoding="utf-8")
-    except FileNotFoundError:
-        parser.error(f"input file {args.diff} not found")
-    result = run_checks(
-        pr_number=args.pr_number,
-        diff_text=diff_text,
-        head_sha=args.head_sha,
-    )
+    decision = _resolve_skip(args.pr_number, args.head_sha)
+    print(decision.reason, file=sys.stderr)
+    if decision.skip:
+        result = CheckRunResult(
+            pr_number=args.pr_number, head_sha=args.head_sha, skip_aw=True
+        )
+    else:
+        try:
+            diff_text = args.diff.read_text(encoding="utf-8")
+        except FileNotFoundError:
+            parser.error(f"input file {args.diff} not found")
+        result = run_checks(
+            pr_number=args.pr_number,
+            diff_text=diff_text,
+            head_sha=args.head_sha,
+        )
+        print(
+            f"check_requirements: {len(result.packages)} package change(s); "
+            f"needs_agent={result.needs_agent}",
+            file=sys.stderr,
+        )
+
    args.output.write_text(
        json.dumps(result.to_dict(), indent=2, ensure_ascii=False) + "\n",
        encoding="utf-8",
    )
-    print(
-        f"check_requirements: {len(result.packages)} package change(s); "
-        f"needs_agent={result.needs_agent}",
-        file=sys.stderr,
-    )
    return 0


@@ -17,11 +17,13 @@ from .models import PackageChange
 # of truth for pinned package changes.
 TRACKED_PATTERNS = (
    "requirements*.txt",
+    "**/requirements*.txt",
    "homeassistant/package_constraints.txt",
 )


-def _is_tracked(path: str) -> bool:
+def is_tracked(path: str) -> bool:
+    """Return True if `path` is a requirement file the checks care about."""
    return any(fnmatchcase(path, pattern) for pattern in TRACKED_PATTERNS)


@@ -61,7 +63,7 @@ def parse_diff(diff_text: str) -> list[PackageChange]:
    added: dict[str, _Pin] = {}
    removed: dict[str, _Pin] = {}
    for patched_file in PatchSet(diff_text):
-        if not _is_tracked(patched_file.path):
+        if not is_tracked(patched_file.path):
            continue
        for hunk in patched_file:
            for line in hunk:
@@ -0,0 +1,107 @@
+"""Decide whether the deterministic stage can skip re-checking a PR.
+
+The deterministic stage re-runs on every `synchronize` where the PR touches a
+tracked requirement file, even when the latest push changed only unrelated
+files. This module answers "did a tracked requirement file actually change
+since we last commented?" so the stage can skip the PyPI work and flag the
+uploaded artifact as skipped, telling the agentic stage to no-op.
+"""
+
+from dataclasses import dataclass
+import logging
+import os
+import re
+
+from github import Auth, Github, GithubException
+from github.IssueComment import IssueComment
+
+from .diff import is_tracked
+from .render import COMMIT_PATH
+
+_LOGGER = logging.getLogger(__name__)
+
+# The "Checked at commit [`abc1234`](...COMMIT_PATH<40-hex>)." link rendered by
+# render._intro is the only place the head SHA is recorded in the comment.
+_COMMIT_SHA_RE = re.compile(re.escape(COMMIT_PATH) + r"([0-9a-f]{40})", re.IGNORECASE)
+_TRUSTED_AUTHOR = "github-actions[bot]"
+
+
+def _is_trusted_author(comment: IssueComment) -> bool:
+    """True only for the github-actions bot that posts the check comment."""
+    return comment.user is not None and comment.user.login == _TRUSTED_AUTHOR
+
+
+@dataclass(slots=True, frozen=True)
+class GateDecision:
+    """Whether to skip the deterministic checks, with a human-readable reason."""
+
+    skip: bool
+    reason: str
+
+
+def _client(token: str) -> Github:
+    """A lazy GitHub client on the configured (possibly GHES) API base."""
+    base_url = os.environ.get("GITHUB_API_URL", "https://api.github.com").rstrip("/")
+    return Github(auth=Auth.Token(token), base_url=base_url, lazy=True)
+
+
+def fetch_marker_comment_bodies(pr_number: int, repo: str, token: str) -> list[str]:
+    """Return the trusted requirements-check comment bodies, oldest-first."""
+    try:
+        comments = _client(token).get_repo(repo).get_issue(pr_number).get_comments()
+        return [comment.body for comment in comments if _is_trusted_author(comment)]
+    except GithubException as err:
+        _LOGGER.warning("Could not read comments for PR #%s: %s", pr_number, err)
+        return []
+
+
+def extract_prior_sha(bodies: list[str]) -> str | None:
+    """Return the head SHA recorded in the most recent marker comment."""
+    shas = [
+        match.group(1).lower()
+        for body in bodies
+        for match in _COMMIT_SHA_RE.finditer(body)
+    ]
+    return shas[-1] if shas else None
+
+
+def compare_changed_files(
+    base: str, head: str, repo: str, token: str
+) -> list[str] | None:
+    """Return filenames changed between two commits, or None if unavailable."""
+    try:
+        comparison = _client(token).get_repo(repo).compare(base, head)
+        return [changed.filename for changed in comparison.files]
+    except GithubException as err:
+        _LOGGER.warning("Could not compare %s...%s: %s", base, head, err)
+        return None
+
+
+def decide_skip(pr_number: int, head_sha: str, repo: str, token: str) -> GateDecision:
+    """Decide whether requirements changed since the last comment."""
+    if not head_sha:
+        return GateDecision(False, "No head SHA available; running checks.")
+    prior = extract_prior_sha(fetch_marker_comment_bodies(pr_number, repo, token))
+    if prior is None:
+        return GateDecision(
+            False, "No previous requirements-check comment; running checks."
+        )
+    if prior == head_sha.lower():
+        return GateDecision(
+            True, f"Head {head_sha} unchanged since the last comment; skipping."
+        )
+    changed = compare_changed_files(prior, head_sha, repo, token)
+    if changed is None:
+        return GateDecision(
+            False, f"Could not compare {prior}...{head_sha}; running checks."
+        )
+    tracked = [path for path in changed if is_tracked(path)]
+    if tracked:
+        return GateDecision(
+            False,
+            f"Tracked requirement files changed since {prior}; running checks: "
+            + ", ".join(tracked),
+        )
+    return GateDecision(
+        True, f"No tracked requirement files changed since {prior}; skipping."
+    )
@@ -90,6 +90,7 @@ class CheckRunResult:
    head_sha: str | None = None
    packages: list[PackageChange] = field(default_factory=list)
    rendered_comment: str = ""
+    skip_aw: bool = False

    @property
    def needs_agent(self) -> bool:
@@ -101,6 +102,7 @@ class CheckRunResult:
        return {
            "version": 1,
            "pr_number": self.pr_number,
+            "skip_aw": self.skip_aw,
            "head_sha": self.head_sha,
            "needs_agent": self.needs_agent,
            "packages": [p.to_dict() for p in self.packages],
@@ -14,6 +14,7 @@ from .models import CheckKind, CheckRunResult, CheckStatus, PackageChange
 MARKER = "<!-- requirements-check -->"
 HEADER = "## Check requirements"
 REPO_URL = "https://github.com/home-assistant/core"
+COMMIT_PATH = "/commit/"

 # Column / bullet labels per check kind, in display order.
 _CHECK_DISPLAY: tuple[tuple[CheckKind, str], ...] = (
@@ -127,7 +128,7 @@ def _intro(result: CheckRunResult) -> str:
    """Marker, header, and the optional commit line the gate reads back."""
    parts: list[str] = []
    if result.head_sha:
-        commit = f"[`{result.head_sha[:7]}`]({REPO_URL}/commit/{result.head_sha})"
+        commit = f"[`{result.head_sha[:7]}`]({REPO_URL}{COMMIT_PATH}{result.head_sha})"
        parts.append(f"Checked at commit {commit}.")
    return "\n\n".join([f"{MARKER}\n{HEADER}", *parts])

@@ -1,2 +1,3 @@
+PyGithub==2.9.1
 requests==2.34.2
 unidiff==0.7.5
@@ -125,6 +125,7 @@ NO_IOT_CLASS = [
    "tag",
    "temperature",
    "timer",
+    "timer_list",
    "trace",
    "web_rtc",
    "webhook",
@@ -2109,6 +2109,8 @@ NO_QUALITY_SCALE = [
    "tag",
    "temperature",
    "timer",
+    "timer_list",
+    "local_timer_list",
    "trace",
    "usage_prediction",
    "web_rtc",
@@ -107,8 +107,8 @@ async def test_alexa_unique_id_migration(
    )

    entity = entity_registry.async_get_or_create(
-        DOMAIN,
        SWITCH_DOMAIN,
+        DOMAIN,
        unique_id=f"{TEST_DEVICE_1_SN}-do_not_disturb",
        device_id=device.id,
        config_entry=mock_config_entry,
@@ -145,8 +145,8 @@ async def test_alexa_dnd_group_removal(
    )

    entity = entity_registry.async_get_or_create(
-        DOMAIN,
        SWITCH_DOMAIN,
+        DOMAIN,
        unique_id=f"{TEST_DEVICE_1_SN}-do_not_disturb",
        device_id=device.id,
        config_entry=mock_config_entry,
@@ -184,8 +184,8 @@ async def test_alexa_unsupported_notification_sensor_removal(
    )

    entity = entity_registry.async_get_or_create(
-        DOMAIN,
        SENSOR_DOMAIN,
+        DOMAIN,
        unique_id=f"{TEST_DEVICE_1_SN}-Timer",
        device_id=device.id,
        config_entry=mock_config_entry,
@@ -853,7 +853,7 @@
        'speech': dict({
          'plain': dict({
            'extra_data': None,
-            'speech': 'Sorry, I am not aware of any area called Are the',
+            'speech': 'Sorry, I am not aware of any device called Are the',
          }),
        }),
      }),
@@ -902,7 +902,7 @@
        'speech': dict({
          'plain': dict({
            'extra_data': None,
-            'speech': 'Sorry, I am not aware of any area called Are the',
+            'speech': 'Sorry, I am not aware of any device called Are the',
          }),
        }),
      }),
@@ -7,6 +7,7 @@ from typing import Any
 from unittest.mock import ANY, Mock, patch

 import pytest
+import voluptuous as vol

 from homeassistant.components import automation, input_boolean, script
 from homeassistant.components.automation import (
@@ -1930,6 +1931,187 @@ async def test_automation_with_error_in_script_2(
    assert "string value is None" in caplog.text


+@pytest.mark.parametrize(
+    ("side_effect", "expected_error", "expect_traceback"),
+    [
+        (
+            HomeAssistantError("boom"),
+            "Error while executing automation automation.hello: boom",
+            False,
+        ),
+        (
+            vol.Invalid("not valid"),
+            "Error while executing automation automation.hello: not valid",
+            False,
+        ),
+        (
+            ValueError("unexpected"),
+            "Unexpected error while executing automation automation.hello",
+            True,
+        ),
+    ],
+    ids=["home_assistant_error", "voluptuous_invalid", "unexpected_exception"],
+)
+async def test_automation_with_error_in_action_script(
+    hass: HomeAssistant,
+    calls: list[ServiceCall],
+    caplog: pytest.LogCaptureFixture,
+    hass_ws_client: WebSocketGenerator,
+    side_effect: Exception,
+    expected_error: str,
+    expect_traceback: bool,
+) -> None:
+    """Test errors raised while running the action script are handled and traced."""
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: {
+                "id": "hello",
+                "alias": "hello",
+                "trigger": {"platform": "event", "event_type": "test_event"},
+                "action": {"action": "test.automation"},
+            }
+        },
+    )
+
+    with patch(
+        "homeassistant.helpers.script.Script.async_run",
+        side_effect=side_effect,
+    ):
+        hass.bus.async_fire("test_event")
+        await hass.async_block_till_done()
+
+    assert len(calls) == 0
+    assert expected_error in caplog.text
+    # A HomeAssistantError/voluptuous error is logged without a traceback, an
+    # unexpected error is logged with a traceback.
+    assert ("Traceback" in caplog.text) is expect_traceback
+
+    # The error is recorded on the automation trace.
+    client = await hass_ws_client()
+    await client.send_json_auto_id(
+        {"type": "trace/list", "domain": "automation", "item_id": "hello"}
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    traces = response["result"]
+    assert len(traces) == 1
+    assert traces[0]["error"] == str(side_effect)
+
+
+@pytest.mark.parametrize(
+    ("side_effect", "expected_error", "expect_traceback"),
+    [
+        (
+            HomeAssistantError("boom"),
+            "Error while checking conditions of automation automation.hello: boom",
+            False,
+        ),
+        (
+            vol.Invalid("not valid"),
+            "Error while checking conditions of automation automation.hello: not valid",
+            False,
+        ),
+        (
+            ValueError("unexpected"),
+            "Unexpected error while checking conditions of automation automation.hello",
+            True,
+        ),
+    ],
+    ids=["home_assistant_error", "voluptuous_invalid", "unexpected_exception"],
+)
+async def test_automation_with_error_in_condition(
+    hass: HomeAssistant,
+    calls: list[ServiceCall],
+    caplog: pytest.LogCaptureFixture,
+    hass_ws_client: WebSocketGenerator,
+    side_effect: Exception,
+    expected_error: str,
+    expect_traceback: bool,
+) -> None:
+    """Test errors raised while checking conditions are handled and traced."""
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: {
+                "id": "hello",
+                "alias": "hello",
+                "trigger": {"platform": "event", "event_type": "test_event"},
+                "condition": {
+                    "condition": "state",
+                    "entity_id": "test.entity",
+                    "state": "on",
+                },
+                "action": {"action": "test.automation"},
+            }
+        },
+    )
+
+    with patch(
+        "homeassistant.helpers.condition.ConditionsChecker.async_check",
+        side_effect=side_effect,
+    ):
+        hass.bus.async_fire("test_event")
+        await hass.async_block_till_done()
+
+    # The action must not run when the condition check raises.
+    assert len(calls) == 0
+    assert expected_error in caplog.text
+    # A HomeAssistantError/voluptuous error is logged without a traceback, an
+    # unexpected error is logged with a traceback.
+    assert ("Traceback" in caplog.text) is expect_traceback
+
+    # The error is recorded on the automation trace.
+    client = await hass_ws_client()
+    await client.send_json_auto_id(
+        {"type": "trace/list", "domain": "automation", "item_id": "hello"}
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    traces = response["result"]
+    assert len(traces) == 1
+    assert traces[0]["error"] == str(side_effect)
+
+
+async def test_automation_with_error_in_condition_continues_after_recovery(
+    hass: HomeAssistant,
+    calls: list[ServiceCall],
+) -> None:
+    """Test the automation still runs once the condition stops raising."""
+    assert await async_setup_component(
+        hass,
+        automation.DOMAIN,
+        {
+            automation.DOMAIN: {
+                "alias": "hello",
+                "trigger": {"platform": "event", "event_type": "test_event"},
+                "condition": {
+                    "condition": "state",
+                    "entity_id": "test.entity",
+                    "state": "on",
+                },
+                "action": {"action": "test.automation"},
+            }
+        },
+    )
+    hass.states.async_set("test.entity", "on")
+
+    with patch(
+        "homeassistant.helpers.condition.ConditionsChecker.async_check",
+        side_effect=HomeAssistantError("boom"),
+    ):
+        hass.bus.async_fire("test_event")
+        await hass.async_block_till_done()
+    assert len(calls) == 0
+
+    # Without the error, the condition passes and the action runs.
+    hass.bus.async_fire("test_event")
+    await hass.async_block_till_done()
+    assert len(calls) == 1
+
+
 async def test_automation_restore_last_triggered_with_initial_state(
    hass: HomeAssistant,
 ) -> None:
@@ -302,7 +302,7 @@
      'speech': dict({
        'plain': dict({
          'extra_data': None,
-          'speech': 'Sorry, I am not aware of any area called late added',
+          'speech': 'Sorry, I am not aware of any device called late added',
        }),
      }),
    }),
@@ -373,7 +373,7 @@
      'speech': dict({
        'plain': dict({
          'extra_data': None,
-          'speech': 'Sorry, I am not aware of any area called kitchen',
+          'speech': 'Sorry, I am not aware of any device called kitchen',
        }),
      }),
    }),
@@ -423,7 +423,7 @@
      'speech': dict({
        'plain': dict({
          'extra_data': None,
-          'speech': 'Sorry, I am not aware of any area called renamed',
+          'speech': 'Sorry, I am not aware of any device called renamed',
        }),
      }),
    }),
@@ -467,10 +467,11 @@
          'name': 'HassTurnOn',
        }),
        'match': True,
-        'sentence_template': '<turn> on (<area> <name>|<name> [in <area>])',
+        'sentence_template': '<turn> on [<the>] {name}',
        'slots': dict({
          'name': 'my cool light',
        }),
+        'source': 'builtin',
        'targets': dict({
          'light.kitchen': dict({
            'matched': True,
@@ -491,10 +492,11 @@
          'name': 'HassTurnOff',
        }),
        'match': True,
-        'sentence_template': '[<turn>] (<area> <name>|<name> [in <area>]) [to] off',
+        'sentence_template': '[<turn>] [<the>] {name} [to] off',
        'slots': dict({
          'name': 'my cool light',
        }),
+        'source': 'builtin',
        'targets': dict({
          'light.kitchen': dict({
            'matched': True,
@@ -520,11 +522,12 @@
          'name': 'HassTurnOn',
        }),
        'match': True,
-        'sentence_template': '<turn> on [(<all>|<the>)] <light> <in> <area>',
+        'sentence_template': '<turn> on [(<all>|<the>)] <light> <in> [<the>] {area}',
        'slots': dict({
          'area': 'kitchen',
          'domain': 'light',
        }),
+        'source': 'builtin',
        'targets': dict({
          'light.kitchen': dict({
            'matched': True,
@@ -542,7 +545,7 @@
          }),
          'domain': dict({
            'name': 'domain',
-            'text': 'lights',
+            'text': '',
            'value': 'light',
          }),
          'state': dict({
@@ -555,12 +558,13 @@
          'name': 'HassGetState',
        }),
        'match': True,
-        'sentence_template': '[tell me] how many {on_off_domains:domain} (is|are) {on_off_states:state} [<in_area_floor>]',
+        'sentence_template': '<how_many> <light> <is> {on_off_states:state} [<in>] [<the>] {area}',
        'slots': dict({
          'area': 'kitchen',
-          'domain': 'lights',
+          'domain': 'light',
          'state': 'on',
        }),
+        'source': 'builtin',
        'targets': dict({
          'light.kitchen': dict({
            'matched': False,
@@ -629,11 +633,12 @@
          'name': 'HassLightSet',
        }),
        'match': True,
-        'sentence_template': '[<numeric_value_set>] <name> brightness [to] <brightness>',
+        'sentence_template': '[<numeric_value_set>] [<the>] {name} brightness [to] {brightness}[([ ]%)| percent]',
        'slots': dict({
          'brightness': '100',
          'name': 'test light',
        }),
+        'source': 'builtin',
        'targets': dict({
          'light.demo_1234': dict({
            'matched': True,
@@ -660,10 +665,11 @@
          'name': 'HassLightSet',
        }),
        'match': False,
-        'sentence_template': '[<numeric_value_set>] <name> brightness [to] <brightness>',
+        'sentence_template': '[<numeric_value_set>] [<the>] {name} brightness [to] {brightness}[([ ]%)| percent]',
        'slots': dict({
          'name': 'test light',
        }),
+        'source': 'builtin',
        'targets': dict({
        }),
        'unmatched_slots': dict({
@@ -729,19 +729,6 @@ async def test_satellite_area_context(
    }
    turn_off_calls.clear()

-    # Turn on/off all lights also works
-    for command in ("on", "off"):
-        result = await conversation.async_converse(
-            hass, f"turn {command} all lights", None, Context(), None
-        )
-        await hass.async_block_till_done()
-        assert result.response.response_type is intent.IntentResponseType.ACTION_DONE
-
-        # All lights should have been targeted
-        assert {s.entity_id for s in result.response.matched_states} == {
-            e.entity_id for e in all_lights
-        }
-

@pytest.mark.usefixtures("init_components")
 async def test_error_no_device(hass: HomeAssistant) -> None:
@@ -841,7 +828,7 @@ async def test_error_no_device_on_floor(
    assert result.response.error_code == intent.IntentResponseErrorCode.NO_VALID_TARGETS
    assert (
        result.response.speech["plain"]["speech"]
-        == "Sorry, I am not aware of any device called missing entity on ground floor"
+        == "Sorry, I am not aware of any device called missing entity in the ground floor"
    )


@@ -1128,7 +1115,7 @@ async def test_error_no_domain_on_floor_exposed(
    await hass.async_block_till_done()

    result = await conversation.async_converse(
-        hass, "turn on all lights on the ground floor", None, Context(), None
+        hass, "turn on all lights in the ground floor", None, Context(), None
    )

    assert result.response.response_type is intent.IntentResponseType.ERROR
@@ -1493,21 +1480,6 @@ async def test_error_duplicate_names_same_area(
            f" {name} in the {area_kitchen.name} area"
        )

-        # question
-        result = await conversation.async_converse(
-            hass, f"is {name} on in the {area_kitchen.name}?", None, Context(), None
-        )
-        assert result.response.response_type is intent.IntentResponseType.ERROR
-        assert (
-            result.response.error_code
-            == intent.IntentResponseErrorCode.NO_VALID_TARGETS
-        )
-        assert (
-            result.response.speech["plain"]["speech"]
-            == f"Sorry, there are multiple devices called"
-            f" {name} in the {area_kitchen.name} area"
-        )
-

@pytest.mark.usefixtures("init_components")
 async def test_duplicate_names_same_area_but_one_is_exposed(
@@ -2855,9 +2827,9 @@ async def test_config_sentences_priority(
        {
            "conversation": {
                "intents": {
-                    "CustomIntent": ["turn on <name>"],
+                    "CustomIntent": ["turn on [the] {name}"],
                    "WorseCustomIntent": ["turn on the lamp"],
-                    "FakeCustomIntent": ["turn on <name>"],
+                    "FakeCustomIntent": ["turn on [the] {name}"],
                }
            }
        },
@@ -127,29 +127,39 @@ async def test_cover_set_position(
 async def test_cover_device_class(
    hass: HomeAssistant,
    init_components,
+    area_registry: ar.AreaRegistry,
+    entity_registry: er.EntityRegistry,
 ) -> None:
    """Test the open position for covers by device class."""
    await cover_intent.async_setup_intents(hass)

-    entity_id = f"{cover.DOMAIN}.front"
-    hass.states.async_set(
-        entity_id, STATE_CLOSED, attributes={"device_class": "garage"}
+    area_kitchen = area_registry.async_get_or_create("kitchen_id")
+    area_kitchen = area_registry.async_update(area_kitchen.id, name="kitchen")
+
+    kitchen_window = entity_registry.async_get_or_create(
+        "cover", "demo", "kitchen_window"
    )
-    async_expose_entity(hass, conversation.DOMAIN, entity_id, True)
+    kitchen_window = entity_registry.async_update_entity(
+        kitchen_window.entity_id, area_id=area_kitchen.id
+    )
+    hass.states.async_set(
+        kitchen_window.entity_id, STATE_CLOSED, attributes={"device_class": "window"}
+    )
+    async_expose_entity(hass, conversation.DOMAIN, kitchen_window.entity_id, True)

    # Open service
    calls = async_mock_service(hass, cover.DOMAIN, cover.SERVICE_OPEN_COVER)
    result = await conversation.async_converse(
-        hass, "open the garage door", None, Context(), None
+        hass, "open the window in the kitchen", None, Context(), None, device_id=None
    )
    await hass.async_block_till_done()

    response = result.response
    assert response.response_type is intent.IntentResponseType.ACTION_DONE
-    assert response.speech["plain"]["speech"] == "Opening the garage"
+    assert response.speech["plain"]["speech"] == "Opening the window"
    assert len(calls) == 1
    call = calls[0]
-    assert call.data == {"entity_id": entity_id}
+    assert call.data == {"entity_id": kitchen_window.entity_id}


 async def test_valve_intents(
@@ -128,6 +128,54 @@ async def test_already_configured(
    assert result["reason"] == "already_configured"


+@pytest.mark.usefixtures("current_request_with_host")
+@pytest.mark.parametrize(
+    ("token", "expected_step"),
+    [
+        (
+            {
+                "access_token": "mock-access-token",
+                "expires_at": 9_999_999_999,
+                "scope": " ".join(OAUTH2_SCOPES),
+            },
+            "reauth_confirm",
+        ),
+        (
+            {
+                "access_token": "mock-access-token",
+                "refresh_token": "mock-refresh-token",
+                "expires_at": 9_999_999_999,
+                "scope": "account_info.read files.content.read files.content.write",
+            },
+            "reauth_permissions",
+        ),
+    ],
+    ids=["missing_refresh_token", "missing_scope"],
+)
+async def test_reauth_confirm_step(
+    hass: HomeAssistant,
+    mock_config_entry,
+    token: dict[str, object],
+    expected_step: str,
+) -> None:
+    """Test reauth shows the correct confirmation step for the broken token."""
+
+    mock_config_entry.add_to_hass(hass)
+    hass.config_entries.async_update_entry(
+        mock_config_entry, data={**mock_config_entry.data, "token": token}
+    )
+
+    result = await mock_config_entry.start_reauth_flow(hass)
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == expected_step
+
+    result = await hass.config_entries.flow.async_configure(result["flow_id"], {})
+
+    assert result["type"] is FlowResultType.EXTERNAL_STEP
+    assert result["step_id"] == "auth"
+
+
@pytest.mark.usefixtures("current_request_with_host")
@pytest.mark.parametrize(
    (
@@ -1,11 +1,13 @@
 """Test the Dropbox integration setup."""

+from typing import Any
 from unittest.mock import AsyncMock, patch

 import pytest
 from python_dropbox_api import DropboxAuthException, DropboxUnknownException

-from homeassistant.config_entries import ConfigEntryState
+from homeassistant.components.dropbox.const import DOMAIN, OAUTH2_SCOPES
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigEntryState
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.config_entry_oauth2_flow import (
    ImplementationUnavailableError,
@@ -80,6 +82,46 @@ async def test_setup_entry_implementation_unavailable(
    assert mock_config_entry.state is ConfigEntryState.SETUP_RETRY


+@pytest.mark.usefixtures("mock_dropbox_client")
+@pytest.mark.parametrize(
+    "token",
+    [
+        {
+            "access_token": "mock-access-token",
+            "expires_at": 9_999_999_999,
+            "scope": " ".join(OAUTH2_SCOPES),
+        },
+        {
+            "access_token": "mock-access-token",
+            "refresh_token": "mock-refresh-token",
+            "expires_at": 9_999_999_999,
+            "scope": "account_info.read files.content.read files.content.write",
+        },
+    ],
+    ids=["missing_refresh_token", "missing_scope"],
+)
+async def test_setup_entry_triggers_reauth(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    token: dict[str, Any],
+) -> None:
+    """Test that a broken token triggers a reauth flow during setup."""
+    mock_config_entry.add_to_hass(hass)
+    hass.config_entries.async_update_entry(
+        mock_config_entry, data={**mock_config_entry.data, "token": token}
+    )
+
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
+
+    flows = hass.config_entries.flow.async_progress_by_handler(DOMAIN)
+    assert len(flows) == 1
+    assert flows[0]["context"]["source"] == SOURCE_REAUTH
+    assert flows[0]["context"]["entry_id"] == mock_config_entry.entry_id
+
+
@pytest.mark.usefixtures("mock_dropbox_client")
 async def test_unload_entry(
    hass: HomeAssistant,
@@ -35,7 +35,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'aa:bb:cc:dd:ee:ff_113_humidity',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.bathroom_rh_humidity-state]
@@ -44,7 +44,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Bathroom RH Humidity',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.bathroom_rh_humidity',
@@ -90,7 +90,7 @@
    'supported_features': 0,
    'translation_key': 'iaq_rh',
    'unique_id': 'aa:bb:cc:dd:ee:ff_113_iaq_rh',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.bathroom_rh_humidity_air_quality_index-state]
@@ -98,7 +98,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Bathroom RH Humidity air quality index',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.bathroom_rh_humidity_air_quality_index',
@@ -144,7 +144,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'aa:bb:cc:dd:ee:ff_60_humidity',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.bedroom_valve_humidity-state]
@@ -153,7 +153,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Bedroom valve Humidity',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.bedroom_valve_humidity',
@@ -199,7 +199,7 @@
    'supported_features': 0,
    'translation_key': 'iaq_rh',
    'unique_id': 'aa:bb:cc:dd:ee:ff_60_iaq_rh',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.bedroom_valve_humidity_air_quality_index-state]
@@ -207,7 +207,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Bedroom valve Humidity air quality index',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.bedroom_valve_humidity_air_quality_index',
@@ -253,7 +253,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'aa:bb:cc:dd:ee:ff_61_co2',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.hall_valve_carbon_dioxide-state]
@@ -262,7 +262,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Hall valve Carbon dioxide',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'ppm',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.hall_valve_carbon_dioxide',
@@ -308,7 +308,7 @@
    'supported_features': 0,
    'translation_key': 'iaq_co2',
    'unique_id': 'aa:bb:cc:dd:ee:ff_61_iaq_co2',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.hall_valve_co2_air_quality_index-state]
@@ -316,7 +316,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Hall valve CO2 air quality index',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.hall_valve_co2_air_quality_index',
@@ -362,7 +362,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'aa:bb:cc:dd:ee:ff_50_humidity',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.kitchen_rh_humidity-state]
@@ -371,7 +371,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Kitchen RH Humidity',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.kitchen_rh_humidity',
@@ -417,7 +417,7 @@
    'supported_features': 0,
    'translation_key': 'iaq_rh',
    'unique_id': 'aa:bb:cc:dd:ee:ff_50_iaq_rh',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.kitchen_rh_humidity_air_quality_index-state]
@@ -425,7 +425,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Kitchen RH Humidity air quality index',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.kitchen_rh_humidity_air_quality_index',
@@ -635,7 +635,7 @@
    'supported_features': 0,
    'translation_key': 'target_flow_level',
    'unique_id': 'aa:bb:cc:dd:ee:ff_1_target_flow_level',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.living_target_flow_level-state]
@@ -643,7 +643,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Living Target flow level',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.living_target_flow_level',
@@ -781,7 +781,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'aa:bb:cc:dd:ee:ff_2_co2',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.office_co2_carbon_dioxide-state]
@@ -790,7 +790,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Office CO2 Carbon dioxide',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'ppm',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.office_co2_carbon_dioxide',
@@ -836,7 +836,7 @@
    'supported_features': 0,
    'translation_key': 'iaq_co2',
    'unique_id': 'aa:bb:cc:dd:ee:ff_2_iaq_co2',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.office_co2_co2_air_quality_index-state]
@@ -844,7 +844,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Office CO2 CO2 air quality index',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.office_co2_co2_air_quality_index',
@@ -890,7 +890,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'aa:bb:cc:dd:ee:ff_62_co2',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.study_valve_carbon_dioxide-state]
@@ -899,7 +899,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Study valve Carbon dioxide',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'ppm',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.study_valve_carbon_dioxide',
@@ -945,7 +945,7 @@
    'supported_features': 0,
    'translation_key': 'iaq_co2',
    'unique_id': 'aa:bb:cc:dd:ee:ff_62_iaq_co2',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.study_valve_co2_air_quality_index-state]
@@ -953,7 +953,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Study valve CO2 air quality index',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.study_valve_co2_air_quality_index',
@@ -999,7 +999,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'aa:bb:cc:dd:ee:ff_62_humidity',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.study_valve_humidity-state]
@@ -1008,7 +1008,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Study valve Humidity',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.study_valve_humidity',
@@ -1054,7 +1054,7 @@
    'supported_features': 0,
    'translation_key': 'iaq_rh',
    'unique_id': 'aa:bb:cc:dd:ee:ff_62_iaq_rh',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor_entities_state[sensor.study_valve_humidity_air_quality_index-state]
@@ -1062,7 +1062,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Study valve Humidity air quality index',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.study_valve_humidity_air_quality_index',
@@ -325,13 +325,13 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_32896_32900',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Airversa AP2 1808 Filter lifetime',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.airversa_ap2_1808_filter_lifetime',
            'state': '100.0',
@@ -373,14 +373,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_2576_2580',
-            'unit_of_measurement': 'μg/m³',
+            'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'pm25',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Airversa AP2 1808 PM2.5 Density',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'μg/m³',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
            }),
            'entity_id': 'sensor.airversa_ap2_1808_pm2_5_density',
            'state': '3.0',
@@ -930,7 +930,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4_101',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -938,7 +938,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'eufyCam2-0000 Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery-20',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.eufycam2_0000_battery',
            'state': '17',
@@ -1192,7 +1192,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_2_101',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -1200,7 +1200,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'eufyCam2-000A Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery-40',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.eufycam2_000a_battery',
            'state': '38',
@@ -1454,7 +1454,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_3_101',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -1462,7 +1462,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'eufyCam2-000A Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery-alert',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.eufycam2_000a_battery_2',
            'state': '100',
@@ -1898,7 +1898,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_33_5',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -1906,7 +1906,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Contact Sensor Battery Sensor',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.contact_sensor_battery_sensor',
            'state': '100',
@@ -2321,7 +2321,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_5',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -2329,7 +2329,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Programmable Switch Battery Sensor',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.programmable_switch_battery_sensor',
            'state': '100',
@@ -2655,7 +2655,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_700',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -2663,7 +2663,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'ArloBabyA0 Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery-80',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.arlobabya0_battery',
            'state': '82',
@@ -2705,14 +2705,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_900',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'ArloBabyA0 Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.arlobabya0_humidity',
            'state': '60.099998',
@@ -3950,14 +3950,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_16_24',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'HomeW Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.homew_current_humidity',
            'state': '34',
@@ -4573,7 +4573,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4295608960_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -4581,7 +4581,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Basement Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.basement_battery',
            'state': '100',
@@ -4888,7 +4888,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4298360914_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -4896,7 +4896,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Basement Window 1 Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.basement_window_1_battery',
            'state': '100',
@@ -5151,7 +5151,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4298360921_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -5159,7 +5159,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Deck Door Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.deck_door_battery',
            'state': '100',
@@ -5414,7 +5414,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4298527970_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -5422,7 +5422,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Front Door Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.front_door_battery',
            'state': '100',
@@ -5677,7 +5677,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4298527962_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -5685,7 +5685,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Garage Door Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.garage_door_battery',
            'state': '100',
@@ -5895,7 +5895,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4295016858_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -5903,7 +5903,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Living Room Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.living_room_battery',
            'state': '100',
@@ -6210,7 +6210,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4298360712_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -6218,7 +6218,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Living Room Window 1 Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.living_room_window_1_battery',
            'state': '100',
@@ -6473,7 +6473,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4298649931_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -6481,7 +6481,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Loft window Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.loft_window_battery',
            'state': '100',
@@ -6691,7 +6691,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4295608971_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -6699,7 +6699,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Master BR Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.master_br_battery',
            'state': '100',
@@ -7006,7 +7006,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4298584118_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -7014,7 +7014,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Master BR Window Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.master_br_window_battery',
            'state': '100',
@@ -7363,14 +7363,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_16_24',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Thermostat Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.thermostat_current_humidity',
            'state': '45.0',
@@ -7632,7 +7632,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4295016969_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -7640,7 +7640,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Upstairs BR Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.upstairs_br_battery',
            'state': '100',
@@ -7947,7 +7947,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4298568508_192',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -7955,7 +7955,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Upstairs BR Window Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.upstairs_br_window_battery',
            'state': '100',
@@ -8394,14 +8394,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_16_24',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'HomeW Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.homew_current_humidity',
            'state': '34',
@@ -8826,14 +8826,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_16_24',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'HomeW Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.homew_current_humidity',
            'state': '34',
@@ -9683,14 +9683,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_16_24',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'My ecobee Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.my_ecobee_current_humidity',
            'state': '55.0',
@@ -10341,7 +10341,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_17',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -10349,7 +10349,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Eve Degree AA11 Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery-60',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.eve_degree_aa11_battery',
            'state': '65',
@@ -10391,14 +10391,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_27',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Eve Degree AA11 Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.eve_degree_aa11_humidity',
            'state': '59.4818115234375',
@@ -11350,7 +11350,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_123016423_162',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -11358,7 +11358,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Family Room North Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.family_room_north_battery',
            'state': '100',
@@ -11603,7 +11603,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_878448248_9',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -11611,7 +11611,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Kitchen Window Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.kitchen_window_battery',
            'state': '100',
@@ -12255,14 +12255,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1233851541_169_180',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: '89 Living Room Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.89_living_room_current_humidity',
            'state': '60',
@@ -12648,7 +12648,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_3982136094_604',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -12656,7 +12656,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Laundry Smoke ED78 Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.laundry_smoke_ed78_battery',
            'state': '100',
@@ -12827,7 +12827,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_123016423_162',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -12835,7 +12835,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Family Room North Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.family_room_north_battery',
            'state': '100',
@@ -13080,7 +13080,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_878448248_9',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -13088,7 +13088,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Kitchen Window Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.kitchen_window_battery',
            'state': '100',
@@ -13957,14 +13957,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1233851541_169_180',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: '89 Living Room Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.89_living_room_current_humidity',
            'state': '60',
@@ -14358,14 +14358,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_293334836_8_9',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Humidifier 182A Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.humidifier_182a_current_humidity',
            'state': '0',
@@ -14629,14 +14629,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_293334836_8_9',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Humidifier 182A Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.humidifier_182a_current_humidity',
            'state': '0',
@@ -14902,7 +14902,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_3982136094_604',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -14910,7 +14910,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Laundry Smoke ED78 Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.laundry_smoke_ed78_battery',
            'state': '100',
@@ -16320,7 +16320,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_6623462389072572_644245094400',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -16328,7 +16328,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Hue dimmer switch Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.hue_dimmer_switch_battery',
            'state': '100',
@@ -18122,14 +18122,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_100_107',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Lennox Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.lennox_current_humidity',
            'state': '34',
@@ -19321,14 +19321,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_20_27',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mysa-85dda9 Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.mysa_85dda9_current_humidity',
            'state': '40',
@@ -20323,14 +20323,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_10',
-            'unit_of_measurement': 'ppm',
+            'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Healthy Home Coach Carbon Dioxide sensor',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'ppm',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
            }),
            'entity_id': 'sensor.healthy_home_coach_carbon_dioxide_sensor',
            'state': '804',
@@ -20372,14 +20372,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_14',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Healthy Home Coach Humidity sensor',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.healthy_home_coach_humidity_sensor',
            'state': '59',
@@ -21112,7 +21112,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_2_64',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -21120,7 +21120,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Master Bath South RYSE Shade Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.master_bath_south_ryse_shade_battery',
            'state': '100',
@@ -21365,7 +21365,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_3_64',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -21373,7 +21373,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'RYSE SmartShade RYSE Shade Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.ryse_smartshade_ryse_shade_battery',
            'state': '100',
@@ -21544,7 +21544,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_4_64',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -21552,7 +21552,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'BR Left RYSE Shade Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.br_left_ryse_shade_battery',
            'state': '100',
@@ -21719,7 +21719,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_2_64',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -21727,7 +21727,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'LR Left RYSE Shade Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery-90',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.lr_left_ryse_shade_battery',
            'state': '89',
@@ -21894,7 +21894,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_3_64',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -21902,7 +21902,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'LR Right RYSE Shade Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.lr_right_ryse_shade_battery',
            'state': '100',
@@ -22147,7 +22147,7 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_5_64',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
@@ -22155,7 +22155,7 @@
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'RZSS RYSE Shade Battery',
              <EntityStateAttribute.ICON: 'icon'>: 'mdi:battery-alert',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.rzss_ryse_shade_battery',
            'state': '0',
@@ -23151,14 +23151,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_14',
-            'unit_of_measurement': 'ppm',
+            'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'VELUX Sensor Carbon Dioxide sensor',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'ppm',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
            }),
            'entity_id': 'sensor.velux_sensor_carbon_dioxide_sensor',
            'state': '1124.0',
@@ -23200,14 +23200,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_11',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'VELUX Sensor Humidity sensor',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.velux_sensor_humidity_sensor',
            'state': '69.0',
@@ -23461,14 +23461,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_2_14',
-            'unit_of_measurement': 'ppm',
+            'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'VELUX Sensor Carbon Dioxide sensor',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'ppm',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
            }),
            'entity_id': 'sensor.velux_sensor_carbon_dioxide_sensor',
            'state': '400',
@@ -23510,14 +23510,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_2_11',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'VELUX Sensor Humidity sensor',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.velux_sensor_humidity_sensor',
            'state': '58',
@@ -24267,14 +24267,14 @@
            'supported_features': 0,
            'translation_key': None,
            'unique_id': '00:00:00:00:00:00_1_30_33',
-            'unit_of_measurement': '%',
+            'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
          }),
          'state': dict({
            'attributes': dict({
              <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
              <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'VOCOlinc-Flowerbud-0d324b Current Humidity',
              <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+              <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
            }),
            'entity_id': 'sensor.vocolinc_flowerbud_0d324b_current_humidity',
            'state': '45.0',
@@ -0,0 +1 @@
+"""Tests for the Local Timer list integration."""
@@ -0,0 +1,28 @@
+"""Test the Local Timer list config flow."""
+
+from homeassistant.components.local_timer_list.const import CONF_TIMER_LIST_NAME, DOMAIN
+from homeassistant.config_entries import SOURCE_USER
+from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResultType
+
+
+async def test_user_flow_creates_entity(hass: HomeAssistant) -> None:
+    """Test the user config flow creates an entry and a named timer list entity."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"], {CONF_TIMER_LIST_NAME: "Kitchen"}
+    )
+    await hass.async_block_till_done()
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["title"] == "Kitchen"
+    assert result["data"] == {CONF_TIMER_LIST_NAME: "Kitchen"}
+
+    state = hass.states.get("timer_list.kitchen")
+    assert state is not None
+    assert state.state == "0"
@@ -151,7 +151,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'be37ca9c47c24498a38bc62c7c711840-sensor2-air_humidity',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_setup[sensor.test_sensor_2-state]
@@ -160,7 +160,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Test Sensor 2',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.test_sensor_2',
@@ -14,7 +14,7 @@
    'device_id': <ANY>,
    'disabled_by': None,
    'domain': 'sensor',
-    'entity_category': None,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
    'entity_id': 'sensor.mealie_categories',
    'has_entity_name': True,
    'hidden_by': None,
@@ -68,7 +68,7 @@
    'device_id': <ANY>,
    'disabled_by': None,
    'domain': 'sensor',
-    'entity_category': None,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
    'entity_id': 'sensor.mealie_recipes',
    'has_entity_name': True,
    'hidden_by': None,
@@ -122,7 +122,7 @@
    'device_id': <ANY>,
    'disabled_by': None,
    'domain': 'sensor',
-    'entity_category': None,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
    'entity_id': 'sensor.mealie_tags',
    'has_entity_name': True,
    'hidden_by': None,
@@ -176,7 +176,7 @@
    'device_id': <ANY>,
    'disabled_by': None,
    'domain': 'sensor',
-    'entity_category': None,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
    'entity_id': 'sensor.mealie_tools',
    'has_entity_name': True,
    'hidden_by': None,
@@ -230,7 +230,7 @@
    'device_id': <ANY>,
    'disabled_by': None,
    'domain': 'sensor',
-    'entity_category': None,
+    'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
    'entity_id': 'sensor.mealie_users',
    'has_entity_name': True,
    'hidden_by': None,
@@ -80,6 +80,29 @@ async def test_missing_sensor_graceful_handling(
    assert state.state == "Charging"


+async def test_websocket_callback_updates_entities(
+    hass: HomeAssistant,
+    mock_config_entry: MockConfigEntry,
+    mock_charger: MagicMock,
+) -> None:
+    """Test the websocket callback pushes updates to entity state."""
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.openevse_mock_config_charging_status")
+    assert state
+    assert state.state == "Charging"
+
+    mock_charger.status = "Sleeping"
+    await mock_charger.callback()
+    await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.openevse_mock_config_charging_status")
+    assert state
+    assert state.state == "Sleeping"
+
+
 async def test_sensor_unavailable_on_coordinator_timeout(
    hass: HomeAssistant,
    mock_config_entry: MockConfigEntry,
@@ -203,7 +203,7 @@
    'supported_features': 0,
    'translation_key': 'cpu_usage_total',
    'unique_id': 'portainer_test_entry_123_dashy_dashy.1.qgza68hnz4n1qvyz3iohynx05_cpu_usage_total',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.dashy_dashy_1_qgza68hnz4n1qvyz3iohynx05_cpu_usage_total-state]
@@ -211,7 +211,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'dashy_dashy.1.qgza68hnz4n1qvyz3iohynx05 CPU usage total',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.dashy_dashy_1_qgza68hnz4n1qvyz3iohynx05_cpu_usage_total',
@@ -432,7 +432,7 @@
    'supported_features': 0,
    'translation_key': 'memory_usage_percentage',
    'unique_id': 'portainer_test_entry_123_dashy_dashy.1.qgza68hnz4n1qvyz3iohynx05_memory_usage_percentage',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.dashy_dashy_1_qgza68hnz4n1qvyz3iohynx05_memory_usage_percentage-state]
@@ -440,7 +440,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'dashy_dashy.1.qgza68hnz4n1qvyz3iohynx05 Memory usage percentage',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.dashy_dashy_1_qgza68hnz4n1qvyz3iohynx05_memory_usage_percentage',
@@ -730,7 +730,7 @@
    'supported_features': 0,
    'translation_key': 'cpu_usage_total',
    'unique_id': 'portainer_test_entry_123_focused_einstein_cpu_usage_total',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.focused_einstein_cpu_usage_total-state]
@@ -738,7 +738,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'focused_einstein CPU usage total',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.focused_einstein_cpu_usage_total',
@@ -959,7 +959,7 @@
    'supported_features': 0,
    'translation_key': 'memory_usage_percentage',
    'unique_id': 'portainer_test_entry_123_focused_einstein_memory_usage_percentage',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.focused_einstein_memory_usage_percentage-state]
@@ -967,7 +967,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'focused_einstein Memory usage percentage',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.focused_einstein_memory_usage_percentage',
@@ -1084,7 +1084,7 @@
    'supported_features': 0,
    'translation_key': 'cpu_usage_total',
    'unique_id': 'portainer_test_entry_123_funny_chatelet_cpu_usage_total',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.funny_chatelet_cpu_usage_total-state]
@@ -1092,7 +1092,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'funny_chatelet CPU usage total',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.funny_chatelet_cpu_usage_total',
@@ -1313,7 +1313,7 @@
    'supported_features': 0,
    'translation_key': 'memory_usage_percentage',
    'unique_id': 'portainer_test_entry_123_funny_chatelet_memory_usage_percentage',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.funny_chatelet_memory_usage_percentage-state]
@@ -1321,7 +1321,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'funny_chatelet Memory usage percentage',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.funny_chatelet_memory_usage_percentage',
@@ -2533,7 +2533,7 @@
    'supported_features': 0,
    'translation_key': 'cpu_usage_total',
    'unique_id': 'portainer_test_entry_123_practical_morse_cpu_usage_total',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.practical_morse_cpu_usage_total-state]
@@ -2541,7 +2541,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'practical_morse CPU usage total',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.practical_morse_cpu_usage_total',
@@ -2762,7 +2762,7 @@
    'supported_features': 0,
    'translation_key': 'memory_usage_percentage',
    'unique_id': 'portainer_test_entry_123_practical_morse_memory_usage_percentage',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.practical_morse_memory_usage_percentage-state]
@@ -2770,7 +2770,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'practical_morse Memory usage percentage',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.practical_morse_memory_usage_percentage',
@@ -2887,7 +2887,7 @@
    'supported_features': 0,
    'translation_key': 'cpu_usage_total',
    'unique_id': 'portainer_test_entry_123_serene_banach_cpu_usage_total',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.serene_banach_cpu_usage_total-state]
@@ -2895,7 +2895,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'serene_banach CPU usage total',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.serene_banach_cpu_usage_total',
@@ -3116,7 +3116,7 @@
    'supported_features': 0,
    'translation_key': 'memory_usage_percentage',
    'unique_id': 'portainer_test_entry_123_serene_banach_memory_usage_percentage',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.serene_banach_memory_usage_percentage-state]
@@ -3124,7 +3124,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'serene_banach Memory usage percentage',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.serene_banach_memory_usage_percentage',
@@ -3241,7 +3241,7 @@
    'supported_features': 0,
    'translation_key': 'cpu_usage_total',
    'unique_id': 'portainer_test_entry_123_stoic_turing_cpu_usage_total',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.stoic_turing_cpu_usage_total-state]
@@ -3249,7 +3249,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'stoic_turing CPU usage total',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.stoic_turing_cpu_usage_total',
@@ -3470,7 +3470,7 @@
    'supported_features': 0,
    'translation_key': 'memory_usage_percentage',
    'unique_id': 'portainer_test_entry_123_stoic_turing_memory_usage_percentage',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_all_entities[sensor.stoic_turing_memory_usage_percentage-state]
@@ -3478,7 +3478,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'stoic_turing Memory usage percentage',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.stoic_turing_memory_usage_percentage',
@@ -267,7 +267,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'ctd_000001_94-1',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor[sensor.kitchen_vochtigheid_keuken-state]
@@ -276,7 +276,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Vochtigheid Keuken',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.kitchen_vochtigheid_keuken',
@@ -441,7 +441,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'ctd_000001_224',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensor[sensor.luchtsensor-state]
@@ -450,7 +450,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Luchtsensor',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'ppm',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.luchtsensor',
@@ -615,7 +615,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': 'ctd_000001_82',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensor[sensor.tuin_luchtkwaliteit-state]
@@ -624,7 +624,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Luchtkwaliteit',
      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'ppm',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.tuin_luchtkwaliteit',
@@ -4765,3 +4765,46 @@ async def test_import_statistics_with_last_reset(
            },
        ]
    }
+
+
+async def test_entity_options_ws(
+    hass: HomeAssistant,
+    async_setup_recorder_instance: RecorderInstanceGenerator,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test recorder entity options WS commands."""
+    client = await hass_ws_client()
+
+    await async_setup_recorder_instance(hass, {"exclude": {"domains": "test2"}})
+
+    # Test getting a single entity's settings
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/entity_options/get",
+            "entity_id": "test.recorder",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {"recording_disabled_by": None}
+
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/entity_options/get",
+            "entity_id": "test2.recorder",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {"recording_disabled_by": "user"}
+
+    # Test getting settings for an unknown entity
+    await client.send_json_auto_id(
+        {
+            "type": "recorder/entity_options/get",
+            "entity_id": "unknown.entity",
+        }
+    )
+    response = await client.receive_json()
+    assert response["success"]
+    assert response["result"] == {"recording_disabled_by": None}
@@ -318,6 +318,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -359,6 +360,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -1143,6 +1145,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -1184,6 +1187,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -2411,6 +2415,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -2452,6 +2457,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -3400,6 +3406,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -3441,6 +3448,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -4273,6 +4281,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -4314,6 +4323,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -5088,6 +5098,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -5129,6 +5140,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -5971,6 +5983,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -6012,6 +6025,7 @@
      <SensorEntityCapabilityAttribute.OPTIONS: 'options'>: list([
        'always',
        'delayed',
+        'delegated',
        'scheduled',
      ]),
    }),
@@ -20,6 +20,7 @@ def mock_config_entry() -> MockConfigEntry:
        data=CONF_DATA,
        options=CONF_OPTIONS,
        unique_id=ACCOUNT_1,
+        version=2,
    )


--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Hansen	1993031364	Update bootstrap snapshot for timer_list base platform timer_list is a base platform, so it is set up by default with the other base platforms and now appears in the bootstrap components snapshot. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-25 15:13:02 -05:00
Michael Hansen	fdd5da3f3b	Add timer_list integration A timer_list entity holds many in-memory countdown timers (its items), mirroring how a to-do list holds many to-do items; its state is the number of active timers. Adds the base entity platform with start/pause/unpause/ cancel/add_time/remove_time/clear/get services, automation triggers (timer_started/updated/finished/cancelled), and a websocket subscribe command. Also adds a local_timer_list helper so timer lists can be created from the UI. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-25 14:25:48 -05: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
				`@@ -0,0 +1 @@`
				`"""Tests for the Local Timer list integration."""`