Add decorator to define Python tools from Python functions

2025-10-11 20:59:34 +00:00 · 2025-08-17 20:59:10 +00:00
2381 changed files with 27143 additions and 161978 deletions
--- a/.claude/agents/quality-scale-rule-verifier.md
+++ b/.claude/agents/quality-scale-rule-verifier.md
@@ -1,77 +0,0 @@
 ---
 name: quality-scale-rule-verifier
 description: |
  Use this agent when you need to verify that a Home Assistant integration follows a specific quality scale rule. This includes checking if the integration implements required patterns, configurations, or code structures defined by the quality scale system.
  <example>
  Context: The user wants to verify if an integration follows a specific quality scale rule.
  user: "Check if the peblar integration follows the config-flow rule"
  assistant: "I'll use the quality scale rule verifier to check if the peblar integration properly implements the config-flow rule."
  <commentary>
  Since the user is asking to verify a quality scale rule implementation, use the quality-scale-rule-verifier agent.
  </commentary>
  </example>
  <example>
  Context: The user is reviewing if an integration reaches a specific quality scale level.
  user: "Verify that this integration reaches the bronze quality scale"
  assistant: "Let me use the quality scale rule verifier to check the bronze quality scale implementation."
  <commentary>
  The user wants to verify the integration has reached a certain quality level, so use multiple quality-scale-rule-verifier agents to verify each bronze rule.
  </commentary>
  </example>
 model: inherit
 color: yellow
 tools: Read, Bash, Grep, Glob, WebFetch
 ---
 You are an expert Home Assistant integration quality scale auditor specializing in verifying compliance with specific quality scale rules. You have deep knowledge of Home Assistant's architecture, best practices, and the quality scale system that ensures integration consistency and reliability.
 You will verify if an integration follows a specific quality scale rule by:
 1. **Fetching Rule Documentation**: Retrieve the official rule documentation from:
   `https://raw.githubusercontent.com/home-assistant/developers.home-assistant/refs/heads/master/docs/core/integration-quality-scale/rules/{rule_name}.md`
   where `{rule_name}` is the rule identifier (e.g., 'config-flow', 'entity-unique-id', 'parallel-updates')
 2. **Understanding Rule Requirements**: Parse the rule documentation to identify:
   - Core requirements and mandatory implementations
   - Specific code patterns or configurations required
   - Common violations and anti-patterns
   - Exemption criteria (when a rule might not apply)
   - The quality tier this rule belongs to (Bronze, Silver, Gold, Platinum)
 3. **Analyzing Integration Code**: Examine the integration's codebase at `homeassistant/components/<integration domain>` focusing on:
   - `manifest.json` for quality scale declaration and configuration
   - `quality_scale.yaml` for rule status (done, todo, exempt)
   - Relevant Python modules based on the rule requirements
   - Configuration files and service definitions as needed
 4. **Verification Process**:
   - Check if the rule is marked as 'done', 'todo', or 'exempt' in quality_scale.yaml
   - If marked 'exempt', verify the exemption reason is valid
   - If marked 'done', verify the actual implementation matches requirements
   - Identify specific files and code sections that demonstrate compliance or violations
   - Consider the integration's declared quality tier when applying rules
   - To fetch the integration docs, use WebFetch to fetch from `https://raw.githubusercontent.com/home-assistant/home-assistant.io/refs/heads/current/source/_integrations/<integration domain>.markdown`
   - To fetch information about a PyPI package, use the URL `https://pypi.org/pypi/<package>/json`
 5. **Reporting Findings**: Provide a comprehensive verification report that includes:
   - **Rule Summary**: Brief description of what the rule requires
   - **Compliance Status**: Clear pass/fail/exempt determination
   - **Evidence**: Specific code examples showing compliance or violations
   - **Issues Found**: Detailed list of any non-compliance issues with file locations
   - **Recommendations**: Actionable steps to achieve compliance if needed
   - **Exemption Analysis**: If applicable, whether the exemption is justified
 When examining code, you will:
 - Look for exact implementation patterns specified in the rule
 - Verify all required components are present and properly configured
 - Check for common mistakes and anti-patterns
 - Consider edge cases and error handling requirements
 - Validate that implementations follow Home Assistant conventions
 You will be thorough but focused, examining only the aspects relevant to the specific rule being verified. You will provide clear, actionable feedback that helps developers understand both what needs to be fixed and why it matters for integration quality.
 If you cannot access the rule documentation or find the integration code, clearly state what information is missing and what you would need to complete the verification.
 Remember that quality scale rules are cumulative - Bronze rules apply to all integrations with a quality scale, Silver rules apply to Silver+ integrations, and so on. Always consider the integration's target quality level when determining which rules should be enforced.
--- a/.core_files.yaml
+++ b/.core_files.yaml
@@ -58,7 +58,6 @@ base_platforms: &base_platforms
 # Extra components that trigger the full suite
 components: &components
  - homeassistant/components/alexa/**
  - homeassistant/components/analytics/**
  - homeassistant/components/application_credentials/**
  - homeassistant/components/assist_pipeline/**
  - homeassistant/components/auth/**
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,8 +8,6 @@
    "PYTHONASYNCIODEBUG": "1"
  },
  "features": {
    // Node feature required for Claude Code until fixed https://github.com/anthropics/devcontainer-features/issues/28
    "ghcr.io/devcontainers/features/node:1": {},
    "ghcr.io/anthropics/devcontainer-features/claude-code:1.0": {},
    "ghcr.io/devcontainers/features/github-cli:1": {}
  },
--- a/.dockerignore
+++ b/.dockerignore
@@ -14,8 +14,7 @@ tests
 # Other virtualization methods
 venv
 .venv
 .vagrant
 # Temporary files
-**/__pycache__
+**/__pycache__
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -55,12 +55,8 @@
  creating the PR. If you're unsure about any of them, don't hesitate to ask.
  We're here to help! This is simply a reminder of what we are going to look
  for before merging your code.
  AI tools are welcome, but contributors are responsible for *fully*
  understanding the code before submitting a PR.
 -->
 - [ ] I understand the code I am submitting and can explain how it works.
 - [ ] The code change is tested and works locally.
 - [ ] Local tests pass. **Your PR cannot be merged unless tests pass**
 - [ ] There is no commented out code in this PR.
@@ -68,7 +64,6 @@
 - [ ] I have followed the [perfect PR recommendations][perfect-pr]
 - [ ] The code has been formatted using Ruff (`ruff format homeassistant tests`)
 - [ ] Tests have been added to verify that the new code works.
 - [ ] Any generated code has been carefully reviewed for correctness and compliance with project standards.
 If user exposed functionality or configuration variables are added/changed:
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1073,11 +1073,7 @@ async def test_flow_connection_error(hass, mock_api_error):
 ### Entity Testing Patterns
 ```python
-@pytest.fixture 
+@pytest.mark.parametrize("init_integration", [Platform.SENSOR], indirect=True)
 def platforms() -> list[Platform]: 
    """Overridden fixture to specify platforms to test.""" 
    return [Platform.SENSOR]  # Or another specific platform as needed.
@pytest.mark.usefixtures("entity_registry_enabled_by_default", "init_integration")
 async def test_entities(
    hass: HomeAssistant,
@@ -1124,25 +1120,16 @@ def mock_device_api() -> Generator[MagicMock]:
        )
        yield api
@pytest.fixture 
 def platforms() -> list[Platform]: 
    """Fixture to specify platforms to test.""" 
    return PLATFORMS
@pytest.fixture
 async def init_integration(
    hass: HomeAssistant,
    mock_config_entry: MockConfigEntry,
    mock_device_api: MagicMock,
    platforms: list[Platform],
 ) -> MockConfigEntry:
    """Set up the integration for testing."""
    mock_config_entry.add_to_hass(hass)
-    
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    with patch("homeassistant.components.my_integration.PLATFORMS", platforms):
+    await hass.async_block_till_done()
        await hass.config_entries.async_setup(mock_config_entry.entry_id)
        await hass.async_block_till_done()
    return mock_config_entry
 ```
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -27,12 +27,12 @@ jobs:
      publish: ${{ steps.version.outputs.publish }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
        with:
          fetch-depth: 0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
@@ -69,7 +69,7 @@ jobs:
        run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
      - name: Upload translations
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: translations
          path: translations.tar.gz
@@ -90,11 +90,11 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Download nightly wheels of frontend
        if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
+        uses: dawidd6/action-download-artifact@v11
        with:
          github_token: ${{secrets.GITHUB_TOKEN}}
          repo: home-assistant/frontend
@@ -105,7 +105,7 @@ jobs:
      - name: Download nightly wheels of intents
        if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
+        uses: dawidd6/action-download-artifact@v11
        with:
          github_token: ${{secrets.GITHUB_TOKEN}}
          repo: OHF-Voice/intents-package
@@ -116,7 +116,7 @@ jobs:
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
@@ -175,7 +175,7 @@ jobs:
          sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
      - name: Download translations
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: translations
@@ -190,15 +190,14 @@ jobs:
          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}
      # home-assistant/builder doesn't support sha pinning
      - name: Build base image
-        uses: home-assistant/builder@2025.09.0
+        uses: home-assistant/builder@2025.03.0
        with:
          args: |
            $BUILD_ARGS \
@@ -243,7 +242,7 @@ jobs:
          - green
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set build additional args
        run: |
@@ -257,15 +256,14 @@ jobs:
          fi
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}
      # home-assistant/builder doesn't support sha pinning
      - name: Build base image
-        uses: home-assistant/builder@2025.09.0
+        uses: home-assistant/builder@2025.03.0
        with:
          args: |
            $BUILD_ARGS \
@@ -281,7 +279,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Initialize git
        uses: home-assistant/actions/helpers/git-init@master
@@ -323,23 +321,23 @@ jobs:
        registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Install Cosign
-        uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
+        uses: sigstore/cosign-installer@v3.9.2
        with:
          cosign-release: "v2.2.3"
      - name: Login to DockerHub
        if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@v3.5.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Login to GitHub Container Registry
        if: matrix.registry == 'ghcr.io/home-assistant'
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -456,15 +454,15 @@ jobs:
    if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Download translations
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: translations
@@ -482,7 +480,7 @@ jobs:
          python -m build
      - name: Upload package to PyPI
-        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.12.4
        with:
          skip-existing: true
@@ -533,7 +531,7 @@ jobs:
      - name: Generate artifact attestation
        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
+        uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0
        with:
          subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
          subject-digest: ${{ steps.push.outputs.digest }}
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -37,10 +37,10 @@ on:
        type: boolean
 env:
-  CACHE_VERSION: 8
+  CACHE_VERSION: 5
  UV_CACHE_VERSION: 1
  MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.10"
+  HA_SHORT_VERSION: "2025.9"
  DEFAULT_PYTHON: "3.13"
  ALL_PYTHON_VERSIONS: "['3.13']"
  # 10.3 is the oldest supported version
@@ -61,9 +61,6 @@ env:
  POSTGRESQL_VERSIONS: "['postgres:12.14','postgres:15.2']"
  PRE_COMMIT_CACHE: ~/.cache/pre-commit
  UV_CACHE_DIR: /tmp/uv-cache
  APT_CACHE_BASE: /home/runner/work/apt
  APT_CACHE_DIR: /home/runner/work/apt/cache
  APT_LIST_CACHE_DIR: /home/runner/work/apt/lists
  SQLALCHEMY_WARN_20: 1
  PYTHONASYNCIODEBUG: 1
  HASS_CI: 1
@@ -81,7 +78,6 @@ jobs:
      core: ${{ steps.core.outputs.changes }}
      integrations_glob: ${{ steps.info.outputs.integrations_glob }}
      integrations: ${{ steps.integrations.outputs.changes }}
      apt_cache_key: ${{ steps.generate_apt_cache_key.outputs.key }}
      pre-commit_cache_key: ${{ steps.generate_pre-commit_cache_key.outputs.key }}
      python_cache_key: ${{ steps.generate_python_cache_key.outputs.key }}
      requirements: ${{ steps.core.outputs.requirements }}
@@ -98,7 +94,7 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Generate partial Python venv restore key
        id: generate_python_cache_key
        run: |
@@ -115,12 +111,8 @@ jobs:
        run: >-
          echo "key=pre-commit-${{ env.CACHE_VERSION }}-${{
            hashFiles('.pre-commit-config.yaml') }}"  >> $GITHUB_OUTPUT
      - name: Generate partial apt restore key
        id: generate_apt_cache_key
        run: |
          echo "key=$(lsb_release -rs)-apt-${{ env.CACHE_VERSION }}-${{ env.HA_SHORT_VERSION }}" >> $GITHUB_OUTPUT
      - name: Filter for core changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        uses: dorny/paths-filter@v3.0.2
        id: core
        with:
          filters: .core_files.yaml
@@ -135,7 +127,7 @@ jobs:
          echo "Result:"
          cat .integration_paths.yaml
      - name: Filter for integration changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        uses: dorny/paths-filter@v3.0.2
        id: integrations
        with:
          filters: .integration_paths.yaml
@@ -254,16 +246,16 @@ jobs:
      - info
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@v4.2.4
        with:
          path: venv
          key: >-
@@ -279,7 +271,7 @@ jobs:
          uv pip install "$(cat requirements_test.txt | grep pre-commit)"
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          lookup-only: true
@@ -300,16 +292,16 @@ jobs:
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -318,7 +310,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -340,16 +332,16 @@ jobs:
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -358,7 +350,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -380,16 +372,16 @@ jobs:
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -398,7 +390,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -470,7 +462,7 @@ jobs:
          - script/hassfest/docker/Dockerfile
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Register hadolint problem matcher
        run: |
          echo "::add-matcher::.github/workflows/matchers/hadolint.json"
@@ -489,10 +481,10 @@ jobs:
        python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
@@ -505,7 +497,7 @@ jobs:
            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@v4.2.4
        with:
          path: venv
          key: >-
@@ -513,7 +505,7 @@ jobs:
            needs.info.outputs.python_cache_key }}
      - name: Restore uv wheel cache
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@v4.2.4
        with:
          path: ${{ env.UV_CACHE_DIR }}
          key: >-
@@ -523,38 +515,15 @@ jobs:
            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-uv-${{
            env.UV_CACHE_VERSION }}-${{ steps.generate-uv-key.outputs.version }}-${{
            env.HA_SHORT_VERSION }}-
      - name: Check if apt cache exists
        id: cache-apt-check
        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
        with:
          lookup-only: ${{ steps.cache-venv.outputs.cache-hit == 'true' }}
          path: |
            ${{ env.APT_CACHE_DIR }}
            ${{ env.APT_LIST_CACHE_DIR }}
          key: >-
            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
-        if: |
+        if: steps.cache-venv.outputs.cache-hit != 'true'
          steps.cache-venv.outputs.cache-hit != 'true'
          || steps.cache-apt-check.outputs.cache-hit != 'true'
        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          if [[ "${{ steps.cache-apt-check.outputs.cache-hit }}" != 'true' ]]; then
+          sudo apt-get update
            mkdir -p ${{ env.APT_CACHE_DIR }}
            mkdir -p ${{ env.APT_LIST_CACHE_DIR }}
          fi
          sudo apt-get update \
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
          sudo apt-get -y install \
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libxml2-utils \
            libavcodec-dev \
            libavdevice-dev \
            libavfilter-dev \
@@ -564,19 +533,6 @@ jobs:
            libswresample-dev \
            libswscale-dev \
            libudev-dev
          if [[ "${{ steps.cache-apt-check.outputs.cache-hit }}" != 'true' ]]; then
            sudo chmod -R 755 ${{ env.APT_CACHE_BASE }}
          fi
      - name: Save apt cache
        if: steps.cache-apt-check.outputs.cache-hit != 'true'
        uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
            ${{ env.APT_LIST_CACHE_DIR }}
          key: >-
            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Create Python virtual environment
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -596,7 +552,7 @@ jobs:
          python --version
          uv pip freeze >> pip_freeze.txt
      - name: Upload pip_freeze artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pip-freeze-${{ matrix.python-version }}
          path: pip_freeze.txt
@@ -621,37 +577,23 @@ jobs:
      - info
      - base
    steps:
      - name: Restore apt cache
        uses: actions/cache/restore@v4.2.4
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
            ${{ env.APT_LIST_CACHE_DIR }}
          fail-on-cache-miss: true
          key: >-
            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
+          sudo apt-get update
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
          sudo apt-get -y install \
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            libturbojpeg
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -675,16 +617,16 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -709,9 +651,9 @@ jobs:
      && github.event_name == 'pull_request'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Dependency review
-        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
+        uses: actions/dependency-review-action@v4.7.1
        with:
          license-check: false # We use our own license audit checks
@@ -732,16 +674,16 @@ jobs:
        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -753,7 +695,7 @@ jobs:
          . venv/bin/activate
          python -m script.licenses extract --output-file=licenses-${{ matrix.python-version }}.json
      - name: Upload licenses
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: licenses-${{ github.run_number }}-${{ matrix.python-version }}
          path: licenses-${{ matrix.python-version }}.json
@@ -775,16 +717,16 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -822,16 +764,16 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -867,10 +809,10 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -883,7 +825,7 @@ jobs:
            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -891,7 +833,7 @@ jobs:
            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Restore mypy cache
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@v4.2.4
        with:
          path: .mypy_cache
          key: >-
@@ -934,40 +876,26 @@ jobs:
      - mypy
    name: Split tests for full run
    steps:
      - name: Restore apt cache
        uses: actions/cache/restore@v4.2.4
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
            ${{ env.APT_LIST_CACHE_DIR }}
          fail-on-cache-miss: true
          key: >-
            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
+          sudo apt-get update
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
          sudo apt-get -y install \
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libgammu-dev
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -979,7 +907,7 @@ jobs:
          . venv/bin/activate
          python -m script.split_tests ${{ needs.info.outputs.test_group_count }} tests
      - name: Upload pytest_buckets
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pytest_buckets
          path: pytest_buckets.txt
@@ -1008,41 +936,27 @@ jobs:
    name: >-
      Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
    steps:
      - name: Restore apt cache
        uses: actions/cache/restore@v4.2.4
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
            ${{ env.APT_LIST_CACHE_DIR }}
          fail-on-cache-miss: true
          key: >-
            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
+          sudo apt-get update
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
          sudo apt-get -y install \
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libgammu-dev \
            libxml2-utils
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1056,7 +970,7 @@ jobs:
        run: |
          echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
      - name: Download pytest_buckets
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: pytest_buckets
      - name: Compile English translations
@@ -1095,14 +1009,14 @@ jobs:
              2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-full.conclusion == 'failure'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
          path: pytest-*.txt
          overwrite: true
      - name: Upload coverage artifact
        if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
          path: coverage.xml
@@ -1115,7 +1029,7 @@ jobs:
          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: test-results-full-${{ matrix.python-version }}-${{ matrix.group }}
          path: junit.xml
@@ -1155,41 +1069,27 @@ jobs:
    name: >-
      Run ${{ matrix.mariadb-group }} tests Python ${{ matrix.python-version }}
    steps:
      - name: Restore apt cache
        uses: actions/cache/restore@v4.2.4
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
            ${{ env.APT_LIST_CACHE_DIR }}
          fail-on-cache-miss: true
          key: >-
            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
+          sudo apt-get update
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
          sudo apt-get -y install \
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libmariadb-dev-compat \
            libxml2-utils
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1248,7 +1148,7 @@ jobs:
              2>&1 | tee pytest-${{ matrix.python-version }}-${mariadb}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.mariadb }}
@@ -1256,7 +1156,7 @@ jobs:
          overwrite: true
      - name: Upload coverage artifact
        if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: coverage-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.mariadb }}
@@ -1270,7 +1170,7 @@ jobs:
          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: test-results-mariadb-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.mariadb }}
@@ -1309,25 +1209,11 @@ jobs:
    name: >-
      Run ${{ matrix.postgresql-group }} tests Python ${{ matrix.python-version }}
    steps:
      - name: Restore apt cache
        uses: actions/cache/restore@v4.2.4
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
            ${{ env.APT_LIST_CACHE_DIR }}
          fail-on-cache-miss: true
          key: >-
            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
+          sudo apt-get update
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
          sudo apt-get -y install \
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
@@ -1336,16 +1222,16 @@ jobs:
          sudo apt-get -y install \
            postgresql-server-dev-14
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1405,7 +1291,7 @@ jobs:
              2>&1 | tee pytest-${{ matrix.python-version }}-${postgresql}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.postgresql }}
@@ -1413,7 +1299,7 @@ jobs:
          overwrite: true
      - name: Upload coverage artifact
        if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: coverage-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.postgresql }}
@@ -1427,7 +1313,7 @@ jobs:
          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: test-results-postgres-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.postgresql }}
@@ -1448,14 +1334,14 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: coverage-*
      - name: Upload coverage to Codecov
        if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@v5.4.3
        with:
          fail_ci_if_error: true
          flags: full-suite
@@ -1484,41 +1370,27 @@ jobs:
    name: >-
      Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
    steps:
      - name: Restore apt cache
        uses: actions/cache/restore@v4.2.4
        with:
          path: |
            ${{ env.APT_CACHE_DIR }}
            ${{ env.APT_LIST_CACHE_DIR }}
          fail-on-cache-miss: true
          key: >-
            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
+          sudo apt-get update
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
          sudo apt-get -y install \
            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libgammu-dev \
            libxml2-utils
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1574,14 +1446,14 @@ jobs:
              2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
          path: pytest-*.txt
          overwrite: true
      - name: Upload coverage artifact
        if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
          path: coverage.xml
@@ -1594,7 +1466,7 @@ jobs:
          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: test-results-partial-${{ matrix.python-version }}-${{ matrix.group }}
          path: junit.xml
@@ -1612,14 +1484,14 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: coverage-*
      - name: Upload coverage to Codecov
        if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@v5.4.3
        with:
          fail_ci_if_error: true
          token: ${{ secrets.CODECOV_TOKEN }}
@@ -1639,11 +1511,11 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: test-results-*
      - name: Upload test results to Codecov
-        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        uses: codecov/test-results-action@v1
        with:
          fail_ci_if_error: true
          verbose: true
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -21,14 +21,14 @@ jobs:
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/init@v3.29.9
        with:
          languages: python
      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/analyze@v3.29.9
        with:
          category: "/language:python"
--- a/.github/workflows/detect-duplicate-issues.yml
+++ b/.github/workflows/detect-duplicate-issues.yml
@@ -16,7 +16,7 @@ jobs:
    steps:
      - name: Check if integration label was added and extract details
        id: extract
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7.0.1
        with:
          script: |
            // Debug: Log the event payload
@@ -113,7 +113,7 @@ jobs:
      - name: Fetch similar issues
        id: fetch_similar
        if: steps.extract.outputs.should_continue == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7.0.1
        env:
          INTEGRATION_LABELS: ${{ steps.extract.outputs.integration_labels }}
          CURRENT_NUMBER: ${{ steps.extract.outputs.current_number }}
@@ -231,7 +231,7 @@ jobs:
      - name: Detect duplicates using AI
        id: ai_detection
        if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/ai-inference@a1c11829223a786afe3b5663db904a3aa1eac3a2 # v2.0.1
+        uses: actions/ai-inference@v2.0.0
        with:
          model: openai/gpt-4o
          system-prompt: |
@@ -280,7 +280,7 @@ jobs:
      - name: Post duplicate detection results
        id: post_results
        if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7.0.1
        env:
          AI_RESPONSE: ${{ steps.ai_detection.outputs.response }}
          SIMILAR_ISSUES: ${{ steps.fetch_similar.outputs.similar_issues }}
--- a/.github/workflows/detect-non-english-issues.yml
+++ b/.github/workflows/detect-non-english-issues.yml
@@ -16,7 +16,7 @@ jobs:
    steps:
      - name: Check issue language
        id: detect_language
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7.0.1
        env:
          ISSUE_NUMBER: ${{ github.event.issue.number }}
          ISSUE_TITLE: ${{ github.event.issue.title }}
@@ -57,7 +57,7 @@ jobs:
      - name: Detect language using AI
        id: ai_language_detection
        if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/ai-inference@a1c11829223a786afe3b5663db904a3aa1eac3a2 # v2.0.1
+        uses: actions/ai-inference@v2.0.0
        with:
          model: openai/gpt-4o-mini
          system-prompt: |
@@ -90,7 +90,7 @@ jobs:
      - name: Process non-English issues
        if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7.0.1
        env:
          AI_RESPONSE: ${{ steps.ai_language_detection.outputs.response }}
          ISSUE_NUMBER: ${{ steps.detect_language.outputs.issue_number }}
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -10,7 +10,7 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
+      - uses: dessant/lock-threads@v5.0.1
        with:
          github-token: ${{ github.token }}
          issue-inactive-days: "30"
--- a/.github/workflows/restrict-task-creation.yml
+++ b/.github/workflows/restrict-task-creation.yml
@@ -12,7 +12,7 @@ jobs:
    if: github.event.issue.type.name == 'Task'
    steps:
      - name: Check if user is authorized
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7
        with:
          script: |
            const issueAuthor = context.payload.issue.user.login;
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -17,7 +17,7 @@ jobs:
      # - No PRs marked as no-stale
      # - No issues (-1)
      - name: 60 days stale PRs policy
-        uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+        uses: actions/stale@v9.1.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 60
@@ -57,7 +57,7 @@ jobs:
      # - No issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: 90 days stale issues
-        uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+        uses: actions/stale@v9.1.0
        with:
          repo-token: ${{ steps.token.outputs.token }}
          days-before-stale: 90
@@ -87,7 +87,7 @@ jobs:
      # - No Issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: Needs more information stale issues policy
-        uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+        uses: actions/stale@v9.1.0
        with:
          repo-token: ${{ steps.token.outputs.token }}
          only-labels: "needs-more-information"
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -19,10 +19,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -32,11 +32,11 @@ jobs:
      architectures: ${{ steps.info.outputs.architectures }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -91,7 +91,7 @@ jobs:
          ) > build_constraints.txt
      - name: Upload env_file
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: env_file
          path: ./.env_file
@@ -99,14 +99,14 @@ jobs:
          overwrite: true
      - name: Upload build_constraints
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: build_constraints
          path: ./build_constraints.txt
          overwrite: true
      - name: Upload requirements_diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: requirements_diff
          path: ./requirements_diff.txt
@@ -118,7 +118,7 @@ jobs:
          python -m script.gen_requirements_all ci
      - name: Upload requirements_all_wheels
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: requirements_all_wheels
          path: ./requirements_all_wheels_*.txt
@@ -135,20 +135,20 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Download env_file
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: env_file
      - name: Download build_constraints
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: build_constraints
      - name: Download requirements_diff
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: requirements_diff
@@ -158,9 +158,8 @@ jobs:
          sed -i "/uv/d" requirements.txt
          sed -i "/uv/d" requirements_diff.txt
      # home-assistant/wheels doesn't support sha pinning
      - name: Build wheels
-        uses: home-assistant/wheels@2025.09.1
+        uses: home-assistant/wheels@2025.07.0
        with:
          abi: ${{ matrix.abi }}
          tag: musllinux_1_2
@@ -185,25 +184,25 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Download env_file
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: env_file
      - name: Download build_constraints
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: build_constraints
      - name: Download requirements_diff
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: requirements_diff
      - name: Download requirements_all_wheels
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: requirements_all_wheels
@@ -219,9 +218,8 @@ jobs:
          sed -i "/uv/d" requirements.txt
          sed -i "/uv/d" requirements_diff.txt
      # home-assistant/wheels doesn't support sha pinning
      - name: Build wheels
-        uses: home-assistant/wheels@2025.09.1
+        uses: home-assistant/wheels@2025.07.0
        with:
          abi: ${{ matrix.abi }}
          tag: musllinux_1_2
--- a/.gitignore
+++ b/.gitignore
@@ -140,5 +140,5 @@ tmp_cache
 pytest_buckets.txt
 # AI tooling
-.claude/settings.local.json
+.claude
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.0
+    rev: v0.12.1
    hooks:
      - id: ruff-check
        args:
--- a/.strict-typing
+++ b/.strict-typing
@@ -142,7 +142,6 @@ homeassistant.components.cloud.*
 homeassistant.components.co2signal.*
 homeassistant.components.comelit.*
 homeassistant.components.command_line.*
 homeassistant.components.compit.*
 homeassistant.components.config.*
 homeassistant.components.configurator.*
 homeassistant.components.cookidoo.*
@@ -170,7 +169,6 @@ homeassistant.components.dnsip.*
 homeassistant.components.doorbird.*
 homeassistant.components.dormakaba_dkey.*
 homeassistant.components.downloader.*
 homeassistant.components.droplet.*
 homeassistant.components.dsmr.*
 homeassistant.components.duckdns.*
 homeassistant.components.dunehd.*
@@ -309,7 +307,6 @@ homeassistant.components.ld2410_ble.*
 homeassistant.components.led_ble.*
 homeassistant.components.lektrico.*
 homeassistant.components.letpot.*
 homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*
 homeassistant.components.light.*
@@ -385,7 +382,6 @@ homeassistant.components.openai_conversation.*
 homeassistant.components.openexchangerates.*
 homeassistant.components.opensky.*
 homeassistant.components.openuv.*
 homeassistant.components.opnsense.*
 homeassistant.components.opower.*
 homeassistant.components.oralb.*
 homeassistant.components.otbr.*
@@ -403,7 +399,6 @@ homeassistant.components.person.*
 homeassistant.components.pi_hole.*
 homeassistant.components.ping.*
 homeassistant.components.plugwise.*
 homeassistant.components.portainer.*
 homeassistant.components.powerfox.*
 homeassistant.components.powerwall.*
 homeassistant.components.private_ble_device.*
@@ -443,7 +438,6 @@ homeassistant.components.rituals_perfume_genie.*
 homeassistant.components.roborock.*
 homeassistant.components.roku.*
 homeassistant.components.romy.*
 homeassistant.components.route_b_smart_meter.*
 homeassistant.components.rpi_power.*
 homeassistant.components.rss_feed_template.*
 homeassistant.components.russound_rio.*
@@ -464,7 +458,6 @@ homeassistant.components.sensorpush_cloud.*
 homeassistant.components.sensoterra.*
 homeassistant.components.senz.*
 homeassistant.components.sfr_box.*
 homeassistant.components.sftp_storage.*
 homeassistant.components.shell_command.*
 homeassistant.components.shelly.*
 homeassistant.components.shopping_list.*
--- a/109
+++ b/109
@@ -87,8 +87,6 @@ build.json @home-assistant/supervisor
 /tests/components/airzone/ @Noltari
 /homeassistant/components/airzone_cloud/ @Noltari
 /tests/components/airzone_cloud/ @Noltari
 /homeassistant/components/aladdin_connect/ @swcloudgenie
 /tests/components/aladdin_connect/ @swcloudgenie
 /homeassistant/components/alarm_control_panel/ @home-assistant/core
 /tests/components/alarm_control_panel/ @home-assistant/core
 /homeassistant/components/alert/ @home-assistant/core @frenck
@@ -107,8 +105,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/ambient_station/ @bachya
 /tests/components/ambient_station/ @bachya
 /homeassistant/components/amcrest/ @flacjacket
-/homeassistant/components/analytics/ @home-assistant/core
+/homeassistant/components/analytics/ @home-assistant/core @ludeeus
-/tests/components/analytics/ @home-assistant/core
+/tests/components/analytics/ @home-assistant/core @ludeeus
 /homeassistant/components/analytics_insights/ @joostlek
 /tests/components/analytics_insights/ @joostlek
 /homeassistant/components/android_ip_webcam/ @engrbm87
@@ -154,10 +152,10 @@ build.json @home-assistant/supervisor
 /tests/components/arve/ @ikalnyi
 /homeassistant/components/aseko_pool_live/ @milanmeu
 /tests/components/aseko_pool_live/ @milanmeu
-/homeassistant/components/assist_pipeline/ @synesthesiam @arturpragacz
+/homeassistant/components/assist_pipeline/ @balloob @synesthesiam
-/tests/components/assist_pipeline/ @synesthesiam @arturpragacz
+/tests/components/assist_pipeline/ @balloob @synesthesiam
-/homeassistant/components/assist_satellite/ @home-assistant/core @synesthesiam @arturpragacz
+/homeassistant/components/assist_satellite/ @home-assistant/core @synesthesiam
-/tests/components/assist_satellite/ @home-assistant/core @synesthesiam @arturpragacz
+/tests/components/assist_satellite/ @home-assistant/core @synesthesiam
 /homeassistant/components/asuswrt/ @kennedyshead @ollo69 @Vaskivskyi
 /tests/components/asuswrt/ @kennedyshead @ollo69 @Vaskivskyi
 /homeassistant/components/atag/ @MatsNL
@@ -292,16 +290,14 @@ build.json @home-assistant/supervisor
 /tests/components/command_line/ @gjohansson-ST
 /homeassistant/components/compensation/ @Petro31
 /tests/components/compensation/ @Petro31
 /homeassistant/components/compit/ @Przemko92
 /tests/components/compit/ @Przemko92
 /homeassistant/components/config/ @home-assistant/core
 /tests/components/config/ @home-assistant/core
 /homeassistant/components/configurator/ @home-assistant/core
 /tests/components/configurator/ @home-assistant/core
 /homeassistant/components/control4/ @lawtancool
 /tests/components/control4/ @lawtancool
-/homeassistant/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
+/homeassistant/components/conversation/ @home-assistant/core @synesthesiam
-/tests/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
+/tests/components/conversation/ @home-assistant/core @synesthesiam
 /homeassistant/components/cookidoo/ @miaucl
 /tests/components/cookidoo/ @miaucl
 /homeassistant/components/coolmaster/ @OnFreund
@@ -316,8 +312,6 @@ build.json @home-assistant/supervisor
 /tests/components/crownstone/ @Crownstone @RicArch97
 /homeassistant/components/cups/ @fabaff
 /tests/components/cups/ @fabaff
 /homeassistant/components/cync/ @Kinachi249
 /tests/components/cync/ @Kinachi249
 /homeassistant/components/daikin/ @fredrike
 /tests/components/daikin/ @fredrike
 /homeassistant/components/date/ @home-assistant/core
@@ -381,8 +375,6 @@ build.json @home-assistant/supervisor
 /tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/drop_connect/ @ChandlerSystems @pfrazer
 /tests/components/drop_connect/ @ChandlerSystems @pfrazer
 /homeassistant/components/droplet/ @sarahseidman
 /tests/components/droplet/ @sarahseidman
 /homeassistant/components/dsmr/ @Robbie1221
 /tests/components/dsmr/ @Robbie1221
 /homeassistant/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
@@ -412,8 +404,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/egardia/ @jeroenterheerdt
 /homeassistant/components/eheimdigital/ @autinerd
 /tests/components/eheimdigital/ @autinerd
 /homeassistant/components/ekeybionyx/ @richardpolzer
 /tests/components/ekeybionyx/ @richardpolzer
 /homeassistant/components/electrasmart/ @jafar-atili
 /tests/components/electrasmart/ @jafar-atili
 /homeassistant/components/electric_kiwi/ @mikey0000
@@ -432,8 +422,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/emby/ @mezz64
 /homeassistant/components/emoncms/ @borpin @alexandrecuer
 /tests/components/emoncms/ @borpin @alexandrecuer
 /homeassistant/components/emoncms_history/ @alexandrecuer
 /tests/components/emoncms_history/ @alexandrecuer
 /homeassistant/components/emonitor/ @bdraco
 /tests/components/emonitor/ @bdraco
 /homeassistant/components/emulated_hue/ @bdraco @Tho85
@@ -448,6 +436,8 @@ build.json @home-assistant/supervisor
 /tests/components/energyzero/ @klaasnicolaas
 /homeassistant/components/enigma2/ @autinerd
 /tests/components/enigma2/ @autinerd
 /homeassistant/components/enocean/ @bdurrer
 /tests/components/enocean/ @bdurrer
 /homeassistant/components/enphase_envoy/ @bdraco @cgarwood @catsmanac
 /tests/components/enphase_envoy/ @bdraco @cgarwood @catsmanac
 /homeassistant/components/entur_public_transport/ @hfurubotten
@@ -470,6 +460,8 @@ build.json @home-assistant/supervisor
 /tests/components/eufylife_ble/ @bdr99
 /homeassistant/components/event/ @home-assistant/core
 /tests/components/event/ @home-assistant/core
 /homeassistant/components/evil_genius_labs/ @balloob
 /tests/components/evil_genius_labs/ @balloob
 /homeassistant/components/evohome/ @zxdavb
 /tests/components/evohome/ @zxdavb
 /homeassistant/components/ezviz/ @RenierM26
@@ -519,8 +511,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/forked_daapd/ @uvjustin
 /tests/components/forked_daapd/ @uvjustin
 /homeassistant/components/fortios/ @kimfrellsen
-/homeassistant/components/foscam/ @Foscam-wangzhengyu
+/homeassistant/components/foscam/ @krmarien
-/tests/components/foscam/ @Foscam-wangzhengyu
+/tests/components/foscam/ @krmarien
 /homeassistant/components/freebox/ @hacf-fr @Quentame
 /tests/components/freebox/ @hacf-fr @Quentame
 /homeassistant/components/freedompro/ @stefano055415
@@ -654,8 +646,6 @@ build.json @home-assistant/supervisor
 /tests/components/homeassistant/ @home-assistant/core
 /homeassistant/components/homeassistant_alerts/ @home-assistant/core
 /tests/components/homeassistant_alerts/ @home-assistant/core
 /homeassistant/components/homeassistant_connect_zbt2/ @home-assistant/core
 /tests/components/homeassistant_connect_zbt2/ @home-assistant/core
 /homeassistant/components/homeassistant_green/ @home-assistant/core
 /tests/components/homeassistant_green/ @home-assistant/core
 /homeassistant/components/homeassistant_hardware/ @home-assistant/core
@@ -684,8 +674,8 @@ build.json @home-assistant/supervisor
 /tests/components/http/ @home-assistant/core
 /homeassistant/components/huawei_lte/ @scop @fphammerle
 /tests/components/huawei_lte/ @scop @fphammerle
-/homeassistant/components/hue/ @marcelveldt
+/homeassistant/components/hue/ @balloob @marcelveldt
-/tests/components/hue/ @marcelveldt
+/tests/components/hue/ @balloob @marcelveldt
 /homeassistant/components/huisbaasje/ @dennisschroer
 /tests/components/huisbaasje/ @dennisschroer
 /homeassistant/components/humidifier/ @home-assistant/core @Shulyaka
@@ -757,8 +747,8 @@ build.json @home-assistant/supervisor
 /tests/components/integration/ @dgomes
 /homeassistant/components/intellifire/ @jeeftor
 /tests/components/intellifire/ @jeeftor
-/homeassistant/components/intent/ @home-assistant/core @synesthesiam @arturpragacz
+/homeassistant/components/intent/ @home-assistant/core @synesthesiam
-/tests/components/intent/ @home-assistant/core @synesthesiam @arturpragacz
+/tests/components/intent/ @home-assistant/core @synesthesiam
 /homeassistant/components/intesishome/ @jnimmo
 /homeassistant/components/iometer/ @MaestroOnICe
 /tests/components/iometer/ @MaestroOnICe
@@ -776,8 +766,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/iqvia/ @bachya
 /tests/components/iqvia/ @bachya
 /homeassistant/components/irish_rail_transport/ @ttroy50
 /homeassistant/components/irm_kmi/ @jdejaegh
 /tests/components/irm_kmi/ @jdejaegh
 /homeassistant/components/iron_os/ @tr4nt0r
 /tests/components/iron_os/ @tr4nt0r
 /homeassistant/components/isal/ @bdraco
@@ -868,8 +856,6 @@ build.json @home-assistant/supervisor
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
 /tests/components/lg_thinq/ @LG-ThinQ-Integration
 /homeassistant/components/libre_hardware_monitor/ @Sab44
 /tests/components/libre_hardware_monitor/ @Sab44
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/lifx/ @Djelibeybi
@@ -1023,8 +1009,7 @@ build.json @home-assistant/supervisor
 /tests/components/nanoleaf/ @milanmeu @joostlek
 /homeassistant/components/nasweb/ @nasWebio
 /tests/components/nasweb/ @nasWebio
-/homeassistant/components/nederlandse_spoorwegen/ @YarmoM @heindrichpaul
+/homeassistant/components/nederlandse_spoorwegen/ @YarmoM
 /tests/components/nederlandse_spoorwegen/ @YarmoM @heindrichpaul
 /homeassistant/components/ness_alarm/ @nickw444
 /tests/components/ness_alarm/ @nickw444
 /homeassistant/components/nest/ @allenporter
@@ -1119,6 +1104,8 @@ build.json @home-assistant/supervisor
 /tests/components/open_meteo/ @frenck
 /homeassistant/components/open_router/ @joostlek
 /tests/components/open_router/ @joostlek
 /homeassistant/components/openai_conversation/ @balloob
 /tests/components/openai_conversation/ @balloob
 /homeassistant/components/openerz/ @misialq
 /tests/components/openerz/ @misialq
 /homeassistant/components/openexchangerates/ @MartinHjelmare
@@ -1194,12 +1181,8 @@ build.json @home-assistant/supervisor
 /tests/components/plum_lightpad/ @ColinHarrington @prystupa
 /homeassistant/components/point/ @fredrike
 /tests/components/point/ @fredrike
 /homeassistant/components/pooldose/ @lmaertin
 /tests/components/pooldose/ @lmaertin
 /homeassistant/components/poolsense/ @haemishkyd
 /tests/components/poolsense/ @haemishkyd
 /homeassistant/components/portainer/ @erwindouna
 /tests/components/portainer/ @erwindouna
 /homeassistant/components/powerfox/ @klaasnicolaas
 /tests/components/powerfox/ @klaasnicolaas
 /homeassistant/components/powerwall/ @bdraco @jrester @daniel-simpson
@@ -1219,6 +1202,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/proximity/ @mib1185
 /tests/components/proximity/ @mib1185
 /homeassistant/components/proxmoxve/ @jhollowe @Corbeno
 /homeassistant/components/prusalink/ @balloob
 /tests/components/prusalink/ @balloob
 /homeassistant/components/ps4/ @ktnrg45
 /tests/components/ps4/ @ktnrg45
 /homeassistant/components/pterodactyl/ @elmurato
@@ -1312,8 +1297,8 @@ build.json @home-assistant/supervisor
 /tests/components/rflink/ @javicalle
 /homeassistant/components/rfxtrx/ @danielhiversen @elupus @RobBie1221
 /tests/components/rfxtrx/ @danielhiversen @elupus @RobBie1221
-/homeassistant/components/rhasspy/ @synesthesiam
+/homeassistant/components/rhasspy/ @balloob @synesthesiam
-/tests/components/rhasspy/ @synesthesiam
+/tests/components/rhasspy/ @balloob @synesthesiam
 /homeassistant/components/ridwell/ @bachya
 /tests/components/ridwell/ @bachya
 /homeassistant/components/ring/ @sdb9696
@@ -1334,8 +1319,6 @@ build.json @home-assistant/supervisor
 /tests/components/roomba/ @pschmitt @cyr-ius @shenxn @Orhideous
 /homeassistant/components/roon/ @pavoni
 /tests/components/roon/ @pavoni
 /homeassistant/components/route_b_smart_meter/ @SeraphicRav
 /tests/components/route_b_smart_meter/ @SeraphicRav
 /homeassistant/components/rpi_power/ @shenxn @swetoast
 /tests/components/rpi_power/ @shenxn @swetoast
 /homeassistant/components/rss_feed_template/ @home-assistant/core
@@ -1358,8 +1341,6 @@ build.json @home-assistant/supervisor
 /tests/components/samsungtv/ @chemelli74 @epenet
 /homeassistant/components/sanix/ @tomaszsluszniak
 /tests/components/sanix/ @tomaszsluszniak
 /homeassistant/components/satel_integra/ @Tommatheussen
 /tests/components/satel_integra/ @Tommatheussen
 /homeassistant/components/scene/ @home-assistant/core
 /tests/components/scene/ @home-assistant/core
 /homeassistant/components/schedule/ @home-assistant/core
@@ -1405,14 +1386,12 @@ build.json @home-assistant/supervisor
 /tests/components/seventeentrack/ @shaiu
 /homeassistant/components/sfr_box/ @epenet
 /tests/components/sfr_box/ @epenet
 /homeassistant/components/sftp_storage/ @maretodoric
 /tests/components/sftp_storage/ @maretodoric
 /homeassistant/components/sharkiq/ @JeffResc @funkybunch
 /tests/components/sharkiq/ @JeffResc @funkybunch
 /homeassistant/components/shell_command/ @home-assistant/core
 /tests/components/shell_command/ @home-assistant/core
-/homeassistant/components/shelly/ @bieniu @thecode @chemelli74 @bdraco
+/homeassistant/components/shelly/ @balloob @bieniu @thecode @chemelli74 @bdraco
-/tests/components/shelly/ @bieniu @thecode @chemelli74 @bdraco
+/tests/components/shelly/ @balloob @bieniu @thecode @chemelli74 @bdraco
 /homeassistant/components/shodan/ @fabaff
 /homeassistant/components/sia/ @eavanvalkenburg
 /tests/components/sia/ @eavanvalkenburg
@@ -1541,8 +1520,8 @@ build.json @home-assistant/supervisor
 /tests/components/switchbee/ @jafar-atili
 /homeassistant/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski @zerzhang
 /tests/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski @zerzhang
-/homeassistant/components/switchbot_cloud/ @SeraphicRav @laurence-presland @Gigatrappeur @XiaoLing-git
+/homeassistant/components/switchbot_cloud/ @SeraphicRav @laurence-presland @Gigatrappeur
-/tests/components/switchbot_cloud/ @SeraphicRav @laurence-presland @Gigatrappeur @XiaoLing-git
+/tests/components/switchbot_cloud/ @SeraphicRav @laurence-presland @Gigatrappeur
 /homeassistant/components/switcher_kis/ @thecode @YogevBokobza
 /tests/components/switcher_kis/ @thecode @YogevBokobza
 /homeassistant/components/switchmate/ @danielhiversen @qiz-li
@@ -1559,8 +1538,8 @@ build.json @home-assistant/supervisor
 /tests/components/systemmonitor/ @gjohansson-ST
 /homeassistant/components/tado/ @erwindouna
 /tests/components/tado/ @erwindouna
-/homeassistant/components/tag/ @home-assistant/core
+/homeassistant/components/tag/ @balloob @dmulcahey
-/tests/components/tag/ @home-assistant/core
+/tests/components/tag/ @balloob @dmulcahey
 /homeassistant/components/tailscale/ @frenck
 /tests/components/tailscale/ @frenck
 /homeassistant/components/tailwind/ @frenck
@@ -1687,8 +1666,6 @@ build.json @home-assistant/supervisor
 /tests/components/uptime_kuma/ @tr4nt0r
 /homeassistant/components/uptimerobot/ @ludeeus @chemelli74
 /tests/components/uptimerobot/ @ludeeus @chemelli74
 /homeassistant/components/usage_prediction/ @home-assistant/core
 /tests/components/usage_prediction/ @home-assistant/core
 /homeassistant/components/usb/ @bdraco
 /tests/components/usb/ @bdraco
 /homeassistant/components/usgs_earthquakes_feed/ @exxamalte
@@ -1707,19 +1684,17 @@ build.json @home-assistant/supervisor
 /tests/components/vegehub/ @ghowevege
 /homeassistant/components/velbus/ @Cereal2nd @brefra
 /tests/components/velbus/ @Cereal2nd @brefra
-/homeassistant/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
+/homeassistant/components/velux/ @Julius2342 @DeerMaximum @pawlizio
-/tests/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
+/tests/components/velux/ @Julius2342 @DeerMaximum @pawlizio
 /homeassistant/components/venstar/ @garbled1 @jhollowe
 /tests/components/venstar/ @garbled1 @jhollowe
 /homeassistant/components/versasense/ @imstevenxyz
 /homeassistant/components/version/ @ludeeus
 /tests/components/version/ @ludeeus
-/homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
+/homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak
-/tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
+/tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak
 /homeassistant/components/vicare/ @CFenner
 /tests/components/vicare/ @CFenner
 /homeassistant/components/victron_remote_monitoring/ @AndyTempel
 /tests/components/victron_remote_monitoring/ @AndyTempel
 /homeassistant/components/vilfo/ @ManneW
 /tests/components/vilfo/ @ManneW
 /homeassistant/components/vivotek/ @HarlemSquirrel
@@ -1729,14 +1704,16 @@ build.json @home-assistant/supervisor
 /tests/components/vlc_telnet/ @rodripf @MartinHjelmare
 /homeassistant/components/vodafone_station/ @paoloantinori @chemelli74
 /tests/components/vodafone_station/ @paoloantinori @chemelli74
-/homeassistant/components/voip/ @synesthesiam @jaminh
+/homeassistant/components/voip/ @balloob @synesthesiam @jaminh
-/tests/components/voip/ @synesthesiam @jaminh
+/tests/components/voip/ @balloob @synesthesiam @jaminh
 /homeassistant/components/volumio/ @OnFreund
 /tests/components/volumio/ @OnFreund
 /homeassistant/components/volvo/ @thomasddn
 /tests/components/volvo/ @thomasddn
-/homeassistant/components/volvooncall/ @molobrakos @svrooij
+/homeassistant/components/volvooncall/ @molobrakos
-/tests/components/volvooncall/ @molobrakos @svrooij
+/tests/components/volvooncall/ @molobrakos
 /homeassistant/components/vulcan/ @Antoni-Czaplicki
 /tests/components/vulcan/ @Antoni-Czaplicki
 /homeassistant/components/wake_on_lan/ @ntilley905
 /tests/components/wake_on_lan/ @ntilley905
 /homeassistant/components/wake_word/ @home-assistant/core @synesthesiam
@@ -1801,8 +1778,8 @@ build.json @home-assistant/supervisor
 /tests/components/worldclock/ @fabaff
 /homeassistant/components/ws66i/ @ssaenger
 /tests/components/ws66i/ @ssaenger
-/homeassistant/components/wyoming/ @synesthesiam
+/homeassistant/components/wyoming/ @balloob @synesthesiam
-/tests/components/wyoming/ @synesthesiam
+/tests/components/wyoming/ @balloob @synesthesiam
 /homeassistant/components/xbox/ @hunterjm
 /tests/components/xbox/ @hunterjm
 /homeassistant/components/xiaomi_aqara/ @danielhiversen @syssi
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,8 +14,5 @@ Still interested? Then you should take a peek at the [developer documentation](h
 ## Feature suggestions
-If you want to suggest a new feature for Home Assistant (e.g. new integrations), please [start a discussion](https://github.com/orgs/home-assistant/discussions) on GitHub.
+If you want to suggest a new feature for Home Assistant (e.g., new integrations), please open a thread in our [Community Forum: Feature Requests](https://community.home-assistant.io/c/feature-requests).
-
+We use [GitHub for tracking issues](https://github.com/home-assistant/core/issues), not for tracking feature requests.
 ## Issue Tracker
 If you want to report an issue, please [create an issue](https://github.com/home-assistant/core/issues) on GitHub.
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -3,7 +3,8 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:debian
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN \
-    apt-get update \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
    && apt-get update \
    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
        # Additional library needed by some tests and accordingly by VScode Tests Discovery
        bluez \
--- a/build.yaml
+++ b/build.yaml
@@ -1,10 +1,10 @@
 image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.09.3
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.05.0
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.09.3
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.05.0
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.09.3
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.05.0
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.09.3
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.05.0
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.09.3
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.05.0
 codenotary:
  signer: notary@home-assistant.io
  base_image: notary@home-assistant.io
--- a/homeassistant/main.py
+++ b/homeassistant/main.py
@@ -187,42 +187,36 @@ def main() -> int:
    from . import config, runner  # noqa: PLC0415
-    # Ensure only one instance runs per config directory
+    safe_mode = config.safe_mode_enabled(config_dir)
    with runner.ensure_single_execution(config_dir) as single_execution_lock:
        # Check if another instance is already running
        if single_execution_lock.exit_code is not None:
            return single_execution_lock.exit_code
-        safe_mode = config.safe_mode_enabled(config_dir)
+    runtime_conf = runner.RuntimeConfig(
        config_dir=config_dir,
        verbose=args.verbose,
        log_rotate_days=args.log_rotate_days,
        log_file=args.log_file,
        log_no_color=args.log_no_color,
        skip_pip=args.skip_pip,
        skip_pip_packages=args.skip_pip_packages,
        recovery_mode=args.recovery_mode,
        debug=args.debug,
        open_ui=args.open_ui,
        safe_mode=safe_mode,
    )
-        runtime_conf = runner.RuntimeConfig(
+    fault_file_name = os.path.join(config_dir, FAULT_LOG_FILENAME)
-            config_dir=config_dir,
+    with open(fault_file_name, mode="a", encoding="utf8") as fault_file:
-            verbose=args.verbose,
+        faulthandler.enable(fault_file)
-            log_rotate_days=args.log_rotate_days,
+        exit_code = runner.run(runtime_conf)
-            log_file=args.log_file,
+        faulthandler.disable()
            log_no_color=args.log_no_color,
            skip_pip=args.skip_pip,
            skip_pip_packages=args.skip_pip_packages,
            recovery_mode=args.recovery_mode,
            debug=args.debug,
            open_ui=args.open_ui,
            safe_mode=safe_mode,
        )
-        fault_file_name = os.path.join(config_dir, FAULT_LOG_FILENAME)
+    # It's possible for the fault file to disappear, so suppress obvious errors
-        with open(fault_file_name, mode="a", encoding="utf8") as fault_file:
+    with suppress(FileNotFoundError):
-            faulthandler.enable(fault_file)
+        if os.path.getsize(fault_file_name) == 0:
-            exit_code = runner.run(runtime_conf)
+            os.remove(fault_file_name)
            faulthandler.disable()
-        # It's possible for the fault file to disappear, so suppress obvious errors
+    check_threads()
        with suppress(FileNotFoundError):
            if os.path.getsize(fault_file_name) == 0:
                os.remove(fault_file_name)
-        check_threads()
+    return exit_code
        return exit_code
 if __name__ == "__main__":
--- a/homeassistant/auth/mfa_modules/notify.py
+++ b/homeassistant/auth/mfa_modules/notify.py
@@ -27,7 +27,7 @@ from . import (
    SetupFlow,
 )
-REQUIREMENTS = ["pyotp==2.9.0"]
+REQUIREMENTS = ["pyotp==2.8.0"]
 CONF_MESSAGE = "message"
--- a/homeassistant/auth/mfa_modules/totp.py
+++ b/homeassistant/auth/mfa_modules/totp.py
@@ -20,7 +20,7 @@ from . import (
    SetupFlow,
 )
-REQUIREMENTS = ["pyotp==2.9.0", "PyQRCode==1.2.1"]
+REQUIREMENTS = ["pyotp==2.8.0", "PyQRCode==1.2.1"]
 CONFIG_SCHEMA = MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend({}, extra=vol.PREVENT_EXTRA)
--- a/homeassistant/brands/fritzbox.json
+++ b/homeassistant/brands/fritzbox.json
@@ -1,5 +1,5 @@
 {
  "domain": "fritzbox",
-  "name": "FRITZ!",
+  "name": "FRITZ!Box",
  "integrations": ["fritz", "fritzbox", "fritzbox_callmonitor"]
 }
--- a/homeassistant/brands/google.json
+++ b/homeassistant/brands/google.json
@@ -6,6 +6,7 @@
    "google_assistant_sdk",
    "google_cloud",
    "google_drive",
    "google_gemini",
    "google_generative_ai_conversation",
    "google_mail",
    "google_maps",
--- a/homeassistant/components/acaia/coordinator.py
+++ b/homeassistant/components/acaia/coordinator.py
@@ -8,7 +8,6 @@ import logging
 from aioacaia.acaiascale import AcaiaScale
 from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError
 from homeassistant.components.bluetooth import async_get_scanner
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ADDRESS
 from homeassistant.core import HomeAssistant
@@ -43,7 +42,6 @@ class AcaiaCoordinator(DataUpdateCoordinator[None]):
            name=entry.title,
            is_new_style_scale=entry.data[CONF_IS_NEW_STYLE_SCALE],
            notify_callback=self.async_update_listeners,
            scanner=async_get_scanner(hass),
        )
    @property
--- a/homeassistant/components/acaia/manifest.json
+++ b/homeassistant/components/acaia/manifest.json
@@ -26,5 +26,5 @@
  "iot_class": "local_push",
  "loggers": ["aioacaia"],
  "quality_scale": "platinum",
-  "requirements": ["aioacaia==0.1.17"]
+  "requirements": ["aioacaia==0.1.14"]
 }
--- a/homeassistant/components/accuweather/init.py
+++ b/homeassistant/components/accuweather/init.py
@@ -2,23 +2,21 @@
 from __future__ import annotations
 import asyncio
 import logging
 from accuweather import AccuWeather
 from homeassistant.components.sensor import DOMAIN as SENSOR_PLATFORM
-from homeassistant.const import CONF_API_KEY, Platform
+from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from .const import DOMAIN
+from .const import DOMAIN, UPDATE_INTERVAL_DAILY_FORECAST, UPDATE_INTERVAL_OBSERVATION
 from .coordinator import (
    AccuWeatherConfigEntry,
    AccuWeatherDailyForecastDataUpdateCoordinator,
    AccuWeatherData,
    AccuWeatherHourlyForecastDataUpdateCoordinator,
    AccuWeatherObservationDataUpdateCoordinator,
 )
@@ -30,6 +28,7 @@ PLATFORMS = [Platform.SENSOR, Platform.WEATHER]
 async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry) -> bool:
    """Set up AccuWeather as config entry."""
    api_key: str = entry.data[CONF_API_KEY]
    name: str = entry.data[CONF_NAME]
    location_key = entry.unique_id
@@ -42,28 +41,26 @@ async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry)
        hass,
        entry,
        accuweather,
        name,
        "observation",
        UPDATE_INTERVAL_OBSERVATION,
    )
    coordinator_daily_forecast = AccuWeatherDailyForecastDataUpdateCoordinator(
        hass,
        entry,
        accuweather,
-    )
+        name,
-    coordinator_hourly_forecast = AccuWeatherHourlyForecastDataUpdateCoordinator(
+        "daily forecast",
-        hass,
+        UPDATE_INTERVAL_DAILY_FORECAST,
        entry,
        accuweather,
    )
-    await asyncio.gather(
+    await coordinator_observation.async_config_entry_first_refresh()
-        coordinator_observation.async_config_entry_first_refresh(),
+    await coordinator_daily_forecast.async_config_entry_first_refresh()
        coordinator_daily_forecast.async_config_entry_first_refresh(),
        coordinator_hourly_forecast.async_config_entry_first_refresh(),
    )
    entry.runtime_data = AccuWeatherData(
        coordinator_observation=coordinator_observation,
        coordinator_daily_forecast=coordinator_daily_forecast,
        coordinator_hourly_forecast=coordinator_hourly_forecast,
    )
    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
--- a/homeassistant/components/accuweather/config_flow.py
+++ b/homeassistant/components/accuweather/config_flow.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 from asyncio import timeout
 from collections.abc import Mapping
 from typing import Any
 from accuweather import AccuWeather, ApiError, InvalidApiKeyError, RequestsExceededError
@@ -23,8 +22,6 @@ class AccuWeatherFlowHandler(ConfigFlow, domain=DOMAIN):
    """Config flow for AccuWeather."""
    VERSION = 1
    _latitude: float | None = None
    _longitude: float | None = None
    async def async_step_user(
        self, user_input: dict[str, Any] | None = None
@@ -53,7 +50,6 @@ class AccuWeatherFlowHandler(ConfigFlow, domain=DOMAIN):
                await self.async_set_unique_id(
                    accuweather.location_key, raise_on_progress=False
                )
                self._abort_if_unique_id_configured()
                return self.async_create_entry(
                    title=user_input[CONF_NAME], data=user_input
@@ -77,46 +73,3 @@ class AccuWeatherFlowHandler(ConfigFlow, domain=DOMAIN):
            ),
            errors=errors,
        )
    async def async_step_reauth(
        self, entry_data: Mapping[str, Any]
    ) -> ConfigFlowResult:
        """Handle configuration by re-auth."""
        self._latitude = entry_data[CONF_LATITUDE]
        self._longitude = entry_data[CONF_LONGITUDE]
        return await self.async_step_reauth_confirm()
    async def async_step_reauth_confirm(
        self, user_input: dict[str, Any] | None = None
    ) -> ConfigFlowResult:
        """Dialog that informs the user that reauth is required."""
        errors: dict[str, str] = {}
        if user_input is not None:
            websession = async_get_clientsession(self.hass)
            try:
                async with timeout(10):
                    accuweather = AccuWeather(
                        user_input[CONF_API_KEY],
                        websession,
                        latitude=self._latitude,
                        longitude=self._longitude,
                    )
                    await accuweather.async_get_location()
            except (ApiError, ClientConnectorError, TimeoutError, ClientError):
                errors["base"] = "cannot_connect"
            except InvalidApiKeyError:
                errors["base"] = "invalid_api_key"
            except RequestsExceededError:
                errors["base"] = "requests_exceeded"
            else:
                return self.async_update_reload_and_abort(
                    self._get_reauth_entry(), data_updates=user_input
                )
        return self.async_show_form(
            step_id="reauth_confirm",
            data_schema=vol.Schema({vol.Required(CONF_API_KEY): str}),
            errors=errors,
        )
--- a/homeassistant/components/accuweather/const.py
+++ b/homeassistant/components/accuweather/const.py
@@ -69,6 +69,5 @@ POLLEN_CATEGORY_MAP = {
    4: "very_high",
    5: "extreme",
 }
-UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=10)
+UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=40)
 UPDATE_INTERVAL_DAILY_FORECAST = timedelta(hours=6)
 UPDATE_INTERVAL_HOURLY_FORECAST = timedelta(hours=30)
--- a/homeassistant/components/accuweather/coordinator.py
+++ b/homeassistant/components/accuweather/coordinator.py
@@ -3,7 +3,6 @@
 from __future__ import annotations
 from asyncio import timeout
 from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from datetime import timedelta
 import logging
@@ -13,9 +12,7 @@ from accuweather import AccuWeather, ApiError, InvalidApiKeyError, RequestsExcee
 from aiohttp.client_exceptions import ClientConnectorError
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import (
    DataUpdateCoordinator,
@@ -23,15 +20,9 @@ from homeassistant.helpers.update_coordinator import (
    UpdateFailed,
 )
-from .const import (
+from .const import DOMAIN, MANUFACTURER
    DOMAIN,
    MANUFACTURER,
    UPDATE_INTERVAL_DAILY_FORECAST,
    UPDATE_INTERVAL_HOURLY_FORECAST,
    UPDATE_INTERVAL_OBSERVATION,
 )
-EXCEPTIONS = (ApiError, ClientConnectorError, RequestsExceededError)
+EXCEPTIONS = (ApiError, ClientConnectorError, InvalidApiKeyError, RequestsExceededError)
 _LOGGER = logging.getLogger(__name__)
@@ -42,7 +33,6 @@ class AccuWeatherData:
    coordinator_observation: AccuWeatherObservationDataUpdateCoordinator
    coordinator_daily_forecast: AccuWeatherDailyForecastDataUpdateCoordinator
    coordinator_hourly_forecast: AccuWeatherHourlyForecastDataUpdateCoordinator
 type AccuWeatherConfigEntry = ConfigEntry[AccuWeatherData]
@@ -53,18 +43,18 @@ class AccuWeatherObservationDataUpdateCoordinator(
 ):
    """Class to manage fetching AccuWeather data API."""
    config_entry: AccuWeatherConfigEntry
    def __init__(
        self,
        hass: HomeAssistant,
        config_entry: AccuWeatherConfigEntry,
        accuweather: AccuWeather,
        name: str,
        coordinator_type: str,
        update_interval: timedelta,
    ) -> None:
        """Initialize."""
        self.accuweather = accuweather
        self.location_key = accuweather.location_key
        name = config_entry.data[CONF_NAME]
        if TYPE_CHECKING:
            assert self.location_key is not None
@@ -75,8 +65,8 @@ class AccuWeatherObservationDataUpdateCoordinator(
            hass,
            _LOGGER,
            config_entry=config_entry,
-            name=f"{name} (observation)",
+            name=f"{name} ({coordinator_type})",
-            update_interval=UPDATE_INTERVAL_OBSERVATION,
+            update_interval=update_interval,
        )
    async def _async_update_data(self) -> dict[str, Any]:
@@ -90,39 +80,29 @@ class AccuWeatherObservationDataUpdateCoordinator(
                translation_key="current_conditions_update_error",
                translation_placeholders={"error": repr(error)},
            ) from error
        except InvalidApiKeyError as err:
            raise ConfigEntryAuthFailed(
                translation_domain=DOMAIN,
                translation_key="auth_error",
                translation_placeholders={"entry": self.config_entry.title},
            ) from err
        _LOGGER.debug("Requests remaining: %d", self.accuweather.requests_remaining)
        return result
-class AccuWeatherForecastDataUpdateCoordinator(
+class AccuWeatherDailyForecastDataUpdateCoordinator(
    TimestampDataUpdateCoordinator[list[dict[str, Any]]]
 ):
-    """Base class for AccuWeather forecast."""
+    """Class to manage fetching AccuWeather data API."""
    config_entry: AccuWeatherConfigEntry
    def __init__(
        self,
        hass: HomeAssistant,
        config_entry: AccuWeatherConfigEntry,
        accuweather: AccuWeather,
        name: str,
        coordinator_type: str,
        update_interval: timedelta,
        fetch_method: Callable[..., Awaitable[list[dict[str, Any]]]],
    ) -> None:
        """Initialize."""
        self.accuweather = accuweather
        self.location_key = accuweather.location_key
        self._fetch_method = fetch_method
        name = config_entry.data[CONF_NAME]
        if TYPE_CHECKING:
            assert self.location_key is not None
@@ -138,71 +118,24 @@ class AccuWeatherForecastDataUpdateCoordinator(
        )
    async def _async_update_data(self) -> list[dict[str, Any]]:
-        """Update forecast data via library."""
+        """Update data via library."""
        try:
            async with timeout(10):
-                result = await self._fetch_method(language=self.hass.config.language)
+                result = await self.accuweather.async_get_daily_forecast(
                    language=self.hass.config.language
                )
        except EXCEPTIONS as error:
            raise UpdateFailed(
                translation_domain=DOMAIN,
                translation_key="forecast_update_error",
                translation_placeholders={"error": repr(error)},
            ) from error
        except InvalidApiKeyError as err:
            raise ConfigEntryAuthFailed(
                translation_domain=DOMAIN,
                translation_key="auth_error",
                translation_placeholders={"entry": self.config_entry.title},
            ) from err
        _LOGGER.debug("Requests remaining: %d", self.accuweather.requests_remaining)
        return result
 class AccuWeatherDailyForecastDataUpdateCoordinator(
    AccuWeatherForecastDataUpdateCoordinator
 ):
    """Coordinator for daily forecast."""
    def __init__(
        self,
        hass: HomeAssistant,
        config_entry: AccuWeatherConfigEntry,
        accuweather: AccuWeather,
    ) -> None:
        """Initialize."""
        super().__init__(
            hass,
            config_entry,
            accuweather,
            "daily forecast",
            UPDATE_INTERVAL_DAILY_FORECAST,
            fetch_method=accuweather.async_get_daily_forecast,
        )
 class AccuWeatherHourlyForecastDataUpdateCoordinator(
    AccuWeatherForecastDataUpdateCoordinator
 ):
    """Coordinator for hourly forecast."""
    def __init__(
        self,
        hass: HomeAssistant,
        config_entry: AccuWeatherConfigEntry,
        accuweather: AccuWeather,
    ) -> None:
        """Initialize."""
        super().__init__(
            hass,
            config_entry,
            accuweather,
            "hourly forecast",
            UPDATE_INTERVAL_HOURLY_FORECAST,
            fetch_method=accuweather.async_get_hourly_forecast,
        )
 def _get_device_info(location_key: str, name: str) -> DeviceInfo:
    """Get device info."""
    return DeviceInfo(
--- a/homeassistant/components/accuweather/manifest.json
+++ b/homeassistant/components/accuweather/manifest.json
@@ -7,5 +7,6 @@
  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["accuweather"],
-  "requirements": ["accuweather==4.2.2"]
+  "requirements": ["accuweather==4.2.0"],
  "single_config_entry": true
 }
--- a/homeassistant/components/accuweather/strings.json
+++ b/homeassistant/components/accuweather/strings.json
@@ -7,17 +7,6 @@
          "api_key": "[%key:common::config_flow::data::api_key%]",
          "latitude": "[%key:common::config_flow::data::latitude%]",
          "longitude": "[%key:common::config_flow::data::longitude%]"
        },
        "data_description": {
          "api_key": "API key generated in the AccuWeather APIs portal."
        }
      },
      "reauth_confirm": {
        "data": {
          "api_key": "[%key:common::config_flow::data::api_key%]"
        },
        "data_description": {
          "api_key": "[%key:component::accuweather::config::step::user::data_description::api_key%]"
        }
      }
    },
@@ -28,10 +17,6 @@
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
      "requests_exceeded": "The allowed number of requests to the AccuWeather API has been exceeded. You have to wait or change the API key."
    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]",
      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
    }
  },
  "entity": {
@@ -251,9 +236,6 @@
    }
  },
  "exceptions": {
    "auth_error": {
      "message": "Authentication failed for {entry}, please update your API key"
    },
    "current_conditions_update_error": {
      "message": "An error occurred while retrieving weather current conditions data from the AccuWeather API: {error}"
    },
--- a/homeassistant/components/accuweather/weather.py
+++ b/homeassistant/components/accuweather/weather.py
@@ -45,7 +45,6 @@ from .coordinator import (
    AccuWeatherConfigEntry,
    AccuWeatherDailyForecastDataUpdateCoordinator,
    AccuWeatherData,
    AccuWeatherHourlyForecastDataUpdateCoordinator,
    AccuWeatherObservationDataUpdateCoordinator,
 )
@@ -65,7 +64,6 @@ class AccuWeatherEntity(
    CoordinatorWeatherEntity[
        AccuWeatherObservationDataUpdateCoordinator,
        AccuWeatherDailyForecastDataUpdateCoordinator,
        AccuWeatherHourlyForecastDataUpdateCoordinator,
    ]
 ):
    """Define an AccuWeather entity."""
@@ -78,7 +76,6 @@ class AccuWeatherEntity(
        super().__init__(
            observation_coordinator=accuweather_data.coordinator_observation,
            daily_coordinator=accuweather_data.coordinator_daily_forecast,
            hourly_coordinator=accuweather_data.coordinator_hourly_forecast,
        )
        self._attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
@@ -89,13 +86,10 @@ class AccuWeatherEntity(
        self._attr_unique_id = accuweather_data.coordinator_observation.location_key
        self._attr_attribution = ATTRIBUTION
        self._attr_device_info = accuweather_data.coordinator_observation.device_info
-        self._attr_supported_features = (
+        self._attr_supported_features = WeatherEntityFeature.FORECAST_DAILY
            WeatherEntityFeature.FORECAST_DAILY | WeatherEntityFeature.FORECAST_HOURLY
        )
        self.observation_coordinator = accuweather_data.coordinator_observation
        self.daily_coordinator = accuweather_data.coordinator_daily_forecast
        self.hourly_coordinator = accuweather_data.coordinator_hourly_forecast
    @property
    def condition(self) -> str | None:
@@ -213,32 +207,3 @@ class AccuWeatherEntity(
            }
            for item in self.daily_coordinator.data
        ]
    @callback
    def _async_forecast_hourly(self) -> list[Forecast] | None:
        """Return the hourly forecast in native units."""
        return [
            {
                ATTR_FORECAST_TIME: utc_from_timestamp(
                    item["EpochDateTime"]
                ).isoformat(),
                ATTR_FORECAST_CLOUD_COVERAGE: item["CloudCover"],
                ATTR_FORECAST_HUMIDITY: item["RelativeHumidity"],
                ATTR_FORECAST_NATIVE_TEMP: item["Temperature"][ATTR_VALUE],
                ATTR_FORECAST_NATIVE_APPARENT_TEMP: item["RealFeelTemperature"][
                    ATTR_VALUE
                ],
                ATTR_FORECAST_NATIVE_PRECIPITATION: item["TotalLiquid"][ATTR_VALUE],
                ATTR_FORECAST_PRECIPITATION_PROBABILITY: item[
                    "PrecipitationProbability"
                ],
                ATTR_FORECAST_NATIVE_WIND_SPEED: item["Wind"][ATTR_SPEED][ATTR_VALUE],
                ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: item["WindGust"][ATTR_SPEED][
                    ATTR_VALUE
                ],
                ATTR_FORECAST_UV_INDEX: item["UVIndex"],
                ATTR_FORECAST_WIND_BEARING: item["Wind"][ATTR_DIRECTION]["Degrees"],
                ATTR_FORECAST_CONDITION: CONDITION_MAP.get(item["WeatherIcon"]),
            }
            for item in self.hourly_coordinator.data
        ]
--- a/homeassistant/components/ai_task/init.py
+++ b/homeassistant/components/ai_task/init.py
@@ -29,19 +29,11 @@ from .const import (
    DATA_PREFERENCES,
    DOMAIN,
    SERVICE_GENERATE_DATA,
    SERVICE_GENERATE_IMAGE,
    AITaskEntityFeature,
 )
 from .entity import AITaskEntity
 from .http import async_setup as async_setup_http
-from .task import (
+from .task import GenDataTask, GenDataTaskResult, async_generate_data
    GenDataTask,
    GenDataTaskResult,
    GenImageTask,
    GenImageTaskResult,
    async_generate_data,
    async_generate_image,
 )
 __all__ = [
    "DOMAIN",
@@ -49,10 +41,7 @@ __all__ = [
    "AITaskEntityFeature",
    "GenDataTask",
    "GenDataTaskResult",
    "GenImageTask",
    "GenImageTaskResult",
    "async_generate_data",
    "async_generate_image",
    "async_setup",
    "async_setup_entry",
    "async_unload_entry",
@@ -112,23 +101,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
        supports_response=SupportsResponse.ONLY,
        job_type=HassJobType.Coroutinefunction,
    )
    hass.services.async_register(
        DOMAIN,
        SERVICE_GENERATE_IMAGE,
        async_service_generate_image,
        schema=vol.Schema(
            {
                vol.Required(ATTR_TASK_NAME): cv.string,
                vol.Optional(ATTR_ENTITY_ID): cv.entity_id,
                vol.Required(ATTR_INSTRUCTIONS): cv.string,
                vol.Optional(ATTR_ATTACHMENTS): vol.All(
                    cv.ensure_list, [selector.MediaSelector({"accept": ["*/*"]})]
                ),
            }
        ),
        supports_response=SupportsResponse.ONLY,
        job_type=HassJobType.Coroutinefunction,
    )
    return True
@@ -143,23 +115,17 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def async_service_generate_data(call: ServiceCall) -> ServiceResponse:
-    """Run the data task service."""
+    """Run the run task service."""
    result = await async_generate_data(hass=call.hass, **call.data)
    return result.as_dict()
 async def async_service_generate_image(call: ServiceCall) -> ServiceResponse:
    """Run the image task service."""
    return await async_generate_image(hass=call.hass, **call.data)
 class AITaskPreferences:
    """AI Task preferences."""
-    KEYS = ("gen_data_entity_id", "gen_image_entity_id")
+    KEYS = ("gen_data_entity_id",)
    gen_data_entity_id: str | None = None
    gen_image_entity_id: str | None = None
    def __init__(self, hass: HomeAssistant) -> None:
        """Initialize the preferences."""
@@ -173,21 +139,17 @@ class AITaskPreferences:
        if data is None:
            return
        for key in self.KEYS:
-            setattr(self, key, data.get(key))
+            setattr(self, key, data[key])
    @callback
    def async_set_preferences(
        self,
        *,
        gen_data_entity_id: str | None | UndefinedType = UNDEFINED,
        gen_image_entity_id: str | None | UndefinedType = UNDEFINED,
    ) -> None:
        """Set the preferences."""
        changed = False
-        for key, value in (
+        for key, value in (("gen_data_entity_id", gen_data_entity_id),):
            ("gen_data_entity_id", gen_data_entity_id),
            ("gen_image_entity_id", gen_image_entity_id),
        ):
            if value is not UNDEFINED:
                if getattr(self, key) != value:
                    setattr(self, key, value)
--- a/homeassistant/components/ai_task/const.py
+++ b/homeassistant/components/ai_task/const.py
@@ -8,7 +8,6 @@ from typing import TYPE_CHECKING, Final
 from homeassistant.util.hass_dict import HassKey
 if TYPE_CHECKING:
    from homeassistant.components.media_source import local_source
    from homeassistant.helpers.entity_component import EntityComponent
    from . import AITaskPreferences
@@ -17,13 +16,8 @@ if TYPE_CHECKING:
 DOMAIN = "ai_task"
 DATA_COMPONENT: HassKey[EntityComponent[AITaskEntity]] = HassKey(DOMAIN)
 DATA_PREFERENCES: HassKey[AITaskPreferences] = HassKey(f"{DOMAIN}_preferences")
 DATA_MEDIA_SOURCE: HassKey[local_source.LocalSource] = HassKey(f"{DOMAIN}_media_source")
 IMAGE_DIR: Final = "image"
 IMAGE_EXPIRY_TIME = 60 * 60  # 1 hour
 SERVICE_GENERATE_DATA = "generate_data"
 SERVICE_GENERATE_IMAGE = "generate_image"
 ATTR_INSTRUCTIONS: Final = "instructions"
 ATTR_TASK_NAME: Final = "task_name"
@@ -44,6 +38,3 @@ class AITaskEntityFeature(IntFlag):
    SUPPORT_ATTACHMENTS = 2
    """Support attachments with generate data."""
    GENERATE_IMAGE = 4
    """Generate images based on instructions."""
--- a/homeassistant/components/ai_task/entity.py
+++ b/homeassistant/components/ai_task/entity.py
@@ -18,7 +18,7 @@ from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.util import dt as dt_util
 from .const import DEFAULT_SYSTEM_PROMPT, DOMAIN, AITaskEntityFeature
-from .task import GenDataTask, GenDataTaskResult, GenImageTask, GenImageTaskResult
+from .task import GenDataTask, GenDataTaskResult
 class AITaskEntity(RestoreEntity):
@@ -57,13 +57,9 @@ class AITaskEntity(RestoreEntity):
    async def _async_get_ai_task_chat_log(
        self,
        session: ChatSession,
-        task: GenDataTask | GenImageTask,
+        task: GenDataTask,
    ) -> AsyncGenerator[ChatLog]:
        """Context manager used to manage the ChatLog used during an AI Task."""
        user_llm_hass_api: llm.API | None = None
        if isinstance(task, GenDataTask):
            user_llm_hass_api = task.llm_api
        # pylint: disable-next=contextmanager-generator-missing-cleanup
        with (
            async_get_chat_log(
@@ -81,7 +77,6 @@ class AITaskEntity(RestoreEntity):
                    device_id=None,
                ),
                user_llm_prompt=DEFAULT_SYSTEM_PROMPT,
                user_llm_hass_api=user_llm_hass_api,
            )
            chat_log.async_add_user_content(
@@ -109,23 +104,3 @@ class AITaskEntity(RestoreEntity):
    ) -> GenDataTaskResult:
        """Handle a gen data task."""
        raise NotImplementedError
    @final
    async def internal_async_generate_image(
        self,
        session: ChatSession,
        task: GenImageTask,
    ) -> GenImageTaskResult:
        """Run a gen image task."""
        self.__last_activity = dt_util.utcnow().isoformat()
        self.async_write_ha_state()
        async with self._async_get_ai_task_chat_log(session, task) as chat_log:
            return await self._async_generate_image(task, chat_log)
    async def _async_generate_image(
        self,
        task: GenImageTask,
        chat_log: ChatLog,
    ) -> GenImageTaskResult:
        """Handle a gen image task."""
        raise NotImplementedError
--- a/homeassistant/components/ai_task/http.py
+++ b/homeassistant/components/ai_task/http.py
@@ -37,7 +37,6 @@ def websocket_get_preferences(
    {
        vol.Required("type"): "ai_task/preferences/set",
        vol.Optional("gen_data_entity_id"): vol.Any(str, None),
        vol.Optional("gen_image_entity_id"): vol.Any(str, None),
    }
 )
@websocket_api.require_admin
--- a/homeassistant/components/ai_task/icons.json
+++ b/homeassistant/components/ai_task/icons.json
@@ -1,15 +1,7 @@
 {
  "entity_component": {
    "_": {
      "default": "mdi:star-four-points"
    }
  },
  "services": {
    "generate_data": {
      "service": "mdi:file-star-four-points-outline"
    },
    "generate_image": {
      "service": "mdi:star-four-points-box-outline"
    }
  }
 }
--- a/homeassistant/components/ai_task/manifest.json
+++ b/homeassistant/components/ai_task/manifest.json
@@ -5,6 +5,6 @@
  "codeowners": ["@home-assistant/core"],
  "dependencies": ["conversation", "media_source"],
  "documentation": "https://www.home-assistant.io/integrations/ai_task",
-  "integration_type": "entity",
+  "integration_type": "system",
  "quality_scale": "internal"
 }
--- a/homeassistant/components/ai_task/media_source.py
+++ b/homeassistant/components/ai_task/media_source.py
@@ -1,32 +0,0 @@
 """Expose images as media sources."""
 from __future__ import annotations
 from pathlib import Path
 from homeassistant.components.media_source import MediaSource, local_source
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from .const import DATA_MEDIA_SOURCE, DOMAIN, IMAGE_DIR
 async def async_get_media_source(hass: HomeAssistant) -> MediaSource:
    """Set up local media source."""
    media_dirs = list(hass.config.media_dirs.values())
    if not media_dirs:
        raise HomeAssistantError(
            "AI Task media source requires at least one media directory configured"
        )
    media_dir = Path(media_dirs[0]) / DOMAIN / IMAGE_DIR
    hass.data[DATA_MEDIA_SOURCE] = source = local_source.LocalSource(
        hass,
        DOMAIN,
        "AI Generated Images",
        {IMAGE_DIR: str(media_dir)},
        f"/{DOMAIN}",
    )
    return source
--- a/homeassistant/components/ai_task/services.yaml
+++ b/homeassistant/components/ai_task/services.yaml
@@ -20,6 +20,7 @@ generate_data:
            supported_features:
              - ai_task.AITaskEntityFeature.GENERATE_DATA
    structure:
      advanced: true
      required: false
      example: '{ "name": { "selector": { "text": }, "description": "Name of the user", "required": "True" } } }, "age": { "selector": { "number": }, "description": "Age of the user" } }'
      selector:
@@ -30,30 +31,3 @@ generate_data:
        media:
          accept:
            - "*"
 generate_image:
  fields:
    task_name:
      example: "picture of a dog"
      required: true
      selector:
        text:
    instructions:
      example: "Generate a high quality square image of a dog on transparent background"
      required: true
      selector:
        text:
          multiline: true
    entity_id:
      required: true
      selector:
        entity:
          filter:
            domain: ai_task
            supported_features:
              - ai_task.AITaskEntityFeature.GENERATE_IMAGE
    attachments:
      required: false
      selector:
        media:
          accept:
            - "*"
--- a/homeassistant/components/ai_task/strings.json
+++ b/homeassistant/components/ai_task/strings.json
@@ -25,28 +25,6 @@
          "description": "List of files to attach for multi-modal AI analysis."
        }
      }
    },
    "generate_image": {
      "name": "Generate image",
      "description": "Uses AI to generate image.",
      "fields": {
        "task_name": {
          "name": "Task name",
          "description": "Name of the task."
        },
        "instructions": {
          "name": "Instructions",
          "description": "Instructions that explains the image to be generated."
        },
        "entity_id": {
          "name": "Entity ID",
          "description": "Entity ID to run the task on."
        },
        "attachments": {
          "name": "Attachments",
          "description": "List of files to attach for using as references."
        }
      }
    }
  }
 }
--- a/homeassistant/components/ai_task/task.py
+++ b/homeassistant/components/ai_task/task.py
@@ -3,8 +3,6 @@
 from __future__ import annotations
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 import io
 import mimetypes
 from pathlib import Path
 import tempfile
@@ -12,106 +10,25 @@ from typing import Any
 import voluptuous as vol
-from homeassistant.components import camera, conversation, image, media_source
+from homeassistant.components import camera, conversation, media_source
-from homeassistant.components.http.auth import async_sign_path
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.core import HomeAssistant, ServiceResponse, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import llm
+from homeassistant.helpers.chat_session import async_get_chat_session
 from homeassistant.helpers.chat_session import ChatSession, async_get_chat_session
 from homeassistant.util import RE_SANITIZE_FILENAME, slugify
-from .const import (
+from .const import DATA_COMPONENT, DATA_PREFERENCES, AITaskEntityFeature
    DATA_COMPONENT,
    DATA_MEDIA_SOURCE,
    DATA_PREFERENCES,
    DOMAIN,
    IMAGE_DIR,
    IMAGE_EXPIRY_TIME,
    AITaskEntityFeature,
 )
-def _save_camera_snapshot(image_data: camera.Image | image.Image) -> Path:
+def _save_camera_snapshot(image: camera.Image) -> Path:
    """Save camera snapshot to temp file."""
    with tempfile.NamedTemporaryFile(
        mode="wb",
-        suffix=mimetypes.guess_extension(image_data.content_type, False),
+        suffix=mimetypes.guess_extension(image.content_type, False),
        delete=False,
    ) as temp_file:
-        temp_file.write(image_data.content)
+        temp_file.write(image.content)
        return Path(temp_file.name)
 async def _resolve_attachments(
    hass: HomeAssistant,
    session: ChatSession,
    attachments: list[dict] | None = None,
 ) -> list[conversation.Attachment]:
    """Resolve attachments for a task."""
    resolved_attachments: list[conversation.Attachment] = []
    created_files: list[Path] = []
    for attachment in attachments or []:
        media_content_id = attachment["media_content_id"]
        # Special case for certain media sources
        for integration in camera, image:
            media_source_prefix = f"media-source://{integration.DOMAIN}/"
            if not media_content_id.startswith(media_source_prefix):
                continue
            # Extract entity_id from the media content ID
            entity_id = media_content_id.removeprefix(media_source_prefix)
            # Get snapshot from entity
            image_data = await integration.async_get_image(hass, entity_id)
            temp_filename = await hass.async_add_executor_job(
                _save_camera_snapshot, image_data
            )
            created_files.append(temp_filename)
            resolved_attachments.append(
                conversation.Attachment(
                    media_content_id=media_content_id,
                    mime_type=image_data.content_type,
                    path=temp_filename,
                )
            )
            break
        else:
            # Handle regular media sources
            media = await media_source.async_resolve_media(hass, media_content_id, None)
            if media.path is None:
                raise HomeAssistantError(
                    "Only local attachments are currently supported"
                )
            resolved_attachments.append(
                conversation.Attachment(
                    media_content_id=media_content_id,
                    mime_type=media.mime_type,
                    path=media.path,
                )
            )
    if not created_files:
        return resolved_attachments
    def cleanup_files() -> None:
        """Cleanup temporary files."""
        for file in created_files:
            file.unlink(missing_ok=True)
    @callback
    def cleanup_files_callback() -> None:
        """Cleanup temporary files."""
        hass.async_add_executor_job(cleanup_files)
    session.async_on_cleanup(cleanup_files_callback)
    return resolved_attachments
 async def async_generate_data(
    hass: HomeAssistant,
    *,
@@ -120,9 +37,8 @@ async def async_generate_data(
    instructions: str,
    structure: vol.Schema | None = None,
    attachments: list[dict] | None = None,
    llm_api: llm.API | None = None,
 ) -> GenDataTaskResult:
-    """Run a data generation task in the AI Task integration."""
+    """Run a task in the AI Task integration."""
    if entity_id is None:
        entity_id = hass.data[DATA_PREFERENCES].gen_data_entity_id
@@ -138,6 +54,10 @@ async def async_generate_data(
            f"AI Task entity {entity_id} does not support generating data"
        )
    # Resolve attachments
    resolved_attachments: list[conversation.Attachment] = []
    created_files: list[Path] = []
    if (
        attachments
        and AITaskEntityFeature.SUPPORT_ATTACHMENTS not in entity.supported_features
@@ -146,8 +66,58 @@ async def async_generate_data(
            f"AI Task entity {entity_id} does not support attachments"
        )
    for attachment in attachments or []:
        media_content_id = attachment["media_content_id"]
        # Special case for camera media sources
        if media_content_id.startswith("media-source://camera/"):
            # Extract entity_id from the media content ID
            entity_id = media_content_id.removeprefix("media-source://camera/")
            # Get snapshot from camera
            image = await camera.async_get_image(hass, entity_id)
            temp_filename = await hass.async_add_executor_job(
                _save_camera_snapshot, image
            )
            created_files.append(temp_filename)
            resolved_attachments.append(
                conversation.Attachment(
                    media_content_id=media_content_id,
                    mime_type=image.content_type,
                    path=temp_filename,
                )
            )
        else:
            # Handle regular media sources
            media = await media_source.async_resolve_media(hass, media_content_id, None)
            if media.path is None:
                raise HomeAssistantError(
                    "Only local attachments are currently supported"
                )
            resolved_attachments.append(
                conversation.Attachment(
                    media_content_id=media_content_id,
                    mime_type=media.mime_type,
                    path=media.path,
                )
            )
    with async_get_chat_session(hass) as session:
-        resolved_attachments = await _resolve_attachments(hass, session, attachments)
+        if created_files:
            def cleanup_files() -> None:
                """Cleanup temporary files."""
                for file in created_files:
                    file.unlink(missing_ok=True)
            @callback
            def cleanup_files_callback() -> None:
                """Cleanup temporary files."""
                hass.async_add_executor_job(cleanup_files)
            session.async_on_cleanup(cleanup_files_callback)
        return await entity.internal_async_generate_data(
            session,
@@ -156,92 +126,10 @@ async def async_generate_data(
                instructions=instructions,
                structure=structure,
                attachments=resolved_attachments or None,
                llm_api=llm_api,
            ),
        )
 async def async_generate_image(
    hass: HomeAssistant,
    *,
    task_name: str,
    entity_id: str | None = None,
    instructions: str,
    attachments: list[dict] | None = None,
 ) -> ServiceResponse:
    """Run an image generation task in the AI Task integration."""
    if entity_id is None:
        entity_id = hass.data[DATA_PREFERENCES].gen_image_entity_id
    if entity_id is None:
        raise HomeAssistantError("No entity_id provided and no preferred entity set")
    entity = hass.data[DATA_COMPONENT].get_entity(entity_id)
    if entity is None:
        raise HomeAssistantError(f"AI Task entity {entity_id} not found")
    if AITaskEntityFeature.GENERATE_IMAGE not in entity.supported_features:
        raise HomeAssistantError(
            f"AI Task entity {entity_id} does not support generating images"
        )
    if (
        attachments
        and AITaskEntityFeature.SUPPORT_ATTACHMENTS not in entity.supported_features
    ):
        raise HomeAssistantError(
            f"AI Task entity {entity_id} does not support attachments"
        )
    with async_get_chat_session(hass) as session:
        resolved_attachments = await _resolve_attachments(hass, session, attachments)
        task_result = await entity.internal_async_generate_image(
            session,
            GenImageTask(
                name=task_name,
                instructions=instructions,
                attachments=resolved_attachments or None,
            ),
        )
    service_result = task_result.as_dict()
    image_data = service_result.pop("image_data")
    if service_result.get("revised_prompt") is None:
        service_result["revised_prompt"] = instructions
    source = hass.data[DATA_MEDIA_SOURCE]
    current_time = datetime.now()
    ext = mimetypes.guess_extension(task_result.mime_type, False) or ".png"
    sanitized_task_name = RE_SANITIZE_FILENAME.sub("", slugify(task_name))
    image_file = ImageData(
        filename=f"{current_time.strftime('%Y-%m-%d_%H%M%S')}_{sanitized_task_name}{ext}",
        file=io.BytesIO(image_data),
        content_type=task_result.mime_type,
    )
    target_folder = media_source.MediaSourceItem.from_uri(
        hass, f"media-source://{DOMAIN}/{IMAGE_DIR}", None
    )
    service_result["media_source_id"] = await source.async_upload_media(
        target_folder, image_file
    )
    item = media_source.MediaSourceItem.from_uri(
        hass, service_result["media_source_id"], None
    )
    service_result["url"] = async_sign_path(
        hass,
        (await source.async_resolve_media(item)).url,
        timedelta(seconds=IMAGE_EXPIRY_TIME),
    )
    return service_result
@dataclass(slots=True)
 class GenDataTask:
    """Gen data task to be processed."""
@@ -258,9 +146,6 @@ class GenDataTask:
    attachments: list[conversation.Attachment] | None = None
    """List of attachments to go along the instructions."""
    llm_api: llm.API | None = None
    """API to provide to the LLM."""
    def __str__(self) -> str:
        """Return task as a string."""
        return f"<GenDataTask {self.name}: {id(self)}>"
@@ -282,68 +167,3 @@ class GenDataTaskResult:
            "conversation_id": self.conversation_id,
            "data": self.data,
        }
@dataclass(slots=True)
 class GenImageTask:
    """Gen image task to be processed."""
    name: str
    """Name of the task."""
    instructions: str
    """Instructions on what needs to be done."""
    attachments: list[conversation.Attachment] | None = None
    """List of attachments to go along the instructions."""
    def __str__(self) -> str:
        """Return task as a string."""
        return f"<GenImageTask {self.name}: {id(self)}>"
@dataclass(slots=True)
 class GenImageTaskResult:
    """Result of gen image task."""
    image_data: bytes
    """Raw image data generated by the model."""
    conversation_id: str
    """Unique identifier for the conversation."""
    mime_type: str
    """MIME type of the generated image."""
    width: int | None = None
    """Width of the generated image, if available."""
    height: int | None = None
    """Height of the generated image, if available."""
    model: str | None = None
    """Model used to generate the image, if available."""
    revised_prompt: str | None = None
    """Revised prompt used to generate the image, if applicable."""
    def as_dict(self) -> dict[str, Any]:
        """Return result as a dict."""
        return {
            "image_data": self.image_data,
            "conversation_id": self.conversation_id,
            "mime_type": self.mime_type,
            "width": self.width,
            "height": self.height,
            "model": self.model,
            "revised_prompt": self.revised_prompt,
        }
@dataclass(slots=True)
 class ImageData:
    """Implementation of media_source.local_source.UploadedFile protocol."""
    filename: str
    file: io.IOBase
    content_type: str
--- a/homeassistant/components/airgradient/strings.json
+++ b/homeassistant/components/airgradient/strings.json
@@ -61,7 +61,7 @@
      "display_pm_standard": {
        "name": "Display PM standard",
        "state": {
-          "ugm3": "μg/m³",
+          "ugm3": "µg/m³",
          "us_aqi": "US AQI"
        }
      },
--- a/homeassistant/components/airos/init.py
+++ b/homeassistant/components/airos/init.py
@@ -2,20 +2,12 @@
 from __future__ import annotations
-from airos.airos8 import AirOS8
+from airos.airos8 import AirOS
-from homeassistant.const import (
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
    CONF_HOST,
    CONF_PASSWORD,
    CONF_SSL,
    CONF_USERNAME,
    CONF_VERIFY_SSL,
    Platform,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, SECTION_ADVANCED_SETTINGS
 from .coordinator import AirOSConfigEntry, AirOSDataUpdateCoordinator
 _PLATFORMS: list[Platform] = [
@@ -29,16 +21,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> boo
    # By default airOS 8 comes with self-signed SSL certificates,
    # with no option in the web UI to change or upload a custom certificate.
-    session = async_get_clientsession(
+    session = async_get_clientsession(hass, verify_ssl=False)
        hass, verify_ssl=entry.data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL]
    )
-    airos_device = AirOS8(
+    airos_device = AirOS(
        host=entry.data[CONF_HOST],
        username=entry.data[CONF_USERNAME],
        password=entry.data[CONF_PASSWORD],
        session=session,
        use_ssl=entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
    )
    coordinator = AirOSDataUpdateCoordinator(hass, entry, airos_device)
@@ -51,30 +40,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> boo
    return True
 async def async_migrate_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
    """Migrate old config entry."""
    if entry.version > 1:
        # This means the user has downgraded from a future version
        return False
    if entry.version == 1 and entry.minor_version == 1:
        new_data = {**entry.data}
        advanced_data = {
            CONF_SSL: DEFAULT_SSL,
            CONF_VERIFY_SSL: DEFAULT_VERIFY_SSL,
        }
        new_data[SECTION_ADVANCED_SETTINGS] = advanced_data
        hass.config_entries.async_update_entry(
            entry,
            data=new_data,
            minor_version=2,
        )
    return True
 async def async_unload_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
    """Unload a config entry."""
    return await hass.config_entries.async_unload_platforms(entry, _PLATFORMS)
--- a/homeassistant/components/airos/binary_sensor.py
+++ b/homeassistant/components/airos/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from .coordinator import AirOS8Data, AirOSConfigEntry, AirOSDataUpdateCoordinator
+from .coordinator import AirOSConfigEntry, AirOSData, AirOSDataUpdateCoordinator
 from .entity import AirOSEntity
 _LOGGER = logging.getLogger(__name__)
@@ -27,7 +27,7 @@ PARALLEL_UPDATES = 0
 class AirOSBinarySensorEntityDescription(BinarySensorEntityDescription):
    """Describe an AirOS binary sensor."""
-    value_fn: Callable[[AirOS8Data], bool]
+    value_fn: Callable[[AirOSData], bool]
 BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (
--- a/homeassistant/components/airos/config_flow.py
+++ b/homeassistant/components/airos/config_flow.py
@@ -15,18 +15,11 @@ from airos.exceptions import (
 import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import (
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
    CONF_HOST,
    CONF_PASSWORD,
    CONF_SSL,
    CONF_USERNAME,
    CONF_VERIFY_SSL,
 )
 from homeassistant.data_entry_flow import section
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, DOMAIN, SECTION_ADVANCED_SETTINGS
+from .const import DOMAIN
-from .coordinator import AirOS8
+from .coordinator import AirOS
 _LOGGER = logging.getLogger(__name__)
@@ -35,15 +28,6 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
        vol.Required(CONF_HOST): str,
        vol.Required(CONF_USERNAME, default="ubnt"): str,
        vol.Required(CONF_PASSWORD): str,
        vol.Required(SECTION_ADVANCED_SETTINGS): section(
            vol.Schema(
                {
                    vol.Required(CONF_SSL, default=DEFAULT_SSL): bool,
                    vol.Required(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): bool,
                }
            ),
            {"collapsed": True},
        ),
    }
 )
@@ -52,7 +36,6 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Ubiquiti airOS."""
    VERSION = 1
    MINOR_VERSION = 2
    async def async_step_user(
        self,
@@ -63,17 +46,13 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
        if user_input is not None:
            # By default airOS 8 comes with self-signed SSL certificates,
            # with no option in the web UI to change or upload a custom certificate.
-            session = async_get_clientsession(
+            session = async_get_clientsession(self.hass, verify_ssl=False)
                self.hass,
                verify_ssl=user_input[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL],
            )
-            airos_device = AirOS8(
+            airos_device = AirOS(
                host=user_input[CONF_HOST],
                username=user_input[CONF_USERNAME],
                password=user_input[CONF_PASSWORD],
                session=session,
                use_ssl=user_input[SECTION_ADVANCED_SETTINGS][CONF_SSL],
            )
            try:
                await airos_device.login()
--- a/homeassistant/components/airos/const.py
+++ b/homeassistant/components/airos/const.py
@@ -7,8 +7,3 @@ DOMAIN = "airos"
 SCAN_INTERVAL = timedelta(minutes=1)
 MANUFACTURER = "Ubiquiti"
 DEFAULT_VERIFY_SSL = False
 DEFAULT_SSL = True
 SECTION_ADVANCED_SETTINGS = "advanced_settings"
--- a/homeassistant/components/airos/coordinator.py
+++ b/homeassistant/components/airos/coordinator.py
@@ -4,7 +4,7 @@ from __future__ import annotations
 import logging
-from airos.airos8 import AirOS8, AirOS8Data
+from airos.airos8 import AirOS, AirOSData
 from airos.exceptions import (
    AirOSConnectionAuthenticationError,
    AirOSConnectionSetupError,
@@ -24,13 +24,13 @@ _LOGGER = logging.getLogger(__name__)
 type AirOSConfigEntry = ConfigEntry[AirOSDataUpdateCoordinator]
-class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
+class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOSData]):
    """Class to manage fetching AirOS data from single endpoint."""
    config_entry: AirOSConfigEntry
    def __init__(
-        self, hass: HomeAssistant, config_entry: AirOSConfigEntry, airos_device: AirOS8
+        self, hass: HomeAssistant, config_entry: AirOSConfigEntry, airos_device: AirOS
    ) -> None:
        """Initialize the coordinator."""
        self.airos_device = airos_device
@@ -42,7 +42,7 @@ class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
            update_interval=SCAN_INTERVAL,
        )
-    async def _async_update_data(self) -> AirOS8Data:
+    async def _async_update_data(self) -> AirOSData:
        """Fetch data from AirOS."""
        try:
            await self.airos_device.login()
--- a/homeassistant/components/airos/entity.py
+++ b/homeassistant/components/airos/entity.py
@@ -2,11 +2,11 @@
 from __future__ import annotations
-from homeassistant.const import CONF_HOST, CONF_SSL
+from homeassistant.const import CONF_HOST
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from .const import DOMAIN, MANUFACTURER, SECTION_ADVANCED_SETTINGS
+from .const import DOMAIN, MANUFACTURER
 from .coordinator import AirOSDataUpdateCoordinator
@@ -20,14 +20,9 @@ class AirOSEntity(CoordinatorEntity[AirOSDataUpdateCoordinator]):
        super().__init__(coordinator)
        airos_data = self.coordinator.data
        url_schema = (
            "https"
            if coordinator.config_entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL]
            else "http"
        )
        configuration_url: str | None = (
-            f"{url_schema}://{coordinator.config_entry.data[CONF_HOST]}"
+            f"https://{coordinator.config_entry.data[CONF_HOST]}"
        )
        self._attr_device_info = DeviceInfo(
--- a/homeassistant/components/airos/manifest.json
+++ b/homeassistant/components/airos/manifest.json
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/airos",
  "iot_class": "local_polling",
  "quality_scale": "bronze",
-  "requirements": ["airos==0.5.1"]
+  "requirements": ["airos==0.3.0"]
 }
--- a/homeassistant/components/airos/sensor.py
+++ b/homeassistant/components/airos/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
-from .coordinator import AirOS8Data, AirOSConfigEntry, AirOSDataUpdateCoordinator
+from .coordinator import AirOSConfigEntry, AirOSData, AirOSDataUpdateCoordinator
 from .entity import AirOSEntity
 _LOGGER = logging.getLogger(__name__)
@@ -42,7 +42,7 @@ PARALLEL_UPDATES = 0
 class AirOSSensorEntityDescription(SensorEntityDescription):
    """Describe an AirOS sensor."""
-    value_fn: Callable[[AirOS8Data], StateType]
+    value_fn: Callable[[AirOSData], StateType]
 SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
--- a/homeassistant/components/airos/strings.json
+++ b/homeassistant/components/airos/strings.json
@@ -12,18 +12,6 @@
          "host": "IP address or hostname of the airOS device",
          "username": "Administrator username for the airOS device, normally 'ubnt'",
          "password": "Password configured through the UISP app or web interface"
        },
        "sections": {
          "advanced_settings": {
            "data": {
              "ssl": "Use HTTPS",
              "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
            },
            "data_description": {
              "ssl": "Whether the connection should be encrypted (required for most devices)",
              "verify_ssl": "Whether the certificate should be verified when using HTTPS. This should be off for self-signed certificates"
            }
          }
        }
      }
    },
--- a/homeassistant/components/airzone/manifest.json
+++ b/homeassistant/components/airzone/manifest.json
@@ -11,5 +11,5 @@
  "documentation": "https://www.home-assistant.io/integrations/airzone",
  "iot_class": "local_polling",
  "loggers": ["aioairzone"],
-  "requirements": ["aioairzone==1.0.1"]
+  "requirements": ["aioairzone==1.0.0"]
 }
--- a/homeassistant/components/airzone/select.py
+++ b/homeassistant/components/airzone/select.py
@@ -6,19 +6,17 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any, Final
-from aioairzone.common import GrilleAngle, OperationMode, QAdapt, SleepTimeout
+from aioairzone.common import GrilleAngle, OperationMode, SleepTimeout
 from aioairzone.const import (
    API_COLD_ANGLE,
    API_HEAT_ANGLE,
    API_MODE,
    API_Q_ADAPT,
    API_SLEEP,
    AZD_COLD_ANGLE,
    AZD_HEAT_ANGLE,
    AZD_MASTER,
    AZD_MODE,
    AZD_MODES,
    AZD_Q_ADAPT,
    AZD_SLEEP,
    AZD_ZONES,
 )
@@ -67,14 +65,6 @@ SLEEP_DICT: Final[dict[str, int]] = {
    "90m": SleepTimeout.SLEEP_90,
 }
 Q_ADAPT_DICT: Final[dict[str, int]] = {
    "standard": QAdapt.STANDARD,
    "power": QAdapt.POWER,
    "silence": QAdapt.SILENCE,
    "minimum": QAdapt.MINIMUM,
    "maximum": QAdapt.MAXIMUM,
 }
 def main_zone_options(
    zone_data: dict[str, Any],
@@ -93,14 +83,6 @@ MAIN_ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
        options_fn=main_zone_options,
        translation_key="modes",
    ),
    AirzoneSelectDescription(
        api_param=API_Q_ADAPT,
        entity_category=EntityCategory.CONFIG,
        key=AZD_Q_ADAPT,
        options=list(Q_ADAPT_DICT),
        options_dict=Q_ADAPT_DICT,
        translation_key="q_adapt",
    ),
 )
--- a/homeassistant/components/airzone/strings.json
+++ b/homeassistant/components/airzone/strings.json
@@ -63,16 +63,6 @@
          "stop": "Stop"
        }
      },
      "q_adapt": {
        "name": "Q-Adapt",
        "state": {
          "standard": "Standard",
          "power": "Power",
          "silence": "Silence",
          "minimum": "Minimum",
          "maximum": "Maximum"
        }
      },
      "sleep_times": {
        "name": "Sleep",
        "state": {
--- a/homeassistant/components/airzone_cloud/manifest.json
+++ b/homeassistant/components/airzone_cloud/manifest.json
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
  "iot_class": "cloud_push",
  "loggers": ["aioairzone_cloud"],
-  "requirements": ["aioairzone-cloud==0.7.2"]
+  "requirements": ["aioairzone-cloud==0.7.1"]
 }
--- a/homeassistant/components/aladdin_connect/init.py
+++ b/homeassistant/components/aladdin_connect/init.py
@@ -2,96 +2,39 @@
 from __future__ import annotations
-from genie_partner_sdk.client import AladdinConnectClient
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import (
+from homeassistant.helpers import issue_registry as ir
    aiohttp_client,
    config_entry_oauth2_flow,
    device_registry as dr,
 )
-from . import api
+DOMAIN = "aladdin_connect"
 from .const import CONFIG_FLOW_MINOR_VERSION, CONFIG_FLOW_VERSION, DOMAIN
 from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
 PLATFORMS: list[Platform] = [Platform.COVER, Platform.SENSOR]
-async def async_setup_entry(
+async def async_setup_entry(hass: HomeAssistant, _: ConfigEntry) -> bool:
-    hass: HomeAssistant, entry: AladdinConnectConfigEntry
+    """Set up Aladdin Connect from a config entry."""
-) -> bool:
+    ir.async_create_issue(
-    """Set up Aladdin Connect Genie from a config entry."""
+        hass,
-    implementation = (
+        DOMAIN,
-        await config_entry_oauth2_flow.async_get_config_entry_implementation(
+        DOMAIN,
-            hass, entry
+        is_fixable=False,
-        )
+        severity=ir.IssueSeverity.ERROR,
        translation_key="integration_removed",
        translation_placeholders={
            "entries": "/config/integrations/integration/aladdin_connect",
        },
    )
    session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
    client = AladdinConnectClient(
        api.AsyncConfigEntryAuth(aiohttp_client.async_get_clientsession(hass), session)
    )
    doors = await client.get_doors()
    entry.runtime_data = {
        door.unique_id: AladdinConnectCoordinator(hass, entry, client, door)
        for door in doors
    }
    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
    remove_stale_devices(hass, entry)
    return True
-async def async_unload_entry(
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    hass: HomeAssistant, entry: AladdinConnectConfigEntry
 ) -> bool:
    """Unload a config entry."""
    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 async def async_migrate_entry(
    hass: HomeAssistant, config_entry: AladdinConnectConfigEntry
 ) -> bool:
    """Migrate old config."""
    if config_entry.version < CONFIG_FLOW_VERSION:
        config_entry.async_start_reauth(hass)
        new_data = {**config_entry.data}
        hass.config_entries.async_update_entry(
            config_entry,
            data=new_data,
            version=CONFIG_FLOW_VERSION,
            minor_version=CONFIG_FLOW_MINOR_VERSION,
        )
    return True
-def remove_stale_devices(
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
-    hass: HomeAssistant,
+    """Remove a config entry."""
-    config_entry: AladdinConnectConfigEntry,
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
-) -> None:
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
-    """Remove stale devices from device registry."""
+        # Remove any remaining disabled or ignored entries
-    device_registry = dr.async_get(hass)
+        for _entry in hass.config_entries.async_entries(DOMAIN):
-    device_entries = dr.async_entries_for_config_entry(
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))
        device_registry, config_entry.entry_id
    )
    all_device_ids = set(config_entry.runtime_data)
    for device_entry in device_entries:
        device_id: str | None = None
        for identifier in device_entry.identifiers:
            if identifier[0] == DOMAIN:
                device_id = identifier[1]
                break
        if device_id and device_id not in all_device_ids:
            device_registry.async_update_device(
                device_entry.id, remove_config_entry_id=config_entry.entry_id
            )
--- a/homeassistant/components/aladdin_connect/api.py
+++ b/homeassistant/components/aladdin_connect/api.py
@@ -1,33 +0,0 @@
 """API for Aladdin Connect Genie bound to Home Assistant OAuth."""
 from typing import cast
 from aiohttp import ClientSession
 from genie_partner_sdk.auth import Auth
 from homeassistant.helpers import config_entry_oauth2_flow
 API_URL = "https://twdvzuefzh.execute-api.us-east-2.amazonaws.com/v1"
 API_KEY = "k6QaiQmcTm2zfaNns5L1Z8duBtJmhDOW8JawlCC3"
 class AsyncConfigEntryAuth(Auth):
    """Provide Aladdin Connect Genie authentication tied to an OAuth2 based config entry."""
    def __init__(
        self,
        websession: ClientSession,
        oauth_session: config_entry_oauth2_flow.OAuth2Session,
    ) -> None:
        """Initialize Aladdin Connect Genie auth."""
        super().__init__(
            websession, API_URL, oauth_session.token["access_token"], API_KEY
        )
        self._oauth_session = oauth_session
    async def async_get_access_token(self) -> str:
        """Return a valid access token."""
        if not self._oauth_session.valid_token:
            await self._oauth_session.async_ensure_token_valid()
        return cast(str, self._oauth_session.token["access_token"])
--- a/homeassistant/components/aladdin_connect/application_credentials.py
+++ b/homeassistant/components/aladdin_connect/application_credentials.py
@@ -1,14 +0,0 @@
 """application_credentials platform the Aladdin Connect Genie integration."""
 from homeassistant.components.application_credentials import AuthorizationServer
 from homeassistant.core import HomeAssistant
 from .const import OAUTH2_AUTHORIZE, OAUTH2_TOKEN
 async def async_get_authorization_server(hass: HomeAssistant) -> AuthorizationServer:
    """Return authorization server."""
    return AuthorizationServer(
        authorize_url=OAUTH2_AUTHORIZE,
        token_url=OAUTH2_TOKEN,
    )
--- a/homeassistant/components/aladdin_connect/config_flow.py
+++ b/homeassistant/components/aladdin_connect/config_flow.py
@@ -1,63 +1,11 @@
-"""Config flow for Aladdin Connect Genie."""
+"""Config flow for Aladdin Connect integration."""
-from collections.abc import Mapping
+from homeassistant.config_entries import ConfigFlow
 import logging
 from typing import Any
-import jwt
+from . import DOMAIN
 import voluptuous as vol
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
 from homeassistant.helpers import config_entry_oauth2_flow
 from .const import CONFIG_FLOW_MINOR_VERSION, CONFIG_FLOW_VERSION, DOMAIN
-class OAuth2FlowHandler(
+class AladdinConnectConfigFlow(ConfigFlow, domain=DOMAIN):
-    config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
+    """Handle a config flow for Aladdin Connect."""
 ):
    """Config flow to handle Aladdin Connect Genie OAuth2 authentication."""
-    DOMAIN = DOMAIN
+    VERSION = 1
    VERSION = CONFIG_FLOW_VERSION
    MINOR_VERSION = CONFIG_FLOW_MINOR_VERSION
    async def async_step_reauth(
        self, user_input: Mapping[str, Any]
    ) -> ConfigFlowResult:
        """Perform reauth upon API auth error or upgrade from v1 to v2."""
        return await self.async_step_reauth_confirm()
    async def async_step_reauth_confirm(
        self, user_input: Mapping[str, Any] | None = None
    ) -> ConfigFlowResult:
        """Dialog that informs the user that reauth is required."""
        if user_input is None:
            return self.async_show_form(
                step_id="reauth_confirm",
                data_schema=vol.Schema({}),
            )
        return await self.async_step_user()
    async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:
        """Create an oauth config entry or update existing entry for reauth."""
        # Extract the user ID from the JWT token's 'sub' field
        token = jwt.decode(
            data["token"]["access_token"], options={"verify_signature": False}
        )
        user_id = token["sub"]
        await self.async_set_unique_id(user_id)
        if self.source == SOURCE_REAUTH:
            self._abort_if_unique_id_mismatch(reason="wrong_account")
            return self.async_update_reload_and_abort(
                self._get_reauth_entry(), data=data
            )
        self._abort_if_unique_id_configured()
        return self.async_create_entry(title="Aladdin Connect", data=data)
    @property
    def logger(self) -> logging.Logger:
        """Return logger."""
        return logging.getLogger(__name__)
--- a/homeassistant/components/aladdin_connect/const.py
+++ b/homeassistant/components/aladdin_connect/const.py
@@ -1,14 +0,0 @@
 """Constants for the Aladdin Connect Genie integration."""
 from typing import Final
 from homeassistant.components.cover import CoverEntityFeature
 DOMAIN = "aladdin_connect"
 CONFIG_FLOW_VERSION = 2
 CONFIG_FLOW_MINOR_VERSION = 1
 OAUTH2_AUTHORIZE = "https://app.aladdinconnect.com/login.html"
 OAUTH2_TOKEN = "https://twdvzuefzh.execute-api.us-east-2.amazonaws.com/v1/oauth2/token"
 SUPPORTED_FEATURES: Final = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
--- a/homeassistant/components/aladdin_connect/coordinator.py
+++ b/homeassistant/components/aladdin_connect/coordinator.py
@@ -1,50 +0,0 @@
 """Coordinator for Aladdin Connect integration."""
 from __future__ import annotations
 from datetime import timedelta
 import logging
 from genie_partner_sdk.client import AladdinConnectClient
 from genie_partner_sdk.model import GarageDoor
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 _LOGGER = logging.getLogger(__name__)
 type AladdinConnectConfigEntry = ConfigEntry[dict[str, AladdinConnectCoordinator]]
 SCAN_INTERVAL = timedelta(seconds=15)
 class AladdinConnectCoordinator(DataUpdateCoordinator[GarageDoor]):
    """Coordinator for Aladdin Connect integration."""
    def __init__(
        self,
        hass: HomeAssistant,
        entry: AladdinConnectConfigEntry,
        client: AladdinConnectClient,
        garage_door: GarageDoor,
    ) -> None:
        """Initialize the coordinator."""
        super().__init__(
            hass,
            logger=_LOGGER,
            config_entry=entry,
            name="Aladdin Connect Coordinator",
            update_interval=SCAN_INTERVAL,
        )
        self.client = client
        self.data = garage_door
    async def _async_update_data(self) -> GarageDoor:
        """Fetch data from the Aladdin Connect API."""
        await self.client.update_door(self.data.device_id, self.data.door_number)
        self.data.status = self.client.get_door_status(
            self.data.device_id, self.data.door_number
        )
        self.data.battery_level = self.client.get_battery_status(
            self.data.device_id, self.data.door_number
        )
        return self.data
--- a/homeassistant/components/aladdin_connect/cover.py
+++ b/homeassistant/components/aladdin_connect/cover.py
@@ -1,64 +0,0 @@
 """Cover Entity for Genie Garage Door."""
 from __future__ import annotations
 from typing import Any
 from homeassistant.components.cover import CoverDeviceClass, CoverEntity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .const import SUPPORTED_FEATURES
 from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
 from .entity import AladdinConnectEntity
 async def async_setup_entry(
    hass: HomeAssistant,
    entry: AladdinConnectConfigEntry,
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up the cover platform."""
    coordinators = entry.runtime_data
    async_add_entities(
        AladdinCoverEntity(coordinator) for coordinator in coordinators.values()
    )
 class AladdinCoverEntity(AladdinConnectEntity, CoverEntity):
    """Representation of Aladdin Connect cover."""
    _attr_device_class = CoverDeviceClass.GARAGE
    _attr_supported_features = SUPPORTED_FEATURES
    _attr_name = None
    def __init__(self, coordinator: AladdinConnectCoordinator) -> None:
        """Initialize the Aladdin Connect cover."""
        super().__init__(coordinator)
        self._attr_unique_id = coordinator.data.unique_id
    async def async_open_cover(self, **kwargs: Any) -> None:
        """Issue open command to cover."""
        await self.client.open_door(self._device_id, self._number)
    async def async_close_cover(self, **kwargs: Any) -> None:
        """Issue close command to cover."""
        await self.client.close_door(self._device_id, self._number)
    @property
    def is_closed(self) -> bool | None:
        """Update is closed attribute."""
        if (status := self.coordinator.data.status) is None:
            return None
        return status == "closed"
    @property
    def is_closing(self) -> bool | None:
        """Update is closing attribute."""
        return self.coordinator.data.status == "closing"
    @property
    def is_opening(self) -> bool | None:
        """Update is opening attribute."""
        return self.coordinator.data.status == "opening"
--- a/homeassistant/components/aladdin_connect/entity.py
+++ b/homeassistant/components/aladdin_connect/entity.py
@@ -1,32 +0,0 @@
 """Base class for Aladdin Connect entities."""
 from genie_partner_sdk.client import AladdinConnectClient
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from .const import DOMAIN
 from .coordinator import AladdinConnectCoordinator
 class AladdinConnectEntity(CoordinatorEntity[AladdinConnectCoordinator]):
    """Defines a base Aladdin Connect entity."""
    _attr_has_entity_name = True
    def __init__(self, coordinator: AladdinConnectCoordinator) -> None:
        """Initialize Aladdin Connect entity."""
        super().__init__(coordinator)
        device = coordinator.data
        self._attr_device_info = DeviceInfo(
            identifiers={(DOMAIN, device.unique_id)},
            manufacturer="Aladdin Connect",
            name=device.name,
        )
        self._device_id = device.device_id
        self._number = device.door_number
    @property
    def client(self) -> AladdinConnectClient:
        """Return the client for this entity."""
        return self.coordinator.client
--- a/homeassistant/components/aladdin_connect/manifest.json
+++ b/homeassistant/components/aladdin_connect/manifest.json
@@ -1,16 +1,9 @@
 {
  "domain": "aladdin_connect",
  "name": "Aladdin Connect",
-  "codeowners": ["@swcloudgenie"],
+  "codeowners": [],
  "config_flow": true,
  "dependencies": ["application_credentials"],
  "dhcp": [
    {
      "hostname": "gdocntl-*"
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/aladdin_connect",
-  "integration_type": "hub",
+  "integration_type": "system",
  "iot_class": "cloud_polling",
-  "requirements": ["genie-partner-sdk==1.0.11"]
+  "requirements": []
 }
--- a/homeassistant/components/aladdin_connect/quality_scale.yaml
+++ b/homeassistant/components/aladdin_connect/quality_scale.yaml
@@ -1,94 +0,0 @@
 rules:
  # Bronze
  action-setup:
    status: exempt
    comment: Integration does not register any service actions.
  appropriate-polling: done
  brands: done
  common-modules: done
  config-flow: done
  config-flow-test-coverage: todo
  dependency-transparency: done
  docs-actions:
    status: exempt
    comment: Integration does not register any service actions.
  docs-high-level-description: done
  docs-installation-instructions:
    status: todo
    comment: Documentation needs to be created.
  docs-removal-instructions:
    status: todo
    comment: Documentation needs to be created.
  entity-event-setup:
    status: exempt
    comment: Integration does not subscribe to external events.
  entity-unique-id: done
  has-entity-name: done
  runtime-data: done
  test-before-configure:
    status: todo
    comment: Config flow does not currently test connection during setup.
  test-before-setup: todo
  unique-config-entry: done
  # Silver
  action-exceptions: todo
  config-entry-unloading: done
  docs-configuration-parameters:
    status: todo
    comment: Documentation needs to be created.
  docs-installation-parameters:
    status: todo
    comment: Documentation needs to be created.
  entity-unavailable: todo
  integration-owner: done
  log-when-unavailable: todo
  parallel-updates: todo
  reauthentication-flow: done
  test-coverage:
    status: todo
    comment: Platform tests for cover and sensor need to be implemented to reach 95% coverage.
  # Gold
  devices: done
  diagnostics: todo
  discovery: todo
  discovery-update-info: todo
  docs-data-update:
    status: todo
    comment: Documentation needs to be created.
  docs-examples:
    status: todo
    comment: Documentation needs to be created.
  docs-known-limitations:
    status: todo
    comment: Documentation needs to be created.
  docs-supported-devices:
    status: todo
    comment: Documentation needs to be created.
  docs-supported-functions:
    status: todo
    comment: Documentation needs to be created.
  docs-troubleshooting:
    status: todo
    comment: Documentation needs to be created.
  docs-use-cases:
    status: todo
    comment: Documentation needs to be created.
  dynamic-devices: todo
  entity-category: done
  entity-device-class: done
  entity-disabled-by-default: done
  entity-translations: done
  exception-translations: todo
  icon-translations: todo
  reconfiguration-flow: todo
  repair-issues: todo
  stale-devices:
    status: todo
    comment: Stale devices can be done dynamically
  # Platinum
  async-dependency: todo
  inject-websession: done
  strict-typing: done
--- a/homeassistant/components/aladdin_connect/sensor.py
+++ b/homeassistant/components/aladdin_connect/sensor.py
@@ -1,77 +0,0 @@
 """Support for Aladdin Connect Genie sensors."""
 from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 from genie_partner_sdk.model import GarageDoor
 from homeassistant.components.sensor import (
    SensorDeviceClass,
    SensorEntity,
    SensorEntityDescription,
    SensorStateClass,
 )
 from homeassistant.const import PERCENTAGE, EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
 from .entity import AladdinConnectEntity
@dataclass(frozen=True, kw_only=True)
 class AladdinConnectSensorEntityDescription(SensorEntityDescription):
    """Sensor entity description for Aladdin Connect."""
    value_fn: Callable[[GarageDoor], float | None]
 SENSOR_TYPES: tuple[AladdinConnectSensorEntityDescription, ...] = (
    AladdinConnectSensorEntityDescription(
        key="battery_level",
        device_class=SensorDeviceClass.BATTERY,
        entity_registry_enabled_default=False,
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        entity_category=EntityCategory.DIAGNOSTIC,
        value_fn=lambda garage_door: garage_door.battery_level,
    ),
 )
 async def async_setup_entry(
    hass: HomeAssistant,
    entry: AladdinConnectConfigEntry,
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up Aladdin Connect sensor devices."""
    coordinators = entry.runtime_data
    async_add_entities(
        AladdinConnectSensor(coordinator, description)
        for coordinator in coordinators.values()
        for description in SENSOR_TYPES
    )
 class AladdinConnectSensor(AladdinConnectEntity, SensorEntity):
    """A sensor implementation for Aladdin Connect device."""
    entity_description: AladdinConnectSensorEntityDescription
    def __init__(
        self,
        coordinator: AladdinConnectCoordinator,
        entity_description: AladdinConnectSensorEntityDescription,
    ) -> None:
        """Initialize the Aladdin Connect sensor."""
        super().__init__(coordinator)
        self.entity_description = entity_description
        self._attr_unique_id = f"{coordinator.data.unique_id}-{entity_description.key}"
    @property
    def native_value(self) -> float | None:
        """Return the state of the sensor."""
        return self.entity_description.value_fn(self.coordinator.data)
--- a/homeassistant/components/aladdin_connect/strings.json
+++ b/homeassistant/components/aladdin_connect/strings.json
@@ -1,33 +1,8 @@
 {
-  "config": {
+  "issues": {
-    "step": {
+    "integration_removed": {
-      "pick_implementation": {
+      "title": "The Aladdin Connect integration has been removed",
-        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
+      "description": "The Aladdin Connect integration has been removed from Home Assistant.\n\nTo resolve this issue, please remove the (now defunct) integration entries from your Home Assistant setup. [Click here to see your existing Aladdin Connect integration entries]({entries})."
      },
      "reauth_confirm": {
        "title": "[%key:common::config_flow::title::reauth%]",
        "description": "Aladdin Connect needs to re-authenticate your account"
      },
      "oauth_discovery": {
        "description": "Home Assistant has found an Aladdin Connect device on your network. Press **Submit** to continue setting up Aladdin Connect."
      }
    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
      "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
      "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
      "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
      "wrong_account": "You are authenticated with a different account than the one set up. Please authenticate with the configured account."
    },
    "create_entry": {
      "default": "[%key:common::config_flow::create_entry::authenticated%]"
    }
  }
 }
--- a/homeassistant/components/alarm_control_panel/init.py
+++ b/homeassistant/components/alarm_control_panel/init.py
@@ -61,7 +61,7 @@ ALARM_SERVICE_SCHEMA: Final = make_entity_service_schema(
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the alarm control panel component."""
+    """Track states and offer events for sensors."""
    component = hass.data[DATA_COMPONENT] = EntityComponent[AlarmControlPanelEntity](
        _LOGGER, DOMAIN, hass, SCAN_INTERVAL
    )
--- a/homeassistant/components/alert/init.py
+++ b/homeassistant/components/alert/init.py
@@ -1,7 +1,4 @@
-"""Support for repeating alerts when conditions are met.
+"""Support for repeating alerts when conditions are met."""
 DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
 """
 from __future__ import annotations
@@ -66,10 +63,7 @@ CONFIG_SCHEMA = vol.Schema(
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Alert component.
+    """Set up the Alert component."""
    DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
    """
    component = EntityComponent[AlertEntity](LOGGER, DOMAIN, hass)
    entities: list[AlertEntity] = []
--- a/homeassistant/components/alert/entity.py
+++ b/homeassistant/components/alert/entity.py
@@ -1,7 +1,4 @@
-"""Support for repeating alerts when conditions are met.
+"""Support for repeating alerts when conditions are met."""
 DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
 """
 from __future__ import annotations
@@ -30,10 +27,7 @@ from .const import DOMAIN, LOGGER
 class AlertEntity(Entity):
-    """Representation of an alert.
+    """Representation of an alert."""
    DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
    """
    _attr_should_poll = False
--- a/homeassistant/components/alert/reproduce_state.py
+++ b/homeassistant/components/alert/reproduce_state.py
@@ -1,7 +1,4 @@
-"""Reproduce an Alert state.
+"""Reproduce an Alert state."""
 DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
 """
 from __future__ import annotations
--- a/homeassistant/components/alexa_devices/init.py
+++ b/homeassistant/components/alexa_devices/init.py
@@ -1,11 +1,11 @@
 """Alexa Devices integration."""
-from homeassistant.const import CONF_COUNTRY, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client, config_validation as cv
 from homeassistant.helpers.typing import ConfigType
-from .const import _LOGGER, CONF_LOGIN_DATA, CONF_SITE, COUNTRY_DOMAINS, DOMAIN
+from .const import DOMAIN
 from .coordinator import AmazonConfigEntry, AmazonDevicesCoordinator
 from .services import async_setup_services
@@ -40,48 +40,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bo
    return True
 async def async_migrate_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
    """Migrate old entry."""
    if entry.version == 1 and entry.minor_version < 3:
        if CONF_SITE in entry.data:
            # Site in data (wrong place), just move to login data
            new_data = entry.data.copy()
            new_data[CONF_LOGIN_DATA][CONF_SITE] = new_data[CONF_SITE]
            new_data.pop(CONF_SITE)
            hass.config_entries.async_update_entry(
                entry, data=new_data, version=1, minor_version=3
            )
            return True
        if CONF_SITE in entry.data[CONF_LOGIN_DATA]:
            # Site is there, just update version to avoid future migrations
            hass.config_entries.async_update_entry(entry, version=1, minor_version=3)
            return True
        _LOGGER.debug(
            "Migrating from version %s.%s", entry.version, entry.minor_version
        )
        # Convert country in domain
        country = entry.data[CONF_COUNTRY].lower()
        domain = COUNTRY_DOMAINS.get(country, country)
        # Add site to login data
        new_data = entry.data.copy()
        new_data[CONF_LOGIN_DATA][CONF_SITE] = f"https://www.amazon.{domain}"
        hass.config_entries.async_update_entry(
            entry, data=new_data, version=1, minor_version=3
        )
        _LOGGER.info(
            "Migration to version %s.%s successful", entry.version, entry.minor_version
        )
    return True
 async def async_unload_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
    """Unload a config entry."""
    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
--- a/homeassistant/components/alexa_devices/binary_sensor.py
+++ b/homeassistant/components/alexa_devices/binary_sensor.py
@@ -10,7 +10,6 @@ from aioamazondevices.api import AmazonDevice
 from aioamazondevices.const import SENSOR_STATE_OFF
 from homeassistant.components.binary_sensor import (
    DOMAIN as BINARY_SENSOR_DOMAIN,
    BinarySensorDeviceClass,
    BinarySensorEntity,
    BinarySensorEntityDescription,
@@ -21,7 +20,6 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .coordinator import AmazonConfigEntry
 from .entity import AmazonEntity
 from .utils import async_update_unique_id
 # Coordinator is used to centralize the data updates
 PARALLEL_UPDATES = 0
@@ -33,7 +31,6 @@ class AmazonBinarySensorEntityDescription(BinarySensorEntityDescription):
    is_on_fn: Callable[[AmazonDevice, str], bool]
    is_supported: Callable[[AmazonDevice, str], bool] = lambda device, key: True
    is_available_fn: Callable[[AmazonDevice, str], bool] = lambda device, key: True
 BINARY_SENSORS: Final = (
@@ -44,15 +41,46 @@ BINARY_SENSORS: Final = (
        is_on_fn=lambda device, _: device.online,
    ),
    AmazonBinarySensorEntityDescription(
-        key="detectionState",
+        key="bluetooth",
-        device_class=BinarySensorDeviceClass.MOTION,
+        entity_category=EntityCategory.DIAGNOSTIC,
-        is_on_fn=lambda device, key: bool(
+        translation_key="bluetooth",
-            device.sensors[key].value != SENSOR_STATE_OFF
+        is_on_fn=lambda device, _: device.bluetooth_state,
-        ),
+    ),
    AmazonBinarySensorEntityDescription(
        key="babyCryDetectionState",
        translation_key="baby_cry_detection",
        is_on_fn=lambda device, key: (device.sensors[key].value != SENSOR_STATE_OFF),
        is_supported=lambda device, key: device.sensors.get(key) is not None,
    ),
    AmazonBinarySensorEntityDescription(
        key="beepingApplianceDetectionState",
        translation_key="beeping_appliance_detection",
        is_on_fn=lambda device, key: (device.sensors[key].value != SENSOR_STATE_OFF),
        is_supported=lambda device, key: device.sensors.get(key) is not None,
    ),
    AmazonBinarySensorEntityDescription(
        key="coughDetectionState",
        translation_key="cough_detection",
        is_on_fn=lambda device, key: (device.sensors[key].value != SENSOR_STATE_OFF),
        is_supported=lambda device, key: device.sensors.get(key) is not None,
    ),
    AmazonBinarySensorEntityDescription(
        key="dogBarkDetectionState",
        translation_key="dog_bark_detection",
        is_on_fn=lambda device, key: (device.sensors[key].value != SENSOR_STATE_OFF),
        is_supported=lambda device, key: device.sensors.get(key) is not None,
    ),
    AmazonBinarySensorEntityDescription(
        key="humanPresenceDetectionState",
        device_class=BinarySensorDeviceClass.MOTION,
        is_on_fn=lambda device, key: (device.sensors[key].value != SENSOR_STATE_OFF),
        is_supported=lambda device, key: device.sensors.get(key) is not None,
    ),
    AmazonBinarySensorEntityDescription(
        key="waterSoundsDetectionState",
        translation_key="water_sounds_detection",
        is_on_fn=lambda device, key: (device.sensors[key].value != SENSOR_STATE_OFF),
        is_supported=lambda device, key: device.sensors.get(key) is not None,
        is_available_fn=lambda device, key: (
            device.online and device.sensors[key].error is False
        ),
    ),
 )
@@ -66,34 +94,13 @@ async def async_setup_entry(
    coordinator = entry.runtime_data
-    # Replace unique id for "detectionState" binary sensor
+    async_add_entities(
-    await async_update_unique_id(
+        AmazonBinarySensorEntity(coordinator, serial_num, sensor_desc)
-        hass,
+        for sensor_desc in BINARY_SENSORS
-        coordinator,
+        for serial_num in coordinator.data
-        BINARY_SENSOR_DOMAIN,
+        if sensor_desc.is_supported(coordinator.data[serial_num], sensor_desc.key)
        "humanPresenceDetectionState",
        "detectionState",
    )
    known_devices: set[str] = set()
    def _check_device() -> None:
        current_devices = set(coordinator.data)
        new_devices = current_devices - known_devices
        if new_devices:
            known_devices.update(new_devices)
            async_add_entities(
                AmazonBinarySensorEntity(coordinator, serial_num, sensor_desc)
                for sensor_desc in BINARY_SENSORS
                for serial_num in new_devices
                if sensor_desc.is_supported(
                    coordinator.data[serial_num], sensor_desc.key
                )
            )
    _check_device()
    entry.async_on_unload(coordinator.async_add_listener(_check_device))
 class AmazonBinarySensorEntity(AmazonEntity, BinarySensorEntity):
    """Binary sensor device."""
@@ -106,13 +113,3 @@ class AmazonBinarySensorEntity(AmazonEntity, BinarySensorEntity):
        return self.entity_description.is_on_fn(
            self.device, self.entity_description.key
        )
    @property
    def available(self) -> bool:
        """Return if entity is available."""
        return (
            self.entity_description.is_available_fn(
                self.device, self.entity_description.key
            )
            and super().available
        )
--- a/homeassistant/components/alexa_devices/config_flow.py
+++ b/homeassistant/components/alexa_devices/config_flow.py
@@ -10,14 +10,16 @@ from aioamazondevices.exceptions import (
    CannotAuthenticate,
    CannotConnect,
    CannotRetrieveData,
    WrongCountry,
 )
 import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_CODE, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_CODE, CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import CountrySelector
 from .const import CONF_LOGIN_DATA, DOMAIN
@@ -27,12 +29,6 @@ STEP_REAUTH_DATA_SCHEMA = vol.Schema(
        vol.Required(CONF_CODE): cv.string,
    }
 )
 STEP_RECONFIGURE = vol.Schema(
    {
        vol.Required(CONF_PASSWORD): cv.string,
        vol.Required(CONF_CODE): cv.string,
    }
 )
 async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, Any]:
@@ -41,6 +37,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
    session = aiohttp_client.async_create_clientsession(hass)
    api = AmazonEchoApi(
        session,
        data[CONF_COUNTRY],
        data[CONF_USERNAME],
        data[CONF_PASSWORD],
    )
@@ -51,9 +48,6 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
 class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Alexa Devices."""
    VERSION = 1
    MINOR_VERSION = 3
    async def async_step_user(
        self, user_input: dict[str, Any] | None = None
    ) -> ConfigFlowResult:
@@ -68,6 +62,8 @@ class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
                errors["base"] = "invalid_auth"
            except CannotRetrieveData:
                errors["base"] = "cannot_retrieve_data"
            except WrongCountry:
                errors["base"] = "wrong_country"
            else:
                await self.async_set_unique_id(data["customer_info"]["user_id"])
                self._abort_if_unique_id_configured()
@@ -82,6 +78,9 @@ class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
            errors=errors,
            data_schema=vol.Schema(
                {
                    vol.Required(
                        CONF_COUNTRY, default=self.hass.config.country
                    ): CountrySelector(),
                    vol.Required(CONF_USERNAME): cv.string,
                    vol.Required(CONF_PASSWORD): cv.string,
                    vol.Required(CONF_CODE): cv.string,
@@ -107,9 +106,7 @@ class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
        if user_input is not None:
            try:
-                data = await validate_input(
+                await validate_input(self.hass, {**reauth_entry.data, **user_input})
                    self.hass, {**reauth_entry.data, **user_input}
                )
            except CannotConnect:
                errors["base"] = "cannot_connect"
            except CannotAuthenticate:
@@ -121,9 +118,8 @@ class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
                    reauth_entry,
                    data={
                        CONF_USERNAME: entry_data[CONF_USERNAME],
-                        CONF_PASSWORD: user_input[CONF_PASSWORD],
+                        CONF_PASSWORD: entry_data[CONF_PASSWORD],
                        CONF_CODE: user_input[CONF_CODE],
                        CONF_LOGIN_DATA: data,
                    },
                )
@@ -133,47 +129,3 @@ class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
            data_schema=STEP_REAUTH_DATA_SCHEMA,
            errors=errors,
        )
    async def async_step_reconfigure(
        self, user_input: dict[str, Any] | None = None
    ) -> ConfigFlowResult:
        """Handle reconfiguration of the device."""
        reconfigure_entry = self._get_reconfigure_entry()
        if not user_input:
            return self.async_show_form(
                step_id="reconfigure",
                data_schema=STEP_RECONFIGURE,
            )
        updated_password = user_input[CONF_PASSWORD]
        self._async_abort_entries_match(
            {CONF_USERNAME: reconfigure_entry.data[CONF_USERNAME]}
        )
        errors: dict[str, str] = {}
        try:
            data = await validate_input(
                self.hass, {**reconfigure_entry.data, **user_input}
            )
        except CannotConnect:
            errors["base"] = "cannot_connect"
        except CannotAuthenticate:
            errors["base"] = "invalid_auth"
        except CannotRetrieveData:
            errors["base"] = "cannot_retrieve_data"
        else:
            return self.async_update_reload_and_abort(
                reconfigure_entry,
                data_updates={
                    CONF_PASSWORD: updated_password,
                    CONF_LOGIN_DATA: data,
                },
            )
        return self.async_show_form(
            step_id="reconfigure",
            data_schema=STEP_RECONFIGURE,
            errors=errors,
        )
--- a/homeassistant/components/alexa_devices/const.py
+++ b/homeassistant/components/alexa_devices/const.py
@@ -6,23 +6,3 @@ _LOGGER = logging.getLogger(__package__)
 DOMAIN = "alexa_devices"
 CONF_LOGIN_DATA = "login_data"
 CONF_SITE = "site"
 DEFAULT_DOMAIN = "com"
 COUNTRY_DOMAINS = {
    "ar": DEFAULT_DOMAIN,
    "at": DEFAULT_DOMAIN,
    "au": "com.au",
    "be": "com.be",
    "br": DEFAULT_DOMAIN,
    "gb": "co.uk",
    "il": DEFAULT_DOMAIN,
    "jp": "co.jp",
    "mx": "com.mx",
    "no": DEFAULT_DOMAIN,
    "nz": "com.au",
    "pl": DEFAULT_DOMAIN,
    "tr": "com.tr",
    "us": DEFAULT_DOMAIN,
    "za": "co.za",
 }
--- a/homeassistant/components/alexa_devices/coordinator.py
+++ b/homeassistant/components/alexa_devices/coordinator.py
@@ -11,10 +11,9 @@ from aioamazondevices.exceptions import (
 from aiohttp import ClientSession
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from .const import _LOGGER, CONF_LOGIN_DATA, DOMAIN
@@ -45,17 +44,17 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
        )
        self.api = AmazonEchoApi(
            session,
            entry.data[CONF_COUNTRY],
            entry.data[CONF_USERNAME],
            entry.data[CONF_PASSWORD],
            entry.data[CONF_LOGIN_DATA],
        )
        self.previous_devices: set[str] = set()
    async def _async_update_data(self) -> dict[str, AmazonDevice]:
        """Update device data."""
        try:
            await self.api.login_mode_stored_data()
-            data = await self.api.get_devices_data()
+            return await self.api.get_devices_data()
        except CannotConnect as err:
            raise UpdateFailed(
                translation_domain=DOMAIN,
@@ -74,31 +73,3 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
                translation_key="invalid_auth",
                translation_placeholders={"error": repr(err)},
            ) from err
        else:
            current_devices = set(data.keys())
            if stale_devices := self.previous_devices - current_devices:
                await self._async_remove_device_stale(stale_devices)
            self.previous_devices = current_devices
            return data
    async def _async_remove_device_stale(
        self,
        stale_devices: set[str],
    ) -> None:
        """Remove stale device."""
        device_registry = dr.async_get(self.hass)
        for serial_num in stale_devices:
            _LOGGER.debug(
                "Detected change in devices: serial %s removed",
                serial_num,
            )
            device = device_registry.async_get_device(
                identifiers={(DOMAIN, serial_num)}
            )
            if device:
                device_registry.async_update_device(
                    device_id=device.id,
                    remove_config_entry_id=self.config_entry.entry_id,
                )
--- a/homeassistant/components/alexa_devices/diagnostics.py
+++ b/homeassistant/components/alexa_devices/diagnostics.py
@@ -60,5 +60,7 @@ def build_device_data(device: AmazonDevice) -> dict[str, Any]:
        "online": device.online,
        "serial number": device.serial_number,
        "software version": device.software_version,
-        "sensors": device.sensors,
+        "do not disturb": device.do_not_disturb,
        "response style": device.response_style,
        "bluetooth state": device.bluetooth_state,
    }
--- a/homeassistant/components/alexa_devices/icons.json
+++ b/homeassistant/components/alexa_devices/icons.json
@@ -1,4 +1,44 @@
 {
  "entity": {
    "binary_sensor": {
      "bluetooth": {
        "default": "mdi:bluetooth-off",
        "state": {
          "on": "mdi:bluetooth"
        }
      },
      "baby_cry_detection": {
        "default": "mdi:account-voice-off",
        "state": {
          "on": "mdi:account-voice"
        }
      },
      "beeping_appliance_detection": {
        "default": "mdi:bell-off",
        "state": {
          "on": "mdi:bell-ring"
        }
      },
      "cough_detection": {
        "default": "mdi:blur-off",
        "state": {
          "on": "mdi:blur"
        }
      },
      "dog_bark_detection": {
        "default": "mdi:dog-side-off",
        "state": {
          "on": "mdi:dog-side"
        }
      },
      "water_sounds_detection": {
        "default": "mdi:water-pump-off",
        "state": {
          "on": "mdi:water-pump"
        }
      }
    }
  },
  "services": {
    "send_sound": {
      "service": "mdi:cast-audio"
--- a/homeassistant/components/alexa_devices/manifest.json
+++ b/homeassistant/components/alexa_devices/manifest.json
@@ -7,6 +7,6 @@
  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["aioamazondevices"],
-  "quality_scale": "platinum",
+  "quality_scale": "silver",
-  "requirements": ["aioamazondevices==6.2.7"]
+  "requirements": ["aioamazondevices==4.0.0"]
 }
--- a/homeassistant/components/alexa_devices/notify.py
+++ b/homeassistant/components/alexa_devices/notify.py
@@ -57,23 +57,13 @@ async def async_setup_entry(
    coordinator = entry.runtime_data
-    known_devices: set[str] = set()
+    async_add_entities(
-
+        AmazonNotifyEntity(coordinator, serial_num, sensor_desc)
-    def _check_device() -> None:
+        for sensor_desc in NOTIFY
-        current_devices = set(coordinator.data)
+        for serial_num in coordinator.data
-        new_devices = current_devices - known_devices
+        if sensor_desc.subkey in coordinator.data[serial_num].capabilities
-        if new_devices:
+        and sensor_desc.is_supported(coordinator.data[serial_num])
-            known_devices.update(new_devices)
+    )
            async_add_entities(
                AmazonNotifyEntity(coordinator, serial_num, sensor_desc)
                for sensor_desc in NOTIFY
                for serial_num in new_devices
                if sensor_desc.subkey in coordinator.data[serial_num].capabilities
                and sensor_desc.is_supported(coordinator.data[serial_num])
            )
    _check_device()
    entry.async_on_unload(coordinator.async_add_listener(_check_device))
 class AmazonNotifyEntity(AmazonEntity, NotifyEntity):
--- a/homeassistant/components/alexa_devices/quality_scale.yaml
+++ b/homeassistant/components/alexa_devices/quality_scale.yaml
@@ -53,18 +53,20 @@ rules:
  docs-supported-functions: done
  docs-troubleshooting: done
  docs-use-cases: done
-  dynamic-devices: done
+  dynamic-devices: todo
  entity-category: done
  entity-device-class: done
  entity-disabled-by-default: done
  entity-translations: done
  exception-translations: done
  icon-translations: done
-  reconfiguration-flow: done
+  reconfiguration-flow: todo
  repair-issues:
    status: exempt
    comment: no known use cases for repair issues or flows, yet
-  stale-devices: done
+  stale-devices:
    status: todo
    comment: automate the cleanup process
  # Platinum
  async-dependency: done
--- a/homeassistant/components/alexa_devices/sensor.py
+++ b/homeassistant/components/alexa_devices/sensor.py
@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
    SensorDeviceClass,
    SensorEntity,
    SensorEntityDescription,
    SensorStateClass,
 )
 from homeassistant.const import LIGHT_LUX, UnitOfTemperature
 from homeassistant.core import HomeAssistant
@@ -31,9 +30,6 @@ class AmazonSensorEntityDescription(SensorEntityDescription):
    """Amazon Devices sensor entity description."""
    native_unit_of_measurement_fn: Callable[[AmazonDevice, str], str] | None = None
    is_available_fn: Callable[[AmazonDevice, str], bool] = lambda device, key: (
        device.online and device.sensors[key].error is False
    )
 SENSORS: Final = (
@@ -45,13 +41,11 @@ SENSORS: Final = (
            if device.sensors[_key].scale == "CELSIUS"
            else UnitOfTemperature.FAHRENHEIT
        ),
        state_class=SensorStateClass.MEASUREMENT,
    ),
    AmazonSensorEntityDescription(
        key="illuminance",
        device_class=SensorDeviceClass.ILLUMINANCE,
        native_unit_of_measurement=LIGHT_LUX,
        state_class=SensorStateClass.MEASUREMENT,
    ),
 )
@@ -65,22 +59,12 @@ async def async_setup_entry(
    coordinator = entry.runtime_data
-    known_devices: set[str] = set()
+    async_add_entities(
-
+        AmazonSensorEntity(coordinator, serial_num, sensor_desc)
-    def _check_device() -> None:
+        for sensor_desc in SENSORS
-        current_devices = set(coordinator.data)
+        for serial_num in coordinator.data
-        new_devices = current_devices - known_devices
+        if coordinator.data[serial_num].sensors.get(sensor_desc.key) is not None
-        if new_devices:
+    )
            known_devices.update(new_devices)
            async_add_entities(
                AmazonSensorEntity(coordinator, serial_num, sensor_desc)
                for sensor_desc in SENSORS
                for serial_num in new_devices
                if coordinator.data[serial_num].sensors.get(sensor_desc.key) is not None
            )
    _check_device()
    entry.async_on_unload(coordinator.async_add_listener(_check_device))
 class AmazonSensorEntity(AmazonEntity, SensorEntity):
@@ -102,13 +86,3 @@ class AmazonSensorEntity(AmazonEntity, SensorEntity):
    def native_value(self) -> StateType:
        """Return the state of the sensor."""
        return self.device.sensors[self.entity_description.key].value
    @property
    def available(self) -> bool:
        """Return if entity is available."""
        return (
            self.entity_description.is_available_fn(
                self.device, self.entity_description.key
            )
            and super().available
        )
--- a/homeassistant/components/alexa_devices/services.py
+++ b/homeassistant/components/alexa_devices/services.py
@@ -14,12 +14,14 @@ from .coordinator import AmazonConfigEntry
 ATTR_TEXT_COMMAND = "text_command"
 ATTR_SOUND = "sound"
 ATTR_SOUND_VARIANT = "sound_variant"
 SERVICE_TEXT_COMMAND = "send_text_command"
 SERVICE_SOUND_NOTIFICATION = "send_sound"
 SCHEMA_SOUND_SERVICE = vol.Schema(
    {
        vol.Required(ATTR_SOUND): cv.string,
        vol.Required(ATTR_SOUND_VARIANT): cv.positive_int,
        vol.Required(ATTR_DEVICE_ID): cv.string,
    },
 )
@@ -73,14 +75,17 @@ async def _async_execute_action(call: ServiceCall, attribute: str) -> None:
    coordinator = config_entry.runtime_data
    if attribute == ATTR_SOUND:
-        if value not in SOUNDS_LIST:
+        variant: int = call.data[ATTR_SOUND_VARIANT]
        pad = "_" if variant > 10 else "_0"
        file = f"{value}{pad}{variant!s}"
        if value not in SOUNDS_LIST or variant > SOUNDS_LIST[value]:
            raise ServiceValidationError(
                translation_domain=DOMAIN,
                translation_key="invalid_sound_value",
-                translation_placeholders={"sound": value},
+                translation_placeholders={"sound": value, "variant": str(variant)},
            )
        await coordinator.api.call_alexa_sound(
-            coordinator.data[device.serial_number], value
+            coordinator.data[device.serial_number], file
        )
    elif attribute == ATTR_TEXT_COMMAND:
        await coordinator.api.call_alexa_text_command(
--- a/homeassistant/components/alexa_devices/services.yaml
+++ b/homeassistant/components/alexa_devices/services.yaml
@@ -18,6 +18,14 @@ send_sound:
      selector:
        device:
          integration: alexa_devices
    sound_variant:
      required: true
      example: 1
      default: 1
      selector:
        number:
          min: 1
          max: 50
    sound:
      required: true
      example: amzn_sfx_doorbell_chime
@@ -25,45 +33,472 @@ send_sound:
      selector:
        select:
          options:
-            - air_horn_03
+            - air_horn
-            - amzn_sfx_cat_meow_1x_01
+            - air_horns
-            - amzn_sfx_church_bell_1x_02
+            - airboat
-            - amzn_sfx_crowd_applause_01
+            - airport
-            - amzn_sfx_dog_med_bark_1x_02
+            - aliens
-            - amzn_sfx_doorbell_01
+            - amzn_sfx_airplane_takeoff_whoosh
-            - amzn_sfx_doorbell_chime_01
+            - amzn_sfx_army_march_clank_7x
-            - amzn_sfx_doorbell_chime_02
+            - amzn_sfx_army_march_large_8x
-            - amzn_sfx_large_crowd_cheer_01
+            - amzn_sfx_army_march_small_8x
-            - amzn_sfx_lion_roar_02
+            - amzn_sfx_baby_big_cry
-            - amzn_sfx_rooster_crow_01
+            - amzn_sfx_baby_cry
-            - amzn_sfx_scifi_alarm_01
+            - amzn_sfx_baby_fuss
-            - amzn_sfx_scifi_alarm_04
+            - amzn_sfx_battle_group_clanks
-            - amzn_sfx_scifi_engines_on_02
+            - amzn_sfx_battle_man_grunts
-            - amzn_sfx_scifi_sheilds_up_01
+            - amzn_sfx_battle_men_grunts
-            - amzn_sfx_trumpet_bugle_04
+            - amzn_sfx_battle_men_horses
-            - amzn_sfx_wolf_howl_02
+            - amzn_sfx_battle_noisy_clanks
-            - bell_02
+            - amzn_sfx_battle_yells_men
-            - boing_01
+            - amzn_sfx_battle_yells_men_run
-            - boing_03
+            - amzn_sfx_bear_groan_roar
-            - buzzers_pistols_01
+            - amzn_sfx_bear_roar_grumble
-            - camera_01
+            - amzn_sfx_bear_roar_small
-            - christmas_05
+            - amzn_sfx_beep_1x
-            - clock_01
+            - amzn_sfx_bell_med_chime
-            - futuristic_10
+            - amzn_sfx_bell_short_chime
-            - halloween_bats
+            - amzn_sfx_bell_timer
-            - halloween_crows
+            - amzn_sfx_bicycle_bell_ring
-            - halloween_footsteps
+            - amzn_sfx_bird_chickadee_chirp_1x
-            - halloween_wind
+            - amzn_sfx_bird_chickadee_chirps
-            - halloween_wolf
+            - amzn_sfx_bird_forest
-            - holiday_halloween_ghost
+            - amzn_sfx_bird_forest_short
-            - horror_10
+            - amzn_sfx_bird_robin_chirp_1x
-            - med_system_alerts_minimal_dragon_short
+            - amzn_sfx_boing_long_1x
-            - med_system_alerts_minimal_owl_short
+            - amzn_sfx_boing_med_1x
-            - med_system_alerts_minimals_blue_wave_small
+            - amzn_sfx_boing_short_1x
-            - med_system_alerts_minimals_galaxy_short
+            - amzn_sfx_bus_drive_past
-            - med_system_alerts_minimals_panda_short
+            - amzn_sfx_buzz_electronic
-            - med_system_alerts_minimals_tiger_short
+            - amzn_sfx_buzzer_loud_alarm
-            - med_ui_success_generic_1-1
+            - amzn_sfx_buzzer_small
-            - squeaky_12
+            - amzn_sfx_car_accelerate
-            - zap_01
+            - amzn_sfx_car_accelerate_noisy
            - amzn_sfx_car_click_seatbelt
            - amzn_sfx_car_close_door_1x
            - amzn_sfx_car_drive_past
            - amzn_sfx_car_honk_1x
            - amzn_sfx_car_honk_2x
            - amzn_sfx_car_honk_3x
            - amzn_sfx_car_honk_long_1x
            - amzn_sfx_car_into_driveway
            - amzn_sfx_car_into_driveway_fast
            - amzn_sfx_car_slam_door_1x
            - amzn_sfx_car_undo_seatbelt
            - amzn_sfx_cat_angry_meow_1x
            - amzn_sfx_cat_angry_screech_1x
            - amzn_sfx_cat_long_meow_1x
            - amzn_sfx_cat_meow_1x
            - amzn_sfx_cat_purr
            - amzn_sfx_cat_purr_meow
            - amzn_sfx_chicken_cluck
            - amzn_sfx_church_bell_1x
            - amzn_sfx_church_bells_ringing
            - amzn_sfx_clear_throat_ahem
            - amzn_sfx_clock_ticking
            - amzn_sfx_clock_ticking_long
            - amzn_sfx_copy_machine
            - amzn_sfx_cough
            - amzn_sfx_crow_caw_1x
            - amzn_sfx_crowd_applause
            - amzn_sfx_crowd_bar
            - amzn_sfx_crowd_bar_rowdy
            - amzn_sfx_crowd_boo
            - amzn_sfx_crowd_cheer_med
            - amzn_sfx_crowd_excited_cheer
            - amzn_sfx_dog_med_bark_1x
            - amzn_sfx_dog_med_bark_2x
            - amzn_sfx_dog_med_bark_growl
            - amzn_sfx_dog_med_growl_1x
            - amzn_sfx_dog_med_woof_1x
            - amzn_sfx_dog_small_bark_2x
            - amzn_sfx_door_open
            - amzn_sfx_door_shut
            - amzn_sfx_doorbell
            - amzn_sfx_doorbell_buzz
            - amzn_sfx_doorbell_chime
            - amzn_sfx_drinking_slurp
            - amzn_sfx_drum_and_cymbal
            - amzn_sfx_drum_comedy
            - amzn_sfx_earthquake_rumble
            - amzn_sfx_electric_guitar
            - amzn_sfx_electronic_beep
            - amzn_sfx_electronic_major_chord
            - amzn_sfx_elephant
            - amzn_sfx_elevator_bell_1x
            - amzn_sfx_elevator_open_bell
            - amzn_sfx_fairy_melodic_chimes
            - amzn_sfx_fairy_sparkle_chimes
            - amzn_sfx_faucet_drip
            - amzn_sfx_faucet_running
            - amzn_sfx_fireplace_crackle
            - amzn_sfx_fireworks
            - amzn_sfx_fireworks_firecrackers
            - amzn_sfx_fireworks_launch
            - amzn_sfx_fireworks_whistles
            - amzn_sfx_food_frying
            - amzn_sfx_footsteps
            - amzn_sfx_footsteps_muffled
            - amzn_sfx_ghost_spooky
            - amzn_sfx_glass_on_table
            - amzn_sfx_glasses_clink
            - amzn_sfx_horse_gallop_4x
            - amzn_sfx_horse_huff_whinny
            - amzn_sfx_horse_neigh
            - amzn_sfx_horse_neigh_low
            - amzn_sfx_horse_whinny
            - amzn_sfx_human_walking
            - amzn_sfx_jar_on_table_1x
            - amzn_sfx_kitchen_ambience
            - amzn_sfx_large_crowd_cheer
            - amzn_sfx_large_fire_crackling
            - amzn_sfx_laughter
            - amzn_sfx_laughter_giggle
            - amzn_sfx_lightning_strike
            - amzn_sfx_lion_roar
            - amzn_sfx_magic_blast_1x
            - amzn_sfx_monkey_calls_3x
            - amzn_sfx_monkey_chimp
            - amzn_sfx_monkeys_chatter
            - amzn_sfx_motorcycle_accelerate
            - amzn_sfx_motorcycle_engine_idle
            - amzn_sfx_motorcycle_engine_rev
            - amzn_sfx_musical_drone_intro
            - amzn_sfx_oars_splashing_rowboat
            - amzn_sfx_object_on_table_2x
            - amzn_sfx_ocean_wave_1x
            - amzn_sfx_ocean_wave_on_rocks_1x
            - amzn_sfx_ocean_wave_surf
            - amzn_sfx_people_walking
            - amzn_sfx_person_running
            - amzn_sfx_piano_note_1x
            - amzn_sfx_punch
            - amzn_sfx_rain
            - amzn_sfx_rain_on_roof
            - amzn_sfx_rain_thunder
            - amzn_sfx_rat_squeak_2x
            - amzn_sfx_rat_squeaks
            - amzn_sfx_raven_caw_1x
            - amzn_sfx_raven_caw_2x
            - amzn_sfx_restaurant_ambience
            - amzn_sfx_rooster_crow
            - amzn_sfx_scifi_air_escaping
            - amzn_sfx_scifi_alarm
            - amzn_sfx_scifi_alien_voice
            - amzn_sfx_scifi_boots_walking
            - amzn_sfx_scifi_close_large_explosion
            - amzn_sfx_scifi_door_open
            - amzn_sfx_scifi_engines_on
            - amzn_sfx_scifi_engines_on_large
            - amzn_sfx_scifi_engines_on_short_burst
            - amzn_sfx_scifi_explosion
            - amzn_sfx_scifi_explosion_2x
            - amzn_sfx_scifi_incoming_explosion
            - amzn_sfx_scifi_laser_gun_battle
            - amzn_sfx_scifi_laser_gun_fires
            - amzn_sfx_scifi_laser_gun_fires_large
            - amzn_sfx_scifi_long_explosion_1x
            - amzn_sfx_scifi_missile
            - amzn_sfx_scifi_motor_short_1x
            - amzn_sfx_scifi_open_airlock
            - amzn_sfx_scifi_radar_high_ping
            - amzn_sfx_scifi_radar_low
            - amzn_sfx_scifi_radar_medium
            - amzn_sfx_scifi_run_away
            - amzn_sfx_scifi_sheilds_up
            - amzn_sfx_scifi_short_low_explosion
            - amzn_sfx_scifi_small_whoosh_flyby
            - amzn_sfx_scifi_small_zoom_flyby
            - amzn_sfx_scifi_sonar_ping_3x
            - amzn_sfx_scifi_sonar_ping_4x
            - amzn_sfx_scifi_spaceship_flyby
            - amzn_sfx_scifi_timer_beep
            - amzn_sfx_scifi_zap_backwards
            - amzn_sfx_scifi_zap_electric
            - amzn_sfx_sheep_baa
            - amzn_sfx_sheep_bleat
            - amzn_sfx_silverware_clank
            - amzn_sfx_sirens
            - amzn_sfx_sleigh_bells
            - amzn_sfx_small_stream
            - amzn_sfx_sneeze
            - amzn_sfx_stream
            - amzn_sfx_strong_wind_desert
            - amzn_sfx_strong_wind_whistling
            - amzn_sfx_subway_leaving
            - amzn_sfx_subway_passing
            - amzn_sfx_subway_stopping
            - amzn_sfx_swoosh_cartoon_fast
            - amzn_sfx_swoosh_fast_1x
            - amzn_sfx_swoosh_fast_6x
            - amzn_sfx_test_tone
            - amzn_sfx_thunder_rumble
            - amzn_sfx_toilet_flush
            - amzn_sfx_trumpet_bugle
            - amzn_sfx_turkey_gobbling
            - amzn_sfx_typing_medium
            - amzn_sfx_typing_short
            - amzn_sfx_typing_typewriter
            - amzn_sfx_vacuum_off
            - amzn_sfx_vacuum_on
            - amzn_sfx_walking_in_mud
            - amzn_sfx_walking_in_snow
            - amzn_sfx_walking_on_grass
            - amzn_sfx_water_dripping
            - amzn_sfx_water_droplets
            - amzn_sfx_wind_strong_gusting
            - amzn_sfx_wind_whistling_desert
            - amzn_sfx_wings_flap_4x
            - amzn_sfx_wings_flap_fast
            - amzn_sfx_wolf_howl
            - amzn_sfx_wolf_young_howl
            - amzn_sfx_wooden_door
            - amzn_sfx_wooden_door_creaks_long
            - amzn_sfx_wooden_door_creaks_multiple
            - amzn_sfx_wooden_door_creaks_open
            - amzn_ui_sfx_gameshow_bridge
            - amzn_ui_sfx_gameshow_countdown_loop_32s_full
            - amzn_ui_sfx_gameshow_countdown_loop_64s_full
            - amzn_ui_sfx_gameshow_countdown_loop_64s_minimal
            - amzn_ui_sfx_gameshow_intro
            - amzn_ui_sfx_gameshow_negative_response
            - amzn_ui_sfx_gameshow_neutral_response
            - amzn_ui_sfx_gameshow_outro
            - amzn_ui_sfx_gameshow_player1
            - amzn_ui_sfx_gameshow_player2
            - amzn_ui_sfx_gameshow_player3
            - amzn_ui_sfx_gameshow_player4
            - amzn_ui_sfx_gameshow_positive_response
            - amzn_ui_sfx_gameshow_tally_negative
            - amzn_ui_sfx_gameshow_tally_positive
            - amzn_ui_sfx_gameshow_waiting_loop_30s
            - anchor
            - answering_machines
            - arcs_sparks
            - arrows_bows
            - baby
            - back_up_beeps
            - bars_restaurants
            - baseball
            - basketball
            - battles
            - beeps_tones
            - bell
            - bikes
            - billiards
            - board_games
            - body
            - boing
            - books
            - bow_wash
            - box
            - break_shatter_smash
            - breaks
            - brooms_mops
            - bullets
            - buses
            - buzz
            - buzz_hums
            - buzzers
            - buzzers_pistols
            - cables_metal
            - camera
            - cannons
            - car_alarm
            - car_alarms
            - car_cell_phones
            - carnivals_fairs
            - cars
            - casino
            - casinos
            - cellar
            - chimes
            - chimes_bells
            - chorus
            - christmas
            - church_bells
            - clock
            - cloth
            - concrete
            - construction
            - construction_factory
            - crashes
            - crowds
            - debris
            - dining_kitchens
            - dinosaurs
            - dripping
            - drops
            - electric
            - electrical
            - elevator
            - evolution_monsters
            - explosions
            - factory
            - falls
            - fax_scanner_copier
            - feedback_mics
            - fight
            - fire
            - fire_extinguisher
            - fireballs
            - fireworks
            - fishing_pole
            - flags
            - football
            - footsteps
            - futuristic
            - futuristic_ship
            - gameshow
            - gear
            - ghosts_demons
            - giant_monster
            - glass
            - glasses_clink
            - golf
            - gorilla
            - grenade_lanucher
            - griffen
            - gyms_locker_rooms
            - handgun_loading
            - handgun_shot
            - handle
            - hands
            - heartbeats_ekg
            - helicopter
            - high_tech
            - hit_punch_slap
            - hits
            - horns
            - horror
            - hot_tub_filling_up
            - human
            - human_vocals
            - hygene # codespell:ignore
            - ice_skating
            - ignitions
            - infantry
            - intro
            - jet
            - juggling
            - key_lock
            - kids
            - knocks
            - lab_equip
            - lacrosse
            - lamps_lanterns
            - leather
            - liquid_suction
            - locker_doors
            - machine_gun
            - magic_spells
            - medium_large_explosions
            - metal
            - modern_rings
            - money_coins
            - motorcycles
            - movement
            - moves
            - nature
            - oar_boat
            - pagers
            - paintball
            - paper
            - parachute
            - pay_phones
            - phone_beeps
            - pigmy_bats
            - pills
            - pour_water
            - power_up_down
            - printers
            - prison
            - public_space
            - racquetball
            - radios_static
            - rain
            - rc_airplane
            - rc_car
            - refrigerators_freezers
            - regular
            - respirator
            - rifle
            - roller_coaster
            - rollerskates_rollerblades
            - room_tones
            - ropes_climbing
            - rotary_rings
            - rowboat_canoe
            - rubber
            - running
            - sails
            - sand_gravel
            - screen_doors
            - screens
            - seats_stools
            - servos
            - shoes_boots
            - shotgun
            - shower
            - sink_faucet
            - sink_filling_water
            - sink_run_and_off
            - sink_water_splatter
            - sirens
            - skateboards
            - ski
            - skids_tires
            - sled
            - slides
            - small_explosions
            - snow
            - snowmobile
            - soldiers
            - splash_water
            - splashes_sprays
            - sports_whistles
            - squeaks
            - squeaky
            - stairs
            - steam
            - submarine_diesel
            - swing_doors
            - switches_levers
            - swords
            - tape
            - tape_machine
            - televisions_shows
            - tennis_pingpong
            - textile
            - throw
            - thunder
            - ticks
            - timer
            - toilet_flush
            - tone
            - tones_noises
            - toys
            - tractors
            - traffic
            - train
            - trucks_vans
            - turnstiles
            - typing
            - umbrella
            - underwater
            - vampires
            - various
            - video_tunes
            - volcano_earthquake
            - watches
            - water
            - water_running
            - werewolves
            - winches_gears
            - wind
            - wood
            - wood_boat
            - woosh
            - zap
            - zippers
          translation_key: sound
--- a/homeassistant/components/alexa_devices/strings.json
+++ b/homeassistant/components/alexa_devices/strings.json
@@ -1,6 +1,7 @@
 {
  "common": {
    "data_code": "One-time password (OTP code)",
    "data_description_country": "The country where your Amazon account is registered.",
    "data_description_username": "The email address of your Amazon account.",
    "data_description_password": "The password of your Amazon account.",
    "data_description_code": "The one-time password to log in to your account. Currently, only tokens from OTP applications are supported.",
@@ -11,11 +12,13 @@
    "step": {
      "user": {
        "data": {
          "country": "[%key:common::config_flow::data::country%]",
          "username": "[%key:common::config_flow::data::username%]",
          "password": "[%key:common::config_flow::data::password%]",
          "code": "[%key:component::alexa_devices::common::data_code%]"
        },
        "data_description": {
          "country": "[%key:component::alexa_devices::common::data_description_country%]",
          "username": "[%key:component::alexa_devices::common::data_description_username%]",
          "password": "[%key:component::alexa_devices::common::data_description_password%]",
          "code": "[%key:component::alexa_devices::common::data_description_code%]"
@@ -30,16 +33,6 @@
          "password": "[%key:component::alexa_devices::common::data_description_password%]",
          "code": "[%key:component::alexa_devices::common::data_description_code%]"
        }
      },
      "reconfigure": {
        "data": {
          "password": "[%key:common::config_flow::data::password%]",
          "code": "[%key:component::alexa_devices::common::data_code%]"
        },
        "data_description": {
          "password": "[%key:component::alexa_devices::common::data_description_password%]",
          "code": "[%key:component::alexa_devices::common::data_description_code%]"
        }
      }
    },
    "abort": {
@@ -47,17 +40,37 @@
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "cannot_retrieve_data": "Unable to retrieve data from Amazon. Please try again later.",
      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
      "wrong_country": "Wrong country selected. Please select the country where your Amazon account is registered.",
      "unknown": "[%key:common::config_flow::error::unknown%]"
    }
  },
  "entity": {
    "binary_sensor": {
      "bluetooth": {
        "name": "Bluetooth"
      },
      "baby_cry_detection": {
        "name": "Baby crying"
      },
      "beeping_appliance_detection": {
        "name": "Beeping appliance"
      },
      "cough_detection": {
        "name": "Coughing"
      },
      "dog_bark_detection": {
        "name": "Dog barking"
      },
      "water_sounds_detection": {
        "name": "Water sounds"
      }
    },
    "notify": {
      "speak": {
        "name": "Speak"
@@ -84,6 +97,10 @@
        "sound": {
          "name": "Alexa Skill sound file",
          "description": "The sound file to play."
        },
        "sound_variant": {
          "name": "Sound variant",
          "description": "The variant of the sound to play."
        }
      }
    },
@@ -105,47 +122,474 @@
  "selector": {
    "sound": {
      "options": {
-        "air_horn_03": "Air horn",
+        "air_horn": "Air Horn",
-        "amzn_sfx_cat_meow_1x_01": "Cat meow",
+        "air_horns": "Air Horns",
-        "amzn_sfx_church_bell_1x_02": "Church bell",
+        "airboat": "Airboat",
-        "amzn_sfx_crowd_applause_01": "Crowd applause",
+        "airport": "Airport",
-        "amzn_sfx_dog_med_bark_1x_02": "Dog bark",
+        "aliens": "Aliens",
-        "amzn_sfx_doorbell_01": "Doorbell 1",
+        "amzn_sfx_airplane_takeoff_whoosh": "Airplane Takeoff Whoosh",
-        "amzn_sfx_doorbell_chime_01": "Doorbell 2",
+        "amzn_sfx_army_march_clank_7x": "Army March Clank 7x",
-        "amzn_sfx_doorbell_chime_02": "Doorbell 3",
+        "amzn_sfx_army_march_large_8x": "Army March Large 8x",
-        "amzn_sfx_large_crowd_cheer_01": "Crowd cheers",
+        "amzn_sfx_army_march_small_8x": "Army March Small 8x",
-        "amzn_sfx_lion_roar_02": "Lion roar",
+        "amzn_sfx_baby_big_cry": "Baby Big Cry",
-        "amzn_sfx_rooster_crow_01": "Rooster",
+        "amzn_sfx_baby_cry": "Baby Cry",
-        "amzn_sfx_scifi_alarm_01": "Sirens",
+        "amzn_sfx_baby_fuss": "Baby Fuss",
-        "amzn_sfx_scifi_alarm_04": "Red alert",
+        "amzn_sfx_battle_group_clanks": "Battle Group Clanks",
-        "amzn_sfx_scifi_engines_on_02": "Engines on",
+        "amzn_sfx_battle_man_grunts": "Battle Man Grunts",
-        "amzn_sfx_scifi_sheilds_up_01": "Shields up",
+        "amzn_sfx_battle_men_grunts": "Battle Men Grunts",
-        "amzn_sfx_trumpet_bugle_04": "Trumpet",
+        "amzn_sfx_battle_men_horses": "Battle Men Horses",
-        "amzn_sfx_wolf_howl_02": "Wolf howl",
+        "amzn_sfx_battle_noisy_clanks": "Battle Noisy Clanks",
-        "bell_02": "Bells",
+        "amzn_sfx_battle_yells_men": "Battle Yells Men",
-        "boing_01": "Boing 1",
+        "amzn_sfx_battle_yells_men_run": "Battle Yells Men Run",
-        "boing_03": "Boing 2",
+        "amzn_sfx_bear_groan_roar": "Bear Groan Roar",
-        "buzzers_pistols_01": "Buzzer",
+        "amzn_sfx_bear_roar_grumble": "Bear Roar Grumble",
-        "camera_01": "Camera",
+        "amzn_sfx_bear_roar_small": "Bear Roar Small",
-        "christmas_05": "Christmas bells",
+        "amzn_sfx_beep_1x": "Beep 1x",
-        "clock_01": "Ticking clock",
+        "amzn_sfx_bell_med_chime": "Bell Med Chime",
-        "futuristic_10": "Aircraft",
+        "amzn_sfx_bell_short_chime": "Bell Short Chime",
-        "halloween_bats": "Halloween bats",
+        "amzn_sfx_bell_timer": "Bell Timer",
-        "halloween_crows": "Halloween crows",
+        "amzn_sfx_bicycle_bell_ring": "Bicycle Bell Ring",
-        "halloween_footsteps": "Halloween spooky footsteps",
+        "amzn_sfx_bird_chickadee_chirp_1x": "Bird Chickadee Chirp 1x",
-        "halloween_wind": "Halloween wind",
+        "amzn_sfx_bird_chickadee_chirps": "Bird Chickadee Chirps",
-        "halloween_wolf": "Halloween wolf",
+        "amzn_sfx_bird_forest": "Bird Forest",
-        "holiday_halloween_ghost": "Halloween ghost",
+        "amzn_sfx_bird_forest_short": "Bird Forest Short",
-        "horror_10": "Halloween creepy door",
+        "amzn_sfx_bird_robin_chirp_1x": "Bird Robin Chirp 1x",
-        "med_system_alerts_minimal_dragon_short": "Friendly dragon",
+        "amzn_sfx_boing_long_1x": "Boing Long 1x",
-        "med_system_alerts_minimal_owl_short": "Happy owl",
+        "amzn_sfx_boing_med_1x": "Boing Med 1x",
-        "med_system_alerts_minimals_blue_wave_small": "Underwater World Sonata",
+        "amzn_sfx_boing_short_1x": "Boing Short 1x",
-        "med_system_alerts_minimals_galaxy_short": "Infinite Galaxy",
+        "amzn_sfx_bus_drive_past": "Bus Drive Past",
-        "med_system_alerts_minimals_panda_short": "Baby panda",
+        "amzn_sfx_buzz_electronic": "Buzz Electronic",
-        "med_system_alerts_minimals_tiger_short": "Playful tiger",
+        "amzn_sfx_buzzer_loud_alarm": "Buzzer Loud Alarm",
-        "med_ui_success_generic_1-1": "Success 1",
+        "amzn_sfx_buzzer_small": "Buzzer Small",
-        "squeaky_12": "Squeaky door",
+        "amzn_sfx_car_accelerate": "Car Accelerate",
-        "zap_01": "Zap"
+        "amzn_sfx_car_accelerate_noisy": "Car Accelerate Noisy",
        "amzn_sfx_car_click_seatbelt": "Car Click Seatbelt",
        "amzn_sfx_car_close_door_1x": "Car Close Door 1x",
        "amzn_sfx_car_drive_past": "Car Drive Past",
        "amzn_sfx_car_honk_1x": "Car Honk 1x",
        "amzn_sfx_car_honk_2x": "Car Honk 2x",
        "amzn_sfx_car_honk_3x": "Car Honk 3x",
        "amzn_sfx_car_honk_long_1x": "Car Honk Long 1x",
        "amzn_sfx_car_into_driveway": "Car Into Driveway",
        "amzn_sfx_car_into_driveway_fast": "Car Into Driveway Fast",
        "amzn_sfx_car_slam_door_1x": "Car Slam Door 1x",
        "amzn_sfx_car_undo_seatbelt": "Car Undo Seatbelt",
        "amzn_sfx_cat_angry_meow_1x": "Cat Angry Meow 1x",
        "amzn_sfx_cat_angry_screech_1x": "Cat Angry Screech 1x",
        "amzn_sfx_cat_long_meow_1x": "Cat Long Meow 1x",
        "amzn_sfx_cat_meow_1x": "Cat Meow 1x",
        "amzn_sfx_cat_purr": "Cat Purr",
        "amzn_sfx_cat_purr_meow": "Cat Purr Meow",
        "amzn_sfx_chicken_cluck": "Chicken Cluck",
        "amzn_sfx_church_bell_1x": "Church Bell 1x",
        "amzn_sfx_church_bells_ringing": "Church Bells Ringing",
        "amzn_sfx_clear_throat_ahem": "Clear Throat Ahem",
        "amzn_sfx_clock_ticking": "Clock Ticking",
        "amzn_sfx_clock_ticking_long": "Clock Ticking Long",
        "amzn_sfx_copy_machine": "Copy Machine",
        "amzn_sfx_cough": "Cough",
        "amzn_sfx_crow_caw_1x": "Crow Caw 1x",
        "amzn_sfx_crowd_applause": "Crowd Applause",
        "amzn_sfx_crowd_bar": "Crowd Bar",
        "amzn_sfx_crowd_bar_rowdy": "Crowd Bar Rowdy",
        "amzn_sfx_crowd_boo": "Crowd Boo",
        "amzn_sfx_crowd_cheer_med": "Crowd Cheer Med",
        "amzn_sfx_crowd_excited_cheer": "Crowd Excited Cheer",
        "amzn_sfx_dog_med_bark_1x": "Dog Med Bark 1x",
        "amzn_sfx_dog_med_bark_2x": "Dog Med Bark 2x",
        "amzn_sfx_dog_med_bark_growl": "Dog Med Bark Growl",
        "amzn_sfx_dog_med_growl_1x": "Dog Med Growl 1x",
        "amzn_sfx_dog_med_woof_1x": "Dog Med Woof 1x",
        "amzn_sfx_dog_small_bark_2x": "Dog Small Bark 2x",
        "amzn_sfx_door_open": "Door Open",
        "amzn_sfx_door_shut": "Door Shut",
        "amzn_sfx_doorbell": "Doorbell",
        "amzn_sfx_doorbell_buzz": "Doorbell Buzz",
        "amzn_sfx_doorbell_chime": "Doorbell Chime",
        "amzn_sfx_drinking_slurp": "Drinking Slurp",
        "amzn_sfx_drum_and_cymbal": "Drum And Cymbal",
        "amzn_sfx_drum_comedy": "Drum Comedy",
        "amzn_sfx_earthquake_rumble": "Earthquake Rumble",
        "amzn_sfx_electric_guitar": "Electric Guitar",
        "amzn_sfx_electronic_beep": "Electronic Beep",
        "amzn_sfx_electronic_major_chord": "Electronic Major Chord",
        "amzn_sfx_elephant": "Elephant",
        "amzn_sfx_elevator_bell_1x": "Elevator Bell 1x",
        "amzn_sfx_elevator_open_bell": "Elevator Open Bell",
        "amzn_sfx_fairy_melodic_chimes": "Fairy Melodic Chimes",
        "amzn_sfx_fairy_sparkle_chimes": "Fairy Sparkle Chimes",
        "amzn_sfx_faucet_drip": "Faucet Drip",
        "amzn_sfx_faucet_running": "Faucet Running",
        "amzn_sfx_fireplace_crackle": "Fireplace Crackle",
        "amzn_sfx_fireworks": "Fireworks",
        "amzn_sfx_fireworks_firecrackers": "Fireworks Firecrackers",
        "amzn_sfx_fireworks_launch": "Fireworks Launch",
        "amzn_sfx_fireworks_whistles": "Fireworks Whistles",
        "amzn_sfx_food_frying": "Food Frying",
        "amzn_sfx_footsteps": "Footsteps",
        "amzn_sfx_footsteps_muffled": "Footsteps Muffled",
        "amzn_sfx_ghost_spooky": "Ghost Spooky",
        "amzn_sfx_glass_on_table": "Glass On Table",
        "amzn_sfx_glasses_clink": "Glasses Clink",
        "amzn_sfx_horse_gallop_4x": "Horse Gallop 4x",
        "amzn_sfx_horse_huff_whinny": "Horse Huff Whinny",
        "amzn_sfx_horse_neigh": "Horse Neigh",
        "amzn_sfx_horse_neigh_low": "Horse Neigh Low",
        "amzn_sfx_horse_whinny": "Horse Whinny",
        "amzn_sfx_human_walking": "Human Walking",
        "amzn_sfx_jar_on_table_1x": "Jar On Table 1x",
        "amzn_sfx_kitchen_ambience": "Kitchen Ambience",
        "amzn_sfx_large_crowd_cheer": "Large Crowd Cheer",
        "amzn_sfx_large_fire_crackling": "Large Fire Crackling",
        "amzn_sfx_laughter": "Laughter",
        "amzn_sfx_laughter_giggle": "Laughter Giggle",
        "amzn_sfx_lightning_strike": "Lightning Strike",
        "amzn_sfx_lion_roar": "Lion Roar",
        "amzn_sfx_magic_blast_1x": "Magic Blast 1x",
        "amzn_sfx_monkey_calls_3x": "Monkey Calls 3x",
        "amzn_sfx_monkey_chimp": "Monkey Chimp",
        "amzn_sfx_monkeys_chatter": "Monkeys Chatter",
        "amzn_sfx_motorcycle_accelerate": "Motorcycle Accelerate",
        "amzn_sfx_motorcycle_engine_idle": "Motorcycle Engine Idle",
        "amzn_sfx_motorcycle_engine_rev": "Motorcycle Engine Rev",
        "amzn_sfx_musical_drone_intro": "Musical Drone Intro",
        "amzn_sfx_oars_splashing_rowboat": "Oars Splashing Rowboat",
        "amzn_sfx_object_on_table_2x": "Object On Table 2x",
        "amzn_sfx_ocean_wave_1x": "Ocean Wave 1x",
        "amzn_sfx_ocean_wave_on_rocks_1x": "Ocean Wave On Rocks 1x",
        "amzn_sfx_ocean_wave_surf": "Ocean Wave Surf",
        "amzn_sfx_people_walking": "People Walking",
        "amzn_sfx_person_running": "Person Running",
        "amzn_sfx_piano_note_1x": "Piano Note 1x",
        "amzn_sfx_punch": "Punch",
        "amzn_sfx_rain": "Rain",
        "amzn_sfx_rain_on_roof": "Rain On Roof",
        "amzn_sfx_rain_thunder": "Rain Thunder",
        "amzn_sfx_rat_squeak_2x": "Rat Squeak 2x",
        "amzn_sfx_rat_squeaks": "Rat Squeaks",
        "amzn_sfx_raven_caw_1x": "Raven Caw 1x",
        "amzn_sfx_raven_caw_2x": "Raven Caw 2x",
        "amzn_sfx_restaurant_ambience": "Restaurant Ambience",
        "amzn_sfx_rooster_crow": "Rooster Crow",
        "amzn_sfx_scifi_air_escaping": "Scifi Air Escaping",
        "amzn_sfx_scifi_alarm": "Scifi Alarm",
        "amzn_sfx_scifi_alien_voice": "Scifi Alien Voice",
        "amzn_sfx_scifi_boots_walking": "Scifi Boots Walking",
        "amzn_sfx_scifi_close_large_explosion": "Scifi Close Large Explosion",
        "amzn_sfx_scifi_door_open": "Scifi Door Open",
        "amzn_sfx_scifi_engines_on": "Scifi Engines On",
        "amzn_sfx_scifi_engines_on_large": "Scifi Engines On Large",
        "amzn_sfx_scifi_engines_on_short_burst": "Scifi Engines On Short Burst",
        "amzn_sfx_scifi_explosion": "Scifi Explosion",
        "amzn_sfx_scifi_explosion_2x": "Scifi Explosion 2x",
        "amzn_sfx_scifi_incoming_explosion": "Scifi Incoming Explosion",
        "amzn_sfx_scifi_laser_gun_battle": "Scifi Laser Gun Battle",
        "amzn_sfx_scifi_laser_gun_fires": "Scifi Laser Gun Fires",
        "amzn_sfx_scifi_laser_gun_fires_large": "Scifi Laser Gun Fires Large",
        "amzn_sfx_scifi_long_explosion_1x": "Scifi Long Explosion 1x",
        "amzn_sfx_scifi_missile": "Scifi Missile",
        "amzn_sfx_scifi_motor_short_1x": "Scifi Motor Short 1x",
        "amzn_sfx_scifi_open_airlock": "Scifi Open Airlock",
        "amzn_sfx_scifi_radar_high_ping": "Scifi Radar High Ping",
        "amzn_sfx_scifi_radar_low": "Scifi Radar Low",
        "amzn_sfx_scifi_radar_medium": "Scifi Radar Medium",
        "amzn_sfx_scifi_run_away": "Scifi Run Away",
        "amzn_sfx_scifi_sheilds_up": "Scifi Sheilds Up",
        "amzn_sfx_scifi_short_low_explosion": "Scifi Short Low Explosion",
        "amzn_sfx_scifi_small_whoosh_flyby": "Scifi Small Whoosh Flyby",
        "amzn_sfx_scifi_small_zoom_flyby": "Scifi Small Zoom Flyby",
        "amzn_sfx_scifi_sonar_ping_3x": "Scifi Sonar Ping 3x",
        "amzn_sfx_scifi_sonar_ping_4x": "Scifi Sonar Ping 4x",
        "amzn_sfx_scifi_spaceship_flyby": "Scifi Spaceship Flyby",
        "amzn_sfx_scifi_timer_beep": "Scifi Timer Beep",
        "amzn_sfx_scifi_zap_backwards": "Scifi Zap Backwards",
        "amzn_sfx_scifi_zap_electric": "Scifi Zap Electric",
        "amzn_sfx_sheep_baa": "Sheep Baa",
        "amzn_sfx_sheep_bleat": "Sheep Bleat",
        "amzn_sfx_silverware_clank": "Silverware Clank",
        "amzn_sfx_sirens": "Sirens",
        "amzn_sfx_sleigh_bells": "Sleigh Bells",
        "amzn_sfx_small_stream": "Small Stream",
        "amzn_sfx_sneeze": "Sneeze",
        "amzn_sfx_stream": "Stream",
        "amzn_sfx_strong_wind_desert": "Strong Wind Desert",
        "amzn_sfx_strong_wind_whistling": "Strong Wind Whistling",
        "amzn_sfx_subway_leaving": "Subway Leaving",
        "amzn_sfx_subway_passing": "Subway Passing",
        "amzn_sfx_subway_stopping": "Subway Stopping",
        "amzn_sfx_swoosh_cartoon_fast": "Swoosh Cartoon Fast",
        "amzn_sfx_swoosh_fast_1x": "Swoosh Fast 1x",
        "amzn_sfx_swoosh_fast_6x": "Swoosh Fast 6x",
        "amzn_sfx_test_tone": "Test Tone",
        "amzn_sfx_thunder_rumble": "Thunder Rumble",
        "amzn_sfx_toilet_flush": "Toilet Flush",
        "amzn_sfx_trumpet_bugle": "Trumpet Bugle",
        "amzn_sfx_turkey_gobbling": "Turkey Gobbling",
        "amzn_sfx_typing_medium": "Typing Medium",
        "amzn_sfx_typing_short": "Typing Short",
        "amzn_sfx_typing_typewriter": "Typing Typewriter",
        "amzn_sfx_vacuum_off": "Vacuum Off",
        "amzn_sfx_vacuum_on": "Vacuum On",
        "amzn_sfx_walking_in_mud": "Walking In Mud",
        "amzn_sfx_walking_in_snow": "Walking In Snow",
        "amzn_sfx_walking_on_grass": "Walking On Grass",
        "amzn_sfx_water_dripping": "Water Dripping",
        "amzn_sfx_water_droplets": "Water Droplets",
        "amzn_sfx_wind_strong_gusting": "Wind Strong Gusting",
        "amzn_sfx_wind_whistling_desert": "Wind Whistling Desert",
        "amzn_sfx_wings_flap_4x": "Wings Flap 4x",
        "amzn_sfx_wings_flap_fast": "Wings Flap Fast",
        "amzn_sfx_wolf_howl": "Wolf Howl",
        "amzn_sfx_wolf_young_howl": "Wolf Young Howl",
        "amzn_sfx_wooden_door": "Wooden Door",
        "amzn_sfx_wooden_door_creaks_long": "Wooden Door Creaks Long",
        "amzn_sfx_wooden_door_creaks_multiple": "Wooden Door Creaks Multiple",
        "amzn_sfx_wooden_door_creaks_open": "Wooden Door Creaks Open",
        "amzn_ui_sfx_gameshow_bridge": "Gameshow Bridge",
        "amzn_ui_sfx_gameshow_countdown_loop_32s_full": "Gameshow Countdown Loop 32s Full",
        "amzn_ui_sfx_gameshow_countdown_loop_64s_full": "Gameshow Countdown Loop 64s Full",
        "amzn_ui_sfx_gameshow_countdown_loop_64s_minimal": "Gameshow Countdown Loop 64s Minimal",
        "amzn_ui_sfx_gameshow_intro": "Gameshow Intro",
        "amzn_ui_sfx_gameshow_negative_response": "Gameshow Negative Response",
        "amzn_ui_sfx_gameshow_neutral_response": "Gameshow Neutral Response",
        "amzn_ui_sfx_gameshow_outro": "Gameshow Outro",
        "amzn_ui_sfx_gameshow_player1": "Gameshow Player1",
        "amzn_ui_sfx_gameshow_player2": "Gameshow Player2",
        "amzn_ui_sfx_gameshow_player3": "Gameshow Player3",
        "amzn_ui_sfx_gameshow_player4": "Gameshow Player4",
        "amzn_ui_sfx_gameshow_positive_response": "Gameshow Positive Response",
        "amzn_ui_sfx_gameshow_tally_negative": "Gameshow Tally Negative",
        "amzn_ui_sfx_gameshow_tally_positive": "Gameshow Tally Positive",
        "amzn_ui_sfx_gameshow_waiting_loop_30s": "Gameshow Waiting Loop 30s",
        "anchor": "Anchor",
        "answering_machines": "Answering Machines",
        "arcs_sparks": "Arcs Sparks",
        "arrows_bows": "Arrows Bows",
        "baby": "Baby",
        "back_up_beeps": "Back Up Beeps",
        "bars_restaurants": "Bars Restaurants",
        "baseball": "Baseball",
        "basketball": "Basketball",
        "battles": "Battles",
        "beeps_tones": "Beeps Tones",
        "bell": "Bell",
        "bikes": "Bikes",
        "billiards": "Billiards",
        "board_games": "Board Games",
        "body": "Body",
        "boing": "Boing",
        "books": "Books",
        "bow_wash": "Bow Wash",
        "box": "Box",
        "break_shatter_smash": "Break Shatter Smash",
        "breaks": "Breaks",
        "brooms_mops": "Brooms Mops",
        "bullets": "Bullets",
        "buses": "Buses",
        "buzz": "Buzz",
        "buzz_hums": "Buzz Hums",
        "buzzers": "Buzzers",
        "buzzers_pistols": "Buzzers Pistols",
        "cables_metal": "Cables Metal",
        "camera": "Camera",
        "cannons": "Cannons",
        "car_alarm": "Car Alarm",
        "car_alarms": "Car Alarms",
        "car_cell_phones": "Car Cell Phones",
        "carnivals_fairs": "Carnivals Fairs",
        "cars": "Cars",
        "casino": "Casino",
        "casinos": "Casinos",
        "cellar": "Cellar",
        "chimes": "Chimes",
        "chimes_bells": "Chimes Bells",
        "chorus": "Chorus",
        "christmas": "Christmas",
        "church_bells": "Church Bells",
        "clock": "Clock",
        "cloth": "Cloth",
        "concrete": "Concrete",
        "construction": "Construction",
        "construction_factory": "Construction Factory",
        "crashes": "Crashes",
        "crowds": "Crowds",
        "debris": "Debris",
        "dining_kitchens": "Dining Kitchens",
        "dinosaurs": "Dinosaurs",
        "dripping": "Dripping",
        "drops": "Drops",
        "electric": "Electric",
        "electrical": "Electrical",
        "elevator": "Elevator",
        "evolution_monsters": "Evolution Monsters",
        "explosions": "Explosions",
        "factory": "Factory",
        "falls": "Falls",
        "fax_scanner_copier": "Fax Scanner Copier",
        "feedback_mics": "Feedback Mics",
        "fight": "Fight",
        "fire": "Fire",
        "fire_extinguisher": "Fire Extinguisher",
        "fireballs": "Fireballs",
        "fireworks": "Fireworks",
        "fishing_pole": "Fishing Pole",
        "flags": "Flags",
        "football": "Football",
        "footsteps": "Footsteps",
        "futuristic": "Futuristic",
        "futuristic_ship": "Futuristic Ship",
        "gameshow": "Gameshow",
        "gear": "Gear",
        "ghosts_demons": "Ghosts Demons",
        "giant_monster": "Giant Monster",
        "glass": "Glass",
        "glasses_clink": "Glasses Clink",
        "golf": "Golf",
        "gorilla": "Gorilla",
        "grenade_lanucher": "Grenade Lanucher",
        "griffen": "Griffen",
        "gyms_locker_rooms": "Gyms Locker Rooms",
        "handgun_loading": "Handgun Loading",
        "handgun_shot": "Handgun Shot",
        "handle": "Handle",
        "hands": "Hands",
        "heartbeats_ekg": "Heartbeats EKG",
        "helicopter": "Helicopter",
        "high_tech": "High Tech",
        "hit_punch_slap": "Hit Punch Slap",
        "hits": "Hits",
        "horns": "Horns",
        "horror": "Horror",
        "hot_tub_filling_up": "Hot Tub Filling Up",
        "human": "Human",
        "human_vocals": "Human Vocals",
        "hygene": "Hygene",
        "ice_skating": "Ice Skating",
        "ignitions": "Ignitions",
        "infantry": "Infantry",
        "intro": "Intro",
        "jet": "Jet",
        "juggling": "Juggling",
        "key_lock": "Key Lock",
        "kids": "Kids",
        "knocks": "Knocks",
        "lab_equip": "Lab Equip",
        "lacrosse": "Lacrosse",
        "lamps_lanterns": "Lamps Lanterns",
        "leather": "Leather",
        "liquid_suction": "Liquid Suction",
        "locker_doors": "Locker Doors",
        "machine_gun": "Machine Gun",
        "magic_spells": "Magic Spells",
        "medium_large_explosions": "Medium Large Explosions",
        "metal": "Metal",
        "modern_rings": "Modern Rings",
        "money_coins": "Money Coins",
        "motorcycles": "Motorcycles",
        "movement": "Movement",
        "moves": "Moves",
        "nature": "Nature",
        "oar_boat": "Oar Boat",
        "pagers": "Pagers",
        "paintball": "Paintball",
        "paper": "Paper",
        "parachute": "Parachute",
        "pay_phones": "Pay Phones",
        "phone_beeps": "Phone Beeps",
        "pigmy_bats": "Pigmy Bats",
        "pills": "Pills",
        "pour_water": "Pour Water",
        "power_up_down": "Power Up Down",
        "printers": "Printers",
        "prison": "Prison",
        "public_space": "Public Space",
        "racquetball": "Racquetball",
        "radios_static": "Radios Static",
        "rain": "Rain",
        "rc_airplane": "RC Airplane",
        "rc_car": "RC Car",
        "refrigerators_freezers": "Refrigerators Freezers",
        "regular": "Regular",
        "respirator": "Respirator",
        "rifle": "Rifle",
        "roller_coaster": "Roller Coaster",
        "rollerskates_rollerblades": "RollerSkates RollerBlades",
        "room_tones": "Room Tones",
        "ropes_climbing": "Ropes Climbing",
        "rotary_rings": "Rotary Rings",
        "rowboat_canoe": "Rowboat Canoe",
        "rubber": "Rubber",
        "running": "Running",
        "sails": "Sails",
        "sand_gravel": "Sand Gravel",
        "screen_doors": "Screen Doors",
        "screens": "Screens",
        "seats_stools": "Seats Stools",
        "servos": "Servos",
        "shoes_boots": "Shoes Boots",
        "shotgun": "Shotgun",
        "shower": "Shower",
        "sink_faucet": "Sink Faucet",
        "sink_filling_water": "Sink Filling Water",
        "sink_run_and_off": "Sink Run And Off",
        "sink_water_splatter": "Sink Water Splatter",
        "sirens": "Sirens",
        "skateboards": "Skateboards",
        "ski": "Ski",
        "skids_tires": "Skids Tires",
        "sled": "Sled",
        "slides": "Slides",
        "small_explosions": "Small Explosions",
        "snow": "Snow",
        "snowmobile": "Snowmobile",
        "soldiers": "Soldiers",
        "splash_water": "Splash Water",
        "splashes_sprays": "Splashes Sprays",
        "sports_whistles": "Sports Whistles",
        "squeaks": "Squeaks",
        "squeaky": "Squeaky",
        "stairs": "Stairs",
        "steam": "Steam",
        "submarine_diesel": "Submarine Diesel",
        "swing_doors": "Swing Doors",
        "switches_levers": "Switches Levers",
        "swords": "Swords",
        "tape": "Tape",
        "tape_machine": "Tape Machine",
        "televisions_shows": "Televisions Shows",
        "tennis_pingpong": "Tennis PingPong",
        "textile": "Textile",
        "throw": "Throw",
        "thunder": "Thunder",
        "ticks": "Ticks",
        "timer": "Timer",
        "toilet_flush": "Toilet Flush",
        "tone": "Tone",
        "tones_noises": "Tones Noises",
        "toys": "Toys",
        "tractors": "Tractors",
        "traffic": "Traffic",
        "train": "Train",
        "trucks_vans": "Trucks Vans",
        "turnstiles": "Turnstiles",
        "typing": "Typing",
        "umbrella": "Umbrella",
        "underwater": "Underwater",
        "vampires": "Vampires",
        "various": "Various",
        "video_tunes": "Video Tunes",
        "volcano_earthquake": "Volcano Earthquake",
        "watches": "Watches",
        "water": "Water",
        "water_running": "Water Running",
        "werewolves": "Werewolves",
        "winches_gears": "Winches Gears",
        "wind": "Wind",
        "wood": "Wood",
        "wood_boat": "Wood Boat",
        "woosh": "Woosh",
        "zap": "Zap",
        "zippers": "Zippers"
      }
    }
  },
@@ -163,7 +607,7 @@
      "message": "Invalid device ID specified: {device_id}"
    },
    "invalid_sound_value": {
-      "message": "Invalid sound {sound} specified"
+      "message": "Invalid sound {sound} with variant {variant} specified"
    },
    "entry_not_loaded": {
      "message": "Entry not loaded: {entry}"
--- a/homeassistant/components/alexa_devices/switch.py
+++ b/homeassistant/components/alexa_devices/switch.py
@@ -8,17 +8,13 @@ from typing import TYPE_CHECKING, Any, Final
 from aioamazondevices.api import AmazonDevice
-from homeassistant.components.switch import (
+from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
    DOMAIN as SWITCH_DOMAIN,
    SwitchEntity,
    SwitchEntityDescription,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .coordinator import AmazonConfigEntry
 from .entity import AmazonEntity
-from .utils import alexa_api_call, async_update_unique_id
+from .utils import alexa_api_call
 PARALLEL_UPDATES = 1
@@ -28,17 +24,16 @@ class AmazonSwitchEntityDescription(SwitchEntityDescription):
    """Alexa Devices switch entity description."""
    is_on_fn: Callable[[AmazonDevice], bool]
-    is_available_fn: Callable[[AmazonDevice, str], bool] = lambda device, key: (
+    subkey: str
        device.online and device.sensors[key].error is False
    )
    method: str
 SWITCHES: Final = (
    AmazonSwitchEntityDescription(
-        key="dnd",
+        key="do_not_disturb",
        subkey="AUDIO_PLAYER",
        translation_key="do_not_disturb",
-        is_on_fn=lambda device: bool(device.sensors["dnd"].value),
+        is_on_fn=lambda _device: _device.do_not_disturb,
        method="set_do_not_disturb",
    ),
 )
@@ -53,28 +48,13 @@ async def async_setup_entry(
    coordinator = entry.runtime_data
-    # Replace unique id for "DND" switch and remove from Speaker Group
+    async_add_entities(
-    await async_update_unique_id(
+        AmazonSwitchEntity(coordinator, serial_num, switch_desc)
-        hass, coordinator, SWITCH_DOMAIN, "do_not_disturb", "dnd"
+        for switch_desc in SWITCHES
        for serial_num in coordinator.data
        if switch_desc.subkey in coordinator.data[serial_num].capabilities
    )
    known_devices: set[str] = set()
    def _check_device() -> None:
        current_devices = set(coordinator.data)
        new_devices = current_devices - known_devices
        if new_devices:
            known_devices.update(new_devices)
            async_add_entities(
                AmazonSwitchEntity(coordinator, serial_num, switch_desc)
                for switch_desc in SWITCHES
                for serial_num in new_devices
                if switch_desc.key in coordinator.data[serial_num].sensors
            )
    _check_device()
    entry.async_on_unload(coordinator.async_add_listener(_check_device))
 class AmazonSwitchEntity(AmazonEntity, SwitchEntity):
    """Switch device."""
@@ -104,13 +84,3 @@ class AmazonSwitchEntity(AmazonEntity, SwitchEntity):
    def is_on(self) -> bool:
        """Return True if switch is on."""
        return self.entity_description.is_on_fn(self.device)
    @property
    def available(self) -> bool:
        """Return if entity is available."""
        return (
            self.entity_description.is_available_fn(
                self.device, self.entity_description.key
            )
            and super().available
        )
--- a/homeassistant/components/alexa_devices/utils.py
+++ b/homeassistant/components/alexa_devices/utils.py
@@ -6,12 +6,9 @@ from typing import Any, Concatenate
 from aioamazondevices.exceptions import CannotConnect, CannotRetrieveData
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.entity_registry as er
-from .const import _LOGGER, DOMAIN
+from .const import DOMAIN
 from .coordinator import AmazonDevicesCoordinator
 from .entity import AmazonEntity
@@ -41,23 +38,3 @@ def alexa_api_call[_T: AmazonEntity, **_P](
            ) from err
    return cmd_wrapper
 async def async_update_unique_id(
    hass: HomeAssistant,
    coordinator: AmazonDevicesCoordinator,
    domain: str,
    old_key: str,
    new_key: str,
 ) -> None:
    """Update unique id for entities created with old format."""
    entity_registry = er.async_get(hass)
    for serial_num in coordinator.data:
        unique_id = f"{serial_num}-{old_key}"
        if entity_id := entity_registry.async_get_entity_id(domain, DOMAIN, unique_id):
            _LOGGER.debug("Updating unique_id for %s", entity_id)
            new_unique_id = unique_id.replace(old_key, new_key)
            # Update the registry with the new unique_id
            entity_registry.async_update_entity(entity_id, new_unique_id=new_unique_id)
--- a/homeassistant/components/amberelectric/config_flow.py
+++ b/homeassistant/components/amberelectric/config_flow.py
@@ -16,7 +16,7 @@ from homeassistant.helpers.selector import (
    SelectSelectorMode,
 )
-from .const import CONF_SITE_ID, CONF_SITE_NAME, DOMAIN, REQUEST_TIMEOUT
+from .const import CONF_SITE_ID, CONF_SITE_NAME, DOMAIN
 API_URL = "https://app.amber.com.au/developers"
@@ -64,9 +64,7 @@ class AmberElectricConfigFlow(ConfigFlow, domain=DOMAIN):
        api = amberelectric.AmberApi(api_client)
        try:
-            sites: list[Site] = filter_sites(
+            sites: list[Site] = filter_sites(api.get_sites())
                api.get_sites(_request_timeout=REQUEST_TIMEOUT)
            )
        except amberelectric.ApiException as api_exception:
            if api_exception.status == 403:
                self._errors[CONF_API_TOKEN] = "invalid_api_token"
--- a/homeassistant/components/amberelectric/const.py
+++ b/homeassistant/components/amberelectric/const.py
@@ -21,5 +21,3 @@ SERVICE_GET_FORECASTS = "get_forecasts"
 GENERAL_CHANNEL = "general"
 CONTROLLED_LOAD_CHANNEL = "controlled_load"
 FEED_IN_CHANNEL = "feed_in"
 REQUEST_TIMEOUT = 15
--- a/homeassistant/components/amberelectric/coordinator.py
+++ b/homeassistant/components/amberelectric/coordinator.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from .const import LOGGER, REQUEST_TIMEOUT
+from .const import LOGGER
 from .helpers import normalize_descriptor
 type AmberConfigEntry = ConfigEntry[AmberUpdateCoordinator]
@@ -82,11 +82,7 @@ class AmberUpdateCoordinator(DataUpdateCoordinator):
            "grid": {},
        }
        try:
-            data = self._api.get_current_prices(
+            data = self._api.get_current_prices(self.site_id, next=288)
                self.site_id,
                next=288,
                _request_timeout=REQUEST_TIMEOUT,
            )
            intervals = [interval.actual_instance for interval in data]
        except ApiException as api_exception:
            raise UpdateFailed("Missing price data, skipping update") from api_exception
--- a/homeassistant/components/amcrest/services.py
+++ b/homeassistant/components/amcrest/services.py
@@ -41,7 +41,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
        if call.data.get(ATTR_ENTITY_ID) == ENTITY_MATCH_NONE:
            return []
-        call_ids = await async_extract_entity_ids(call)
+        call_ids = await async_extract_entity_ids(hass, call)
        entity_ids = []
        for entity_id in hass.data[DATA_AMCREST][CAMERAS]:
            if entity_id not in call_ids:
--- a/homeassistant/components/analytics/init.py
+++ b/homeassistant/components/analytics/init.py
@@ -12,25 +12,10 @@ from homeassistant.helpers.event import async_call_later, async_track_time_inter
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.hass_dict import HassKey
-from .analytics import (
+from .analytics import Analytics
    Analytics,
    AnalyticsInput,
    AnalyticsModifications,
    DeviceAnalyticsModifications,
    EntityAnalyticsModifications,
    async_devices_payload,
 )
 from .const import ATTR_ONBOARDED, ATTR_PREFERENCES, DOMAIN, INTERVAL, PREFERENCE_SCHEMA
 from .http import AnalyticsDevicesView
 __all__ = [
    "AnalyticsInput",
    "AnalyticsModifications",
    "DeviceAnalyticsModifications",
    "EntityAnalyticsModifications",
    "async_devices_payload",
 ]
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 DATA_COMPONENT: HassKey[Analytics] = HassKey(DOMAIN)
--- a/homeassistant/components/analytics/analytics.py
+++ b/homeassistant/components/analytics/analytics.py
@@ -4,10 +4,9 @@ from __future__ import annotations
 import asyncio
 from asyncio import timeout
-from collections.abc import Awaitable, Callable, Iterable, Mapping
+from dataclasses import asdict as dataclass_asdict, dataclass
 from dataclasses import asdict as dataclass_asdict, dataclass, field
 from datetime import datetime
-from typing import Any, Protocol
+from typing import Any
 import uuid
 import aiohttp
@@ -25,25 +24,17 @@ from homeassistant.components.recorder import (
    get_instance as get_recorder_instance,
 )
 from homeassistant.config_entries import SOURCE_IGNORE
-from homeassistant.const import (
+from homeassistant.const import ATTR_DOMAIN, BASE_PLATFORMS, __version__ as HA_VERSION
    ATTR_ASSUMED_STATE,
    ATTR_DOMAIN,
    BASE_PLATFORMS,
    __version__ as HA_VERSION,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.singleton import singleton
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.system_info import async_get_system_info
 from homeassistant.helpers.typing import UNDEFINED
 from homeassistant.loader import (
    Integration,
    IntegrationNotFound,
    async_get_integration,
    async_get_integrations,
 )
 from homeassistant.setup import async_get_loaded_integrations
@@ -79,115 +70,12 @@ from .const import (
    ATTR_USER_COUNT,
    ATTR_UUID,
    ATTR_VERSION,
    DOMAIN,
    LOGGER,
    PREFERENCE_SCHEMA,
    STORAGE_KEY,
    STORAGE_VERSION,
 )
 DATA_ANALYTICS_MODIFIERS = "analytics_modifiers"
 type AnalyticsModifier = Callable[
    [HomeAssistant, AnalyticsInput], Awaitable[AnalyticsModifications]
 ]
@singleton(DATA_ANALYTICS_MODIFIERS)
 def _async_get_modifiers(
    hass: HomeAssistant,
 ) -> dict[str, AnalyticsModifier | None]:
    """Return the analytics modifiers."""
    return {}
@dataclass
 class AnalyticsInput:
    """Analytics input for a single integration.
    This is sent to integrations that implement the platform.
    """
    device_ids: Iterable[str] = field(default_factory=list)
    entity_ids: Iterable[str] = field(default_factory=list)
@dataclass
 class AnalyticsModifications:
    """Analytics config for a single integration.
    This is used by integrations that implement the platform.
    """
    remove: bool = False
    devices: Mapping[str, DeviceAnalyticsModifications] | None = None
    entities: Mapping[str, EntityAnalyticsModifications] | None = None
@dataclass
 class DeviceAnalyticsModifications:
    """Analytics config for a single device.
    This is used by integrations that implement the platform.
    """
    remove: bool = False
@dataclass
 class EntityAnalyticsModifications:
    """Analytics config for a single entity.
    This is used by integrations that implement the platform.
    """
    remove: bool = False
 class AnalyticsPlatformProtocol(Protocol):
    """Define the format of analytics platforms."""
    async def async_modify_analytics(
        self,
        hass: HomeAssistant,
        analytics_input: AnalyticsInput,
    ) -> AnalyticsModifications:
        """Modify the analytics."""
 async def _async_get_analytics_platform(
    hass: HomeAssistant, domain: str
 ) -> AnalyticsPlatformProtocol | None:
    """Get analytics platform."""
    try:
        integration = await async_get_integration(hass, domain)
    except IntegrationNotFound:
        return None
    try:
        return await integration.async_get_platform(DOMAIN)
    except ImportError:
        return None
 async def _async_get_modifier(
    hass: HomeAssistant, domain: str
 ) -> AnalyticsModifier | None:
    """Get analytics modifier."""
    modifiers = _async_get_modifiers(hass)
    modifier = modifiers.get(domain, UNDEFINED)
    if modifier is not UNDEFINED:
        return modifier
    platform = await _async_get_analytics_platform(hass, domain)
    if platform is None:
        modifiers[domain] = None
        return None
    modifier = getattr(platform, "async_modify_analytics", None)
    modifiers[domain] = modifier
    return modifier
 def gen_uuid() -> str:
    """Generate a new UUID."""
@@ -500,208 +388,66 @@ def _domains_from_yaml_config(yaml_configuration: dict[str, Any]) -> set[str]:
    return domains
 DEFAULT_ANALYTICS_CONFIG = AnalyticsModifications()
 DEFAULT_DEVICE_ANALYTICS_CONFIG = DeviceAnalyticsModifications()
 DEFAULT_ENTITY_ANALYTICS_CONFIG = EntityAnalyticsModifications()
 async def async_devices_payload(hass: HomeAssistant) -> dict:
-    """Return detailed information about entities and devices."""
+    """Return the devices payload."""
    devices: list[dict[str, Any]] = []
    dev_reg = dr.async_get(hass)
-    ent_reg = er.async_get(hass)
+    # Devices that need via device info set
    new_indexes: dict[str, int] = {}
    via_devices: dict[str, str] = {}
-    integration_inputs: dict[str, tuple[list[str], list[str]]] = {}
+    seen_integrations = set()
    integration_configs: dict[str, AnalyticsModifications] = {}
-    # Get device list
+    for device in dev_reg.devices.values():
-    for device_entry in dev_reg.devices.values():
+        if not device.primary_config_entry:
        if not device_entry.primary_config_entry:
            continue
-        config_entry = hass.config_entries.async_get_entry(
+        config_entry = hass.config_entries.async_get_entry(device.primary_config_entry)
            device_entry.primary_config_entry
        )
        if config_entry is None:
            continue
-        integration_domain = config_entry.domain
+        seen_integrations.add(config_entry.domain)
-        integration_input = integration_inputs.setdefault(integration_domain, ([], []))
+        new_indexes[device.id] = len(devices)
-        integration_input[0].append(device_entry.id)
+        devices.append(
            {
                "integration": config_entry.domain,
                "manufacturer": device.manufacturer,
                "model_id": device.model_id,
                "model": device.model,
                "sw_version": device.sw_version,
                "hw_version": device.hw_version,
                "has_configuration_url": device.configuration_url is not None,
                "via_device": None,
                "entry_type": device.entry_type.value if device.entry_type else None,
            }
        )
-    # Get entity list
+        if device.via_device_id:
-    for entity_entry in ent_reg.entities.values():
+            via_devices[device.id] = device.via_device_id
        integration_domain = entity_entry.platform
-        integration_input = integration_inputs.setdefault(integration_domain, ([], []))
+    for from_device, via_device in via_devices.items():
-        integration_input[1].append(entity_entry.entity_id)
+        if via_device not in new_indexes:
            continue
        devices[new_indexes[from_device]]["via_device"] = new_indexes[via_device]
    integrations = {
        domain: integration
        for domain, integration in (
-            await async_get_integrations(hass, integration_inputs.keys())
+            await async_get_integrations(hass, seen_integrations)
        ).items()
        if isinstance(integration, Integration)
    }
-    # Filter out custom integrations and integrations that are not device or hub type
+    for device_info in devices:
-    integration_inputs = {
+        if integration := integrations.get(device_info["integration"]):
-        domain: integration_info
+            device_info["is_custom_integration"] = not integration.is_built_in
-        for domain, integration_info in integration_inputs.items()
+            # Include version for custom integrations
-        if (integration := integrations.get(domain)) is not None
+            if not integration.is_built_in and integration.version:
-        and integration.is_built_in
+                device_info["custom_integration_version"] = str(integration.version)
        and integration.manifest.get("integration_type") in ("device", "hub")
    }
    # Call integrations that implement the analytics platform
    for integration_domain, integration_input in integration_inputs.items():
        if (
            modifier := await _async_get_modifier(hass, integration_domain)
        ) is not None:
            try:
                integration_config = await modifier(
                    hass, AnalyticsInput(*integration_input)
                )
            except Exception as err:  # noqa: BLE001
                LOGGER.exception(
                    "Calling async_modify_analytics for integration '%s' failed: %s",
                    integration_domain,
                    err,
                )
                integration_configs[integration_domain] = AnalyticsModifications(
                    remove=True
                )
                continue
            if not isinstance(integration_config, AnalyticsModifications):
                LOGGER.error(  # type: ignore[unreachable]
                    "Calling async_modify_analytics for integration '%s' did not return an AnalyticsConfig",
                    integration_domain,
                )
                integration_configs[integration_domain] = AnalyticsModifications(
                    remove=True
                )
                continue
            integration_configs[integration_domain] = integration_config
    integrations_info: dict[str, dict[str, Any]] = {}
    # We need to refer to other devices, for example in `via_device` field.
    # We don't however send the original device ids outside of Home Assistant,
    # instead we refer to devices by (integration_domain, index_in_integration_device_list).
    device_id_mapping: dict[str, tuple[str, int]] = {}
    # Fill out information about devices
    for integration_domain, integration_input in integration_inputs.items():
        integration_config = integration_configs.get(
            integration_domain, DEFAULT_ANALYTICS_CONFIG
        )
        if integration_config.remove:
            continue
        integration_info = integrations_info.setdefault(
            integration_domain, {"devices": [], "entities": []}
        )
        devices_info = integration_info["devices"]
        for device_id in integration_input[0]:
            device_config = DEFAULT_DEVICE_ANALYTICS_CONFIG
            if integration_config.devices is not None:
                device_config = integration_config.devices.get(device_id, device_config)
            if device_config.remove:
                continue
            device_entry = dev_reg.devices[device_id]
            device_id_mapping[device_entry.id] = (integration_domain, len(devices_info))
            devices_info.append(
                {
                    "entities": [],
                    "entry_type": device_entry.entry_type,
                    "has_configuration_url": device_entry.configuration_url is not None,
                    "hw_version": device_entry.hw_version,
                    "manufacturer": device_entry.manufacturer,
                    "model": device_entry.model,
                    "model_id": device_entry.model_id,
                    "sw_version": device_entry.sw_version,
                    "via_device": device_entry.via_device_id,
                }
            )
    # Fill out via_device with new device ids
    for integration_info in integrations_info.values():
        for device_info in integration_info["devices"]:
            if device_info["via_device"] is None:
                continue
            device_info["via_device"] = device_id_mapping.get(device_info["via_device"])
    # Fill out information about entities
    for integration_domain, integration_input in integration_inputs.items():
        integration_config = integration_configs.get(
            integration_domain, DEFAULT_ANALYTICS_CONFIG
        )
        if integration_config.remove:
            continue
        integration_info = integrations_info.setdefault(
            integration_domain, {"devices": [], "entities": []}
        )
        devices_info = integration_info["devices"]
        entities_info = integration_info["entities"]
        for entity_id in integration_input[1]:
            entity_config = DEFAULT_ENTITY_ANALYTICS_CONFIG
            if integration_config.entities is not None:
                entity_config = integration_config.entities.get(
                    entity_id, entity_config
                )
            if entity_config.remove:
                continue
            entity_entry = ent_reg.entities[entity_id]
            entity_state = hass.states.get(entity_entry.entity_id)
            entity_info = {
                # LIMITATION: `assumed_state` can be overridden by users;
                # we should replace it with the original value in the future.
                # It is also not present, if entity is not in the state machine,
                # which can happen for disabled entities.
                "assumed_state": (
                    entity_state.attributes.get(ATTR_ASSUMED_STATE, False)
                    if entity_state is not None
                    else None
                ),
                "domain": entity_entry.domain,
                "entity_category": entity_entry.entity_category,
                "has_entity_name": entity_entry.has_entity_name,
                "original_device_class": entity_entry.original_device_class,
                # LIMITATION: `unit_of_measurement` can be overridden by users;
                # we should replace it with the original value in the future.
                "unit_of_measurement": entity_entry.unit_of_measurement,
            }
            if (
                ((device_id_ := entity_entry.device_id) is not None)
                and ((new_device_id := device_id_mapping.get(device_id_)) is not None)
                and (new_device_id[0] == integration_domain)
            ):
                device_info = devices_info[new_device_id[1]]
                device_info["entities"].append(entity_info)
            else:
                entities_info.append(entity_info)
    return {
        "version": "home-assistant:1",
-        "home_assistant": HA_VERSION,
+        "devices": devices,
        "integrations": integrations_info,
    }
--- a/homeassistant/components/analytics/manifest.json
+++ b/homeassistant/components/analytics/manifest.json
@@ -2,7 +2,7 @@
  "domain": "analytics",
  "name": "Analytics",
  "after_dependencies": ["energy", "hassio", "recorder"],
-  "codeowners": ["@home-assistant/core"],
+  "codeowners": ["@home-assistant/core", "@ludeeus"],
  "dependencies": ["api", "websocket_api", "http"],
  "documentation": "https://www.home-assistant.io/integrations/analytics",
  "integration_type": "system",
--- a/Show More
+++ b/Show More