Merge branch 'dev' into llm-integration

Bump uiprotect to 15.1.0 (#174846 )
Bump aioamazondevices to 14.1.6 (#174848 )
2026-06-27 09:05:47 +02:00 · 2026-06-25 22:29:58 -04:00 · 2026-06-25 22:27:17 -04:00 · 2026-06-25 22:26:39 -04:00 · 2026-06-25 22:25:47 -04:00 · 2026-06-25 22:25:28 -04:00
117 changed files with 2308 additions and 1166 deletions
@@ -95,6 +95,7 @@ components: &components
  - homeassistant/components/input_select/**
  - homeassistant/components/input_text/**
  - homeassistant/components/labs/**
+  - homeassistant/components/llm/**
  - homeassistant/components/logbook/**
  - homeassistant/components/logger/**
  - homeassistant/components/lovelace/**
@@ -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
@@ -1027,6 +1027,8 @@ CLAUDE.md @home-assistant/core
 /tests/components/litterrobot/ @natekspencer @tkdrob
 /homeassistant/components/livisi/ @StefanIacobLivisi @planbnet
 /tests/components/livisi/ @StefanIacobLivisi @planbnet
+/homeassistant/components/llm/ @home-assistant/core
+/tests/components/llm/ @home-assistant/core
 /homeassistant/components/local_calendar/ @allenporter
 /tests/components/local_calendar/ @allenporter
 /homeassistant/components/local_ip/ @issacg
@@ -11,10 +11,10 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
    CONF_NAME,
-    PERCENTAGE,
+    UnitOfDensity,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -76,14 +76,14 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_PM1,
        device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
    ),
    AirlySensorEntityDescription(
        key=ATTR_API_PM25,
        device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -94,7 +94,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_PM10,
        device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -105,7 +105,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_HUMIDITY,
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=1,
    ),
@@ -126,7 +126,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_CO,
        device_class=SensorDeviceClass.CO,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -137,7 +137,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_NO2,
        device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -148,7 +148,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_SO2,
        device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -159,7 +159,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_O3,
        device_class=SensorDeviceClass.OZONE,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["aioamazondevices"],
  "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==14.1.3"]
+  "requirements": ["aioamazondevices==14.1.6"]
 }
@@ -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,
@@ -17,7 +17,7 @@
  "mqtt": ["esphome/discover/#"],
  "quality_scale": "platinum",
  "requirements": [
-    "aioesphomeapi==45.3.1",
+    "aioesphomeapi==45.5.2",
    "esphome-dashboard-api==1.3.0",
    "bleak-esphome==3.9.4"
  ],
@@ -21,5 +21,5 @@
  "integration_type": "system",
  "preview_features": { "winter_mode": {} },
  "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20260624.0"]
+  "requirements": ["home-assistant-frontend==20260624.1"]
 }
@@ -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,79 @@
+"""The LLM integration.
+
+Owns the LLM tools platform: integrations contribute tools to the LLM APIs
+through an ``<integration>/llm.py`` platform with an ``async_get_tools`` hook.
+The platforms are loaded lazily and queried per request. The framework
+(``Tool``, the APIs) lives in ``homeassistant.helpers.llm``.
+"""
+
+from dataclasses import dataclass
+import logging
+from typing import Protocol
+
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.integration_platform import LazyIntegrationPlatforms
+from homeassistant.helpers.llm import LLMContext, Tool
+from homeassistant.helpers.typing import ConfigType
+from homeassistant.util.hass_dict import HassKey
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
+DATA_PLATFORMS: HassKey[LazyIntegrationPlatforms[LLMToolsPlatformProtocol]] = HassKey(
+    "llm_platforms"
+)
+
+
+@dataclass(slots=True)
+class LLMTools:
+    """Tools and an optional prompt fragment contributed by a platform."""
+
+    tools: list[Tool]
+    prompt: str | None = None
+
+
+class LLMToolsPlatformProtocol(Protocol):
+    """Define the format that LLM tools platforms can have."""
+
+    @callback
+    def async_get_tools(self, hass: HomeAssistant, llm_context: LLMContext) -> LLMTools:
+        """Return the integration's LLM tools for the given context."""
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the LLM integration."""
+    hass.data[DATA_PLATFORMS] = LazyIntegrationPlatforms(
+        hass, DOMAIN, _process_llm_tools_platform
+    )
+    return True
+
+
+@callback
+def _process_llm_tools_platform(
+    hass: HomeAssistant, domain: str, platform: LLMToolsPlatformProtocol
+) -> LLMToolsPlatformProtocol:
+    """Process an integration's LLM tools platform."""
+    return platform
+
+
+async def async_get_tools(hass: HomeAssistant, llm_context: LLMContext) -> LLMTools:
+    """Return the tools and merged prompt from all integration platforms."""
+    platforms = await hass.data[DATA_PLATFORMS].async_get_platforms()
+
+    tools: list[Tool] = []
+    prompts: list[str] = []
+    # Sort by domain so the tool and prompt order is independent of load order.
+    for domain, platform in sorted(platforms.items()):
+        try:
+            result = platform.async_get_tools(hass, llm_context)
+        except Exception:
+            _LOGGER.exception("Error getting tools from LLM platform %s", domain)
+            continue
+        tools.extend(result.tools)
+        if result.prompt:
+            prompts.append(result.prompt)
+    return LLMTools(tools=tools, prompt="\n".join(prompts) if prompts else None)
@@ -0,0 +1,3 @@
+"""Constants for the LLM integration."""
+
+DOMAIN = "llm"
@@ -0,0 +1,9 @@
+{
+  "domain": "llm",
+  "name": "LLM",
+  "codeowners": ["@home-assistant/core"],
+  "documentation": "https://www.home-assistant.io/integrations/llm",
+  "integration_type": "system",
+  "iot_class": "calculated",
+  "quality_scale": "internal"
+}
@@ -12,11 +12,9 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -32,7 +30,7 @@ SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
    SensorType.AIR_HUMIDITY: SensorEntityDescription(
        key="air_humidity",
        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorType.AIR_PRESSURE: SensorEntityDescription(
@@ -49,7 +47,7 @@ SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
    SensorType.ECO2: SensorEntityDescription(
        key="eco2",
        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
    ),
    SensorType.LIGHT: SensorEntityDescription(
@@ -67,7 +65,7 @@ SENSOR_TYPES: Final[dict[str, SensorEntityDescription]] = {
    SensorType.VOC: SensorEntityDescription(
        key="voc",
        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
        state_class=SensorStateClass.MEASUREMENT,
    ),
 }
@@ -22,20 +22,19 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    REVOLUTIONS_PER_MINUTE,
    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
    EntityCategory,
    Platform,
    UnitOfApparentPower,
+    UnitOfDensity,
    UnitOfElectricCurrent,
    UnitOfElectricPotential,
    UnitOfEnergy,
    UnitOfPower,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfReactivePower,
    UnitOfTemperature,
    UnitOfTime,
@@ -444,7 +443,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="HumiditySensor",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            device_class=SensorDeviceClass.HUMIDITY,
            device_to_ha=lambda x: x / HUMIDITY_SCALING_FACTOR,
            state_class=SensorStateClass.MEASUREMENT,
@@ -459,7 +458,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="SoilMoistureSensor",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            device_class=SensorDeviceClass.MOISTURE,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -484,7 +483,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="PowerSource",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            device_class=SensorDeviceClass.BATTERY,
            entity_category=EntityCategory.DIAGNOSTIC,
            # value has double precision
@@ -625,7 +624,7 @@ DISCOVERY_SCHEMAS = [
        entity_description=MatterSensorEntityDescription(
            key="EveThermoValvePosition",
            translation_key="valve_position",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        ),
        entity_class=MatterSensor,
        required_attributes=(EveCluster.Attributes.ValvePosition,),
@@ -658,7 +657,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="CarbonDioxideSensor",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
            device_class=SensorDeviceClass.CO2,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -671,7 +670,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="TotalVolatileOrganicCompoundsSensor",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
            device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -699,7 +698,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="PM1Sensor",
-            native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
            device_class=SensorDeviceClass.PM1,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -712,7 +711,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="PM25Sensor",
-            native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
            device_class=SensorDeviceClass.PM25,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -725,7 +724,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="PM10Sensor",
-            native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
            device_class=SensorDeviceClass.PM10,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -750,7 +749,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="CarbonMonoxideSensor",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
            device_class=SensorDeviceClass.CO,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -763,7 +762,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="NitrogenDioxideSensor",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
            device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -776,7 +775,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="OzoneConcentrationSensor",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
            device_class=SensorDeviceClass.OZONE,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -802,7 +801,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="HepaFilterCondition",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            state_class=SensorStateClass.MEASUREMENT,
            translation_key="hepa_filter_condition",
        ),
@@ -813,7 +812,7 @@ DISCOVERY_SCHEMAS = [
        platform=Platform.SENSOR,
        entity_description=MatterSensorEntityDescription(
            key="ActivatedCarbonFilterCondition",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            state_class=SensorStateClass.MEASUREMENT,
            translation_key="activated_carbon_filter_condition",
        ),
@@ -1297,7 +1296,7 @@ DISCOVERY_SCHEMAS = [
        entity_description=MatterSensorEntityDescription(
            key="ThermostatPIHeatingDemand",
            translation_key="pi_heating_demand",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            entity_category=EntityCategory.DIAGNOSTIC,
        ),
        entity_class=MatterSensor,
@@ -1379,7 +1378,7 @@ DISCOVERY_SCHEMAS = [
            entity_registry_enabled_default=False,
            translation_key="window_covering_target_position",
            device_to_ha=lambda x: round((10000 - x) / 100),
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        ),
        entity_class=MatterSensor,
        required_attributes=(
@@ -1464,7 +1463,7 @@ DISCOVERY_SCHEMAS = [
        entity_description=MatterSensorEntityDescription(
            key="EnergyEvseStateOfCharge",
            translation_key="evse_soc",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            device_class=SensorDeviceClass.BATTERY,
            state_class=SensorStateClass.MEASUREMENT,
        ),
@@ -1488,7 +1487,7 @@ DISCOVERY_SCHEMAS = [
        entity_description=MatterSensorEntityDescription(
            key="WaterHeaterManagementTankPercentage",
            translation_key="tank_percentage",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
            state_class=SensorStateClass.MEASUREMENT,
        ),
        entity_class=MatterSensor,
@@ -11,6 +11,7 @@ from homeassistant.components.sensor import (
    SensorEntityDescription,
    SensorStateClass,
 )
+from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
@@ -73,6 +74,7 @@ async def async_setup_entry(
 class MealieStatisticSensors(MealieEntity, SensorEntity):
    """Defines a Mealie sensor."""

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

@@ -1,21 +0,0 @@
-"""Support for Mycroft AI."""
-
-import voluptuous as vol
-
-from homeassistant.const import CONF_HOST, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv, discovery
-from homeassistant.helpers.typing import ConfigType
-
-DOMAIN = "mycroft"
-
-CONFIG_SCHEMA = vol.Schema(
-    {DOMAIN: vol.Schema({vol.Required(CONF_HOST): cv.string})}, extra=vol.ALLOW_EXTRA
-)
-
-
-def setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Mycroft component."""
-    hass.data[DOMAIN] = config[DOMAIN][CONF_HOST]
-    discovery.load_platform(hass, Platform.NOTIFY, DOMAIN, {}, config)
-    return True
@@ -1,11 +0,0 @@
-{
-  "domain": "mycroft",
-  "name": "Mycroft",
-  "codeowners": [],
-  "disabled": "Dependencies not compatible with the new pip resolver",
-  "documentation": "https://www.home-assistant.io/integrations/mycroft",
-  "iot_class": "local_push",
-  "loggers": ["mycroftapi"],
-  "quality_scale": "legacy",
-  "requirements": ["mycroftapi==2.0"]
-}
@@ -1,42 +0,0 @@
-"""Mycroft AI notification platform."""
-
-import logging
-from typing import Any, override
-
-from mycroftapi import MycroftAPI
-
-from homeassistant.components.notify import BaseNotificationService
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-
-from . import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def get_service(
-    hass: HomeAssistant,
-    config: ConfigType,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> MycroftNotificationService:
-    """Get the Mycroft notification service."""
-    return MycroftNotificationService(hass.data[DOMAIN])
-
-
-class MycroftNotificationService(BaseNotificationService):
-    """The Mycroft Notification Service."""
-
-    def __init__(self, mycroft_ip: str) -> None:
-        """Initialize the service."""
-        self.mycroft_ip = mycroft_ip
-
-    @override
-    def send_message(self, message: str = "", **kwargs: Any) -> None:
-        """Send a message mycroft to speak on instance."""
-
-        text = message
-        mycroft = MycroftAPI(self.mycroft_ip)
-        if mycroft is not None:
-            mycroft.speak_text(text)
-        else:
-            _LOGGER.warning("Could not reach this instance of mycroft")
@@ -15,16 +15,29 @@ from homeassistant.const import (
    CONF_PASSWORD,
    CONF_USERNAME,
 )
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.selector import (
+    TextSelector,
+    TextSelectorConfig,
+    TextSelectorType,
+)
 from homeassistant.helpers.service_info import zeroconf

 from .const import CONF_SERIAL, DOMAIN

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

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


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

@@ -122,7 +122,7 @@ CONTAINER_SENSORS: tuple[PortainerContainerSensorEntityDescription, ...] = (
            and data.stats.memory_stats.usage > 0
            else 0.0
        ),
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        entity_category=EntityCategory.DIAGNOSTIC,
        suggested_display_precision=2,
        state_class=SensorStateClass.MEASUREMENT,
@@ -151,7 +151,7 @@ CONTAINER_SENSORS: tuple[PortainerContainerSensorEntityDescription, ...] = (
            and data.stats.cpu_stats.online_cpus > 0
            else 0.0
        ),
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        entity_category=EntityCategory.DIAGNOSTIC,
        suggested_display_precision=2,
        state_class=SensorStateClass.MEASUREMENT,
@@ -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
@@ -85,34 +85,18 @@ def sun(
    has_sunrise_condition = SUN_EVENT_SUNRISE in (before, after)
    has_sunset_condition = SUN_EVENT_SUNSET in (before, after)

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

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

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

+    # "before: sunrise" combined with "after: sunset" describes the dark period
+    # around midnight, so it is evaluated as an OR (true before sunrise or after
+    # sunset) rather than the usual AND of the two bounds.
+    if before == SUN_EVENT_SUNRISE and after == SUN_EVENT_SUNSET:
+        wanted_time_before = cast(datetime, sunrise) + before_offset
+        condition_trace_update_result(wanted_time_before=wanted_time_before)
+        wanted_time_after = cast(datetime, sunset) + after_offset
+        condition_trace_update_result(wanted_time_after=wanted_time_after)
+        return utcnow < wanted_time_before or utcnow > wanted_time_after
+
    if before == SUN_EVENT_SUNRISE:
        wanted_time_before = cast(datetime, sunrise) + before_offset
        condition_trace_update_result(wanted_time_before=wanted_time_before)
@@ -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"
@@ -13,12 +13,7 @@ from homeassistant.components.sensor import (
    SensorEntityDescription,
    SensorStateClass,
 )
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    PERCENTAGE,
-    Platform,
-    UnitOfTime,
-)
+from homeassistant.const import Platform, UnitOfDensity, UnitOfRatio, UnitOfTime
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -62,7 +57,7 @@ SENSOR_DESCRIPTIONS_BATTERY: tuple[TradfriSensorEntityDescription, ...] = (
        key="battery_level",
        device_class=SensorDeviceClass.BATTERY,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        value=lambda device: cast(int, device.device_info.battery_level),
    ),
 )
@@ -73,7 +68,7 @@ SENSOR_DESCRIPTIONS_FAN: tuple[TradfriSensorEntityDescription, ...] = (
        key="aqi",
        translation_key="aqi",
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        value=_get_air_quality,
    ),
    TradfriSensorEntityDescription(
@@ -6,21 +6,18 @@ import logging

 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
    LIGHT_LUX,
-    PERCENTAGE,
    SIGNAL_STRENGTH_DECIBELS,
    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
    Platform,
    UnitOfConductivity,
+    UnitOfDensity,
    UnitOfElectricCurrent,
    UnitOfElectricPotential,
    UnitOfEnergy,
    UnitOfPower,
    UnitOfPressure,
+    UnitOfRatio,
    UnitOfTemperature,
    UnitOfVolume,
    UnitOfVolumetricFlux,
@@ -1023,7 +1020,7 @@ UNITS = (
        },
    ),
    UnitOfMeasurement(
-        unit=PERCENTAGE,
+        unit=UnitOfRatio.PERCENTAGE,
        aliases={"pct", "percent", "% RH"},
        device_classes={
            SensorDeviceClass.BATTERY,
@@ -1032,14 +1029,14 @@ UNITS = (
        },
    ),
    UnitOfMeasurement(
-        unit=CONCENTRATION_PARTS_PER_MILLION,
+        unit=UnitOfRatio.PARTS_PER_MILLION,
        device_classes={
            SensorDeviceClass.CO,
            SensorDeviceClass.CO2,
        },
    ),
    UnitOfMeasurement(
-        unit=CONCENTRATION_PARTS_PER_BILLION,
+        unit=UnitOfRatio.PARTS_PER_BILLION,
        device_classes={
            SensorDeviceClass.CO,
            SensorDeviceClass.CO2,
@@ -1086,7 +1083,7 @@ UNITS = (
        device_classes={SensorDeviceClass.ILLUMINANCE},
    ),
    UnitOfMeasurement(
-        unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        unit=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        # The μ-char has 2 unicode variants \u00b5 and \u03bc
        # The \u03bc variant (Greek Mu char) is recommended
        aliases={"ug/m3", "\u03bcg/m3", "\u00b5g/m3", "ug/m³"},
@@ -1103,7 +1100,7 @@ UNITS = (
        },
    ),
    UnitOfMeasurement(
-        unit=CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
+        unit=UnitOfDensity.MILLIGRAMS_PER_CUBIC_METER,
        aliases={"mg/m3"},
        device_classes={
            SensorDeviceClass.NITROGEN_DIOXIDE,
@@ -44,7 +44,7 @@
  "iot_class": "cloud_push",
  "loggers": ["tuya_sharing"],
  "requirements": [
-    "tuya-device-handlers==0.0.22",
-    "tuya-device-sharing-sdk==0.2.8"
+    "tuya-device-handlers==0.0.24",
+    "tuya-device-sharing-sdk==0.2.10"
  ]
 }
@@ -31,14 +31,13 @@ from homeassistant.components.sensor import (
    SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
    EntityCategory,
+    UnitOfDensity,
    UnitOfElectricCurrent,
    UnitOfElectricPotential,
    UnitOfEnergy,
    UnitOfPower,
+    UnitOfRatio,
    UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -75,7 +74,7 @@ BATTERY_SENSORS: tuple[TuyaSensorEntityDescription, ...] = (
    TuyaSensorEntityDescription(
        key=DPCode.BATTERY_PERCENTAGE,
        translation_key="battery",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.BATTERY,
        state_class=SensorStateClass.MEASUREMENT,
        entity_category=EntityCategory.DIAGNOSTIC,
@@ -83,7 +82,7 @@ BATTERY_SENSORS: tuple[TuyaSensorEntityDescription, ...] = (
    TuyaSensorEntityDescription(
        key=DPCode.BATTERY,  # Used by non-standard contact sensor implementations
        translation_key="battery",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
        device_class=SensorDeviceClass.BATTERY,
        state_class=SensorStateClass.MEASUREMENT,
        entity_category=EntityCategory.DIAGNOSTIC,
@@ -181,7 +180,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="carbon_dioxide",
            device_class=SensorDeviceClass.CO2,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.CH2O_VALUE,
@@ -199,7 +198,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="pm25",
            device_class=SensorDeviceClass.PM25,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            suggested_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.PM10,
@@ -215,7 +214,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="carbon_monoxide",
            device_class=SensorDeviceClass.CO,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        ),
        *BATTERY_SENSORS,
    ),
@@ -302,21 +301,21 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="pm25",
            device_class=SensorDeviceClass.PM25,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            suggested_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.CO_VALUE,
            translation_key="carbon_monoxide",
            device_class=SensorDeviceClass.CO,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.CO2_VALUE,
            translation_key="carbon_dioxide",
            device_class=SensorDeviceClass.CO2,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.EC_CURRENT,
@@ -535,7 +534,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="carbon_dioxide",
            device_class=SensorDeviceClass.CO2,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.CH2O_VALUE,
@@ -553,14 +552,14 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="pm25",
            device_class=SensorDeviceClass.PM25,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            suggested_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.PM10,
            translation_key="pm10",
            device_class=SensorDeviceClass.PM10,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            suggested_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        ),
        *BATTERY_SENSORS,
    ),
@@ -570,7 +569,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="carbon_dioxide",
            device_class=SensorDeviceClass.CO2,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.VOC_VALUE,
@@ -583,7 +582,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="pm25",
            device_class=SensorDeviceClass.PM25,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            suggested_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.VA_HUMIDITY,
@@ -684,7 +683,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="pm25",
            device_class=SensorDeviceClass.PM25,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            suggested_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.TEMP,
@@ -709,7 +708,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="concentration_carbon_dioxide",
            device_class=SensorDeviceClass.CO2,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.TOTAL_TIME,
@@ -756,7 +755,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="carbon_dioxide",
            device_class=SensorDeviceClass.CO2,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        ),
        *BATTERY_SENSORS,
    ),
@@ -808,7 +807,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="pm25",
            device_class=SensorDeviceClass.PM25,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            suggested_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.CH2O_VALUE,
@@ -832,7 +831,7 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="carbon_dioxide",
            device_class=SensorDeviceClass.CO2,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.HUMIDITY_VALUE,
@@ -845,14 +844,14 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="pm1",
            device_class=SensorDeviceClass.PM1,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            suggested_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.PM10,
            translation_key="pm10",
            device_class=SensorDeviceClass.PM10,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            suggested_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        ),
        *BATTERY_SENSORS,
    ),
@@ -1230,14 +1229,14 @@ SENSORS: dict[DeviceCategory, tuple[TuyaSensorEntityDescription, ...]] = {
            translation_key="carbon_dioxide",
            device_class=SensorDeviceClass.CO2,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+            suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.PM25_VALUE,
            translation_key="pm25",
            device_class=SensorDeviceClass.PM25,
            state_class=SensorStateClass.MEASUREMENT,
-            suggested_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+            suggested_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
        ),
        TuyaSensorEntityDescription(
            key=DPCode.CH2O_VALUE,
@@ -9,5 +9,5 @@
  "iot_class": "local_push",
  "loggers": ["uiprotect"],
  "quality_scale": "platinum",
-  "requirements": ["uiprotect==14.0.0"]
+  "requirements": ["uiprotect==15.1.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,
@@ -149,7 +149,6 @@ SELECTOR_TYPES = (
    XiaomiMiioSelectDescription(
        key=ATTR_DISPLAY_ORIENTATION,
        attr_name=ATTR_DISPLAY_ORIENTATION,
-        name="Display Orientation",
        options_map={
            "Portrait": "Forward",
            "LandscapeLeft": "Left",
@@ -165,7 +164,6 @@ SELECTOR_TYPES = (
    XiaomiMiioSelectDescription(
        key=ATTR_MODE,
        attr_name=ATTR_MODE,
-        name="Mode",
        set_method="set_mode",
        set_method_error_message="Setting the mode of the fan failed.",
        icon="mdi:fan",
@@ -176,7 +174,6 @@ SELECTOR_TYPES = (
    XiaomiMiioSelectDescription(
        key=ATTR_LED_BRIGHTNESS,
        attr_name=ATTR_LED_BRIGHTNESS,
-        name="Led Brightness",
        set_method="set_led_brightness",
        set_method_error_message="Setting the led brightness failed.",
        icon="mdi:brightness-6",
@@ -187,7 +184,6 @@ SELECTOR_TYPES = (
    XiaomiMiioSelectDescription(
        key=ATTR_PTC_LEVEL,
        attr_name=ATTR_PTC_LEVEL,
-        name="Auxiliary Heat Level",
        set_method="set_ptc_level",
        set_method_error_message="Setting the ptc level failed.",
        icon="mdi:fire-circle",
@@ -138,6 +138,7 @@
    },
    "select": {
      "airpurifier_mode": {
+        "name": "Mode",
        "state": {
          "auto": "[%key:common::state::auto%]",
          "favorite": "Favorite",
@@ -145,6 +146,7 @@
        }
      },
      "display_orientation": {
+        "name": "Display orientation",
        "state": {
          "forward": "Forward",
          "left": "Left",
@@ -152,6 +154,7 @@
        }
      },
      "led_brightness": {
+        "name": "LED brightness",
        "state": {
          "bright": "Bright",
          "dim": "Dim",
@@ -159,6 +162,7 @@
        }
      },
      "ptc_level": {
+        "name": "Auxiliary heat level",
        "state": {
          "high": "[%key:common::state::high%]",
          "low": "[%key:common::state::low%]",
@@ -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,8 +21,8 @@ if TYPE_CHECKING:

 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2026
-MINOR_VERSION: Final = 7
-PATCH_VERSION: Final = "0b0"
+MINOR_VERSION: Final = 8
+PATCH_VERSION: Final = "0.dev0"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 14, 2)
@@ -4587,12 +4587,6 @@
      "config_flow": false,
      "iot_class": "cloud_polling"
    },
-    "mycroft": {
-      "name": "Mycroft",
-      "integration_type": "hub",
-      "config_flow": false,
-      "iot_class": "local_push"
-    },
    "myneomitis": {
      "name": "MyNeomitis",
      "integration_type": "hub",
@@ -740,7 +740,7 @@ def _get_exposed_entities(

        if include_state and (
            attributes := {
-                attr_name: (
+                str(attr_name): (
                    str(attr_value)
                    if isinstance(attr_value, (Enum, Decimal, int))
                    else attr_value
@@ -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-frontend==20260624.1
+home-assistant-intents==2026.6.24
 httpx==0.28.1
 ifaddr==0.2.0
 Jinja2==3.1.6
@@ -5,7 +5,7 @@ To update, run python3 -m script.hassfest

 from typing import Final

-FRONTEND_VERSION: Final[str] = "20260624.0"
+FRONTEND_VERSION: Final[str] = "20260624.1"

 MDI_ICONS: Final[set[str]] = {
    "ab-testing",
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "homeassistant"
-version = "2026.7.0b0"
+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
@@ -193,7 +193,7 @@ aioairzone-cloud==0.7.2
 aioairzone==1.0.5

 # homeassistant.components.alexa_devices
-aioamazondevices==14.1.3
+aioamazondevices==14.1.6

 # homeassistant.components.ambient_network
 # homeassistant.components.ambient_station
@@ -260,7 +260,7 @@ aioelectricitymaps==1.1.1
 aioemonitor==1.0.5

 # homeassistant.components.esphome
-aioesphomeapi==45.3.1
+aioesphomeapi==45.5.2

 # homeassistant.components.matrix
 # homeassistant.components.slack
@@ -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
@@ -1272,10 +1272,10 @@ hole==0.9.2
 holidays==0.99

 # homeassistant.components.frontend
-home-assistant-frontend==20260624.0
+home-assistant-frontend==20260624.1

 # 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
@@ -3221,10 +3221,10 @@ ttls==1.8.3
 ttn_client==1.3.0

 # homeassistant.components.tuya
-tuya-device-handlers==0.0.22
+tuya-device-handlers==0.0.24

 # homeassistant.components.tuya
-tuya-device-sharing-sdk==0.2.8
+tuya-device-sharing-sdk==0.2.10

 # homeassistant.components.twentemilieu
 twentemilieu==3.0.0
@@ -3245,7 +3245,7 @@ uasiren==0.0.1
 uhooapi==1.2.8

 # homeassistant.components.unifiprotect
-uiprotect==14.0.0
+uiprotect==15.1.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
@@ -622,7 +622,6 @@ INTEGRATIONS_WITHOUT_QUALITY_SCALE_FILE = [
    "mullvad",
    "mutesync",
    "mvglive",
-    "mycroft",
    "myq",
    "mysensors",
    "mystrom",
@@ -1589,7 +1588,6 @@ INTEGRATIONS_WITHOUT_SCALE = [
    "mullvad",
    "mutesync",
    "mvglive",
-    "mycroft",
    "myq",
    "mysensors",
    "mystrom",
@@ -2084,6 +2082,7 @@ NO_QUALITY_SCALE = [
    "intent_script",
    "intent",
    "labs",
+    "llm",
    "logbook",
    "logger",
    "lovelace",
@@ -38,7 +38,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '123-456-co',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensor[sensor.home_carbon_monoxide-state]
@@ -50,7 +50,7 @@
      'limit': 4000,
      'percent': 4,
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.home_carbon_monoxide',
@@ -157,7 +157,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '123-456-humidity',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensor[sensor.home_humidity-state]
@@ -167,7 +167,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Home 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.home_humidity',
@@ -216,7 +216,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '123-456-no2',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensor[sensor.home_nitrogen_dioxide-state]
@@ -228,7 +228,7 @@
      'limit': 25,
      'percent': 64,
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.home_nitrogen_dioxide',
@@ -277,7 +277,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '123-456-o3',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensor[sensor.home_ozone-state]
@@ -289,7 +289,7 @@
      'limit': 100,
      'percent': 42,
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.home_ozone',
@@ -338,7 +338,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '123-456-pm1',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensor[sensor.home_pm1-state]
@@ -348,7 +348,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'pm1',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Home PM1',
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.home_pm1',
@@ -397,7 +397,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '123-456-pm10',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensor[sensor.home_pm10-state]
@@ -409,7 +409,7 @@
      'limit': 45,
      'percent': 14,
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.home_pm10',
@@ -458,7 +458,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '123-456-pm25',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensor[sensor.home_pm2_5-state]
@@ -470,7 +470,7 @@
      'limit': 15,
      'percent': 29,
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.home_pm2_5',
@@ -578,7 +578,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '123-456-so2',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensor[sensor.home_sulphur_dioxide-state]
@@ -590,7 +590,7 @@
      'limit': 40,
      'percent': 35,
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.home_sulphur_dioxide',
@@ -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 LLM integration."""
@@ -0,0 +1,121 @@
+"""Tests for the LLM integration."""
+
+from unittest.mock import Mock
+
+import pytest
+
+from homeassistant.components.llm import DATA_PLATFORMS, LLMTools, async_get_tools
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import llm
+from homeassistant.setup import async_setup_component
+from homeassistant.util.json import JsonObjectType
+
+from tests.common import mock_platform
+
+
+class _StubTool(llm.Tool):
+    """Minimal tool for registry tests."""
+
+    def __init__(self, name: str) -> None:
+        """Initialize the stub tool."""
+        self.name = name
+        self.description = f"{name} description"
+
+    async def async_call(
+        self,
+        hass: HomeAssistant,
+        tool_input: llm.ToolInput,
+        llm_context: llm.LLMContext,
+    ) -> JsonObjectType:
+        """Return an empty result."""
+        return {}
+
+
+@pytest.fixture
+def llm_context() -> llm.LLMContext:
+    """Return an LLM context."""
+    return llm.LLMContext(
+        platform="test",
+        context=None,
+        language="*",
+        assistant="conversation",
+        device_id=None,
+    )
+
+
+def _mock_tools_platform(
+    hass: HomeAssistant, domain: str, tools: LLMTools | Exception
+) -> None:
+    """Register a mock <integration>/llm.py platform returning the given tools."""
+    if isinstance(tools, Exception):
+        async_get_tools = Mock(side_effect=tools)
+    else:
+        async_get_tools = Mock(return_value=tools)
+    hass.config.components.add(domain)
+    mock_platform(hass, f"{domain}.llm", Mock(async_get_tools=async_get_tools))
+
+
+async def test_setup(hass: HomeAssistant) -> None:
+    """Test the integration sets up."""
+    assert await async_setup_component(hass, "llm", {})
+    assert DATA_PLATFORMS in hass.data
+
+
+async def test_get_tools(hass: HomeAssistant, llm_context: llm.LLMContext) -> None:
+    """Test that tools from an integration platform are returned."""
+    tool = _StubTool("my_tool")
+    _mock_tools_platform(
+        hass, "test", LLMTools(tools=[tool], prompt="use my_tool wisely")
+    )
+
+    assert await async_setup_component(hass, "llm", {})
+
+    result = await async_get_tools(hass, llm_context)
+    assert result.tools == [tool]
+    assert result.prompt == "use my_tool wisely"
+
+
+async def test_get_tools_empty(
+    hass: HomeAssistant, llm_context: llm.LLMContext
+) -> None:
+    """Test that no platforms yields no tools."""
+    assert await async_setup_component(hass, "llm", {})
+
+    result = await async_get_tools(hass, llm_context)
+    assert result.tools == []
+    assert result.prompt is None
+
+
+async def test_get_tools_merges_sorted(
+    hass: HomeAssistant, llm_context: llm.LLMContext
+) -> None:
+    """Test that tools and prompts are merged in a load-order-independent order."""
+    tool_a = _StubTool("tool_a")
+    tool_b = _StubTool("tool_b")
+    # Register "test_b" before "test_a" to prove the result is sorted by domain.
+    _mock_tools_platform(hass, "test_b", LLMTools(tools=[tool_b], prompt="prompt b"))
+    _mock_tools_platform(hass, "test_a", LLMTools(tools=[tool_a], prompt="prompt a"))
+
+    assert await async_setup_component(hass, "llm", {})
+
+    result = await async_get_tools(hass, llm_context)
+    assert result.tools == [tool_a, tool_b]
+    assert result.prompt == "prompt a\nprompt b"
+
+
+async def test_get_tools_isolates_failing_platform(
+    hass: HomeAssistant,
+    llm_context: llm.LLMContext,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test that one failing platform does not drop the others' tools."""
+    tool = _StubTool("good_tool")
+    _mock_tools_platform(hass, "test_bad", ValueError("boom"))
+    _mock_tools_platform(hass, "test_good", LLMTools(tools=[tool], prompt="prompt"))
+
+    assert await async_setup_component(hass, "llm", {})
+
+    result = await async_get_tools(hass, llm_context)
+    assert result.tools == [tool]
+    assert result.prompt == "prompt"
+    assert "Error getting tools from LLM platform test_bad" in caplog.text
@@ -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',
@@ -103,7 +103,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-CarbonDioxideSensor-1037-0',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_carbon_dioxide-state]
@@ -112,7 +112,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'lightfi-aq1-air-quality-sensor 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.lightfi_aq1_air_quality_sensor_carbon_dioxide',
@@ -158,7 +158,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-HumiditySensor-1029-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_humidity-state]
@@ -167,7 +167,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'lightfi-aq1-air-quality-sensor 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.lightfi_aq1_air_quality_sensor_humidity',
@@ -213,7 +213,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-NitrogenDioxideSensor-1043-0',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_nitrogen_dioxide-state]
@@ -222,7 +222,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'nitrogen_dioxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'lightfi-aq1-air-quality-sensor Nitrogen 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.lightfi_aq1_air_quality_sensor_nitrogen_dioxide',
@@ -268,7 +268,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PM1Sensor-1068-0',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_pm1-state]
@@ -277,7 +277,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'pm1',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'lightfi-aq1-air-quality-sensor PM1',
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.lightfi_aq1_air_quality_sensor_pm1',
@@ -323,7 +323,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PM10Sensor-1069-0',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_pm10-state]
@@ -332,7 +332,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'pm10',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'lightfi-aq1-air-quality-sensor PM10',
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.lightfi_aq1_air_quality_sensor_pm10',
@@ -378,7 +378,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-PM25Sensor-1066-0',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_pm2_5-state]
@@ -387,7 +387,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'pm25',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'lightfi-aq1-air-quality-sensor PM2.5',
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.lightfi_aq1_air_quality_sensor_pm2_5',
@@ -598,7 +598,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000001-MatterNodeDevice-1-TotalVolatileOrganicCompoundsSensor-1070-0',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensors[air_quality_sensor][sensor.lightfi_aq1_air_quality_sensor_volatile_organic_compounds_parts-state]
@@ -607,7 +607,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'volatile_organic_compounds_parts',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'lightfi-aq1-air-quality-sensor Volatile organic compounds parts',
      <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.lightfi_aq1_air_quality_sensor_volatile_organic_compounds_parts',
@@ -653,7 +653,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000005B-MatterNodeDevice-2-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[aqara_door_window_p2][sensor.aqara_door_and_window_sensor_p2_battery-state]
@@ -662,7 +662,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Aqara Door and Window Sensor P2 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.aqara_door_and_window_sensor_p2_battery',
@@ -993,7 +993,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000053-MatterNodeDevice-3-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[aqara_motion_p2][sensor.aqara_motion_and_light_sensor_p2_battery-state]
@@ -1002,7 +1002,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Aqara Motion and Light Sensor P2 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.aqara_motion_and_light_sensor_p2_battery',
@@ -1388,7 +1388,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000016C-MatterNodeDevice-2-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[aqara_multi_state_p100][sensor.multi_state_sensor_p100_battery-state]
@@ -1397,7 +1397,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Multi-State Sensor P100 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.multi_state_sensor_p100_battery',
@@ -1900,7 +1900,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-00000000000000CD-MatterNodeDevice-5-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[aqara_presence_fp300][sensor.presence_multi_sensor_fp300_1_battery-state]
@@ -1909,7 +1909,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Presence Multi-Sensor FP300 1 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.presence_multi_sensor_fp300_1_battery',
@@ -2136,7 +2136,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-00000000000000CD-MatterNodeDevice-4-HumiditySensor-1029-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[aqara_presence_fp300][sensor.presence_multi_sensor_fp300_1_humidity-state]
@@ -2145,7 +2145,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Presence Multi-Sensor FP300 1 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.presence_multi_sensor_fp300_1_humidity',
@@ -2580,7 +2580,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000004B-MatterNodeDevice-6-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[aqara_sensor_w100][sensor.climate_sensor_w100_battery-state]
@@ -2589,7 +2589,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Climate Sensor W100 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.climate_sensor_w100_battery',
@@ -2975,7 +2975,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000004B-MatterNodeDevice-2-HumiditySensor-1029-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[aqara_sensor_w100][sensor.climate_sensor_w100_humidity-state]
@@ -2984,7 +2984,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Climate Sensor W100 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.climate_sensor_w100_humidity',
@@ -3556,7 +3556,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000064-MatterNodeDevice-2-HumiditySensor-1029-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[aqara_thermostat_w500][sensor.floor_heating_thermostat_humidity-state]
@@ -3565,7 +3565,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Floor Heating Thermostat 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.floor_heating_thermostat_humidity',
@@ -3945,7 +3945,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000014-MatterNodeDevice-2-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[aqara_u200][sensor.aqara_smart_lock_u200_battery-state]
@@ -3954,7 +3954,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Aqara Smart Lock U200 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.aqara_smart_lock_u200_battery',
@@ -4633,14 +4633,14 @@
    'supported_features': 0,
    'translation_key': 'pi_heating_demand',
    'unique_id': '00000000000004D2-0000000000000007-MatterNodeDevice-1-ThermostatPIHeatingDemand-513-8',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[eberle_ute3000][sensor.connected_thermostat_ute_3000_heating_demand-state]
  StateSnapshot({
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Connected Thermostat UTE 3000 Heating demand',
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.connected_thermostat_ute_3000_heating_demand',
@@ -4852,7 +4852,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000002F-MatterNodeDevice-1-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[ecovacs_deebot][sensor.ecodeebot_battery-state]
@@ -4861,7 +4861,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'ecodeebot 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.ecodeebot_battery',
@@ -5539,7 +5539,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000028-MatterNodeDevice-1-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[eufy_vacuum_omni_e28][sensor.2bavs_ab6031x_44pe_battery-state]
@@ -5548,7 +5548,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: '2BAVS-AB6031X-44PE 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.2bavs_ab6031x_44pe_battery',
@@ -5994,7 +5994,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000009-MatterNodeDevice-1-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[eve_contact_sensor][sensor.eve_door_battery-state]
@@ -6003,7 +6003,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Eve Door 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.eve_door_battery',
@@ -7973,14 +7973,14 @@
    'supported_features': 0,
    'translation_key': 'window_covering_target_position',
    'unique_id': '00000000000004D2-0000000000000094-MatterNodeDevice-1-TargetPositionLiftPercent100ths-258-11',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[eve_shutter][sensor.eve_shutter_switch_20eci1701_target_opening_position-state]
  StateSnapshot({
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Eve Shutter Switch 20ECI1701 Target opening position',
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.eve_shutter_switch_20eci1701_target_opening_position',
@@ -8249,7 +8249,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000021-MatterNodeDevice-0-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[eve_thermo_v4][sensor.eve_thermo_20ebp1701_battery-state]
@@ -8258,7 +8258,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Eve Thermo 20EBP1701 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.eve_thermo_20ebp1701_battery',
@@ -8697,14 +8697,14 @@
    'supported_features': 0,
    'translation_key': 'valve_position',
    'unique_id': '00000000000004D2-0000000000000021-MatterNodeDevice-1-EveThermoValvePosition-319486977-319422488',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[eve_thermo_v4][sensor.eve_thermo_20ebp1701_valve_position-state]
  StateSnapshot({
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Eve Thermo 20EBP1701 Valve position',
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.eve_thermo_20ebp1701_valve_position',
@@ -8750,7 +8750,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000000C-MatterNodeDevice-0-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[eve_thermo_v5][sensor.eve_thermo_20ecd1701_battery-state]
@@ -8759,7 +8759,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Eve Thermo 20ECD1701 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.eve_thermo_20ecd1701_battery',
@@ -9137,14 +9137,14 @@
    'supported_features': 0,
    'translation_key': 'valve_position',
    'unique_id': '00000000000004D2-000000000000000C-MatterNodeDevice-1-EveThermoValvePosition-319486977-319422488',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[eve_thermo_v5][sensor.eve_thermo_20ecd1701_valve_position-state]
  StateSnapshot({
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Eve Thermo 20ECD1701 Valve position',
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.eve_thermo_20ecd1701_valve_position',
@@ -9190,7 +9190,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-0-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[eve_weather_sensor][sensor.eve_weather_battery-state]
@@ -9199,7 +9199,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Eve Weather 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.eve_weather_battery',
@@ -9306,7 +9306,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000001D-MatterNodeDevice-2-HumiditySensor-1029-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[eve_weather_sensor][sensor.eve_weather_humidity-state]
@@ -9315,7 +9315,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Eve Weather 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.eve_weather_humidity',
@@ -9991,7 +9991,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000003-MatterNodeDevice-0-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[haojai_switch][sensor.hjmt_6b_battery-state]
@@ -10000,7 +10000,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'HJMT-6B 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.hjmt_6b_battery',
@@ -10771,7 +10771,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000006-MatterNodeDevice-1-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[heiman_co_sensor][sensor.smart_co_sensor_battery-state]
@@ -10780,7 +10780,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Smart CO sensor 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.smart_co_sensor_battery',
@@ -10937,7 +10937,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000006-MatterNodeDevice-1-CarbonMonoxideSensor-1036-0',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensors[heiman_co_sensor][sensor.smart_co_sensor_carbon_monoxide-state]
@@ -10946,7 +10946,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_monoxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Smart CO sensor Carbon monoxide',
      <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.smart_co_sensor_carbon_monoxide',
@@ -11329,7 +11329,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000058-MatterNodeDevice-1-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[heiman_motion_sensor_m1][sensor.smart_motion_sensor_battery-state]
@@ -11338,7 +11338,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Smart motion sensor 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.smart_motion_sensor_battery',
@@ -11887,7 +11887,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000000B-MatterNodeDevice-1-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[heiman_smoke_detector][sensor.smoke_sensor_battery-state]
@@ -11896,7 +11896,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Smoke sensor 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.smoke_sensor_battery',
@@ -12365,7 +12365,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000025-MatterNodeDevice-1-CarbonDioxideSensor-1037-0',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensors[ikea_air_quality_monitor][sensor.alpstuga_air_quality_monitor_carbon_dioxide-state]
@@ -12374,7 +12374,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'ALPSTUGA air quality monitor 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.alpstuga_air_quality_monitor_carbon_dioxide',
@@ -12420,7 +12420,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000025-MatterNodeDevice-1-HumiditySensor-1029-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[ikea_air_quality_monitor][sensor.alpstuga_air_quality_monitor_humidity-state]
@@ -12429,7 +12429,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'ALPSTUGA air quality monitor 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.alpstuga_air_quality_monitor_humidity',
@@ -12475,7 +12475,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000025-MatterNodeDevice-1-PM25Sensor-1066-0',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensors[ikea_air_quality_monitor][sensor.alpstuga_air_quality_monitor_pm2_5-state]
@@ -12484,7 +12484,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'pm25',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'ALPSTUGA air quality monitor PM2.5',
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.alpstuga_air_quality_monitor_pm2_5',
@@ -12864,7 +12864,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000089-MatterNodeDevice-0-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[ikea_bilresa_dual_button][sensor.bilresa_dual_button_battery-state]
@@ -12873,7 +12873,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'BILRESA dual button 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.bilresa_dual_button_battery',
@@ -13412,7 +13412,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000002-MatterNodeDevice-0-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[ikea_scroll_wheel][sensor.bilresa_scroll_wheel_battery-state]
@@ -13421,7 +13421,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'BILRESA scroll wheel 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.bilresa_scroll_wheel_battery',
@@ -14682,7 +14682,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000100-MatterNodeDevice-8-HumiditySensor-1029-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[inovelli_vtm30][sensor.white_series_onoff_switch_humidity-state]
@@ -14691,7 +14691,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'White Series OnOff Switch 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.white_series_onoff_switch_humidity',
@@ -16043,7 +16043,7 @@
    'supported_features': 0,
    'translation_key': 'activated_carbon_filter_condition',
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-1-ActivatedCarbonFilterCondition-114-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_activated_carbon_filter_condition-state]
@@ -16051,7 +16051,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier Activated carbon filter condition',
      <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.mock_air_purifier_activated_carbon_filter_condition',
@@ -16235,7 +16235,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-2-CarbonDioxideSensor-1037-0',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_carbon_dioxide-state]
@@ -16244,7 +16244,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_dioxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier 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.mock_air_purifier_carbon_dioxide',
@@ -16290,7 +16290,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-2-CarbonMonoxideSensor-1036-0',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_carbon_monoxide-state]
@@ -16299,7 +16299,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'carbon_monoxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier Carbon monoxide',
      <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.mock_air_purifier_carbon_monoxide',
@@ -16345,7 +16345,7 @@
    'supported_features': 0,
    'translation_key': 'hepa_filter_condition',
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-1-HepaFilterCondition-113-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_hepa_filter_condition-state]
@@ -16353,7 +16353,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier HEPA filter condition',
      <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.mock_air_purifier_hepa_filter_condition',
@@ -16399,7 +16399,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-4-HumiditySensor-1029-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_humidity-state]
@@ -16408,7 +16408,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier 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.mock_air_purifier_humidity',
@@ -16454,7 +16454,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-2-NitrogenDioxideSensor-1043-0',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_nitrogen_dioxide-state]
@@ -16463,7 +16463,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'nitrogen_dioxide',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier Nitrogen 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.mock_air_purifier_nitrogen_dioxide',
@@ -16509,7 +16509,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-2-OzoneConcentrationSensor-1045-0',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_ozone-state]
@@ -16518,7 +16518,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'ozone',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier Ozone',
      <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.mock_air_purifier_ozone',
@@ -16564,7 +16564,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-2-PM1Sensor-1068-0',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_pm1-state]
@@ -16573,7 +16573,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'pm1',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier PM1',
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.mock_air_purifier_pm1',
@@ -16619,7 +16619,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-2-PM10Sensor-1069-0',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_pm10-state]
@@ -16628,7 +16628,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'pm10',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier PM10',
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.mock_air_purifier_pm10',
@@ -16674,7 +16674,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-2-PM25Sensor-1066-0',
-    'unit_of_measurement': 'μg/m³',
+    'unit_of_measurement': <UnitOfDensity.MICROGRAMS_PER_CUBIC_METER: 'μg/m³'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_pm2_5-state]
@@ -16683,7 +16683,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'pm25',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier PM2.5',
      <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³'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.mock_air_purifier_pm2_5',
@@ -17067,7 +17067,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000008F-MatterNodeDevice-2-TotalVolatileOrganicCompoundsSensor-1070-0',
-    'unit_of_measurement': 'ppm',
+    'unit_of_measurement': <UnitOfRatio.PARTS_PER_MILLION: 'ppm'>,
  })
 # ---
 # name: test_sensors[mock_air_purifier][sensor.mock_air_purifier_volatile_organic_compounds_parts-state]
@@ -17076,7 +17076,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'volatile_organic_compounds_parts',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Air Purifier Volatile organic compounds parts',
      <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.mock_air_purifier_volatile_organic_compounds_parts',
@@ -17249,7 +17249,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000019-MatterNodeDevice-1-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_battery_storage][sensor.mock_battery_storage_battery-state]
@@ -17258,7 +17258,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Battery Storage 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.mock_battery_storage_battery',
@@ -18815,7 +18815,7 @@
    'supported_features': 0,
    'translation_key': 'activated_carbon_filter_condition',
    'unique_id': '00000000000004D2-0000000000000049-MatterNodeDevice-1-ActivatedCarbonFilterCondition-114-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_extractor_hood][sensor.mock_extractor_hood_activated_carbon_filter_condition-state]
@@ -18823,7 +18823,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Extractor hood Activated carbon filter condition',
      <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.mock_extractor_hood_activated_carbon_filter_condition',
@@ -18939,7 +18939,7 @@
    'supported_features': 0,
    'translation_key': 'hepa_filter_condition',
    'unique_id': '00000000000004D2-0000000000000049-MatterNodeDevice-1-HepaFilterCondition-113-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_extractor_hood][sensor.mock_extractor_hood_hepa_filter_condition-state]
@@ -18947,7 +18947,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Extractor hood HEPA filter condition',
      <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.mock_extractor_hood_hepa_filter_condition',
@@ -19656,7 +19656,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000015-MatterNodeDevice-1-HumiditySensor-1029-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_humidity_sensor][sensor.mock_humidity_sensor_humidity-state]
@@ -19665,7 +19665,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Humidity Sensor 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.mock_humidity_sensor_humidity',
@@ -22707,7 +22707,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000065-MatterNodeDevice-1-SoilMoistureSensor-1072-1',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_soil_sensor][sensor.mock_soil_sensor_moisture-state]
@@ -22716,7 +22716,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'moisture',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Soil Sensor Moisture',
      <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.mock_soil_sensor_moisture',
@@ -23410,14 +23410,14 @@
    'supported_features': 0,
    'translation_key': 'pi_heating_demand',
    'unique_id': '00000000000004D2-0000000000000096-MatterNodeDevice-1-ThermostatPIHeatingDemand-513-8',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_thermostat][sensor.mock_thermostat_heating_demand-state]
  StateSnapshot({
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Thermostat Heating demand',
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.mock_thermostat_heating_demand',
@@ -24348,14 +24348,14 @@
    'supported_features': 0,
    'translation_key': 'window_covering_target_position',
    'unique_id': '00000000000004D2-0000000000000032-MatterNodeDevice-1-TargetPositionLiftPercent100ths-258-11',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_window_covering_full][sensor.mock_full_window_covering_target_opening_position-state]
  StateSnapshot({
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Mock Full Window Covering Target opening position',
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.mock_full_window_covering_target_opening_position',
@@ -24685,14 +24685,14 @@
    'supported_features': 0,
    'translation_key': 'window_covering_target_position',
    'unique_id': '00000000000004D2-0000000000000027-MatterNodeDevice-1-TargetPositionLiftPercent100ths-258-11',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[mock_window_covering_pa_lift][sensor.longan_link_wncv_da01_target_opening_position-state]
  StateSnapshot({
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Longan link WNCV DA01 Target opening position',
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: '%',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRatio.PERCENTAGE: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.longan_link_wncv_da01_target_opening_position',
@@ -25451,7 +25451,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-00000000000000CA-MatterNodeDevice-1-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[roborock_saros_10][sensor.robotic_vacuum_cleaner_battery-state]
@@ -25460,7 +25460,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Robotic Vacuum Cleaner 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.robotic_vacuum_cleaner_battery',
@@ -27905,7 +27905,7 @@
    'supported_features': 0,
    'translation_key': 'evse_soc',
    'unique_id': '00000000000004D2-0000000000000017-MatterNodeDevice-1-EnergyEvseStateOfCharge-153-48',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[silabs_evse_charging][sensor.evse_state_of_charge-state]
@@ -27914,7 +27914,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'evse State of charge',
      <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.evse_state_of_charge',
@@ -30846,7 +30846,7 @@
    'supported_features': 0,
    'translation_key': 'tank_percentage',
    'unique_id': '00000000000004D2-0000000000000039-MatterNodeDevice-2-WaterHeaterManagementTankPercentage-148-4',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[silabs_water_heater][sensor.water_heater_hot_water_level-state]
@@ -30854,7 +30854,7 @@
    'attributes': ReadOnlyDict({
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Water Heater Hot water 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.water_heater_hot_water_level',
@@ -31775,7 +31775,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-0000000000000031-MatterNodeDevice-1-HumiditySensor-1029-0',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[tado_smart_radiator_thermostat_x][sensor.smart_radiator_thermostat_x_humidity-state]
@@ -31784,7 +31784,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'humidity',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Smart Radiator Thermostat X 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.smart_radiator_thermostat_x_humidity',
@@ -32395,7 +32395,7 @@
    'supported_features': 0,
    'translation_key': None,
    'unique_id': '00000000000004D2-000000000000007A-MatterNodeDevice-1-PowerSource-47-12',
-    'unit_of_measurement': '%',
+    'unit_of_measurement': <UnitOfRatio.PERCENTAGE: '%'>,
  })
 # ---
 # name: test_sensors[zemismart_mt25b][sensor.zemismart_mt25b_roller_motor_battery-state]
@@ -32404,7 +32404,7 @@
      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'battery',
      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Zemismart MT25B Roller Motor 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: '%'>,
    }),
    'context': <ANY>,
    'entity_id': 'sensor.zemismart_mt25b_roller_motor_battery',
@@ -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,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Paulus Schoutsen	fe13396a5e	Merge branch 'dev' into llm-integration	2026-06-25 22:29:58 -04:00
Raphael Hehl	71342ef1f6	Bump uiprotect to 15.1.0 (#174846 )	2026-06-25 22:27:17 -04:00
Simone Chemelli	544dccd50b	Bump aioamazondevices to 14.1.6 (#174848 )	2026-06-25 22:26:39 -04:00
Manu	5f6508c424	Remove Mycroft integration (#174849 )	2026-06-25 22:25:47 -04:00
Maciej Bieniek	70f3526be3	Use UnitOfDensity / UnitOfRatio enums in Airly (#174854 )	2026-06-25 22:25:28 -04:00
Mick Vleeshouwer	f5f2ecadfd	Migrate to UnitOfRatio enum in Overkiz (#174862 )	2026-06-25 22:25:11 -04:00
Mick Vleeshouwer	a8de57a1c6	Set RTS command duration for Overkiz Rexel client (#174863 )	2026-06-25 22:24:43 -04:00
Erwin Douna	8b08f10f78	Tuya refactor UnitOfs (#174835 )	2026-06-25 20:33:07 +02:00
Erik Montnemery	34679b033a	Improve tests of entity limits (#174793 )	2026-06-25 20:23:50 +02:00
Paul Bottein	014f785050	Fix missing translated names for Xiaomi Miio select entities (#174810 )	2026-06-25 20:23:13 +02:00
epenet	1c53ada438	Bump tuya-device-handlers to 0.0.24 (#174840 ) Co-authored-by: Franck Nijhof <git@frenck.dev>	2026-06-25 20:22:42 +02:00
Erwin Douna	a88de3efab	Matter refactor to UnitOfs (#174824 )	2026-06-25 19:54:53 +02:00
Nicolas Mowen	10ce428387	Handle case where GetLiveContext includes an entity with StrEnum key (#174822 )	2026-06-25 19:53:32 +02:00
Erwin Douna	dae8b60ec4	Tradfri refactor UnitOfs (#174834 )	2026-06-25 19:08:12 +02:00
Bram Kragten	e098cc384c	Update frontend to 20260624.1 (#174831 )	2026-06-25 18:47:17 +02:00
J. Nick Koston	6007bfa1cd	Bump aioesphomeapi to 45.5.2 (#174826 )	2026-06-25 18:31:51 +02:00
epenet	16262362e1	Bump tuya-device-sharing-sdk to 0.2.10 (#174827 )	2026-06-25 17:57:33 +02:00
Erik Montnemery	01350e8f15	Fix exception in legacy sun condition (#174811 )	2026-06-25 17:40:36 +02:00
Manu	8977fc6f67	Migrate entity unique_id in Steam integration (#174701 )	2026-06-25 16:54:53 +02:00
Robert Resch	6411cc5c48	Improve the gate on check requirements aw to avoid useless runs (#174599 )	2026-06-25 16:48:51 +02:00
Erik Montnemery	9ce56183ea	Add WS command recorder/entity_options/get (#174134 )	2026-06-25 15:59:29 +02:00
MoonDevLT	5117c0b964	Migrate lunatone to UnitOfRatio enums (#174817 )	2026-06-25 15:01:10 +02:00
Christian Lackas	7dd5e188bb	Migrate homematicip_cloud to UnitOfDensity / UnitOfRatio enums (#174813 )	2026-06-25 14:15:36 +02:00
Christian Lackas	ec80260c4c	Migrate vicare to UnitOfDensity / UnitOfRatio enums (#174812 )	2026-06-25 14:14:30 +02:00
Erwin Douna	10ceac63f6	Homekit controller refactor UnitOf (#174806 )	2026-06-25 13:35:51 +02:00
Franck Nijhof	847f4dc287	Add missing unit of measurement to Home Connect battery sensor (#174694 ) Co-authored-by: Erwin Douna <e.douna@gmail.com>	2026-06-25 13:35:30 +02:00
Michael Hansen	8d4c8114d4	Bump intents and fix broken tests (#174689 )	2026-06-25 12:58:39 +02:00
Erik Montnemery	b6b165fd00	Improve tests of sun conditions and triggers (#174805 ) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-06-25 12:56:49 +02:00
Simone Chemelli	7c99cf6385	Fix async_get_entity_id() params for Alexa Devices (#174641 )	2026-06-25 12:32:55 +02:00
Erik Montnemery	d6b743b93e	Catch errors when evaluating automation conditions (#174799 )	2026-06-25 11:15:01 +02:00
Joost Lekkerkerker	0cae5e41b4	Add entity category to Mealie item count sensors (#174795 )	2026-06-25 10:57:06 +02:00
Erwin Douna	6fce245dfa	Portainer refactor to UnitOfRatio (#174801 )	2026-06-25 10:50:12 +02:00
Thomas D	44ba231bf6	Migrate to UnitOfRatio in the Qbus integration (#174800 )	2026-06-25 10:49:56 +02:00
Ronald van der Meer	2be55a06cc	Migrate Duco sensor units to UnitOfRatio (#174791 )	2026-06-25 10:09:55 +02:00
bkobus-bbx	d786fb16a0	Migrate blebox to UnitOfDensity / UnitOfRatio enums (#174790 )	2026-06-25 10:08:56 +02:00
J. Nick Koston	f78dd797b1	Bump habluetooth to 6.25.1 (#174700 )	2026-06-25 09:40:43 +02:00
davidrule1969	0d957a971d	Bump pySwitchbot to 2.3.0 (#174678 )	2026-06-25 08:51:22 +02:00
Raphael Hehl	cff3a711f3	Bump uiprotect to 15.0.0 (#174709 )	2026-06-25 08:42:32 +02:00
Brandon Rothweiler	177c4a4fb5	Bump dropbox to silver quality (#174706 )	2026-06-25 07:39:05 +02:00
Samuel Xiao	7d8204f5e7	Bump switchbot-api to 2.12.0 (#174705 )	2026-06-25 07:37:59 +02:00
Franck Nijhof	9aed167f71	Bump version to 2026.8.0.dev0 (#174693 )	2026-06-25 00:44:19 +02:00
Franck Nijhof	a8630f5570	Add delegated charging mode to Renault integration (#174687 )	2026-06-24 23:35:13 +02:00
J. Nick Koston	2a75b0e2fb	Bump habluetooth to 6.24.0 (#174688 )	2026-06-24 23:34:38 +02:00
Brandon Rothweiler	9c4ad761c4	Add missing scope and authorize param to Dropbox OAuth (#174587 )	2026-06-24 22:26:30 +02:00
Erwin Douna	8e3e1044a1	Tami4 group executor job (#174668 )	2026-06-24 22:01:24 +02:00
Colin	bec6c94e32	openevse: Convert config to textselector (#174675 )	2026-06-24 21:50:41 +02:00
Colin	c9729df69a	openevse: Add missing callback test (#174560 )	2026-06-24 21:33:30 +02:00
Christian Lackas	70ff0fd682	Bump homematicip to 2.13.2 (#174673 )	2026-06-24 20:43:23 +02:00
Erwin Douna	258ae6d506	Vera core group executor job (#174669 )	2026-06-24 20:37:08 +02:00
Ville Skyttä	4f93afd6ae	Remove myself from huawei_lte codeowners (#174671 )	2026-06-24 19:57:24 +02:00
Erwin Douna	7968fc4809	Huawei group executor job (#174666 )	2026-06-24 19:43:54 +02:00
TheJulianJES	975f2a831e	Bump zha-quirks to 2.1.0 (#174662 )	2026-06-24 18:42:41 +02:00
Paulus Schoutsen	18229b0998	Trim llm integration module docstring Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-20 23:37:51 -04:00
Paulus Schoutsen	39a1e6dfcc	Load LLM tools platforms lazily and pull tools on demand Switch from a push model (platforms register providers at setup via an eager async_process_integration_platforms) to a pull model using the new LazyIntegrationPlatforms helper: an <integration>/llm.py platform exposes an async_get_tools(hass, llm_context) hook, and the platform is imported and queried only when tools are requested. This drops the async_register_tool_provider registry. async_get_tools is now async, loads each integration's platform lazily, and merges their tools and prompt fragments. Results are sorted by domain so tool and prompt order does not depend on integration load order. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-20 11:32:48 -04:00
Paulus Schoutsen	bc8bf27e79	Merge remote-tracking branch 'origin/dev' into llm-integration	2026-06-20 11:30:41 -04:00
Paulus Schoutsen	42dbf09f43	Address review: isolate provider failures and guard registration - Add homeassistant/components/llm to .core_files.yaml. - Isolate per-provider failures in async_get_tools so one raising provider no longer blanks out every other provider's tools and prompt. - Raise on duplicate provider registration and make unregister idempotent, matching the defensiveness of the API registry in helpers/llm.py. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-19 15:33:55 -04:00
Paulus Schoutsen	3c36f3809a	Move tool provider registry into the llm integration Keep homeassistant.helpers.llm unchanged: the tool provider registry now lives in the llm integration instead of the helper. Platforms register through homeassistant.components.llm.async_register_tool_provider and the integration exposes async_get_tools to read the merged tools and prompt. The framework (Tool, LLMContext, the APIs) stays in the helper; the integration owns the registry and lifecycle. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-18 22:58:45 -04:00
Paulus Schoutsen	b6bf1c83ab	Add llm integration and tool provider registry Introduce the plumbing for per-integration LLM tools, with no consumer yet. helpers/llm.py gains a tool provider registry: an LLMTools result (tools plus an optional prompt fragment), a provider callback type, and async_register_tool_provider, which appends to a single global registry. _async_get_registered_tools merges every provider's tools and prompt. Nothing reads the registry yet, so there is no behavior change. The new system llm integration owns the LLM tools platform: its async_setup drives async_process_integration_platforms(hass, "llm", ...) so integrations can ship an <integration>/llm.py with an async_setup_tools hook to register tools, mirroring the intent helper/integration split. The framework (registry, Tool, the APIs) stays in homeassistant.helpers.llm. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-18 22:51:29 -04:00