Simplify volume_step assignment in frontier_silicon media player

Move the _attr_volume_step assignment out of the nested conditional to avoid the confusing pattern of checking _max_volume inside a block that only runs when _max_volume is not set. https://claude.ai/code/session_01Gn8AeZ8HvyyDw53e1rynUA
Remove volume_up/volume_down overrides from NADtcp media player
2026-05-05 20:34:52 +02:00 · 2026-02-27 19:01:43 +00:00 · 2026-02-27 18:58:00 +00:00 · 2026-02-27 18:57:15 +00:00 · 2026-02-27 18:56:14 +00:00 · 2026-02-27 18:55:45 +00:00
2109 changed files with 141272 additions and 21538 deletions
@@ -0,0 +1 @@
+../.claude/skills/
@@ -34,6 +34,7 @@ base_platforms: &base_platforms
  - homeassistant/components/humidifier/**
  - homeassistant/components/image/**
  - homeassistant/components/image_processing/**
+  - homeassistant/components/infrared/**
  - homeassistant/components/lawn_mower/**
  - homeassistant/components/light/**
  - homeassistant/components/lock/**
@@ -0,0 +1 @@
+../.claude/skills
@@ -9,3 +9,5 @@ updates:
    labels:
      - dependency
      - github_actions
+    cooldown:
+      default-days: 7
@@ -18,11 +18,19 @@ env:
  BASE_IMAGE_VERSION: "2026.01.0"
  ARCHITECTURES: '["amd64", "aarch64"]'

+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
  init:
    name: Initialize build
    if: github.repository_owner == 'home-assistant'
    runs-on: ubuntu-latest
+    permissions:
+      contents: read # To check out the repository
    outputs:
      version: ${{ steps.version.outputs.version }}
      channel: ${{ steps.version.outputs.channel }}
@@ -31,6 +39,8 @@ jobs:
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -39,16 +49,16 @@ jobs:

      - name: Get information
        id: info
-        uses: home-assistant/actions/helpers/info@master
+        uses: home-assistant/actions/helpers/info@master # zizmor: ignore[unpinned-uses]

      - name: Get version
        id: version
-        uses: home-assistant/actions/helpers/version@master
+        uses: home-assistant/actions/helpers/version@master # zizmor: ignore[unpinned-uses]
        with:
          type: ${{ env.BUILD_TYPE }}

      - name: Verify version
-        uses: home-assistant/actions/helpers/verify-version@master
+        uses: home-assistant/actions/helpers/verify-version@master # zizmor: ignore[unpinned-uses]
        with:
          ignore-dev: true

@@ -82,9 +92,9 @@ jobs:
    needs: init
    runs-on: ${{ matrix.os }}
    permissions:
-      contents: read
-      packages: write
-      id-token: write
+      contents: read # To check out the repository
+      packages: write # To push to GHCR
+      id-token: write # For cosign signing
    strategy:
      fail-fast: false
      matrix:
@@ -97,6 +107,8 @@ jobs:
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Download nightly wheels of frontend
        if: needs.init.outputs.channel == 'dev'
@@ -131,11 +143,12 @@ jobs:
        shell: bash
        env:
          UV_PRERELEASE: allow
+          VERSION: ${{ needs.init.outputs.version }}
        run: |
          python3 -m pip install "$(grep '^uv' < requirements.txt)"
          uv pip install packaging tomli
          uv pip install .
-          python3 script/version_bump.py nightly --set-nightly-version "${{ needs.init.outputs.version }}"
+          python3 script/version_bump.py nightly --set-nightly-version "${VERSION}"

          if [[ "$(ls home_assistant_frontend*.whl)" =~ ^home_assistant_frontend-(.*)-py3-none-any.whl$ ]]; then
            echo "Found frontend wheel, setting version to: ${BASH_REMATCH[1]}"
@@ -181,7 +194,7 @@ jobs:
      - name: Write meta info file
        shell: bash
        run: |
-          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
+          echo "${GITHUB_SHA};${GITHUB_REF};${GITHUB_EVENT_NAME};${GITHUB_ACTOR}" > rootfs/OFFICIAL_IMAGE

      - name: Login to GitHub Container Registry
        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
@@ -201,26 +214,32 @@ jobs:
      - name: Build variables
        id: vars
        shell: bash
+        env:
+          ARCH: ${{ matrix.arch }}
        run: |
-          echo "base_image=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ env.BASE_IMAGE_VERSION }}" >> "$GITHUB_OUTPUT"
-          echo "cache_image=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:latest" >> "$GITHUB_OUTPUT"
+          echo "base_image=ghcr.io/home-assistant/${ARCH}-homeassistant-base:${BASE_IMAGE_VERSION}" >> "$GITHUB_OUTPUT"
+          echo "cache_image=ghcr.io/home-assistant/${ARCH}-homeassistant:latest" >> "$GITHUB_OUTPUT"
          echo "created=$(date --rfc-3339=seconds --utc)" >> "$GITHUB_OUTPUT"

      - name: Verify base image signature
+        env:
+          BASE_IMAGE: ${{ steps.vars.outputs.base_image }}
        run: |
          cosign verify \
            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
            --certificate-identity-regexp "https://github.com/home-assistant/docker/.*" \
-            "${{ steps.vars.outputs.base_image }}"
+            "${BASE_IMAGE}"

      - name: Verify cache image signature
        id: cache
        continue-on-error: true
+        env:
+          CACHE_IMAGE: ${{ steps.vars.outputs.cache_image }}
        run: |
          cosign verify \
            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
            --certificate-identity-regexp "https://github.com/home-assistant/core/.*" \
-            "${{ steps.vars.outputs.cache_image }}"
+            "${CACHE_IMAGE}"

      - name: Build base image
        id: build
@@ -242,18 +261,22 @@ jobs:
            org.opencontainers.image.version=${{ needs.init.outputs.version }}

      - name: Sign image
+        env:
+          ARCH: ${{ matrix.arch }}
+          VERSION: ${{ needs.init.outputs.version }}
+          DIGEST: ${{ steps.build.outputs.digest }}
        run: |
-          cosign sign --yes "ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}@${{ steps.build.outputs.digest }}"
+          cosign sign --yes "ghcr.io/home-assistant/${ARCH}-homeassistant:${VERSION}@${DIGEST}"

  build_machine:
    name: Build ${{ matrix.machine }} machine core image
    if: github.repository_owner == 'home-assistant'
    needs: ["init", "build_base"]
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runs-on }}
    permissions:
-      contents: read
-      packages: write
-      id-token: write
+      contents: read # To check out the repository
+      packages: write # To push to GHCR
+      id-token: write # For cosign signing
    strategy:
      matrix:
        machine:
@@ -271,16 +294,35 @@ jobs:
          - raspberrypi5-64
          - yellow
          - green
+        include:
+          # Default: aarch64 on native ARM runner
+          - arch: aarch64
+            runs-on: ubuntu-24.04-arm
+          # Overrides for amd64 machines
+          - machine: generic-x86-64
+            arch: amd64
+            runs-on: ubuntu-24.04
+          - machine: qemux86-64
+            arch: amd64
+            runs-on: ubuntu-24.04
+          # TODO: remove, intel-nuc is a legacy name for x86-64, renamed in 2021
+          - machine: intel-nuc
+            arch: amd64
+            runs-on: ubuntu-24.04
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Set build additional args
+        env:
+          VERSION: ${{ needs.init.outputs.version }}
        run: |
          # Create general tags
-          if [[ "${{ needs.init.outputs.version }}" =~ d ]]; then
+          if [[ "${VERSION}" =~ d ]]; then
            echo "BUILD_ARGS=--additional-tag dev" >> $GITHUB_ENV
-          elif [[ "${{ needs.init.outputs.version }}" =~ b ]]; then
+          elif [[ "${VERSION}" =~ b ]]; then
            echo "BUILD_ARGS=--additional-tag beta" >> $GITHUB_ENV
          else
            echo "BUILD_ARGS=--additional-tag stable" >> $GITHUB_ENV
@@ -293,10 +335,10 @@ jobs:
          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.11.0
+        uses: home-assistant/builder@6cb4fd3d1338b6e22d0958a4bcb53e0965ea63b4 # 2026.02.1
        with:
+          image: ${{ matrix.arch }}
          args: |
            $BUILD_ARGS \
            --target /data/machine \
@@ -309,19 +351,23 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    needs: ["init", "build_machine"]
    runs-on: ubuntu-latest
+    permissions:
+      contents: read
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Initialize git
-        uses: home-assistant/actions/helpers/git-init@master
+        uses: home-assistant/actions/helpers/git-init@master # zizmor: ignore[unpinned-uses]
        with:
          name: ${{ secrets.GIT_NAME }}
          email: ${{ secrets.GIT_EMAIL }}
          token: ${{ secrets.GIT_TOKEN }}

      - name: Update version file
-        uses: home-assistant/actions/helpers/version-push@master
+        uses: home-assistant/actions/helpers/version-push@master # zizmor: ignore[unpinned-uses]
        with:
          key: "homeassistant[]"
          key-description: "Home Assistant Core"
@@ -331,7 +377,7 @@ jobs:

      - name: Update version file (stable -> beta)
        if: needs.init.outputs.channel == 'stable'
-        uses: home-assistant/actions/helpers/version-push@master
+        uses: home-assistant/actions/helpers/version-push@master # zizmor: ignore[unpinned-uses]
        with:
          key: "homeassistant[]"
          key-description: "Home Assistant Core"
@@ -346,9 +392,9 @@ jobs:
    needs: ["init", "build_base"]
    runs-on: ubuntu-latest
    permissions:
-      contents: read
-      packages: write
-      id-token: write
+      contents: read # To check out the repository
+      packages: write # To push to GHCR
+      id-token: write # For cosign signing
    strategy:
      fail-fast: false
      matrix:
@@ -375,14 +421,17 @@ jobs:

      - name: Verify architecture image signatures
        shell: bash
+        env:
+          ARCHITECTURES: ${{ needs.init.outputs.architectures }}
+          VERSION: ${{ needs.init.outputs.version }}
        run: |
-          ARCHS=$(echo '${{ needs.init.outputs.architectures }}' | jq -r '.[]')
+          ARCHS=$(echo "${ARCHITECTURES}" | jq -r '.[]')
          for arch in $ARCHS; do
            echo "Verifying ${arch} image signature..."
            cosign verify \
              --certificate-oidc-issuer https://token.actions.githubusercontent.com \
              --certificate-identity-regexp https://github.com/home-assistant/core/.* \
-              "ghcr.io/home-assistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"
+              "ghcr.io/home-assistant/${arch}-homeassistant:${VERSION}"
          done
          echo "✓ All images verified successfully"

@@ -413,16 +462,19 @@ jobs:
      - name: Copy architecture images to DockerHub
        if: matrix.registry == 'docker.io/homeassistant'
        shell: bash
+        env:
+          ARCHITECTURES: ${{ needs.init.outputs.architectures }}
+          VERSION: ${{ needs.init.outputs.version }}
        run: |
          # Use imagetools to copy image blobs directly between registries
          # This preserves provenance/attestations and seems to be much faster than pull/push
-          ARCHS=$(echo '${{ needs.init.outputs.architectures }}' | jq -r '.[]')
+          ARCHS=$(echo "${ARCHITECTURES}" | jq -r '.[]')
          for arch in $ARCHS; do
            echo "Copying ${arch} image to DockerHub..."
            for attempt in 1 2 3; do
              if docker buildx imagetools create \
-                --tag "docker.io/homeassistant/${arch}-homeassistant:${{ needs.init.outputs.version }}" \
-                "ghcr.io/home-assistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"; then
+                --tag "docker.io/homeassistant/${arch}-homeassistant:${VERSION}" \
+                "ghcr.io/home-assistant/${arch}-homeassistant:${VERSION}"; then
                break
              fi
              echo "Attempt ${attempt} failed, retrying in 10 seconds..."
@@ -432,23 +484,28 @@ jobs:
                exit 1
              fi
            done
-            cosign sign --yes "docker.io/homeassistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"
+            cosign sign --yes "docker.io/homeassistant/${arch}-homeassistant:${VERSION}"
          done

      - name: Create and push multi-arch manifests
        shell: bash
+        env:
+          ARCHITECTURES: ${{ needs.init.outputs.architectures }}
+          REGISTRY: ${{ matrix.registry }}
+          VERSION: ${{ needs.init.outputs.version }}
+          META_TAGS: ${{ steps.meta.outputs.tags }}
        run: |
          # Build list of architecture images dynamically
-          ARCHS=$(echo '${{ needs.init.outputs.architectures }}' | jq -r '.[]')
+          ARCHS=$(echo "${ARCHITECTURES}" | jq -r '.[]')
          ARCH_IMAGES=()
          for arch in $ARCHS; do
-            ARCH_IMAGES+=("${{ matrix.registry }}/${arch}-homeassistant:${{ needs.init.outputs.version }}")
+            ARCH_IMAGES+=("${REGISTRY}/${arch}-homeassistant:${VERSION}")
          done

          # Build list of all tags for single manifest creation
          # Note: Using sep-tags=',' in metadata-action for easier parsing
          TAG_ARGS=()
-          IFS=',' read -ra TAGS <<< "${{ steps.meta.outputs.tags }}"
+          IFS=',' read -ra TAGS <<< "${META_TAGS}"
          for tag in "${TAGS[@]}"; do
            TAG_ARGS+=("--tag" "${tag}")
          done
@@ -472,12 +529,14 @@ jobs:
    needs: ["init", "build_base"]
    runs-on: ubuntu-latest
    permissions:
-      contents: read
-      id-token: write
+      contents: read # To check out the repository
+      id-token: write # For PyPI trusted publishing
    if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -511,10 +570,10 @@ jobs:
    name: Build and test hassfest image
    runs-on: ubuntu-latest
    permissions:
-      contents: read
-      packages: write
-      attestations: write
-      id-token: write
+      contents: read # To check out the repository
+      packages: write # To push to GHCR
+      attestations: write # For build provenance attestation
+      id-token: write # For build provenance attestation
    needs: ["init"]
    if: github.repository_owner == 'home-assistant'
    env:
@@ -523,6 +582,8 @@ jobs:
    steps:
      - name: Checkout repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Login to GitHub Container Registry
        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
@@ -540,7 +601,7 @@ jobs:
          tags: ${{ env.HASSFEST_IMAGE_TAG }}

      - name: Run hassfest against core
-        run: docker run --rm -v ${{ github.workspace }}:/github/workspace ${{ env.HASSFEST_IMAGE_TAG }} --core-path=/github/workspace
+        run: docker run --rm -v "${GITHUB_WORKSPACE}":/github/workspace "${HASSFEST_IMAGE_TAG}" --core-path=/github/workspace

      - name: Push Docker image
        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
@@ -37,10 +37,10 @@ on:
        type: boolean

 env:
-  CACHE_VERSION: 2
+  CACHE_VERSION: 3
  UV_CACHE_VERSION: 1
  MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.3"
+  HA_SHORT_VERSION: "2026.4"
  DEFAULT_PYTHON: "3.14.2"
  ALL_PYTHON_VERSIONS: "['3.14.2']"
  # 10.3 is the oldest supported version
@@ -67,6 +67,8 @@ env:
  PYTHONASYNCIODEBUG: 1
  HASS_CI: 1

+permissions: {}
+
 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
@@ -75,6 +77,9 @@ jobs:
  info:
    name: Collect information & changes data
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read # To check out the repository
+      pull-requests: read # For paths-filter to detect changed files
    outputs:
      # In case of issues with the partial run, use the following line instead:
      # test_full_suite: 'true'
@@ -97,21 +102,24 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Generate partial Python venv restore key
        id: generate_python_cache_key
+        env:
+          HASH_REQUIREMENTS_TEST: ${{ hashFiles('requirements_test.txt', 'requirements_test_pre_commit.txt') }}
+          HASH_REQUIREMENTS: ${{ hashFiles('requirements.txt') }}
+          HASH_REQUIREMENTS_ALL: ${{ hashFiles('requirements_all.txt') }}
+          HASH_PACKAGE_CONSTRAINTS: ${{ hashFiles('homeassistant/package_constraints.txt') }}
+          HASH_GEN_REQUIREMENTS: ${{ hashFiles('script/gen_requirements_all.py') }}
        run: |
          # Include HA_SHORT_VERSION to force the immediate creation
          # of a new uv cache entry after a version bump.
-          echo "key=venv-${{ env.CACHE_VERSION }}-${{ env.HA_SHORT_VERSION }}-${{
-            hashFiles('requirements_test.txt', 'requirements_test_pre_commit.txt') }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_all.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}-${{
-            hashFiles('script/gen_requirements_all.py') }}" >> $GITHUB_OUTPUT
+          echo "key=venv-${CACHE_VERSION}-${HA_SHORT_VERSION}-${HASH_REQUIREMENTS_TEST}-${HASH_REQUIREMENTS}-${HASH_REQUIREMENTS_ALL}-${HASH_PACKAGE_CONSTRAINTS}-${HASH_GEN_REQUIREMENTS}" >> $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
+          echo "key=$(lsb_release -rs)-apt-${CACHE_VERSION}-${HA_SHORT_VERSION}" >> $GITHUB_OUTPUT
      - name: Filter for core changes
        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
        id: core
@@ -134,6 +142,18 @@ jobs:
          filters: .integration_paths.yaml
      - name: Collect additional information
        id: info
+        env:
+          INTEGRATION_CHANGES: ${{ steps.integrations.outputs.changes }}
+          CORE_ANY: ${{ steps.core.outputs.any }}
+          INPUT_FULL: ${{ github.event.inputs.full }}
+          HAS_CI_FULL_RUN_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'ci-full-run') }}
+          INPUT_LINT_ONLY: ${{ github.event.inputs.lint-only }}
+          INPUT_PYLINT_ONLY: ${{ github.event.inputs.pylint-only }}
+          INPUT_MYPY_ONLY: ${{ github.event.inputs.mypy-only }}
+          INPUT_AUDIT_LICENSES_ONLY: ${{ github.event.inputs.audit-licenses-only }}
+          REPO_FULL_NAME: ${{ github.event.repository.full_name }}
+          INPUT_SKIP_COVERAGE: ${{ github.event.inputs.skip-coverage }}
+          HAS_CI_SKIP_COVERAGE_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'ci-skip-coverage') }}
        run: |
          # Defaults
          integrations_glob=""
@@ -147,14 +167,13 @@ jobs:
          lint_only=""
          skip_coverage=""

-          if [[ "${{ steps.integrations.outputs.changes }}" != "[]" ]];
+          if [[ "${INTEGRATION_CHANGES}" != "[]" ]];
          then
-            # Create a file glob for the integrations
-            integrations_glob=$(echo '${{ steps.integrations.outputs.changes }}' | jq -cSr '. | join(",")')
-            [[ "${integrations_glob}" == *","* ]] && integrations_glob="{${integrations_glob}}"
+            # Create a space-separated list of integrations
+            integrations_glob=$(echo "${INTEGRATION_CHANGES}" | jq -r '. | join(" ")')

            # Create list of testable integrations
-            possible_integrations=$(echo '${{ steps.integrations.outputs.changes }}' | jq -cSr '.[]')
+            possible_integrations=$(echo "${INTEGRATION_CHANGES}" | jq -cSr '.[]')
            tests=$(
              for integration in ${possible_integrations};
              do
@@ -170,9 +189,8 @@ jobs:
            # Test group count should be 1, we don't split partial tests
            test_group_count=1

-            # Create a file glob for the integrations tests
-            tests_glob=$(echo "${tests}" | jq -cSr '. | join(",")')
-            [[ "${tests_glob}" == *","* ]] && tests_glob="{${tests_glob}}"
+            # Create a space-separated list of test integrations
+            tests_glob=$(echo "${tests}" | jq -r '. | join(" ")')

            mariadb_groups="[]"
            postgresql_groups="[]"
@@ -181,12 +199,12 @@ jobs:

          # We need to run the full suite on certain branches.
          # Or, in case core files are touched, for the full suite as well.
-          if [[ "${{ github.ref }}" == "refs/heads/dev" ]] \
-            || [[ "${{ github.ref }}" == "refs/heads/master" ]] \
-            || [[ "${{ github.ref }}" == "refs/heads/rc" ]] \
-            || [[ "${{ steps.core.outputs.any }}" == "true" ]] \
-            || [[ "${{ github.event.inputs.full }}" == "true" ]] \
-            || [[ "${{ contains(github.event.pull_request.labels.*.name, 'ci-full-run') }}" == "true" ]];
+          if [[ "${GITHUB_REF}" == "refs/heads/dev" ]] \
+            || [[ "${GITHUB_REF}" == "refs/heads/master" ]] \
+            || [[ "${GITHUB_REF}" == "refs/heads/rc" ]] \
+            || [[ "${CORE_ANY}" == "true" ]] \
+            || [[ "${INPUT_FULL}" == "true" ]] \
+            || [[ "${HAS_CI_FULL_RUN_LABEL}" == "true" ]];
          then
            mariadb_groups=${MARIADB_VERSIONS}
            postgresql_groups=${POSTGRESQL_VERSIONS}
@@ -195,19 +213,19 @@ jobs:
            test_full_suite="true"
          fi

-          if [[ "${{ github.event.inputs.lint-only }}" == "true" ]] \
-            || [[ "${{ github.event.inputs.pylint-only }}" == "true" ]] \
-            || [[ "${{ github.event.inputs.mypy-only }}" == "true" ]] \
-            || [[ "${{ github.event.inputs.audit-licenses-only }}" == "true" ]] \
-            || [[ "${{ github.event_name }}" == "push" \
-              && "${{ github.event.repository.full_name }}" != "home-assistant/core" ]];
+          if [[ "${INPUT_LINT_ONLY}" == "true" ]] \
+            || [[ "${INPUT_PYLINT_ONLY}" == "true" ]] \
+            || [[ "${INPUT_MYPY_ONLY}" == "true" ]] \
+            || [[ "${INPUT_AUDIT_LICENSES_ONLY}" == "true" ]] \
+            || [[ "${GITHUB_EVENT_NAME}" == "push" \
+              && "${REPO_FULL_NAME}" != "home-assistant/core" ]];
          then
            lint_only="true"
            skip_coverage="true"
          fi

-          if [[ "${{ github.event.inputs.skip-coverage }}" == "true" ]] \
-            || [[ "${{ contains(github.event.pull_request.labels.*.name, 'ci-skip-coverage') }}" == "true" ]];
+          if [[ "${INPUT_SKIP_COVERAGE}" == "true" ]] \
+            || [[ "${HAS_CI_SKIP_COVERAGE_LABEL}" == "true" ]];
          then
            skip_coverage="true"
          fi
@@ -239,6 +257,8 @@ jobs:
  prek:
    name: Run prek checks
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs: [info]
    if: |
      github.event.inputs.pylint-only != 'true'
@@ -247,6 +267,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Register problem matchers
        run: |
          echo "::add-matcher::.github/workflows/matchers/yamllint.json"
@@ -256,12 +278,34 @@ jobs:
      - name: Run prek
        uses: j178/prek-action@0bb87d7f00b0c99306c8bcb8b8beba1eb581c037 # v1.1.1
        env:
-          PREK_SKIP: no-commit-to-branch,mypy,pylint,gen_requirements_all,hassfest,hassfest-metadata,hassfest-mypy-config
+          PREK_SKIP: no-commit-to-branch,mypy,pylint,gen_requirements_all,hassfest,hassfest-metadata,hassfest-mypy-config,zizmor
          RUFF_OUTPUT_FORMAT: github

+  zizmor:
+    name: Check GitHub Actions workflows
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read # To check out the repository
+    needs: [info]
+    if: |
+      github.event.inputs.pylint-only != 'true'
+      && github.event.inputs.mypy-only != 'true'
+      && github.event.inputs.audit-licenses-only != 'true'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+      - name: Run zizmor
+        uses: j178/prek-action@0bb87d7f00b0c99306c8bcb8b8beba1eb581c037 # v1.1.1
+        with:
+          extra-args: --all-files zizmor
+
  lint-hadolint:
    name: Check ${{ matrix.file }}
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs: [info]
    if: |
      github.event.inputs.pylint-only != 'true'
@@ -277,17 +321,21 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Register hadolint problem matcher
        run: |
          echo "::add-matcher::.github/workflows/matchers/hadolint.json"
      - name: Check ${{ matrix.file }}
-        uses: docker://hadolint/hadolint:v2.12.0
+        uses: docker://hadolint/hadolint:v2.12.0@sha256:30a8fd2e785ab6176eed53f74769e04f125afb2f74a6c52aef7d463583b6d45e
        with:
          args: hadolint ${{ matrix.file }}

  base:
    name: Prepare dependencies
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs: [info]
    timeout-minutes: 60
    strategy:
@@ -296,6 +344,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -307,8 +357,7 @@ jobs:
        run: |
          uv_version=$(cat requirements.txt | grep uv | cut -d '=' -f 3)
          echo "version=${uv_version}" >> $GITHUB_OUTPUT
-          echo "key=uv-${{ env.UV_CACHE_VERSION }}-${uv_version}-${{
-            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
+          echo "key=uv-${UV_CACHE_VERSION}-${uv_version}-${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@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
@@ -344,19 +393,21 @@ jobs:
          steps.cache-venv.outputs.cache-hit != 'true'
          || steps.cache-apt-check.outputs.cache-hit != 'true'
        timeout-minutes: 10
+        env:
+          APT_CACHE_HIT: ${{ steps.cache-apt-check.outputs.cache-hit }}
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          if [[ "${{ steps.cache-apt-check.outputs.cache-hit }}" != 'true' ]]; then
-            mkdir -p ${{ env.APT_CACHE_DIR }}
-            mkdir -p ${{ env.APT_LIST_CACHE_DIR }}
+          if [[ "${APT_CACHE_HIT}" != 'true' ]]; then
+            mkdir -p ${APT_CACHE_DIR}
+            mkdir -p ${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 }}
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${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 }} \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
            bluez \
            ffmpeg \
            libturbojpeg \
@@ -370,8 +421,8 @@ jobs:
            libswscale-dev \
            libudev-dev

-          if [[ "${{ steps.cache-apt-check.outputs.cache-hit }}" != 'true' ]]; then
-            sudo chmod -R 755 ${{ env.APT_CACHE_BASE }}
+          if [[ "${APT_CACHE_HIT}" != 'true' ]]; then
+            sudo chmod -R 755 ${APT_CACHE_BASE}
          fi
      - name: Save apt cache
        if: steps.cache-apt-check.outputs.cache-hit != 'true'
@@ -418,6 +469,8 @@ jobs:
  hassfest:
    name: Check hassfest
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
      - base
@@ -440,14 +493,16 @@ jobs:
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${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 }} \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
            libturbojpeg
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -471,6 +526,8 @@ jobs:
  gen-requirements-all:
    name: Check all requirements
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
      - base
@@ -481,6 +538,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -504,6 +563,8 @@ jobs:
  gen-copilot-instructions:
    name: Check copilot instructions
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
    if: |
@@ -513,6 +574,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -526,6 +589,8 @@ jobs:
  dependency-review:
    name: Dependency review
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
      - base
@@ -537,6 +602,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Dependency review
        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
        with:
@@ -545,6 +612,8 @@ jobs:
  audit-licenses:
    name: Audit licenses
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
      - base
@@ -560,6 +629,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -576,22 +647,28 @@ jobs:
            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Extract license data
+        env:
+          PYTHON_VERSION: ${{ matrix.python-version }}
        run: |
          . venv/bin/activate
-          python -m script.licenses extract --output-file=licenses-${{ matrix.python-version }}.json
+          python -m script.licenses extract --output-file=licenses-${PYTHON_VERSION}.json
      - name: Upload licenses
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
          name: licenses-${{ github.run_number }}-${{ matrix.python-version }}
          path: licenses-${{ matrix.python-version }}.json
      - name: Check licenses
+        env:
+          PYTHON_VERSION: ${{ matrix.python-version }}
        run: |
          . venv/bin/activate
-          python -m script.licenses check licenses-${{ matrix.python-version }}.json
+          python -m script.licenses check licenses-${PYTHON_VERSION}.json

  pylint:
    name: Check pylint
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
      - base
@@ -603,6 +680,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -630,14 +709,18 @@ jobs:
      - name: Run pylint (partially)
        if: needs.info.outputs.test_full_suite == 'false'
        shell: bash
+        env:
+          INTEGRATIONS_GLOB: ${{ needs.info.outputs.integrations_glob }}
        run: |
          . venv/bin/activate
          python --version
-          pylint --ignore-missing-annotations=y homeassistant/components/${{ needs.info.outputs.integrations_glob }}
+          pylint --ignore-missing-annotations=y $(printf "homeassistant/components/%s " ${INTEGRATIONS_GLOB})

  pylint-tests:
    name: Check pylint on tests
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
      - base
@@ -650,6 +733,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -677,14 +762,18 @@ jobs:
      - name: Run pylint (partially)
        if: needs.info.outputs.test_full_suite == 'false'
        shell: bash
+        env:
+          TESTS_GLOB: ${{ needs.info.outputs.tests_glob }}
        run: |
          . venv/bin/activate
          python --version
-          pylint tests/components/${{ needs.info.outputs.tests_glob }}
+          pylint $(printf "tests/components/%s " ${TESTS_GLOB})

  mypy:
    name: Check mypy
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
      - base
@@ -695,6 +784,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -705,9 +796,8 @@ jobs:
        id: generate-mypy-key
        run: |
          mypy_version=$(cat requirements_test.txt | grep 'mypy.*=' | cut -d '=' -f 3)
-          echo "version=$mypy_version" >> $GITHUB_OUTPUT
-          echo "key=mypy-${{ env.MYPY_CACHE_VERSION }}-$mypy_version-${{
-            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
+          echo "version=${mypy_version}" >> $GITHUB_OUTPUT
+          echo "key=mypy-${MYPY_CACHE_VERSION}-${mypy_version}-${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@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
@@ -740,14 +830,18 @@ jobs:
      - name: Run mypy (partially)
        if: needs.info.outputs.test_full_suite == 'false'
        shell: bash
+        env:
+          INTEGRATIONS_GLOB: ${{ needs.info.outputs.integrations_glob }}
        run: |
          . venv/bin/activate
          python --version
-          mypy homeassistant/components/${{ needs.info.outputs.integrations_glob }}
+          mypy $(printf "homeassistant/components/%s " ${INTEGRATIONS_GLOB})

  prepare-pytest-full:
    name: Split tests for full run
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    if: |
      needs.info.outputs.lint_only != 'true'
      && needs.info.outputs.test_full_suite == 'true'
@@ -773,16 +867,18 @@ jobs:
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${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 }} \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
            bluez \
            ffmpeg \
            libturbojpeg
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -799,9 +895,11 @@ jobs:
            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Run split_tests.py
+        env:
+          TEST_GROUP_COUNT: ${{ needs.info.outputs.test_group_count }}
        run: |
          . venv/bin/activate
-          python -m script.split_tests ${{ needs.info.outputs.test_group_count }} tests
+          python -m script.split_tests ${TEST_GROUP_COUNT} tests
      - name: Upload pytest_buckets
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        with:
@@ -812,6 +910,8 @@ jobs:
  pytest-full:
    name: Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
      - base
@@ -843,17 +943,19 @@ jobs:
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${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 }} \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libxml2-utils
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -888,18 +990,21 @@ jobs:
        id: pytest-full
        env:
          PYTHONDONTWRITEBYTECODE: 1
+          SKIP_COVERAGE: ${{ needs.info.outputs.skip_coverage }}
+          TEST_GROUP: ${{ matrix.group }}
+          PYTHON_VERSION: ${{ matrix.python-version }}
        run: |
          . venv/bin/activate
          python --version
          set -o pipefail
          cov_params=()
-          if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
+          if [[ "${SKIP_COVERAGE}" != "true" ]]; then
            cov_params+=(--cov="homeassistant")
            cov_params+=(--cov-report=xml)
            cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
          fi

-          echo "Test group ${{ matrix.group }}: $(sed -n "${{ matrix.group }},1p" pytest_buckets.txt)"
+          echo "Test group ${TEST_GROUP}: $(sed -n "${TEST_GROUP},1p" pytest_buckets.txt)"
          python3 -b -X dev -m pytest \
            -qq \
            --timeout=9 \
@@ -911,8 +1016,8 @@ jobs:
            -o console_output_style=count \
            -p no:sugar \
            --exclude-warning-annotations \
-            $(sed -n "${{ matrix.group }},1p" pytest_buckets.txt) \
-              2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
+            $(sed -n "${TEST_GROUP},1p" pytest_buckets.txt) \
+              2>&1 | tee pytest-${PYTHON_VERSION}-${TEST_GROUP}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-full.conclusion == 'failure'
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
@@ -948,9 +1053,11 @@ jobs:
  pytest-mariadb:
    name: Run ${{ matrix.mariadb-group }} tests Python ${{ matrix.python-version }}
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    services:
      mariadb:
-        image: ${{ matrix.mariadb-group }}
+        image: ${{ matrix.mariadb-group }} # zizmor: ignore[unpinned-images]
        ports:
          - 3306:3306
        env:
@@ -986,11 +1093,11 @@ jobs:
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${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 }} \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
            bluez \
            ffmpeg \
            libturbojpeg \
@@ -998,6 +1105,8 @@ jobs:
            libxml2-utils
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -1033,14 +1142,17 @@ jobs:
        shell: bash
        env:
          PYTHONDONTWRITEBYTECODE: 1
+          MARIADB_GROUP: ${{ matrix.mariadb-group }}
+          SKIP_COVERAGE: ${{ needs.info.outputs.skip_coverage }}
+          PYTHON_VERSION: ${{ matrix.python-version }}
        run: |
          . venv/bin/activate
          python --version
          set -o pipefail
-          mariadb=$(echo "${{ matrix.mariadb-group }}" | sed "s/:/-/g")
+          mariadb=$(echo "${MARIADB_GROUP}" | sed "s/:/-/g")
          echo "mariadb=${mariadb}" >> $GITHUB_OUTPUT
          cov_params=()
-          if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
+          if [[ "${SKIP_COVERAGE}" != "true" ]]; then
            cov_params+=(--cov="homeassistant.components.recorder")
            cov_params+=(--cov-report=xml)
            cov_params+=(--cov-report=term-missing)
@@ -1062,7 +1174,7 @@ jobs:
            tests/components/logbook \
            tests/components/recorder \
            tests/components/sensor \
-              2>&1 | tee pytest-${{ matrix.python-version }}-${mariadb}.txt
+              2>&1 | tee pytest-${PYTHON_VERSION}-${mariadb}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
@@ -1099,9 +1211,11 @@ jobs:
  pytest-postgres:
    name: Run ${{ matrix.postgresql-group }} tests Python ${{ matrix.python-version }}
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    services:
      postgres:
-        image: ${{ matrix.postgresql-group }}
+        image: ${{ matrix.postgresql-group }} # zizmor: ignore[unpinned-images]
        ports:
          - 5432:5432
        env:
@@ -1137,11 +1251,11 @@ jobs:
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${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 }} \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
            bluez \
            ffmpeg \
            libturbojpeg \
@@ -1151,6 +1265,8 @@ jobs:
            postgresql-server-dev-14
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -1186,14 +1302,17 @@ jobs:
        shell: bash
        env:
          PYTHONDONTWRITEBYTECODE: 1
+          POSTGRESQL_GROUP: ${{ matrix.postgresql-group }}
+          SKIP_COVERAGE: ${{ needs.info.outputs.skip_coverage }}
+          PYTHON_VERSION: ${{ matrix.python-version }}
        run: |
          . venv/bin/activate
          python --version
          set -o pipefail
-          postgresql=$(echo "${{ matrix.postgresql-group }}" | sed "s/:/-/g")
+          postgresql=$(echo "${POSTGRESQL_GROUP}" | sed "s/:/-/g")
          echo "postgresql=${postgresql}" >> $GITHUB_OUTPUT
          cov_params=()
-          if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
+          if [[ "${SKIP_COVERAGE}" != "true" ]]; then
            cov_params+=(--cov="homeassistant.components.recorder")
            cov_params+=(--cov-report=xml)
            cov_params+=(--cov-report=term-missing)
@@ -1216,7 +1335,7 @@ jobs:
            tests/components/logbook \
            tests/components/recorder \
            tests/components/sensor \
-              2>&1 | tee pytest-${{ matrix.python-version }}-${postgresql}.txt
+              2>&1 | tee pytest-${PYTHON_VERSION}-${postgresql}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
@@ -1253,6 +1372,8 @@ jobs:
  coverage-full:
    name: Upload test coverage to Codecov (full suite)
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
      - pytest-full
@@ -1263,6 +1384,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Download all coverage artifacts
        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
@@ -1278,6 +1401,8 @@ jobs:
  pytest-partial:
    name: Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    needs:
      - info
      - base
@@ -1309,17 +1434,19 @@ jobs:
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${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 }} \
+            -o Dir::Cache=${APT_CACHE_DIR} \
+            -o Dir::State::Lists=${APT_LIST_CACHE_DIR} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libxml2-utils
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -1351,19 +1478,22 @@ jobs:
        shell: bash
        env:
          PYTHONDONTWRITEBYTECODE: 1
+          TEST_GROUP: ${{ matrix.group }}
+          SKIP_COVERAGE: ${{ needs.info.outputs.skip_coverage }}
+          PYTHON_VERSION: ${{ matrix.python-version }}
        run: |
          . venv/bin/activate
          python --version
          set -o pipefail

-          if [[ ! -f "tests/components/${{ matrix.group }}/__init__.py" ]]; then
-            echo "::error:: missing file tests/components/${{ matrix.group }}/__init__.py"
+          if [[ ! -f "tests/components/${TEST_GROUP}/__init__.py" ]]; then
+            echo "::error:: missing file tests/components/${TEST_GROUP}/__init__.py"
            exit 1
          fi

          cov_params=()
-          if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
-            cov_params+=(--cov="homeassistant.components.${{ matrix.group }}")
+          if [[ "${SKIP_COVERAGE}" != "true" ]]; then
+            cov_params+=(--cov="homeassistant.components.${TEST_GROUP}")
            cov_params+=(--cov-report=xml)
            cov_params+=(--cov-report=term-missing)
            cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
@@ -1380,8 +1510,8 @@ jobs:
            --durations-min=1 \
            -p no:sugar \
            --exclude-warning-annotations \
-            tests/components/${{ matrix.group }} \
-              2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
+            tests/components/${TEST_GROUP} \
+              2>&1 | tee pytest-${PYTHON_VERSION}-${TEST_GROUP}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
@@ -1416,6 +1546,8 @@ jobs:
    name: Upload test coverage to Codecov (partial suite)
    if: needs.info.outputs.skip_coverage != 'true'
    runs-on: ubuntu-24.04
+    permissions:
+      contents: read
    timeout-minutes: 10
    needs:
      - info
@@ -1423,6 +1555,8 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
      - name: Download all coverage artifacts
        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
        with:
@@ -1445,7 +1579,7 @@ jobs:
      - pytest-mariadb
    timeout-minutes: 10
    permissions:
-      id-token: write
+      id-token: write # For Codecov OIDC upload
    # codecov/test-results-action currently doesn't support tokenless uploads
    # therefore we can't run it on forks
    if: |
@@ -5,6 +5,8 @@ on:
  schedule:
    - cron: "30 18 * * 4"

+permissions: {}
+
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
  cancel-in-progress: true
@@ -15,20 +17,22 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 360
    permissions:
-      actions: read
-      contents: read
-      security-events: write
+      actions: read # To read workflow information for CodeQL
+      contents: read # To check out the repository
+      security-events: write # To upload CodeQL results

    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+        uses: github/codeql-action/init@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
        with:
          languages: python

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+        uses: github/codeql-action/analyze@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
        with:
          category: "/language:python"
@@ -5,13 +5,18 @@ on:
  issues:
    types: [labeled]

-permissions:
-  issues: write
-  models: read
+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.issue.number }}

 jobs:
  detect-duplicates:
+    name: Detect duplicate issues
    runs-on: ubuntu-latest
+    permissions:
+      issues: write # To comment on and label issues
+      models: read # For AI-based duplicate detection

    steps:
      - name: Check if integration label was added and extract details
@@ -5,13 +5,18 @@ on:
  issues:
    types: [opened]

-permissions:
-  issues: write
-  models: read
+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.issue.number }}

 jobs:
  detect-language:
+    name: Detect non-English issues
    runs-on: ubuntu-latest
+    permissions:
+      issues: write # To comment on, label, and close issues
+      models: read # For AI-based language detection

    steps:
      - name: Check issue language
@@ -5,10 +5,20 @@ on:
  schedule:
    - cron: "0 * * * *"

+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
  lock:
+    name: Lock inactive threads
    if: github.repository_owner == 'home-assistant'
    runs-on: ubuntu-latest
+    permissions:
+      issues: write # To lock issues
+      pull-requests: write # To lock pull requests
    steps:
      - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
        with:
@@ -5,9 +5,39 @@ on:
  issues:
    types: [opened]

+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.issue.number }}
+
 jobs:
-  check-authorization:
+  add-no-stale:
+    name: Add no-stale label
    runs-on: ubuntu-latest
+    permissions:
+      issues: write # To add labels to issues
+    if: >-
+      github.event.issue.type.name == 'Task'
+      || github.event.issue.type.name == 'Epic'
+      || github.event.issue.type.name == 'Opportunity'
+    steps:
+      - name: Add no-stale label
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        with:
+          script: |
+            await github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              labels: ['no-stale']
+            });
+
+  check-authorization:
+    name: Check authorization
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read # To read CODEOWNERS file
+      issues: write # To comment on, label, and close issues
    # Only run if this is a Task issue type (from the issue form)
    if: github.event.issue.type.name == 'Task'
    steps:
@@ -6,10 +6,20 @@ on:
    - cron: "0 * * * *"
  workflow_dispatch:

+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
  stale:
+    name: Mark stale issues and PRs
    if: github.repository_owner == 'home-assistant'
    runs-on: ubuntu-latest
+    permissions:
+      issues: write # To label and close stale issues
+      pull-requests: write # To label and close stale PRs
    steps:
      # The 60 day stale policy for PRs
      # Used for:
@@ -17,7 +27,7 @@ jobs:
      # - No PRs marked as no-stale
      # - No issues (-1)
      - name: 60 days stale PRs policy
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 60
@@ -57,7 +67,7 @@ jobs:
      # - No issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: 90 days stale issues
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
        with:
          repo-token: ${{ steps.token.outputs.token }}
          days-before-stale: 90
@@ -87,7 +97,7 @@ jobs:
      # - No Issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: Needs more information stale issues policy
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
        with:
          repo-token: ${{ steps.token.outputs.token }}
          only-labels: "needs-more-information"
@@ -9,6 +9,12 @@ on:
    paths:
      - "**strings.json"

+permissions: {}
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
 env:
  DEFAULT_PYTHON: "3.14.2"

@@ -20,6 +26,8 @@ jobs:
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -27,6 +35,7 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}

      - name: Upload Translations
+        env:
+          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
        run: |
-          export LOKALISE_TOKEN="${{ secrets.LOKALISE_TOKEN }}"
          python3 -m script.translations upload
@@ -19,6 +19,8 @@ on:
 env:
  DEFAULT_PYTHON: "3.14.2"

+permissions: {}
+
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref_name}}
  cancel-in-progress: true
@@ -31,6 +33,8 @@ jobs:
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
@@ -49,7 +53,7 @@ jobs:

      - name: Create requirements_diff file
        run: |
-          if [[ ${{ github.event_name }} =~ (schedule|workflow_dispatch) ]]; then
+          if [[ "${GITHUB_EVENT_NAME}" =~ (schedule|workflow_dispatch) ]]; then
            touch requirements_diff.txt
          else
            curl -s -o requirements_diff.txt https://raw.githubusercontent.com/home-assistant/core/master/requirements.txt
@@ -106,7 +110,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        abi: ["cp313", "cp314"]
+        abi: ["cp314"]
        arch: ["amd64", "aarch64"]
        include:
          - arch: amd64
@@ -116,6 +120,8 @@ jobs:
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Download env_file
        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
@@ -155,7 +161,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        abi: ["cp313", "cp314"]
+        abi: ["cp314"]
        arch: ["amd64", "aarch64"]
        include:
          - arch: amd64
@@ -165,6 +171,8 @@ jobs:
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false

      - name: Download env_file
        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
@@ -17,6 +17,12 @@ repos:
          - --quiet-level=2
        exclude_types: [csv, json, html]
        exclude: ^tests/fixtures/|homeassistant/generated/|tests/components/.*/snapshots/
+  - repo: https://github.com/zizmorcore/zizmor-pre-commit
+    rev: v1.22.0
+    hooks:
+      - id: zizmor
+        args:
+          - --pedantic
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v6.0.0
    hooks:
@@ -49,6 +49,7 @@ homeassistant.components.actiontec.*
 homeassistant.components.adax.*
 homeassistant.components.adguard.*
 homeassistant.components.aftership.*
+homeassistant.components.ai_task.*
 homeassistant.components.air_quality.*
 homeassistant.components.airgradient.*
 homeassistant.components.airly.*
@@ -84,6 +85,7 @@ homeassistant.components.androidtv_remote.*
 homeassistant.components.anel_pwrctrl.*
 homeassistant.components.anova.*
 homeassistant.components.anthemav.*
+homeassistant.components.anthropic.*
 homeassistant.components.apache_kafka.*
 homeassistant.components.apcupsd.*
 homeassistant.components.api.*
@@ -129,6 +131,7 @@ homeassistant.components.bring.*
 homeassistant.components.brother.*
 homeassistant.components.browser.*
 homeassistant.components.bryant_evolution.*
+homeassistant.components.bsblan.*
 homeassistant.components.bthome.*
 homeassistant.components.button.*
 homeassistant.components.calendar.*
@@ -208,6 +211,7 @@ homeassistant.components.firefly_iii.*
 homeassistant.components.fitbit.*
 homeassistant.components.flexit_bacnet.*
 homeassistant.components.flux_led.*
+homeassistant.components.folder_watcher.*
 homeassistant.components.forecast_solar.*
 homeassistant.components.fritz.*
 homeassistant.components.fritzbox.*
@@ -242,6 +246,7 @@ homeassistant.components.guardian.*
 homeassistant.components.habitica.*
 homeassistant.components.hardkernel.*
 homeassistant.components.hardware.*
+homeassistant.components.hdfury.*
 homeassistant.components.heos.*
 homeassistant.components.here_travel_time.*
 homeassistant.components.history.*
@@ -273,6 +278,7 @@ homeassistant.components.humidifier.*
 homeassistant.components.husqvarna_automower.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
+homeassistant.components.hypontech.*
 homeassistant.components.ibeacon.*
 homeassistant.components.idasen_desk.*
 homeassistant.components.image.*
@@ -283,6 +289,7 @@ homeassistant.components.imgw_pib.*
 homeassistant.components.immich.*
 homeassistant.components.incomfort.*
 homeassistant.components.inels.*
+homeassistant.components.infrared.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
 homeassistant.components.input_text.*
@@ -295,6 +302,7 @@ homeassistant.components.iotty.*
 homeassistant.components.ipp.*
 homeassistant.components.iqvia.*
 homeassistant.components.iron_os.*
+homeassistant.components.isal.*
 homeassistant.components.islamic_prayer_times.*
 homeassistant.components.isy994.*
 homeassistant.components.jellyfin.*
@@ -305,6 +313,7 @@ homeassistant.components.knocki.*
 homeassistant.components.knx.*
 homeassistant.components.kraken.*
 homeassistant.components.kulersky.*
+homeassistant.components.labs.*
 homeassistant.components.lacrosse.*
 homeassistant.components.lacrosse_view.*
 homeassistant.components.lamarzocco.*
@@ -364,6 +373,7 @@ homeassistant.components.my.*
 homeassistant.components.mysensors.*
 homeassistant.components.myuplink.*
 homeassistant.components.nam.*
+homeassistant.components.namecheapdns.*
 homeassistant.components.nasweb.*
 homeassistant.components.neato.*
 homeassistant.components.nest.*
@@ -399,6 +409,7 @@ homeassistant.components.opnsense.*
 homeassistant.components.opower.*
 homeassistant.components.oralb.*
 homeassistant.components.otbr.*
+homeassistant.components.otp.*
 homeassistant.components.overkiz.*
 homeassistant.components.overseerr.*
 homeassistant.components.p1_monitor.*
@@ -415,6 +426,7 @@ homeassistant.components.plugwise.*
 homeassistant.components.pooldose.*
 homeassistant.components.portainer.*
 homeassistant.components.powerfox.*
+homeassistant.components.powerfox_local.*
 homeassistant.components.powerwall.*
 homeassistant.components.private_ble_device.*
 homeassistant.components.prometheus.*
@@ -433,10 +445,12 @@ homeassistant.components.radarr.*
 homeassistant.components.radio_browser.*
 homeassistant.components.rainforest_raven.*
 homeassistant.components.rainmachine.*
+homeassistant.components.random.*
 homeassistant.components.raspberry_pi.*
 homeassistant.components.rdw.*
 homeassistant.components.recollect_waste.*
 homeassistant.components.recorder.*
+homeassistant.components.recovery_mode.*
 homeassistant.components.redgtech.*
 homeassistant.components.remember_the_milk.*
 homeassistant.components.remote.*
@@ -468,6 +482,7 @@ homeassistant.components.schlage.*
 homeassistant.components.scrape.*
 homeassistant.components.script.*
 homeassistant.components.search.*
+homeassistant.components.season.*
 homeassistant.components.select.*
 homeassistant.components.sensibo.*
 homeassistant.components.sensirion_ble.*
@@ -494,6 +509,7 @@ homeassistant.components.smtp.*
 homeassistant.components.snooz.*
 homeassistant.components.solarlog.*
 homeassistant.components.sonarr.*
+homeassistant.components.spaceapi.*
 homeassistant.components.speedtestdotnet.*
 homeassistant.components.spotify.*
 homeassistant.components.sql.*
@@ -518,6 +534,7 @@ homeassistant.components.synology_dsm.*
 homeassistant.components.system_health.*
 homeassistant.components.system_log.*
 homeassistant.components.systemmonitor.*
+homeassistant.components.systemnexa2.*
 homeassistant.components.tag.*
 homeassistant.components.tailscale.*
 homeassistant.components.tailwind.*
@@ -560,12 +577,14 @@ homeassistant.components.update.*
 homeassistant.components.uptime.*
 homeassistant.components.uptime_kuma.*
 homeassistant.components.uptimerobot.*
+homeassistant.components.usage_prediction.*
 homeassistant.components.usb.*
 homeassistant.components.uvc.*
 homeassistant.components.vacuum.*
 homeassistant.components.vallox.*
 homeassistant.components.valve.*
 homeassistant.components.velbus.*
+homeassistant.components.velux.*
 homeassistant.components.vivotek.*
 homeassistant.components.vlc_telnet.*
 homeassistant.components.vodafone_station.*
@@ -578,6 +597,7 @@ homeassistant.components.water_heater.*
 homeassistant.components.watts.*
 homeassistant.components.watttime.*
 homeassistant.components.weather.*
+homeassistant.components.web_rtc.*
 homeassistant.components.webhook.*
 homeassistant.components.webostv.*
 homeassistant.components.websocket_api.*
@@ -594,6 +614,7 @@ homeassistant.components.yale_smart_alarm.*
 homeassistant.components.yalexs_ble.*
 homeassistant.components.youtube.*
 homeassistant.components.zeroconf.*
+homeassistant.components.zinvolt.*
 homeassistant.components.zodiac.*
 homeassistant.components.zone.*
 homeassistant.components.zwave_js.*
@@ -242,6 +242,8 @@ build.json @home-assistant/supervisor
 /tests/components/bosch_alarm/ @mag1024 @sanjay900
 /homeassistant/components/bosch_shc/ @tschamm
 /tests/components/bosch_shc/ @tschamm
+/homeassistant/components/brands/ @home-assistant/core
+/tests/components/brands/ @home-assistant/core
 /homeassistant/components/braviatv/ @bieniu @Drafteed
 /tests/components/braviatv/ @bieniu @Drafteed
 /homeassistant/components/bring/ @miaucl @tr4nt0r
@@ -403,8 +405,8 @@ build.json @home-assistant/supervisor
 /tests/components/duke_energy/ @hunterjm
 /homeassistant/components/duotecno/ @cereal2nd
 /tests/components/duotecno/ @cereal2nd
-/homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192 @andarotajo
-/tests/components/dwd_weather_warnings/ @runningman84 @stephan192 @andarotajo
+/homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192
+/tests/components/dwd_weather_warnings/ @runningman84 @stephan192
 /homeassistant/components/dynalite/ @ziv1234
 /tests/components/dynalite/ @ziv1234
 /homeassistant/components/eafm/ @Jc2k
@@ -555,8 +557,6 @@ build.json @home-assistant/supervisor
 /tests/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
 /homeassistant/components/fritzbox/ @mib1185 @flabbamann
 /tests/components/fritzbox/ @mib1185 @flabbamann
-/homeassistant/components/fritzbox_callmonitor/ @cdce8p
-/tests/components/fritzbox_callmonitor/ @cdce8p
 /homeassistant/components/fronius/ @farmio
 /tests/components/fronius/ @farmio
 /homeassistant/components/frontend/ @home-assistant/frontend
@@ -719,8 +719,8 @@ build.json @home-assistant/supervisor
 /tests/components/homematic/ @pvizeli
 /homeassistant/components/homematicip_cloud/ @hahn-th @lackas
 /tests/components/homematicip_cloud/ @hahn-th @lackas
-/homeassistant/components/homevolt/ @danielhiversen
-/tests/components/homevolt/ @danielhiversen
+/homeassistant/components/homevolt/ @danielhiversen @liudger
+/tests/components/homevolt/ @danielhiversen @liudger
 /homeassistant/components/homewizard/ @DCSBL
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
@@ -753,6 +753,8 @@ build.json @home-assistant/supervisor
 /tests/components/hydrawise/ @dknowles2 @thomaskistler @ptcryan
 /homeassistant/components/hyperion/ @dermotduffy
 /tests/components/hyperion/ @dermotduffy
+/homeassistant/components/hypontech/ @jcisio
+/tests/components/hypontech/ @jcisio
 /homeassistant/components/ialarm/ @RyuzakiKK
 /tests/components/ialarm/ @RyuzakiKK
 /homeassistant/components/iammeter/ @lewei50
@@ -786,10 +788,14 @@ build.json @home-assistant/supervisor
 /tests/components/improv_ble/ @emontnemery
 /homeassistant/components/incomfort/ @jbouwh
 /tests/components/incomfort/ @jbouwh
+/homeassistant/components/indevolt/ @xirtnl
+/tests/components/indevolt/ @xirtnl
 /homeassistant/components/inels/ @epdevlab
 /tests/components/inels/ @epdevlab
-/homeassistant/components/influxdb/ @mdegat01
-/tests/components/influxdb/ @mdegat01
+/homeassistant/components/influxdb/ @mdegat01 @Robbie1221
+/tests/components/influxdb/ @mdegat01 @Robbie1221
+/homeassistant/components/infrared/ @home-assistant/core
+/tests/components/infrared/ @home-assistant/core
 /homeassistant/components/inkbird/ @bdraco
 /tests/components/inkbird/ @bdraco
 /homeassistant/components/input_boolean/ @home-assistant/core
@@ -1068,6 +1074,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/mqtt/ @emontnemery @jbouwh @bdraco
 /tests/components/mqtt/ @emontnemery @jbouwh @bdraco
 /homeassistant/components/msteams/ @peroyvind
+/homeassistant/components/mta/ @OnFreund
+/tests/components/mta/ @OnFreund
 /homeassistant/components/mullvad/ @meichthys
 /tests/components/mullvad/ @meichthys
 /homeassistant/components/music_assistant/ @music-assistant @arturpragacz
@@ -1076,6 +1084,8 @@ build.json @home-assistant/supervisor
 /tests/components/mutesync/ @currentoor
 /homeassistant/components/my/ @home-assistant/core
 /tests/components/my/ @home-assistant/core
+/homeassistant/components/myneomitis/ @l-pr
+/tests/components/myneomitis/ @l-pr
 /homeassistant/components/mysensors/ @MartinHjelmare @functionpointer
 /tests/components/mysensors/ @MartinHjelmare @functionpointer
 /homeassistant/components/mystrom/ @fabaff
@@ -1092,8 +1102,8 @@ build.json @home-assistant/supervisor
 /tests/components/nasweb/ @nasWebio
 /homeassistant/components/nederlandse_spoorwegen/ @YarmoM @heindrichpaul
 /tests/components/nederlandse_spoorwegen/ @YarmoM @heindrichpaul
-/homeassistant/components/ness_alarm/ @nickw444
-/tests/components/ness_alarm/ @nickw444
+/homeassistant/components/ness_alarm/ @nickw444 @poshy163
+/tests/components/ness_alarm/ @nickw444 @poshy163
 /homeassistant/components/nest/ @allenporter
 /tests/components/nest/ @allenporter
 /homeassistant/components/netatmo/ @cgtobi
@@ -1277,6 +1287,8 @@ build.json @home-assistant/supervisor
 /tests/components/portainer/ @erwindouna
 /homeassistant/components/powerfox/ @klaasnicolaas
 /tests/components/powerfox/ @klaasnicolaas
+/homeassistant/components/powerfox_local/ @klaasnicolaas
+/tests/components/powerfox_local/ @klaasnicolaas
 /homeassistant/components/powerwall/ @bdraco @jrester @daniel-simpson
 /tests/components/powerwall/ @bdraco @jrester @daniel-simpson
 /homeassistant/components/prana/ @prana-dev-official
@@ -1640,6 +1652,8 @@ build.json @home-assistant/supervisor
 /tests/components/system_bridge/ @timmo001
 /homeassistant/components/systemmonitor/ @gjohansson-ST
 /tests/components/systemmonitor/ @gjohansson-ST
+/homeassistant/components/systemnexa2/ @konsulten @slangstrom
+/tests/components/systemnexa2/ @konsulten @slangstrom
 /homeassistant/components/tado/ @erwindouna
 /tests/components/tado/ @erwindouna
 /homeassistant/components/tag/ @home-assistant/core
@@ -1665,6 +1679,8 @@ build.json @home-assistant/supervisor
 /tests/components/telegram_bot/ @hanwg
 /homeassistant/components/tellduslive/ @fredrike
 /tests/components/tellduslive/ @fredrike
+/homeassistant/components/teltonika/ @karlbeecken
+/tests/components/teltonika/ @karlbeecken
 /homeassistant/components/template/ @Petro31 @home-assistant/core
 /tests/components/template/ @Petro31 @home-assistant/core
 /homeassistant/components/tesla_fleet/ @Bre77
@@ -1731,6 +1747,8 @@ build.json @home-assistant/supervisor
 /tests/components/trafikverket_train/ @gjohansson-ST
 /homeassistant/components/trafikverket_weatherstation/ @gjohansson-ST
 /tests/components/trafikverket_weatherstation/ @gjohansson-ST
+/homeassistant/components/trane/ @bdraco
+/tests/components/trane/ @bdraco
 /homeassistant/components/transmission/ @engrbm87 @JPHutchins @andrew-codechimp
 /tests/components/transmission/ @engrbm87 @JPHutchins @andrew-codechimp
 /homeassistant/components/trend/ @jpbede
@@ -1866,8 +1884,8 @@ build.json @home-assistant/supervisor
 /tests/components/webostv/ @thecode
 /homeassistant/components/websocket_api/ @home-assistant/core
 /tests/components/websocket_api/ @home-assistant/core
-/homeassistant/components/weheat/ @jesperraemaekers
-/tests/components/weheat/ @jesperraemaekers
+/homeassistant/components/weheat/ @barryvdh
+/tests/components/weheat/ @barryvdh
 /homeassistant/components/wemo/ @esev
 /tests/components/wemo/ @esev
 /homeassistant/components/whirlpool/ @abmantis @mkmer
@@ -1883,8 +1901,8 @@ build.json @home-assistant/supervisor
 /tests/components/withings/ @joostlek
 /homeassistant/components/wiz/ @sbidy @arturpragacz
 /tests/components/wiz/ @sbidy @arturpragacz
-/homeassistant/components/wled/ @frenck
-/tests/components/wled/ @frenck
+/homeassistant/components/wled/ @frenck @mik-laj
+/tests/components/wled/ @frenck @mik-laj
 /homeassistant/components/wmspro/ @mback2k
 /tests/components/wmspro/ @mback2k
 /homeassistant/components/wolflink/ @adamkrol93 @mtielen
@@ -1945,11 +1963,14 @@ build.json @home-assistant/supervisor
 /tests/components/zha/ @dmulcahey @adminiuga @puddly @TheJulianJES
 /homeassistant/components/zimi/ @markhannon
 /tests/components/zimi/ @markhannon
+/homeassistant/components/zinvolt/ @joostlek
+/tests/components/zinvolt/ @joostlek
 /homeassistant/components/zodiac/ @JulienTant
 /tests/components/zodiac/ @JulienTant
 /homeassistant/components/zone/ @home-assistant/core
 /tests/components/zone/ @home-assistant/core
 /homeassistant/components/zoneminder/ @rohankapoorcom @nabbi
+/tests/components/zoneminder/ @rohankapoorcom @nabbi
 /homeassistant/components/zwave_js/ @home-assistant/z-wave
 /tests/components/zwave_js/ @home-assistant/z-wave
 /homeassistant/components/zwave_me/ @lawfulchaos @Z-Wave-Me @PoltoS
@@ -30,7 +30,7 @@ RUN \
    # Verify go2rtc can be executed
    go2rtc --version \
    # Install uv
-    && pip3 install uv==0.9.26
+    && pip3 install uv==0.10.6

 WORKDIR /usr/src

@@ -10,6 +10,7 @@ coverage:
        target: auto
        threshold: 1
        paths:
+          - homeassistant/components/*/backup.py
          - homeassistant/components/*/config_flow.py
          - homeassistant/components/*/device_action.py
          - homeassistant/components/*/device_condition.py
@@ -28,6 +29,7 @@ coverage:
        target: 100
        threshold: 0
        paths:
+          - homeassistant/components/*/backup.py
          - homeassistant/components/*/config_flow.py
          - homeassistant/components/*/device_action.py
          - homeassistant/components/*/device_condition.py
@@ -4,7 +4,6 @@ from __future__ import annotations

 from collections.abc import Iterable
 from dataclasses import dataclass
-import hashlib
 import json
 import logging
 from pathlib import Path
@@ -40,17 +39,6 @@ class RestoreBackupFileContent:
    restore_homeassistant: bool


-def password_to_key(password: str) -> bytes:
-    """Generate a AES Key from password.
-
-    Matches the implementation in supervisor.backups.utils.password_to_key.
-    """
-    key: bytes = password.encode()
-    for _ in range(100):
-        key = hashlib.sha256(key).digest()
-    return key[:16]
-
-
 def restore_backup_file_content(config_dir: Path) -> RestoreBackupFileContent | None:
    """Return the contents of the restore backup file."""
    instruction_path = config_dir.joinpath(RESTORE_BACKUP_FILE)
@@ -96,15 +84,14 @@ def _extract_backup(
    """Extract the backup file to the config directory."""
    with (
        TemporaryDirectory() as tempdir,
-        securetar.SecureTarFile(
+        securetar.SecureTarArchive(
            restore_content.backup_file_path,
-            gzip=False,
            mode="r",
        ) as ostf,
    ):
-        ostf.extractall(
+        ostf.tar.extractall(
            path=Path(tempdir, "extracted"),
-            members=securetar.secure_path(ostf),
+            members=securetar.secure_path(ostf.tar),
            filter="fully_trusted",
        )
        backup_meta_file = Path(tempdir, "extracted", "backup.json")
@@ -126,10 +113,7 @@ def _extract_backup(
                f"homeassistant.tar{'.gz' if backup_meta['compressed'] else ''}",
            ),
            gzip=backup_meta["compressed"],
-            key=password_to_key(restore_content.password)
-            if restore_content.password is not None
-            else None,
-            mode="r",
+            password=restore_content.password,
        ) as istf:
            istf.extractall(
                path=Path(tempdir, "homeassistant"),
@@ -210,6 +210,7 @@ DEFAULT_INTEGRATIONS = {
    "analytics",  # Needed for onboarding
    "application_credentials",
    "backup",
+    "brands",
    "frontend",
    "hardware",
    "labs",
@@ -0,0 +1,5 @@
+{
+  "domain": "american_standard",
+  "name": "American Standard",
+  "integrations": ["nexia", "trane"]
+}
@@ -0,0 +1,5 @@
+{
+  "domain": "powerfox",
+  "name": "Powerfox",
+  "integrations": ["powerfox", "powerfox_local"]
+}
@@ -0,0 +1,5 @@
+{
+  "domain": "trane",
+  "name": "Trane",
+  "integrations": ["nexia", "trane"]
+}
@@ -12,10 +12,6 @@ from homeassistant.helpers.dispatcher import dispatcher_send

 from .const import DOMAIN, DOMAIN_DATA, LOGGER

-SERVICE_SETTINGS = "change_setting"
-SERVICE_CAPTURE_IMAGE = "capture_image"
-SERVICE_TRIGGER_AUTOMATION = "trigger_automation"
-
 ATTR_SETTING = "setting"
 ATTR_VALUE = "value"

@@ -75,16 +71,13 @@ def async_setup_services(hass: HomeAssistant) -> None:
    """Home Assistant services."""

    hass.services.async_register(
-        DOMAIN, SERVICE_SETTINGS, _change_setting, schema=CHANGE_SETTING_SCHEMA
+        DOMAIN, "change_setting", _change_setting, schema=CHANGE_SETTING_SCHEMA
    )

    hass.services.async_register(
-        DOMAIN, SERVICE_CAPTURE_IMAGE, _capture_image, schema=CAPTURE_IMAGE_SCHEMA
+        DOMAIN, "capture_image", _capture_image, schema=CAPTURE_IMAGE_SCHEMA
    )

    hass.services.async_register(
-        DOMAIN,
-        SERVICE_TRIGGER_AUTOMATION,
-        _trigger_automation,
-        schema=AUTOMATION_SCHEMA,
+        DOMAIN, "trigger_automation", _trigger_automation, schema=AUTOMATION_SCHEMA
    )
@@ -7,7 +7,7 @@ import logging

 from accuweather import AccuWeather

-from homeassistant.components.sensor import DOMAIN as SENSOR_PLATFORM
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -72,7 +72,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry)
    ent_reg = er.async_get(hass)
    for day in range(5):
        unique_id = f"{location_key}-ozone-{day}"
-        if entity_id := ent_reg.async_get_entity_id(SENSOR_PLATFORM, DOMAIN, unique_id):
+        if entity_id := ent_reg.async_get_entity_id(SENSOR_DOMAIN, DOMAIN, unique_id):
            _LOGGER.debug("Removing ozone sensor entity %s", entity_id)
            ent_reg.async_remove(entity_id)

@@ -7,5 +7,5 @@
  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["accuweather"],
-  "requirements": ["accuweather==5.0.0"]
+  "requirements": ["accuweather==5.1.0"]
 }
@@ -30,6 +30,8 @@ async def system_health_info(hass: HomeAssistant) -> dict[str, Any]:
    )

    return {
-        "can_reach_server": system_health.async_check_can_reach_url(hass, ENDPOINT),
+        "can_reach_server": system_health.async_check_can_reach_url(
+            hass, str(ENDPOINT)
+        ),
        "remaining_requests": remaining_requests,
    }
@@ -9,9 +9,13 @@ import voluptuous as vol

 from homeassistant.components.light import (
    ATTR_BRIGHTNESS,
+    ATTR_COLOR_TEMP_KELVIN,
+    DEFAULT_MAX_KELVIN,
+    DEFAULT_MIN_KELVIN,
    PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA,
    ColorMode,
    LightEntity,
+    filter_supported_color_modes,
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
@@ -24,13 +28,20 @@ from .entity import AdsEntity
 from .hub import AdsHub

 CONF_ADS_VAR_BRIGHTNESS = "adsvar_brightness"
+CONF_ADS_VAR_COLOR_TEMP_KELVIN = "adsvar_color_temp_kelvin"
+CONF_MIN_COLOR_TEMP_KELVIN = "min_color_temp_kelvin"
+CONF_MAX_COLOR_TEMP_KELVIN = "max_color_temp_kelvin"
 STATE_KEY_BRIGHTNESS = "brightness"
+STATE_KEY_COLOR_TEMP_KELVIN = "color_temp_kelvin"

 DEFAULT_NAME = "ADS Light"
 PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
    {
        vol.Required(CONF_ADS_VAR): cv.string,
        vol.Optional(CONF_ADS_VAR_BRIGHTNESS): cv.string,
+        vol.Optional(CONF_ADS_VAR_COLOR_TEMP_KELVIN): cv.string,
+        vol.Optional(CONF_MIN_COLOR_TEMP_KELVIN): cv.positive_int,
+        vol.Optional(CONF_MAX_COLOR_TEMP_KELVIN): cv.positive_int,
        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
    }
 )
@@ -47,9 +58,24 @@ def setup_platform(

    ads_var_enable: str = config[CONF_ADS_VAR]
    ads_var_brightness: str | None = config.get(CONF_ADS_VAR_BRIGHTNESS)
+    ads_var_color_temp_kelvin: str | None = config.get(CONF_ADS_VAR_COLOR_TEMP_KELVIN)
+    min_color_temp_kelvin: int | None = config.get(CONF_MIN_COLOR_TEMP_KELVIN)
+    max_color_temp_kelvin: int | None = config.get(CONF_MAX_COLOR_TEMP_KELVIN)
    name: str = config[CONF_NAME]

-    add_entities([AdsLight(ads_hub, ads_var_enable, ads_var_brightness, name)])
+    add_entities(
+        [
+            AdsLight(
+                ads_hub,
+                ads_var_enable,
+                ads_var_brightness,
+                ads_var_color_temp_kelvin,
+                min_color_temp_kelvin,
+                max_color_temp_kelvin,
+                name,
+            )
+        ]
+    )


 class AdsLight(AdsEntity, LightEntity):
@@ -60,18 +86,40 @@ class AdsLight(AdsEntity, LightEntity):
        ads_hub: AdsHub,
        ads_var_enable: str,
        ads_var_brightness: str | None,
+        ads_var_color_temp_kelvin: str | None,
+        min_color_temp_kelvin: int | None,
+        max_color_temp_kelvin: int | None,
        name: str,
    ) -> None:
        """Initialize AdsLight entity."""
        super().__init__(ads_hub, name, ads_var_enable)
        self._state_dict[STATE_KEY_BRIGHTNESS] = None
+        self._state_dict[STATE_KEY_COLOR_TEMP_KELVIN] = None
        self._ads_var_brightness = ads_var_brightness
+        self._ads_var_color_temp_kelvin = ads_var_color_temp_kelvin
+
+        # Determine supported color modes
+        color_modes = {ColorMode.ONOFF}
        if ads_var_brightness is not None:
-            self._attr_color_mode = ColorMode.BRIGHTNESS
-            self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
-        else:
-            self._attr_color_mode = ColorMode.ONOFF
-            self._attr_supported_color_modes = {ColorMode.ONOFF}
+            color_modes.add(ColorMode.BRIGHTNESS)
+        if ads_var_color_temp_kelvin is not None:
+            color_modes.add(ColorMode.COLOR_TEMP)
+
+        self._attr_supported_color_modes = filter_supported_color_modes(color_modes)
+        self._attr_color_mode = next(iter(self._attr_supported_color_modes))
+
+        # Set color temperature range (static config values take precedence over defaults)
+        if ads_var_color_temp_kelvin is not None:
+            self._attr_min_color_temp_kelvin = (
+                min_color_temp_kelvin
+                if min_color_temp_kelvin is not None
+                else DEFAULT_MIN_KELVIN
+            )
+            self._attr_max_color_temp_kelvin = (
+                max_color_temp_kelvin
+                if max_color_temp_kelvin is not None
+                else DEFAULT_MAX_KELVIN
+            )

    async def async_added_to_hass(self) -> None:
        """Register device notification."""
@@ -84,11 +132,23 @@ class AdsLight(AdsEntity, LightEntity):
                STATE_KEY_BRIGHTNESS,
            )

+        if self._ads_var_color_temp_kelvin is not None:
+            await self.async_initialize_device(
+                self._ads_var_color_temp_kelvin,
+                pyads.PLCTYPE_UINT,
+                STATE_KEY_COLOR_TEMP_KELVIN,
+            )
+
    @property
    def brightness(self) -> int | None:
        """Return the brightness of the light (0..255)."""
        return self._state_dict[STATE_KEY_BRIGHTNESS]

+    @property
+    def color_temp_kelvin(self) -> int | None:
+        """Return the color temperature in Kelvin."""
+        return self._state_dict[STATE_KEY_COLOR_TEMP_KELVIN]
+
    @property
    def is_on(self) -> bool:
        """Return True if the entity is on."""
@@ -97,6 +157,8 @@ class AdsLight(AdsEntity, LightEntity):
    def turn_on(self, **kwargs: Any) -> None:
        """Turn the light on or set a specific dimmer value."""
        brightness = kwargs.get(ATTR_BRIGHTNESS)
+        color_temp = kwargs.get(ATTR_COLOR_TEMP_KELVIN)
+
        self._ads_hub.write_by_name(self._ads_var, True, pyads.PLCTYPE_BOOL)

        if self._ads_var_brightness is not None and brightness is not None:
@@ -104,6 +166,11 @@ class AdsLight(AdsEntity, LightEntity):
                self._ads_var_brightness, brightness, pyads.PLCTYPE_UINT
            )

+        if self._ads_var_color_temp_kelvin is not None and color_temp is not None:
+            self._ads_hub.write_by_name(
+                self._ads_var_color_temp_kelvin, color_temp, pyads.PLCTYPE_UINT
+            )
+
    def turn_off(self, **kwargs: Any) -> None:
        """Turn the light off."""
        self._ads_hub.write_by_name(self._ads_var, False, pyads.PLCTYPE_BOOL)
@@ -1,26 +1,17 @@
 """Advantage Air climate integration."""

-from datetime import timedelta
-import logging
+from advantage_air import advantage_air

-from advantage_air import ApiError, advantage_air
-
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

 from .const import ADVANTAGE_AIR_RETRY, DOMAIN
-from .models import AdvantageAirData
+from .coordinator import AdvantageAirCoordinator, AdvantageAirDataConfigEntry
 from .services import async_setup_services

-type AdvantageAirDataConfigEntry = ConfigEntry[AdvantageAirData]
-
-ADVANTAGE_AIR_SYNC_INTERVAL = 15
 PLATFORMS = [
    Platform.BINARY_SENSOR,
    Platform.CLIMATE,
@@ -32,9 +23,6 @@ PLATFORMS = [
    Platform.UPDATE,
 ]

-_LOGGER = logging.getLogger(__name__)
-REQUEST_REFRESH_DELAY = 0.5
-
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)


@@ -57,27 +45,10 @@ async def async_setup_entry(
        retry=ADVANTAGE_AIR_RETRY,
    )

-    async def async_get():
-        try:
-            return await api.async_get()
-        except ApiError as err:
-            raise UpdateFailed(err) from err
-
-    coordinator = DataUpdateCoordinator(
-        hass,
-        _LOGGER,
-        config_entry=entry,
-        name="Advantage Air",
-        update_method=async_get,
-        update_interval=timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL),
-        request_refresh_debouncer=Debouncer(
-            hass, _LOGGER, cooldown=REQUEST_REFRESH_DELAY, immediate=False
-        ),
-    )
-
+    coordinator = AdvantageAirCoordinator(hass, entry, api)
    await coordinator.async_config_entry_first_refresh()

-    entry.runtime_data = AdvantageAirData(coordinator, api)
+    entry.runtime_data = coordinator

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

@@ -11,8 +11,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import AdvantageAirDataConfigEntry
+from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
-from .models import AdvantageAirData

 PARALLEL_UPDATES = 0

@@ -24,19 +24,23 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir Binary Sensor platform."""

-    instance = config_entry.runtime_data
+    coordinator = config_entry.runtime_data

    entities: list[BinarySensorEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := coordinator.data.get("aircons"):
        for ac_key, ac_device in aircons.items():
-            entities.append(AdvantageAirFilter(instance, ac_key))
+            entities.append(AdvantageAirFilter(coordinator, ac_key))
            for zone_key, zone in ac_device["zones"].items():
                # Only add motion sensor when motion is enabled
                if zone["motionConfig"] >= 2:
-                    entities.append(AdvantageAirZoneMotion(instance, ac_key, zone_key))
+                    entities.append(
+                        AdvantageAirZoneMotion(coordinator, ac_key, zone_key)
+                    )
                # Only add MyZone if it is available
                if zone["type"] != 0:
-                    entities.append(AdvantageAirZoneMyZone(instance, ac_key, zone_key))
+                    entities.append(
+                        AdvantageAirZoneMyZone(coordinator, ac_key, zone_key)
+                    )
    async_add_entities(entities)


@@ -47,9 +51,9 @@ class AdvantageAirFilter(AdvantageAirAcEntity, BinarySensorEntity):
    _attr_entity_category = EntityCategory.DIAGNOSTIC
    _attr_name = "Filter"

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
        """Initialize an Advantage Air Filter sensor."""
-        super().__init__(instance, ac_key)
+        super().__init__(coordinator, ac_key)
        self._attr_unique_id += "-filter"

    @property
@@ -63,9 +67,11 @@ class AdvantageAirZoneMotion(AdvantageAirZoneEntity, BinarySensorEntity):

    _attr_device_class = BinarySensorDeviceClass.MOTION

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
+    ) -> None:
        """Initialize an Advantage Air Zone Motion sensor."""
-        super().__init__(instance, ac_key, zone_key)
+        super().__init__(coordinator, ac_key, zone_key)
        self._attr_name = f"{self._zone['name']} motion"
        self._attr_unique_id += "-motion"

@@ -81,9 +87,11 @@ class AdvantageAirZoneMyZone(AdvantageAirZoneEntity, BinarySensorEntity):
    _attr_entity_registry_enabled_default = False
    _attr_entity_category = EntityCategory.DIAGNOSTIC

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
+    ) -> None:
        """Initialize an Advantage Air Zone MyZone sensor."""
-        super().__init__(instance, ac_key, zone_key)
+        super().__init__(coordinator, ac_key, zone_key)
        self._attr_name = f"{self._zone['name']} myZone"
        self._attr_unique_id += "-myzone"

@@ -31,8 +31,8 @@ from .const import (
    ADVANTAGE_AIR_STATE_ON,
    ADVANTAGE_AIR_STATE_OPEN,
 )
+from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
-from .models import AdvantageAirData

 ADVANTAGE_AIR_HVAC_MODES = {
    "heat": HVACMode.HEAT,
@@ -90,16 +90,16 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir climate platform."""

-    instance = config_entry.runtime_data
+    coordinator = config_entry.runtime_data

    entities: list[ClimateEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := coordinator.data.get("aircons"):
        for ac_key, ac_device in aircons.items():
-            entities.append(AdvantageAirAC(instance, ac_key))
+            entities.append(AdvantageAirAC(coordinator, ac_key))
            for zone_key, zone in ac_device["zones"].items():
                # Only add zone climate control when zone is in temperature control
                if zone["type"] > 0:
-                    entities.append(AdvantageAirZone(instance, ac_key, zone_key))
+                    entities.append(AdvantageAirZone(coordinator, ac_key, zone_key))
    async_add_entities(entities)


@@ -114,9 +114,9 @@ class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
    _attr_name = None
    _support_preset = ClimateEntityFeature(0)

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
        """Initialize an AdvantageAir AC unit."""
-        super().__init__(instance, ac_key)
+        super().__init__(coordinator, ac_key)

        self._attr_preset_modes = [ADVANTAGE_AIR_MYZONE]

@@ -282,9 +282,11 @@ class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
    _attr_max_temp = 32
    _attr_min_temp = 16

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
+    ) -> None:
        """Initialize an AdvantageAir Zone control."""
-        super().__init__(instance, ac_key, zone_key)
+        super().__init__(coordinator, ac_key, zone_key)
        self._attr_name = self._zone["name"]

    @property
@@ -0,0 +1,59 @@
+"""Coordinator for the Advantage Air integration."""
+
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+from typing import Any
+
+from advantage_air import ApiError, advantage_air
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.debounce import Debouncer
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN
+
+ADVANTAGE_AIR_SYNC_INTERVAL = 15
+REQUEST_REFRESH_DELAY = 0.5
+
+_LOGGER = logging.getLogger(__name__)
+
+type AdvantageAirDataConfigEntry = ConfigEntry[AdvantageAirCoordinator]
+
+
+class AdvantageAirCoordinator(DataUpdateCoordinator[dict[str, Any]]):
+    """Advantage Air coordinator."""
+
+    config_entry: AdvantageAirDataConfigEntry
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        config_entry: AdvantageAirDataConfigEntry,
+        api: advantage_air,
+    ) -> None:
+        """Initialize the coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name="Advantage Air",
+            update_interval=timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL),
+            request_refresh_debouncer=Debouncer(
+                hass, _LOGGER, cooldown=REQUEST_REFRESH_DELAY, immediate=False
+            ),
+        )
+        self.api = api
+
+    async def _async_update_data(self) -> dict[str, Any]:
+        """Fetch data from the API."""
+        try:
+            return await self.api.async_get()
+        except ApiError as err:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="update_failed",
+                translation_placeholders={"error": str(err)},
+            ) from err
@@ -13,8 +13,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import AdvantageAirDataConfigEntry
 from .const import ADVANTAGE_AIR_STATE_CLOSE, ADVANTAGE_AIR_STATE_OPEN
+from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirThingEntity, AdvantageAirZoneEntity
-from .models import AdvantageAirData

 PARALLEL_UPDATES = 0

@@ -26,24 +26,24 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir cover platform."""

-    instance = config_entry.runtime_data
+    coordinator = config_entry.runtime_data

    entities: list[CoverEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := coordinator.data.get("aircons"):
        for ac_key, ac_device in aircons.items():
            for zone_key, zone in ac_device["zones"].items():
                # Only add zone vent controls when zone in vent control mode.
                if zone["type"] == 0:
-                    entities.append(AdvantageAirZoneVent(instance, ac_key, zone_key))
-    if things := instance.coordinator.data.get("myThings"):
+                    entities.append(AdvantageAirZoneVent(coordinator, ac_key, zone_key))
+    if things := coordinator.data.get("myThings"):
        for thing in things["things"].values():
            if thing["channelDipState"] in [1, 2]:  # 1 = "Blind", 2 = "Blind 2"
                entities.append(
-                    AdvantageAirThingCover(instance, thing, CoverDeviceClass.BLIND)
+                    AdvantageAirThingCover(coordinator, thing, CoverDeviceClass.BLIND)
                )
            elif thing["channelDipState"] in [3, 10]:  # 3 & 10 = "Garage door"
                entities.append(
-                    AdvantageAirThingCover(instance, thing, CoverDeviceClass.GARAGE)
+                    AdvantageAirThingCover(coordinator, thing, CoverDeviceClass.GARAGE)
                )
    async_add_entities(entities)

@@ -58,9 +58,11 @@ class AdvantageAirZoneVent(AdvantageAirZoneEntity, CoverEntity):
        | CoverEntityFeature.SET_POSITION
    )

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
+    ) -> None:
        """Initialize an Advantage Air Zone Vent."""
-        super().__init__(instance, ac_key, zone_key)
+        super().__init__(coordinator, ac_key, zone_key)
        self._attr_name = self._zone["name"]

    @property
@@ -106,12 +108,12 @@ class AdvantageAirThingCover(AdvantageAirThingEntity, CoverEntity):

    def __init__(
        self,
-        instance: AdvantageAirData,
+        coordinator: AdvantageAirCoordinator,
        thing: dict[str, Any],
        device_class: CoverDeviceClass,
    ) -> None:
        """Initialize an Advantage Air Things Cover."""
-        super().__init__(instance, thing)
+        super().__init__(coordinator, thing)
        self._attr_device_class = device_class

    @property
@@ -27,7 +27,7 @@ async def async_get_config_entry_diagnostics(
    hass: HomeAssistant, config_entry: AdvantageAirDataConfigEntry
 ) -> dict[str, Any]:
    """Return diagnostics for a config entry."""
-    data = config_entry.runtime_data.coordinator.data
+    data = config_entry.runtime_data.data

    # Return only the relevant children
    return {
@@ -9,17 +9,17 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity

 from .const import DOMAIN
-from .models import AdvantageAirData
+from .coordinator import AdvantageAirCoordinator


-class AdvantageAirEntity(CoordinatorEntity):
+class AdvantageAirEntity(CoordinatorEntity[AdvantageAirCoordinator]):
    """Parent class for Advantage Air Entities."""

    _attr_has_entity_name = True

-    def __init__(self, instance: AdvantageAirData) -> None:
+    def __init__(self, coordinator: AdvantageAirCoordinator) -> None:
        """Initialize common aspects of an Advantage Air entity."""
-        super().__init__(instance.coordinator)
+        super().__init__(coordinator)
        self._attr_unique_id: str = self.coordinator.data["system"]["rid"]

    def update_handle_factory(self, func, *keys):
@@ -41,9 +41,9 @@ class AdvantageAirEntity(CoordinatorEntity):
 class AdvantageAirAcEntity(AdvantageAirEntity):
    """Parent class for Advantage Air AC Entities."""

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
        """Initialize common aspects of an Advantage Air ac entity."""
-        super().__init__(instance)
+        super().__init__(coordinator)

        self.ac_key: str = ac_key
        self._attr_unique_id += f"-{ac_key}"
@@ -56,7 +56,7 @@ class AdvantageAirAcEntity(AdvantageAirEntity):
            name=self.coordinator.data["aircons"][self.ac_key]["info"]["name"],
        )
        self.async_update_ac = self.update_handle_factory(
-            instance.api.aircon.async_update_ac, self.ac_key
+            coordinator.api.aircon.async_update_ac, self.ac_key
        )

    @property
@@ -73,14 +73,16 @@ class AdvantageAirAcEntity(AdvantageAirEntity):
 class AdvantageAirZoneEntity(AdvantageAirAcEntity):
    """Parent class for Advantage Air Zone Entities."""

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
+    ) -> None:
        """Initialize common aspects of an Advantage Air zone entity."""
-        super().__init__(instance, ac_key)
+        super().__init__(coordinator, ac_key)

        self.zone_key: str = zone_key
        self._attr_unique_id += f"-{zone_key}"
        self.async_update_zone = self.update_handle_factory(
-            instance.api.aircon.async_update_zone, self.ac_key, self.zone_key
+            coordinator.api.aircon.async_update_zone, self.ac_key, self.zone_key
        )

    @property
@@ -93,9 +95,11 @@ class AdvantageAirThingEntity(AdvantageAirEntity):

    _attr_name = None

-    def __init__(self, instance: AdvantageAirData, thing: dict[str, Any]) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, thing: dict[str, Any]
+    ) -> None:
        """Initialize common aspects of an Advantage Air Things entity."""
-        super().__init__(instance)
+        super().__init__(coordinator)

        self._id = thing["id"]
        self._attr_unique_id += f"-{self._id}"
@@ -108,7 +112,7 @@ class AdvantageAirThingEntity(AdvantageAirEntity):
            name=thing["name"],
        )
        self.async_update_value = self.update_handle_factory(
-            instance.api.things.async_update_value, self._id
+            coordinator.api.things.async_update_value, self._id
        )

    @property
@@ -117,7 +121,7 @@ class AdvantageAirThingEntity(AdvantageAirEntity):
        return self.coordinator.data["myThings"]["things"][self._id]

    @property
-    def is_on(self):
+    def is_on(self) -> bool:
        """Return if the thing is considered on."""
        return self._data["value"] > 0

@@ -9,8 +9,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import AdvantageAirDataConfigEntry
 from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN
+from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirEntity, AdvantageAirThingEntity
-from .models import AdvantageAirData


 async def async_setup_entry(
@@ -20,21 +20,21 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir light platform."""

-    instance = config_entry.runtime_data
+    coordinator = config_entry.runtime_data

    entities: list[LightEntity] = []
-    if my_lights := instance.coordinator.data.get("myLights"):
+    if my_lights := coordinator.data.get("myLights"):
        for light in my_lights["lights"].values():
            if light.get("relay"):
-                entities.append(AdvantageAirLight(instance, light))
+                entities.append(AdvantageAirLight(coordinator, light))
            else:
-                entities.append(AdvantageAirLightDimmable(instance, light))
-    if things := instance.coordinator.data.get("myThings"):
+                entities.append(AdvantageAirLightDimmable(coordinator, light))
+    if things := coordinator.data.get("myThings"):
        for thing in things["things"].values():
            if thing["channelDipState"] == 4:  # 4 = "Light (on/off)""
-                entities.append(AdvantageAirThingLight(instance, thing))
+                entities.append(AdvantageAirThingLight(coordinator, thing))
            elif thing["channelDipState"] == 5:  # 5 = "Light (Dimmable)""
-                entities.append(AdvantageAirThingLightDimmable(instance, thing))
+                entities.append(AdvantageAirThingLightDimmable(coordinator, thing))
    async_add_entities(entities)


@@ -45,9 +45,11 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
    _attr_supported_color_modes = {ColorMode.ONOFF}
    _attr_name = None

-    def __init__(self, instance: AdvantageAirData, light: dict[str, Any]) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, light: dict[str, Any]
+    ) -> None:
        """Initialize an Advantage Air Light."""
-        super().__init__(instance)
+        super().__init__(coordinator)

        self._id: str = light["id"]
        self._attr_unique_id += f"-{self._id}"
@@ -59,7 +61,7 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
            name=light["name"],
        )
        self.async_update_state = self.update_handle_factory(
-            instance.api.lights.async_update_state, self._id
+            coordinator.api.lights.async_update_state, self._id
        )

    @property
@@ -87,11 +89,13 @@ class AdvantageAirLightDimmable(AdvantageAirLight):
    _attr_color_mode = ColorMode.BRIGHTNESS
    _attr_supported_color_modes = {ColorMode.BRIGHTNESS}

-    def __init__(self, instance: AdvantageAirData, light: dict[str, Any]) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, light: dict[str, Any]
+    ) -> None:
        """Initialize an Advantage Air Dimmable Light."""
-        super().__init__(instance, light)
+        super().__init__(coordinator, light)
        self.async_update_value = self.update_handle_factory(
-            instance.api.lights.async_update_value, self._id
+            coordinator.api.lights.async_update_value, self._id
        )

    @property
@@ -1,17 +0,0 @@
-"""The Advantage Air integration models."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from advantage_air import advantage_air
-
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-
-
-@dataclass
-class AdvantageAirData:
-    """Data for the Advantage Air integration."""
-
-    coordinator: DataUpdateCoordinator
-    api: advantage_air
@@ -0,0 +1,99 @@
+rules:
+  # Bronze
+  action-setup: done
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage:
+    status: todo
+    comment: |
+      Add mock_setup_entry common fixture.
+      Test unique_id of the entry in happy flow.
+      Split duplicate entry test from happy flow, use mock_config_entry.
+      Error flow should end in CREATE_ENTRY to test recovery.
+      Add data_description for ip_address (and port) to strings.json - tests fail with:
+      "Translation not found for advantage_air: config.step.user.data_description.ip_address"
+  config-flow:
+    status: todo
+    comment: Data descriptions missing
+  dependency-transparency: done
+  docs-actions: done
+  docs-high-level-description: done
+  docs-installation-instructions: todo
+  docs-removal-instructions: todo
+  entity-event-setup:
+    status: exempt
+    comment: Entities do not explicitly subscribe to events.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions: done
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: No options to be set.
+  docs-installation-parameters: done
+  entity-unavailable:
+    status: todo
+    comment: MyZone temp entity should be unavailable when MyZone is disabled rather than returning None.
+  integration-owner: done
+  log-when-unavailable: todo
+  parallel-updates: todo
+  reauthentication-flow:
+    status: exempt
+    comment: Integration connects to local device without authentication.
+  test-coverage:
+    status: todo
+    comment: |
+      Patch the library instead of mocking at integration level.
+      Split binary sensor tests into multiple tests (enable entities etc).
+      Split tests into Creation (right entities with right values), Actions (right library calls), and Other behaviors.
+
+  # Gold
+  devices:
+    status: todo
+    comment: Consider making every zone its own device for better naming and room assignment. Breaking change to split cover entities to separate devices.
+  diagnostics: done
+  discovery-update-info:
+    status: exempt
+    comment: Device is a generic Android device (android-xxxxxxxx) indistinguishable from other Android devices, not discoverable.
+  discovery:
+    status: exempt
+    comment: Check mDNS, DHCP, SSDP confirmed not feasible. Device is a generic Android device (android-xxxxxxxx) indistinguishable from other Android devices.
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: done
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices:
+    status: exempt
+    comment: AC zones are static per unit and configured on the device itself.
+  entity-category: done
+  entity-device-class:
+    status: todo
+    comment: Consider using UPDATE device class for app update binary sensor instead of custom.
+  entity-disabled-by-default: done
+  entity-translations: todo
+  exception-translations:
+    status: todo
+    comment: HomeAssistantError in entity.py and ServiceValidationError in climate.py
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues:
+    status: exempt
+    comment: Integration does not raise repair issues.
+  stale-devices:
+    status: exempt
+    comment: Zones are part of the AC unit, not separate removable devices.
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: todo
@@ -5,8 +5,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import AdvantageAirDataConfigEntry
+from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirAcEntity
-from .models import AdvantageAirData

 ADVANTAGE_AIR_INACTIVE = "Inactive"

@@ -18,10 +18,12 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir select platform."""

-    instance = config_entry.runtime_data
+    coordinator = config_entry.runtime_data

-    if aircons := instance.coordinator.data.get("aircons"):
-        async_add_entities(AdvantageAirMyZone(instance, ac_key) for ac_key in aircons)
+    if aircons := coordinator.data.get("aircons"):
+        async_add_entities(
+            AdvantageAirMyZone(coordinator, ac_key) for ac_key in aircons
+        )


 class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):
@@ -30,16 +32,16 @@ class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):
    _attr_icon = "mdi:home-thermometer"
    _attr_name = "MyZone"

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
        """Initialize an Advantage Air MyZone control."""
-        super().__init__(instance, ac_key)
+        super().__init__(coordinator, ac_key)
        self._attr_unique_id += "-myzone"
        self._attr_options = [ADVANTAGE_AIR_INACTIVE]
        self._number_to_name = {0: ADVANTAGE_AIR_INACTIVE}
        self._name_to_number = {ADVANTAGE_AIR_INACTIVE: 0}

-        if "aircons" in instance.coordinator.data:
-            for zone in instance.coordinator.data["aircons"][ac_key]["zones"].values():
+        if "aircons" in coordinator.data:
+            for zone in coordinator.data["aircons"][ac_key]["zones"].values():
                if zone["type"] > 0:
                    self._name_to_number[zone["name"]] = zone["number"]
                    self._number_to_name[zone["number"]] = zone["name"]
@@ -16,8 +16,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import AdvantageAirDataConfigEntry
 from .const import ADVANTAGE_AIR_STATE_OPEN
+from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
-from .models import AdvantageAirData

 ADVANTAGE_AIR_SET_COUNTDOWN_VALUE = "minutes"
 ADVANTAGE_AIR_SET_COUNTDOWN_UNIT = "min"
@@ -32,21 +32,23 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir sensor platform."""

-    instance = config_entry.runtime_data
+    coordinator = config_entry.runtime_data

    entities: list[SensorEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := coordinator.data.get("aircons"):
        for ac_key, ac_device in aircons.items():
-            entities.append(AdvantageAirTimeTo(instance, ac_key, "On"))
-            entities.append(AdvantageAirTimeTo(instance, ac_key, "Off"))
+            entities.append(AdvantageAirTimeTo(coordinator, ac_key, "On"))
+            entities.append(AdvantageAirTimeTo(coordinator, ac_key, "Off"))
            for zone_key, zone in ac_device["zones"].items():
                # Only show damper and temp sensors when zone is in temperature control
                if zone["type"] != 0:
-                    entities.append(AdvantageAirZoneVent(instance, ac_key, zone_key))
-                    entities.append(AdvantageAirZoneTemp(instance, ac_key, zone_key))
+                    entities.append(AdvantageAirZoneVent(coordinator, ac_key, zone_key))
+                    entities.append(AdvantageAirZoneTemp(coordinator, ac_key, zone_key))
                # Only show wireless signal strength sensors when using wireless sensors
                if zone["rssi"] > 0:
-                    entities.append(AdvantageAirZoneSignal(instance, ac_key, zone_key))
+                    entities.append(
+                        AdvantageAirZoneSignal(coordinator, ac_key, zone_key)
+                    )
    async_add_entities(entities)


@@ -56,9 +58,11 @@ class AdvantageAirTimeTo(AdvantageAirAcEntity, SensorEntity):
    _attr_native_unit_of_measurement = ADVANTAGE_AIR_SET_COUNTDOWN_UNIT
    _attr_entity_category = EntityCategory.DIAGNOSTIC

-    def __init__(self, instance: AdvantageAirData, ac_key: str, action: str) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, ac_key: str, action: str
+    ) -> None:
        """Initialize the Advantage Air timer control."""
-        super().__init__(instance, ac_key)
+        super().__init__(coordinator, ac_key)
        self.action = action
        self._time_key = f"countDownTo{action}"
        self._attr_name = f"Time to {action}"
@@ -89,9 +93,11 @@ class AdvantageAirZoneVent(AdvantageAirZoneEntity, SensorEntity):
    _attr_state_class = SensorStateClass.MEASUREMENT
    _attr_entity_category = EntityCategory.DIAGNOSTIC

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
+    ) -> None:
        """Initialize an Advantage Air Zone Vent Sensor."""
-        super().__init__(instance, ac_key, zone_key=zone_key)
+        super().__init__(coordinator, ac_key, zone_key=zone_key)
        self._attr_name = f"{self._zone['name']} vent"
        self._attr_unique_id += "-vent"

@@ -117,9 +123,11 @@ class AdvantageAirZoneSignal(AdvantageAirZoneEntity, SensorEntity):
    _attr_state_class = SensorStateClass.MEASUREMENT
    _attr_entity_category = EntityCategory.DIAGNOSTIC

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
+    ) -> None:
        """Initialize an Advantage Air Zone wireless signal sensor."""
-        super().__init__(instance, ac_key, zone_key)
+        super().__init__(coordinator, ac_key, zone_key)
        self._attr_name = f"{self._zone['name']} signal"
        self._attr_unique_id += "-signal"

@@ -151,9 +159,11 @@ class AdvantageAirZoneTemp(AdvantageAirZoneEntity, SensorEntity):
    _attr_entity_registry_enabled_default = False
    _attr_entity_category = EntityCategory.DIAGNOSTIC

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(
+        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
+    ) -> None:
        """Initialize an Advantage Air Zone Temp Sensor."""
-        super().__init__(instance, ac_key, zone_key)
+        super().__init__(coordinator, ac_key, zone_key)
        self._attr_name = f"{self._zone['name']} temperature"
        self._attr_unique_id += "-temp"

@@ -10,8 +10,6 @@ from homeassistant.helpers import config_validation as cv, service

 from .const import DOMAIN

-ADVANTAGE_AIR_SERVICE_SET_TIME_TO = "set_time_to"
-

@callback
 def async_setup_services(hass: HomeAssistant) -> None:
@@ -20,7 +18,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
+        "set_time_to",
        entity_domain=SENSOR_DOMAIN,
        schema={vol.Required("minutes"): cv.positive_int},
        func="set_time_to",
@@ -17,6 +17,11 @@
      }
    }
  },
+  "exceptions": {
+    "update_failed": {
+      "message": "An error occurred while updating from the Advantage Air API: {error}"
+    }
+  },
  "services": {
    "set_time_to": {
      "description": "Controls timers to turn the system on or off after a set number of minutes.",
@@ -13,8 +13,8 @@ from .const import (
    ADVANTAGE_AIR_STATE_OFF,
    ADVANTAGE_AIR_STATE_ON,
 )
+from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirAcEntity, AdvantageAirThingEntity
-from .models import AdvantageAirData


 async def async_setup_entry(
@@ -24,20 +24,20 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir switch platform."""

-    instance = config_entry.runtime_data
+    coordinator = config_entry.runtime_data

    entities: list[SwitchEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := coordinator.data.get("aircons"):
        for ac_key, ac_device in aircons.items():
            if ac_device["info"]["freshAirStatus"] != "none":
-                entities.append(AdvantageAirFreshAir(instance, ac_key))
+                entities.append(AdvantageAirFreshAir(coordinator, ac_key))
            if ADVANTAGE_AIR_AUTOFAN_ENABLED in ac_device["info"]:
-                entities.append(AdvantageAirMyFan(instance, ac_key))
+                entities.append(AdvantageAirMyFan(coordinator, ac_key))
            if ADVANTAGE_AIR_NIGHT_MODE_ENABLED in ac_device["info"]:
-                entities.append(AdvantageAirNightMode(instance, ac_key))
-    if things := instance.coordinator.data.get("myThings"):
+                entities.append(AdvantageAirNightMode(coordinator, ac_key))
+    if things := coordinator.data.get("myThings"):
        entities.extend(
-            AdvantageAirRelay(instance, thing)
+            AdvantageAirRelay(coordinator, thing)
            for thing in things["things"].values()
            if thing["channelDipState"] == 8  # 8 = Other relay
        )
@@ -51,9 +51,9 @@ class AdvantageAirFreshAir(AdvantageAirAcEntity, SwitchEntity):
    _attr_name = "Fresh air"
    _attr_device_class = SwitchDeviceClass.SWITCH

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
        """Initialize an Advantage Air fresh air control."""
-        super().__init__(instance, ac_key)
+        super().__init__(coordinator, ac_key)
        self._attr_unique_id += "-freshair"

    @property
@@ -77,9 +77,9 @@ class AdvantageAirMyFan(AdvantageAirAcEntity, SwitchEntity):
    _attr_name = "MyFan"
    _attr_device_class = SwitchDeviceClass.SWITCH

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
        """Initialize an Advantage Air MyFan control."""
-        super().__init__(instance, ac_key)
+        super().__init__(coordinator, ac_key)
        self._attr_unique_id += "-myfan"

    @property
@@ -103,9 +103,9 @@ class AdvantageAirNightMode(AdvantageAirAcEntity, SwitchEntity):
    _attr_name = "MySleep$aver"
    _attr_device_class = SwitchDeviceClass.SWITCH

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
        """Initialize an Advantage Air Night Mode control."""
-        super().__init__(instance, ac_key)
+        super().__init__(coordinator, ac_key)
        self._attr_unique_id += "-nightmode"

    @property
@@ -7,8 +7,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import AdvantageAirDataConfigEntry
 from .const import DOMAIN
+from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirEntity
-from .models import AdvantageAirData


 async def async_setup_entry(
@@ -18,9 +18,9 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir update platform."""

-    instance = config_entry.runtime_data
+    coordinator = config_entry.runtime_data

-    async_add_entities([AdvantageAirApp(instance)])
+    async_add_entities([AdvantageAirApp(coordinator)])


 class AdvantageAirApp(AdvantageAirEntity, UpdateEntity):
@@ -28,9 +28,9 @@ class AdvantageAirApp(AdvantageAirEntity, UpdateEntity):

    _attr_name = "App"

-    def __init__(self, instance: AdvantageAirData) -> None:
+    def __init__(self, coordinator: AdvantageAirCoordinator) -> None:
        """Initialize the Advantage Air App."""
-        super().__init__(instance)
+        super().__init__(coordinator)
        self._attr_device_info = DeviceInfo(
            identifiers={(DOMAIN, self.coordinator.data["system"]["rid"])},
            manufacturer="Advantage Air",
@@ -74,7 +74,7 @@ class AemetWeather(
        self._attr_unique_id = unique_id

    @property
-    def condition(self):
+    def condition(self) -> str | None:
        """Return the current condition."""
        cond = self.get_aemet_value([AOD_WEATHER, AOD_CONDITION])
        return CONDITIONS_MAP.get(cond)
@@ -90,31 +90,31 @@ class AemetWeather(
        return self.get_aemet_forecast(AOD_FORECAST_HOURLY)

    @property
-    def humidity(self):
+    def humidity(self) -> float | None:
        """Return the humidity."""
        return self.get_aemet_value([AOD_WEATHER, AOD_HUMIDITY])

    @property
-    def native_pressure(self):
+    def native_pressure(self) -> float | None:
        """Return the pressure."""
        return self.get_aemet_value([AOD_WEATHER, AOD_PRESSURE])

    @property
-    def native_temperature(self):
+    def native_temperature(self) -> float | None:
        """Return the temperature."""
        return self.get_aemet_value([AOD_WEATHER, AOD_TEMP])

    @property
-    def wind_bearing(self):
+    def wind_bearing(self) -> float | None:
        """Return the wind bearing."""
        return self.get_aemet_value([AOD_WEATHER, AOD_WIND_DIRECTION])

    @property
-    def native_wind_gust_speed(self):
+    def native_wind_gust_speed(self) -> float | None:
        """Return the wind gust speed in native units."""
        return self.get_aemet_value([AOD_WEATHER, AOD_WIND_SPEED_MAX])

    @property
-    def native_wind_speed(self):
+    def native_wind_speed(self) -> float | None:
        """Return the wind speed."""
        return self.get_aemet_value([AOD_WEATHER, AOD_WIND_SPEED])
@@ -8,18 +8,12 @@ from homeassistant.helpers import service

 from .const import DOMAIN

-_DEV_EN_ALT = "enable_alerts"
-_DEV_DS_ALT = "disable_alerts"
-_DEV_EN_REC = "start_recording"
-_DEV_DS_REC = "stop_recording"
-_DEV_SNAP = "snapshot"
-
 CAMERA_SERVICES = {
-    _DEV_EN_ALT: "async_enable_alerts",
-    _DEV_DS_ALT: "async_disable_alerts",
-    _DEV_EN_REC: "async_start_recording",
-    _DEV_DS_REC: "async_stop_recording",
-    _DEV_SNAP: "async_snapshot",
+    "enable_alerts": "async_enable_alerts",
+    "disable_alerts": "async_disable_alerts",
+    "start_recording": "async_start_recording",
+    "stop_recording": "async_stop_recording",
+    "snapshot": "async_snapshot",
 }


@@ -5,7 +5,7 @@ from __future__ import annotations
 from datetime import timedelta
 import logging

-from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_PLATFORM
+from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_DOMAIN
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -75,9 +75,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirlyConfigEntry) -> boo
    # Remove air_quality entities from registry if they exist
    ent_reg = er.async_get(hass)
    unique_id = f"{coordinator.latitude}-{coordinator.longitude}"
-    if entity_id := ent_reg.async_get_entity_id(
-        AIR_QUALITY_PLATFORM, DOMAIN, unique_id
-    ):
+    if entity_id := ent_reg.async_get_entity_id(AIR_QUALITY_DOMAIN, DOMAIN, unique_id):
        _LOGGER.debug("Removing deprecated air_quality entity %s", entity_id)
        ent_reg.async_remove(entity_id)

@@ -4,7 +4,16 @@ from __future__ import annotations

 import logging

+from airos.airos6 import AirOS6
 from airos.airos8 import AirOS8
+from airos.exceptions import (
+    AirOSConnectionAuthenticationError,
+    AirOSConnectionSetupError,
+    AirOSDataMissingError,
+    AirOSDeviceConnectionError,
+    AirOSKeyDataMissingError,
+)
+from airos.helpers import DetectDeviceData, async_get_firmware_data

 from homeassistant.const import (
    CONF_HOST,
@@ -15,6 +24,11 @@ from homeassistant.const import (
    Platform,
 )
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import (
+    ConfigEntryAuthFailed,
+    ConfigEntryError,
+    ConfigEntryNotReady,
+)
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession

@@ -23,6 +37,7 @@ from .coordinator import AirOSConfigEntry, AirOSDataUpdateCoordinator

 _PLATFORMS: list[Platform] = [
    Platform.BINARY_SENSOR,
+    Platform.BUTTON,
    Platform.SENSOR,
 ]

@@ -38,15 +53,40 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> boo
        hass, verify_ssl=entry.data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL]
    )

-    airos_device = AirOS8(
-        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],
+    conn_data = {
+        CONF_HOST: entry.data[CONF_HOST],
+        CONF_USERNAME: entry.data[CONF_USERNAME],
+        CONF_PASSWORD: entry.data[CONF_PASSWORD],
+        "use_ssl": entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
+        "session": session,
+    }
+
+    # Determine firmware version before creating the device instance
+    try:
+        device_data: DetectDeviceData = await async_get_firmware_data(**conn_data)
+    except (
+        AirOSConnectionSetupError,
+        AirOSDeviceConnectionError,
+        TimeoutError,
+    ) as err:
+        raise ConfigEntryNotReady from err
+    except (
+        AirOSConnectionAuthenticationError,
+        AirOSDataMissingError,
+    ) as err:
+        raise ConfigEntryAuthFailed from err
+    except AirOSKeyDataMissingError as err:
+        raise ConfigEntryError("key_data_missing") from err
+    except Exception as err:
+        raise ConfigEntryError("unknown") from err
+
+    airos_class: type[AirOS8 | AirOS6] = (
+        AirOS8 if device_data["fw_major"] == 8 else AirOS6
    )

-    coordinator = AirOSDataUpdateCoordinator(hass, entry, airos_device)
+    airos_device = airos_class(**conn_data)
+
+    coordinator = AirOSDataUpdateCoordinator(hass, entry, device_data, airos_device)
    await coordinator.async_config_entry_first_refresh()

    entry.runtime_data = coordinator
@@ -4,7 +4,9 @@ from __future__ import annotations

 from collections.abc import Callable
 from dataclasses import dataclass
-import logging
+from typing import Generic, TypeVar
+
+from airos.data import AirOSDataBaseClass

 from homeassistant.components.binary_sensor import (
    BinarySensorDeviceClass,
@@ -18,25 +20,24 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .coordinator import AirOS8Data, AirOSConfigEntry, AirOSDataUpdateCoordinator
 from .entity import AirOSEntity

-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 0

+AirOSDataModel = TypeVar("AirOSDataModel", bound=AirOSDataBaseClass)
+

@dataclass(frozen=True, kw_only=True)
-class AirOSBinarySensorEntityDescription(BinarySensorEntityDescription):
+class AirOSBinarySensorEntityDescription(
+    BinarySensorEntityDescription,
+    Generic[AirOSDataModel],
+):
    """Describe an AirOS binary sensor."""

-    value_fn: Callable[[AirOS8Data], bool]
+    value_fn: Callable[[AirOSDataModel], bool]


-BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (
-    AirOSBinarySensorEntityDescription(
-        key="portfw",
-        translation_key="port_forwarding",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda data: data.portfw,
-    ),
+AirOS8BinarySensorEntityDescription = AirOSBinarySensorEntityDescription[AirOS8Data]
+
+COMMON_BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (
    AirOSBinarySensorEntityDescription(
        key="dhcp_client",
        translation_key="dhcp_client",
@@ -52,14 +53,6 @@ BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (
        value_fn=lambda data: data.services.dhcpd,
        entity_registry_enabled_default=False,
    ),
-    AirOSBinarySensorEntityDescription(
-        key="dhcp6_server",
-        translation_key="dhcp6_server",
-        device_class=BinarySensorDeviceClass.RUNNING,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda data: data.services.dhcp6d_stateful,
-        entity_registry_enabled_default=False,
-    ),
    AirOSBinarySensorEntityDescription(
        key="pppoe",
        translation_key="pppoe",
@@ -70,6 +63,23 @@ BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (
    ),
 )

+AIROS8_BINARY_SENSORS: tuple[AirOS8BinarySensorEntityDescription, ...] = (
+    AirOS8BinarySensorEntityDescription(
+        key="portfw",
+        translation_key="port_forwarding",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.portfw,
+    ),
+    AirOS8BinarySensorEntityDescription(
+        key="dhcp6_server",
+        translation_key="dhcp6_server",
+        device_class=BinarySensorDeviceClass.RUNNING,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.services.dhcp6d_stateful,
+        entity_registry_enabled_default=False,
+    ),
+)
+

 async def async_setup_entry(
    hass: HomeAssistant,
@@ -79,9 +89,18 @@ async def async_setup_entry(
    """Set up the AirOS binary sensors from a config entry."""
    coordinator = config_entry.runtime_data

-    async_add_entities(
-        AirOSBinarySensor(coordinator, description) for description in BINARY_SENSORS
-    )
+    entities = [
+        AirOSBinarySensor(coordinator, description)
+        for description in COMMON_BINARY_SENSORS
+    ]
+
+    if coordinator.device_data["fw_major"] == 8:
+        entities.extend(
+            AirOSBinarySensor(coordinator, description)
+            for description in AIROS8_BINARY_SENSORS
+        )
+
+    async_add_entities(entities)


 class AirOSBinarySensor(AirOSEntity, BinarySensorEntity):
@@ -0,0 +1,69 @@
+"""AirOS button component for Home Assistant."""
+
+from __future__ import annotations
+
+from airos.exceptions import AirOSException
+
+from homeassistant.components.button import (
+    ButtonDeviceClass,
+    ButtonEntity,
+    ButtonEntityDescription,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import DOMAIN, AirOSConfigEntry, AirOSDataUpdateCoordinator
+from .entity import AirOSEntity
+
+PARALLEL_UPDATES = 0
+
+REBOOT_BUTTON = ButtonEntityDescription(
+    key="reboot",
+    device_class=ButtonDeviceClass.RESTART,
+    entity_registry_enabled_default=False,
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: AirOSConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the AirOS button from a config entry."""
+    async_add_entities([AirOSRebootButton(config_entry.runtime_data, REBOOT_BUTTON)])
+
+
+class AirOSRebootButton(AirOSEntity, ButtonEntity):
+    """Button to reboot device."""
+
+    entity_description: ButtonEntityDescription
+
+    def __init__(
+        self,
+        coordinator: AirOSDataUpdateCoordinator,
+        description: ButtonEntityDescription,
+    ) -> None:
+        """Initialize the AirOS client button."""
+        super().__init__(coordinator)
+
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.data.derived.mac}_{description.key}"
+
+    async def async_press(self) -> None:
+        """Handle the button press to reboot the device."""
+        try:
+            await self.coordinator.airos_device.login()
+            result = await self.coordinator.airos_device.reboot()
+
+        except AirOSException as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="cannot_connect",
+            ) from err
+
+        if not result:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="reboot_failed",
+            ) from None
@@ -2,17 +2,24 @@

 from __future__ import annotations

+import asyncio
 from collections.abc import Mapping
 import logging
 from typing import Any

+from airos.airos6 import AirOS6
+from airos.airos8 import AirOS8
+from airos.discovery import airos_discover_devices
 from airos.exceptions import (
    AirOSConnectionAuthenticationError,
    AirOSConnectionSetupError,
    AirOSDataMissingError,
    AirOSDeviceConnectionError,
+    AirOSEndpointError,
    AirOSKeyDataMissingError,
+    AirOSListenerError,
 )
+from airos.helpers import DetectDeviceData, async_get_firmware_data
 import voluptuous as vol

 from homeassistant.config_entries import (
@@ -30,21 +37,36 @@ from homeassistant.const import (
 )
 from homeassistant.data_entry_flow import section
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.selector import (
    TextSelector,
    TextSelectorConfig,
    TextSelectorType,
 )
+from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo

-from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, DOMAIN, SECTION_ADVANCED_SETTINGS
-from .coordinator import AirOS8
+from .const import (
+    DEFAULT_SSL,
+    DEFAULT_USERNAME,
+    DEFAULT_VERIFY_SSL,
+    DEVICE_NAME,
+    DOMAIN,
+    HOSTNAME,
+    IP_ADDRESS,
+    MAC_ADDRESS,
+    SECTION_ADVANCED_SETTINGS,
+)

 _LOGGER = logging.getLogger(__name__)

-STEP_USER_DATA_SCHEMA = vol.Schema(
+AirOSDeviceDetect = AirOS8 | AirOS6
+
+# Discovery duration in seconds, airOS announces every 20 seconds
+DISCOVER_INTERVAL: int = 30
+
+STEP_DISCOVERY_DATA_SCHEMA = vol.Schema(
    {
-        vol.Required(CONF_HOST): str,
-        vol.Required(CONF_USERNAME, default="ubnt"): str,
+        vol.Required(CONF_USERNAME, default=DEFAULT_USERNAME): str,
        vol.Required(CONF_PASSWORD): str,
        vol.Required(SECTION_ADVANCED_SETTINGS): section(
            vol.Schema(
@@ -58,6 +80,10 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
    }
 )

+STEP_MANUAL_DATA_SCHEMA = STEP_DISCOVERY_DATA_SCHEMA.extend(
+    {vol.Required(CONF_HOST): str}
+)
+

 class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Ubiquiti airOS."""
@@ -65,14 +91,29 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
    VERSION = 2
    MINOR_VERSION = 1

+    _discovery_task: asyncio.Task | None = None
+
    def __init__(self) -> None:
        """Initialize the config flow."""
        super().__init__()
-        self.airos_device: AirOS8
+        self.airos_device: AirOSDeviceDetect
        self.errors: dict[str, str] = {}
+        self.discovered_devices: dict[str, dict[str, Any]] = {}
+        self.discovery_abort_reason: str | None = None
+        self.selected_device_info: dict[str, Any] = {}

    async def async_step_user(
        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the initial step."""
+        self.errors = {}
+
+        return self.async_show_menu(
+            step_id="user", menu_options=["discovery", "manual"]
+        )
+
+    async def async_step_manual(
+        self, user_input: dict[str, Any] | None = None
    ) -> ConfigFlowResult:
        """Handle the manual input of host and credentials."""
        self.errors = {}
@@ -84,7 +125,7 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
                    data=validated_info["data"],
                )
        return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=self.errors
+            step_id="manual", data_schema=STEP_MANUAL_DATA_SCHEMA, errors=self.errors
        )

    async def _validate_and_get_device_info(
@@ -98,16 +139,14 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
            verify_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL],
        )

-        airos_device = AirOS8(
-            host=config_data[CONF_HOST],
-            username=config_data[CONF_USERNAME],
-            password=config_data[CONF_PASSWORD],
-            session=session,
-            use_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
-        )
        try:
-            await airos_device.login()
-            airos_data = await airos_device.status()
+            device_data: DetectDeviceData = await async_get_firmware_data(
+                host=config_data[CONF_HOST],
+                username=config_data[CONF_USERNAME],
+                password=config_data[CONF_PASSWORD],
+                session=session,
+                use_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
+            )

        except (
            AirOSConnectionSetupError,
@@ -122,14 +161,14 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
            _LOGGER.exception("Unexpected exception during credential validation")
            self.errors["base"] = "unknown"
        else:
-            await self.async_set_unique_id(airos_data.derived.mac)
+            await self.async_set_unique_id(device_data["mac"])

            if self.source in [SOURCE_REAUTH, SOURCE_RECONFIGURE]:
                self._abort_if_unique_id_mismatch()
            else:
                self._abort_if_unique_id_configured()

-            return {"title": airos_data.host.hostname, "data": config_data}
+            return {"title": device_data["hostname"], "data": config_data}

        return None

@@ -220,3 +259,175 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
            ),
            errors=self.errors,
        )
+
+    async def async_step_discovery(
+        self,
+        discovery_info: dict[str, Any] | None = None,
+    ) -> ConfigFlowResult:
+        """Start the discovery process."""
+        if self._discovery_task and self._discovery_task.done():
+            self._discovery_task = None
+
+            # Handle appropriate 'errors' as abort through progress_done
+            if self.discovery_abort_reason:
+                return self.async_show_progress_done(
+                    next_step_id=self.discovery_abort_reason
+                )
+
+            # Abort through progress_done if no devices were found
+            if not self.discovered_devices:
+                _LOGGER.debug(
+                    "No (new or unconfigured) airOS devices found during discovery"
+                )
+                return self.async_show_progress_done(
+                    next_step_id="discovery_no_devices"
+                )
+
+            # Skip selecting a device if only one new/unconfigured device was found
+            if len(self.discovered_devices) == 1:
+                self.selected_device_info = list(self.discovered_devices.values())[0]
+                return self.async_show_progress_done(next_step_id="configure_device")
+
+            return self.async_show_progress_done(next_step_id="select_device")
+
+        if not self._discovery_task:
+            self.discovered_devices = {}
+            self._discovery_task = self.hass.async_create_task(
+                self._async_run_discovery_with_progress()
+            )
+
+        # Show the progress bar and wait for discovery to complete
+        return self.async_show_progress(
+            step_id="discovery",
+            progress_action="discovering",
+            progress_task=self._discovery_task,
+            description_placeholders={"seconds": str(DISCOVER_INTERVAL)},
+        )
+
+    async def async_step_select_device(
+        self,
+        discovery_info: dict[str, Any] | None = None,
+    ) -> ConfigFlowResult:
+        """Select a discovered device."""
+        if discovery_info is not None:
+            selected_mac = discovery_info[MAC_ADDRESS]
+            self.selected_device_info = self.discovered_devices[selected_mac]
+            return await self.async_step_configure_device()
+
+        list_options = {
+            mac: f"{device.get(HOSTNAME, mac)} ({device.get(IP_ADDRESS, DEVICE_NAME)})"
+            for mac, device in self.discovered_devices.items()
+        }
+
+        return self.async_show_form(
+            step_id="select_device",
+            data_schema=vol.Schema({vol.Required(MAC_ADDRESS): vol.In(list_options)}),
+        )
+
+    async def async_step_configure_device(
+        self,
+        user_input: dict[str, Any] | None = None,
+    ) -> ConfigFlowResult:
+        """Configure the selected device."""
+        self.errors = {}
+
+        if user_input is not None:
+            config_data = {
+                **user_input,
+                CONF_HOST: self.selected_device_info[IP_ADDRESS],
+            }
+            validated_info = await self._validate_and_get_device_info(config_data)
+
+            if validated_info:
+                return self.async_create_entry(
+                    title=validated_info["title"],
+                    data=validated_info["data"],
+                )
+
+        device_name = self.selected_device_info.get(
+            HOSTNAME, self.selected_device_info.get(IP_ADDRESS, DEVICE_NAME)
+        )
+        return self.async_show_form(
+            step_id="configure_device",
+            data_schema=STEP_DISCOVERY_DATA_SCHEMA,
+            errors=self.errors,
+            description_placeholders={"device_name": device_name},
+        )
+
+    async def _async_run_discovery_with_progress(self) -> None:
+        """Run discovery with an embedded progress update loop."""
+        progress_bar = self.hass.async_create_task(self._async_update_progress_bar())
+
+        known_mac_addresses = {
+            entry.unique_id.lower()
+            for entry in self.hass.config_entries.async_entries(DOMAIN)
+            if entry.unique_id
+        }
+
+        try:
+            devices = await airos_discover_devices(DISCOVER_INTERVAL)
+        except AirOSEndpointError:
+            self.discovery_abort_reason = "discovery_detect_error"
+        except AirOSListenerError:
+            self.discovery_abort_reason = "discovery_listen_error"
+        except Exception:
+            self.discovery_abort_reason = "discovery_failed"
+            _LOGGER.exception("An error occurred during discovery")
+        else:
+            self.discovered_devices = {
+                mac_addr: info
+                for mac_addr, info in devices.items()
+                if mac_addr.lower() not in known_mac_addresses
+            }
+            _LOGGER.debug(
+                "Discovery task finished. Found %s new devices",
+                len(self.discovered_devices),
+            )
+        finally:
+            progress_bar.cancel()
+
+    async def _async_update_progress_bar(self) -> None:
+        """Update progress bar every second."""
+        try:
+            for i in range(DISCOVER_INTERVAL):
+                progress = (i + 1) / DISCOVER_INTERVAL
+                self.async_update_progress(progress)
+                await asyncio.sleep(1)
+        except asyncio.CancelledError:
+            pass
+
+    async def async_step_dhcp(
+        self, discovery_info: DhcpServiceInfo
+    ) -> ConfigFlowResult:
+        """Automatically handle a DHCP discovered IP change."""
+        ip_address = discovery_info.ip
+        # python-airos defaults to upper for derived mac_address
+        normalized_mac = format_mac(discovery_info.macaddress).upper()
+        await self.async_set_unique_id(normalized_mac)
+
+        self._abort_if_unique_id_configured(updates={CONF_HOST: ip_address})
+        return self.async_abort(reason="unreachable")
+
+    async def async_step_discovery_no_devices(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Abort if discovery finds no (unconfigured) devices."""
+        return self.async_abort(reason="no_devices_found")
+
+    async def async_step_discovery_listen_error(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Abort if discovery is unable to listen on the port."""
+        return self.async_abort(reason="listen_error")
+
+    async def async_step_discovery_detect_error(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Abort if discovery receives incorrect broadcasts."""
+        return self.async_abort(reason="detect_error")
+
+    async def async_step_discovery_failed(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Abort if discovery fails for other reasons."""
+        return self.async_abort(reason="discovery_failed")
@@ -12,3 +12,10 @@ DEFAULT_VERIFY_SSL = False
 DEFAULT_SSL = True

 SECTION_ADVANCED_SETTINGS = "advanced_settings"
+
+# Discovery related
+DEFAULT_USERNAME = "ubnt"
+HOSTNAME = "hostname"
+IP_ADDRESS = "ip_address"
+MAC_ADDRESS = "mac_address"
+DEVICE_NAME = "airOS device"
@@ -4,6 +4,7 @@ from __future__ import annotations

 import logging

+from airos.airos6 import AirOS6, AirOS6Data
 from airos.airos8 import AirOS8, AirOS8Data
 from airos.exceptions import (
    AirOSConnectionAuthenticationError,
@@ -11,6 +12,7 @@ from airos.exceptions import (
    AirOSDataMissingError,
    AirOSDeviceConnectionError,
 )
+from airos.helpers import DetectDeviceData

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -21,19 +23,28 @@ from .const import DOMAIN, SCAN_INTERVAL

 _LOGGER = logging.getLogger(__name__)

+AirOSDeviceDetect = AirOS8 | AirOS6
+AirOSDataDetect = AirOS8Data | AirOS6Data
+
 type AirOSConfigEntry = ConfigEntry[AirOSDataUpdateCoordinator]


-class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
+class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOSDataDetect]):
    """Class to manage fetching AirOS data from single endpoint."""

+    airos_device: AirOSDeviceDetect
    config_entry: AirOSConfigEntry

    def __init__(
-        self, hass: HomeAssistant, config_entry: AirOSConfigEntry, airos_device: AirOS8
+        self,
+        hass: HomeAssistant,
+        config_entry: AirOSConfigEntry,
+        device_data: DetectDeviceData,
+        airos_device: AirOSDeviceDetect,
    ) -> None:
        """Initialize the coordinator."""
        self.airos_device = airos_device
+        self.device_data = device_data
        super().__init__(
            hass,
            _LOGGER,
@@ -42,7 +53,7 @@ class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
            update_interval=SCAN_INTERVAL,
        )

-    async def _async_update_data(self) -> AirOS8Data:
+    async def _async_update_data(self) -> AirOSDataDetect:
        """Fetch data from AirOS."""
        try:
            await self.airos_device.login()
@@ -62,7 +73,7 @@ class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
                translation_domain=DOMAIN,
                translation_key="cannot_connect",
            ) from err
-        except (AirOSDataMissingError,) as err:
+        except AirOSDataMissingError as err:
            _LOGGER.error("Expected data not returned by airOS device: %s", err)
            raise UpdateFailed(
                translation_domain=DOMAIN,
@@ -3,9 +3,10 @@
  "name": "Ubiquiti airOS",
  "codeowners": ["@CoMPaTech"],
  "config_flow": true,
+  "dhcp": [{ "registered_devices": true }],
  "documentation": "https://www.home-assistant.io/integrations/airos",
  "integration_type": "device",
  "iot_class": "local_polling",
-  "quality_scale": "silver",
-  "requirements": ["airos==0.6.3"]
+  "quality_scale": "platinum",
+  "requirements": ["airos==0.6.4"]
 }
@@ -42,16 +42,20 @@ rules:
  # Gold
  devices: done
  diagnostics: done
-  discovery-update-info: todo
-  discovery: todo
+  discovery-update-info: done
+  discovery:
+    status: exempt
+    comment: No way to detect device on the network
  docs-data-update: done
-  docs-examples: todo
+  docs-examples: done
  docs-known-limitations: done
  docs-supported-devices: done
  docs-supported-functions: done
  docs-troubleshooting: done
  docs-use-cases: done
-  dynamic-devices: todo
+  dynamic-devices:
+    status: exempt
+    comment: single airOS device per config entry; peer/remote endpoints are not modeled as child devices/entities at this time
  entity-category: done
  entity-device-class: done
  entity-disabled-by-default: done
@@ -61,8 +65,10 @@ rules:
    status: exempt
    comment: no (custom) icons used or envisioned
  reconfiguration-flow: done
-  repair-issues: todo
-  stale-devices: todo
+  repair-issues: done
+  stale-devices:
+    status: exempt
+    comment: single airOS device per config entry; peer/remote endpoints are not modeled as child devices/entities at this time

  # Platinum
  async-dependency: done
@@ -5,8 +5,14 @@ from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 import logging
+from typing import Generic, TypeVar

-from airos.data import DerivedWirelessMode, DerivedWirelessRole, NetRole
+from airos.data import (
+    AirOSDataBaseClass,
+    DerivedWirelessMode,
+    DerivedWirelessRole,
+    NetRole,
+)

 from homeassistant.components.sensor import (
    SensorDeviceClass,
@@ -37,15 +43,19 @@ WIRELESS_ROLE_OPTIONS = [mode.value for mode in DerivedWirelessRole]

 PARALLEL_UPDATES = 0

+AirOSDataModel = TypeVar("AirOSDataModel", bound=AirOSDataBaseClass)
+

@dataclass(frozen=True, kw_only=True)
-class AirOSSensorEntityDescription(SensorEntityDescription):
+class AirOSSensorEntityDescription(SensorEntityDescription, Generic[AirOSDataModel]):
    """Describe an AirOS sensor."""

-    value_fn: Callable[[AirOS8Data], StateType]
+    value_fn: Callable[[AirOSDataModel], StateType]


-SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
+AirOS8SensorEntityDescription = AirOSSensorEntityDescription[AirOS8Data]
+
+COMMON_SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
    AirOSSensorEntityDescription(
        key="host_cpuload",
        translation_key="host_cpuload",
@@ -75,54 +85,6 @@ SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
        translation_key="wireless_essid",
        value_fn=lambda data: data.wireless.essid,
    ),
-    AirOSSensorEntityDescription(
-        key="wireless_antenna_gain",
-        translation_key="wireless_antenna_gain",
-        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
-        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.antenna_gain,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_throughput_tx",
-        translation_key="wireless_throughput_tx",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
-        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
-        value_fn=lambda data: data.wireless.throughput.tx,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_throughput_rx",
-        translation_key="wireless_throughput_rx",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
-        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
-        value_fn=lambda data: data.wireless.throughput.rx,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_polling_dl_capacity",
-        translation_key="wireless_polling_dl_capacity",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
-        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
-        value_fn=lambda data: data.wireless.polling.dl_capacity,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_polling_ul_capacity",
-        translation_key="wireless_polling_ul_capacity",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
-        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
-        value_fn=lambda data: data.wireless.polling.ul_capacity,
-    ),
    AirOSSensorEntityDescription(
        key="host_uptime",
        translation_key="host_uptime",
@@ -158,6 +120,57 @@ SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
        options=WIRELESS_ROLE_OPTIONS,
        entity_registry_enabled_default=False,
    ),
+    AirOSSensorEntityDescription(
+        key="wireless_antenna_gain",
+        translation_key="wireless_antenna_gain",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+        value_fn=lambda data: data.wireless.antenna_gain,
+    ),
+    AirOSSensorEntityDescription(
+        key="wireless_polling_dl_capacity",
+        translation_key="wireless_polling_dl_capacity",
+        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
+        device_class=SensorDeviceClass.DATA_RATE,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
+        value_fn=lambda data: data.wireless.polling.dl_capacity,
+    ),
+    AirOSSensorEntityDescription(
+        key="wireless_polling_ul_capacity",
+        translation_key="wireless_polling_ul_capacity",
+        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
+        device_class=SensorDeviceClass.DATA_RATE,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
+        value_fn=lambda data: data.wireless.polling.ul_capacity,
+    ),
+)
+
+AIROS8_SENSORS: tuple[AirOS8SensorEntityDescription, ...] = (
+    AirOS8SensorEntityDescription(
+        key="wireless_throughput_tx",
+        translation_key="wireless_throughput_tx",
+        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
+        device_class=SensorDeviceClass.DATA_RATE,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
+        value_fn=lambda data: data.wireless.throughput.tx,
+    ),
+    AirOS8SensorEntityDescription(
+        key="wireless_throughput_rx",
+        translation_key="wireless_throughput_rx",
+        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
+        device_class=SensorDeviceClass.DATA_RATE,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
+        value_fn=lambda data: data.wireless.throughput.rx,
+    ),
 )


@@ -169,7 +182,14 @@ async def async_setup_entry(
    """Set up the AirOS sensors from a config entry."""
    coordinator = config_entry.runtime_data

-    async_add_entities(AirOSSensor(coordinator, description) for description in SENSORS)
+    entities = [AirOSSensor(coordinator, description) for description in COMMON_SENSORS]
+
+    if coordinator.device_data["fw_major"] == 8:
+        entities.extend(
+            AirOSSensor(coordinator, description) for description in AIROS8_SENSORS
+        )
+
+    async_add_entities(entities)


 class AirOSSensor(AirOSEntity, SensorEntity):
@@ -2,6 +2,10 @@
  "config": {
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "detect_error": "Unable to process discovered devices data, check the documentation for supported devices",
+      "discovery_failed": "Unable to start discovery, check logs for details",
+      "listen_error": "Unable to start listening for devices",
+      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
      "unique_id_mismatch": "Re-authentication should be used for the same device not a new one"
@@ -13,37 +17,36 @@
      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "flow_title": "Ubiquiti airOS device",
+    "progress": {
+      "connecting": "Connecting to the airOS device",
+      "discovering": "Listening for any airOS devices for {seconds} seconds"
+    },
    "step": {
-      "reauth_confirm": {
+      "configure_device": {
        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
+          "password": "[%key:common::config_flow::data::password%]",
+          "username": "[%key:common::config_flow::data::username%]"
        },
        "data_description": {
-          "password": "[%key:component::airos::config::step::user::data_description::password%]"
-        }
-      },
-      "reconfigure": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "password": "[%key:component::airos::config::step::user::data_description::password%]"
+          "password": "[%key:component::airos::config::step::manual::data_description::password%]",
+          "username": "[%key:component::airos::config::step::manual::data_description::username%]"
        },
+        "description": "Enter the username and password for {device_name}",
        "sections": {
          "advanced_settings": {
            "data": {
-              "ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data::ssl%]",
+              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data::ssl%]",
              "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
            },
            "data_description": {
-              "ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data_description::ssl%]",
-              "verify_ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data_description::verify_ssl%]"
+              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::ssl%]",
+              "verify_ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::verify_ssl%]"
            },
-            "name": "[%key:component::airos::config::step::user::sections::advanced_settings::name%]"
+            "name": "[%key:component::airos::config::step::manual::sections::advanced_settings::name%]"
          }
        }
      },
-      "user": {
+      "manual": {
        "data": {
          "host": "[%key:common::config_flow::data::host%]",
          "password": "[%key:common::config_flow::data::password%]",
@@ -67,6 +70,49 @@
            "name": "Advanced settings"
          }
        }
+      },
+      "reauth_confirm": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "[%key:component::airos::config::step::manual::data_description::password%]"
+        }
+      },
+      "reconfigure": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "[%key:component::airos::config::step::manual::data_description::password%]"
+        },
+        "sections": {
+          "advanced_settings": {
+            "data": {
+              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data::ssl%]",
+              "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
+            },
+            "data_description": {
+              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::ssl%]",
+              "verify_ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::verify_ssl%]"
+            },
+            "name": "[%key:component::airos::config::step::manual::sections::advanced_settings::name%]"
+          }
+        }
+      },
+      "select_device": {
+        "data": {
+          "mac_address": "Select the device to configure"
+        },
+        "data_description": {
+          "mac_address": "Select the device MAC address"
+        }
+      },
+      "user": {
+        "menu_options": {
+          "discovery": "Listen for airOS devices on the network",
+          "manual": "Manually configure airOS device"
+        }
      }
    }
  },
@@ -157,6 +203,9 @@
    },
    "key_data_missing": {
      "message": "Key data not returned from device"
+    },
+    "reboot_failed": {
+      "message": "The device did not accept the reboot request. Try again, or check your device web interface for errors."
    }
  }
 }
@@ -2,10 +2,12 @@

 from __future__ import annotations

+import aiohttp
 from genie_partner_sdk.client import AladdinConnectClient

 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import (
    aiohttp_client,
    config_entry_oauth2_flow,
@@ -31,11 +33,27 @@ async def async_setup_entry(

    session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)

+    try:
+        await session.async_ensure_token_valid()
+    except aiohttp.ClientResponseError as err:
+        if 400 <= err.status < 500:
+            raise ConfigEntryAuthFailed(err) from err
+        raise ConfigEntryNotReady from err
+    except aiohttp.ClientError as err:
+        raise ConfigEntryNotReady from err
+
    client = AladdinConnectClient(
        api.AsyncConfigEntryAuth(aiohttp_client.async_get_clientsession(hass), session)
    )

-    doors = await client.get_doors()
+    try:
+        doors = await client.get_doors()
+    except aiohttp.ClientResponseError as err:
+        if 400 <= err.status < 500:
+            raise ConfigEntryAuthFailed(err) from err
+        raise ConfigEntryNotReady from err
+    except aiohttp.ClientError as err:
+        raise ConfigEntryNotReady from err

    entry.runtime_data = {
        door.unique_id: AladdinConnectCoordinator(hass, entry, client, door)
@@ -11,6 +11,18 @@ API_URL = "https://twdvzuefzh.execute-api.us-east-2.amazonaws.com/v1"
 API_KEY = "k6QaiQmcTm2zfaNns5L1Z8duBtJmhDOW8JawlCC3"


+class AsyncConfigFlowAuth(Auth):
+    """Provide Aladdin Connect Genie authentication for config flow validation."""
+
+    def __init__(self, websession: ClientSession, access_token: str) -> None:
+        """Initialize Aladdin Connect Genie auth."""
+        super().__init__(websession, API_URL, access_token, API_KEY)
+
+    async def async_get_access_token(self) -> str:
+        """Return the access token."""
+        return self.access_token
+
+
 class AsyncConfigEntryAuth(Auth):
    """Provide Aladdin Connect Genie authentication tied to an OAuth2 based config entry."""

@@ -4,12 +4,14 @@ from collections.abc import Mapping
 import logging
 from typing import Any

+from genie_partner_sdk.client import AladdinConnectClient
 import jwt
 import voluptuous as vol

 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow

+from .api import AsyncConfigFlowAuth
 from .const import CONFIG_FLOW_MINOR_VERSION, CONFIG_FLOW_VERSION, DOMAIN


@@ -52,11 +54,25 @@ class OAuth2FlowHandler(

    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}
+        try:
+            token = jwt.decode(
+                data["token"]["access_token"], options={"verify_signature": False}
+            )
+            user_id = token["sub"]
+        except jwt.DecodeError, KeyError:
+            return self.async_abort(reason="oauth_error")
+
+        client = AladdinConnectClient(
+            AsyncConfigFlowAuth(
+                aiohttp_client.async_get_clientsession(self.hass),
+                data["token"]["access_token"],
+            )
        )
-        user_id = token["sub"]
+        try:
+            await client.get_doors()
+        except Exception:  # noqa: BLE001
+            return self.async_abort(reason="cannot_connect")
+
        await self.async_set_unique_id(user_id)

        if self.source == SOURCE_REAUTH:
@@ -5,12 +5,13 @@ from __future__ import annotations
 from datetime import timedelta
 import logging

+import aiohttp
 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
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

 _LOGGER = logging.getLogger(__name__)
 type AladdinConnectConfigEntry = ConfigEntry[dict[str, AladdinConnectCoordinator]]
@@ -40,7 +41,10 @@ class AladdinConnectCoordinator(DataUpdateCoordinator[GarageDoor]):

    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)
+        try:
+            await self.client.update_door(self.data.device_id, self.data.door_number)
+        except aiohttp.ClientError as err:
+            raise UpdateFailed(f"Error communicating with API: {err}") from err
        self.data.status = self.client.get_door_status(
            self.data.device_id, self.data.door_number
        )
@@ -4,14 +4,19 @@ from __future__ import annotations

 from typing import Any

+import aiohttp
+
 from homeassistant.components.cover import CoverDeviceClass, CoverEntity
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

-from .const import SUPPORTED_FEATURES
+from .const import DOMAIN, SUPPORTED_FEATURES
 from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
 from .entity import AladdinConnectEntity

+PARALLEL_UPDATES = 1
+

 async def async_setup_entry(
    hass: HomeAssistant,
@@ -40,11 +45,23 @@ class AladdinCoverEntity(AladdinConnectEntity, CoverEntity):

    async def async_open_cover(self, **kwargs: Any) -> None:
        """Issue open command to cover."""
-        await self.client.open_door(self._device_id, self._number)
+        try:
+            await self.client.open_door(self._device_id, self._number)
+        except aiohttp.ClientError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="open_door_failed",
+            ) from err

    async def async_close_cover(self, **kwargs: Any) -> None:
        """Issue close command to cover."""
-        await self.client.close_door(self._device_id, self._number)
+        try:
+            await self.client.close_door(self._device_id, self._number)
+        except aiohttp.ClientError as err:
+            raise HomeAssistantError(
+                translation_domain=DOMAIN,
+                translation_key="close_door_failed",
+            ) from err

    @property
    def is_closed(self) -> bool | None:
@@ -0,0 +1,32 @@
+"""Diagnostics support for Aladdin Connect."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.core import HomeAssistant
+
+from .coordinator import AladdinConnectConfigEntry
+
+TO_REDACT = {"access_token", "refresh_token"}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, config_entry: AladdinConnectConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    return {
+        "config_entry": async_redact_data(config_entry.as_dict(), TO_REDACT),
+        "doors": {
+            uid: {
+                "device_id": coordinator.data.device_id,
+                "door_number": coordinator.data.door_number,
+                "name": coordinator.data.name,
+                "status": coordinator.data.status,
+                "link_status": coordinator.data.link_status,
+                "battery_level": coordinator.data.battery_level,
+            }
+            for uid, coordinator in config_entry.runtime_data.items()
+        },
+    }
@@ -7,74 +7,56 @@ rules:
  brands: done
  common-modules: done
  config-flow: done
-  config-flow-test-coverage: todo
+  config-flow-test-coverage: done
  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.
+  docs-installation-instructions: done
+  docs-removal-instructions: done
  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
+  test-before-configure: done
+  test-before-setup: done
  unique-config-entry: done

  # Silver
-  action-exceptions: todo
+  action-exceptions: done
  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
+    status: exempt
+    comment: Integration does not have an options flow.
+  docs-installation-parameters: done
+  entity-unavailable:
+    status: done
+    comment: Handled by the coordinator.
  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates: todo
+  log-when-unavailable:
+    status: done
+    comment: Handled by the coordinator.
+  parallel-updates: done
  reauthentication-flow: done
-  test-coverage:
-    status: todo
-    comment: Platform tests for cover and sensor need to be implemented to reach 95% coverage.
+  test-coverage: done

  # 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.
+  diagnostics: done
+  discovery: done
+  discovery-update-info:
+    status: exempt
+    comment: Integration connects via the cloud and not locally.
+  docs-data-update: done
+  docs-examples: done
+  docs-known-limitations: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
  dynamic-devices: todo
  entity-category: done
  entity-device-class: done
@@ -86,7 +68,7 @@ rules:
  repair-issues: todo
  stale-devices:
    status: todo
-    comment: Stale devices can be done dynamically
+    comment: We can automatically remove removed devices

  # Platinum
  async-dependency: todo
@@ -20,6 +20,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
 from .entity import AladdinConnectEntity

+PARALLEL_UPDATES = 0
+

@dataclass(frozen=True, kw_only=True)
 class AladdinConnectSensorEntityDescription(SensorEntityDescription):
@@ -4,6 +4,7 @@
      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "cloud_not_enabled": "Please make sure you run Home Assistant with `{default_config}` enabled in your configuration.yaml.",
      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
@@ -31,5 +32,13 @@
        "title": "[%key:common::config_flow::title::reauth%]"
      }
    }
+  },
+  "exceptions": {
+    "close_door_failed": {
+      "message": "Failed to close the garage door"
+    },
+    "open_door_failed": {
+      "message": "Failed to open the garage door"
+    }
  }
 }
@@ -13,9 +13,6 @@ from homeassistant.helpers import config_validation as cv, service

 from .const import DOMAIN

-SERVICE_ALARM_TOGGLE_CHIME = "alarm_toggle_chime"
-
-SERVICE_ALARM_KEYPRESS = "alarm_keypress"
 ATTR_KEYPRESS = "keypress"


@@ -26,7 +23,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        SERVICE_ALARM_TOGGLE_CHIME,
+        "alarm_toggle_chime",
        entity_domain=ALARM_CONTROL_PANEL_DOMAIN,
        schema={
            vol.Required(ATTR_CODE): cv.string,
@@ -37,7 +34,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        SERVICE_ALARM_KEYPRESS,
+        "alarm_keypress",
        entity_domain=ALARM_CONTROL_PANEL_DOMAIN,
        schema={
            vol.Required(ATTR_KEYPRESS): cv.string,
@@ -13,7 +13,7 @@ from homeassistant.components.notify import (
    ATTR_DATA,
    ATTR_MESSAGE,
    ATTR_TITLE,
-    DOMAIN as DOMAIN_NOTIFY,
+    DOMAIN as NOTIFY_DOMAIN,
 )
 from homeassistant.const import STATE_IDLE, STATE_OFF, STATE_ON
 from homeassistant.core import Event, EventStateChangedData, HassJob, HomeAssistant
@@ -185,7 +185,7 @@ class AlertEntity(Entity):
        for target in self._notifiers:
            try:
                await self.hass.services.async_call(
-                    DOMAIN_NOTIFY, target, msg_payload, context=self._context
+                    NOTIFY_DOMAIN, target, msg_payload, context=self._context
                )
            except ServiceNotFound:
                LOGGER.error(
@@ -1,4 +1,11 @@
 {
+  "entity": {
+    "sensor": {
+      "voc_index": {
+        "default": "mdi:molecule"
+      }
+    }
+  },
  "services": {
    "send_info_skill": {
      "service": "mdi:information"
@@ -20,7 +20,13 @@ from homeassistant.components.sensor import (
    SensorEntityDescription,
    SensorStateClass,
 )
-from homeassistant.const import LIGHT_LUX, UnitOfTemperature
+from homeassistant.const import (
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    CONCENTRATION_PARTS_PER_MILLION,
+    LIGHT_LUX,
+    PERCENTAGE,
+    UnitOfTemperature,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
@@ -77,6 +83,41 @@ SENSORS: Final = (
        native_unit_of_measurement=LIGHT_LUX,
        state_class=SensorStateClass.MEASUREMENT,
    ),
+    AmazonSensorEntityDescription(
+        key="Humidity",
+        device_class=SensorDeviceClass.HUMIDITY,
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AmazonSensorEntityDescription(
+        key="PM10",
+        device_class=SensorDeviceClass.PM10,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AmazonSensorEntityDescription(
+        key="PM25",
+        device_class=SensorDeviceClass.PM25,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AmazonSensorEntityDescription(
+        key="CO",
+        device_class=SensorDeviceClass.CO,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    AmazonSensorEntityDescription(
+        key="VOC",
+        # No device class as this is an index not a concentration
+        state_class=SensorStateClass.MEASUREMENT,
+        translation_key="voc_index",
+    ),
+    AmazonSensorEntityDescription(
+        key="Air Quality",
+        device_class=SensorDeviceClass.AQI,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
 )
 NOTIFICATIONS: Final = (
    AmazonNotificationEntityDescription(
@@ -16,9 +16,6 @@ from .coordinator import AmazonConfigEntry
 ATTR_TEXT_COMMAND = "text_command"
 ATTR_SOUND = "sound"
 ATTR_INFO_SKILL = "info_skill"
-SERVICE_TEXT_COMMAND = "send_text_command"
-SERVICE_SOUND_NOTIFICATION = "send_sound"
-SERVICE_INFO_SKILL = "send_info_skill"

 SCHEMA_SOUND_SERVICE = vol.Schema(
    {
@@ -104,7 +101,7 @@ async def _async_execute_action(call: ServiceCall, attribute: str) -> None:
                translation_placeholders={"info_skill": value},
            )
        await coordinator.api.call_alexa_info_skill(
-            coordinator.data[device.serial_number], value
+            coordinator.data[device.serial_number], info_skill
        )


@@ -128,17 +125,17 @@ def async_setup_services(hass: HomeAssistant) -> None:
    """Set up the services for the Amazon Devices integration."""
    for service_name, method, schema in (
        (
-            SERVICE_SOUND_NOTIFICATION,
+            "send_sound",
            async_send_sound_notification,
            SCHEMA_SOUND_SERVICE,
        ),
        (
-            SERVICE_TEXT_COMMAND,
+            "send_text_command",
            async_send_text_command,
            SCHEMA_CUSTOM_COMMAND,
        ),
        (
-            SERVICE_INFO_SKILL,
+            "send_info_skill",
            async_send_info_skill,
            SCHEMA_INFO_SKILL,
        ),
@@ -75,6 +75,9 @@
      },
      "timer": {
        "name": "Next timer"
+      },
+      "voc_index": {
+        "name": "Volatile organic compounds index"
      }
    },
    "switch": {
@@ -16,8 +16,6 @@ ATTRIBUTION = "Data provided by Amber Electric"
 LOGGER = logging.getLogger(__package__)
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]

-SERVICE_GET_FORECASTS = "get_forecasts"
-
 GENERAL_CHANNEL = "general"
 CONTROLLED_LOAD_CHANNEL = "controlled_load"
 FEED_IN_CHANNEL = "feed_in"
@@ -22,7 +22,6 @@ from .const import (
    DOMAIN,
    FEED_IN_CHANNEL,
    GENERAL_CHANNEL,
-    SERVICE_GET_FORECASTS,
 )
 from .coordinator import AmberConfigEntry
 from .helpers import format_cents_to_dollars, normalize_descriptor
@@ -101,7 +100,7 @@ def async_setup_services(hass: HomeAssistant) -> None:

    hass.services.async_register(
        DOMAIN,
-        SERVICE_GET_FORECASTS,
+        "get_forecasts",
        handle_get_forecasts,
        GET_FORECASTS_SCHEMA,
        supports_response=SupportsResponse.ONLY,
@@ -49,18 +49,6 @@ SCAN_INTERVAL = timedelta(seconds=15)

 STREAM_SOURCE_LIST = ["snapshot", "mjpeg", "rtsp"]

-_SRV_EN_REC = "enable_recording"
-_SRV_DS_REC = "disable_recording"
-_SRV_EN_AUD = "enable_audio"
-_SRV_DS_AUD = "disable_audio"
-_SRV_EN_MOT_REC = "enable_motion_recording"
-_SRV_DS_MOT_REC = "disable_motion_recording"
-_SRV_GOTO = "goto_preset"
-_SRV_CBW = "set_color_bw"
-_SRV_TOUR_ON = "start_tour"
-_SRV_TOUR_OFF = "stop_tour"
-
-_SRV_PTZ_CTRL = "ptz_control"
 _ATTR_PTZ_TT = "travel_time"
 _ATTR_PTZ_MOV = "movement"
 _MOV = [
@@ -103,17 +91,17 @@ _SRV_PTZ_SCHEMA = _SRV_SCHEMA.extend(
 )

 CAMERA_SERVICES = {
-    _SRV_EN_REC: (_SRV_SCHEMA, "async_enable_recording", ()),
-    _SRV_DS_REC: (_SRV_SCHEMA, "async_disable_recording", ()),
-    _SRV_EN_AUD: (_SRV_SCHEMA, "async_enable_audio", ()),
-    _SRV_DS_AUD: (_SRV_SCHEMA, "async_disable_audio", ()),
-    _SRV_EN_MOT_REC: (_SRV_SCHEMA, "async_enable_motion_recording", ()),
-    _SRV_DS_MOT_REC: (_SRV_SCHEMA, "async_disable_motion_recording", ()),
-    _SRV_GOTO: (_SRV_GOTO_SCHEMA, "async_goto_preset", (_ATTR_PRESET,)),
-    _SRV_CBW: (_SRV_CBW_SCHEMA, "async_set_color_bw", (_ATTR_COLOR_BW,)),
-    _SRV_TOUR_ON: (_SRV_SCHEMA, "async_start_tour", ()),
-    _SRV_TOUR_OFF: (_SRV_SCHEMA, "async_stop_tour", ()),
-    _SRV_PTZ_CTRL: (
+    "enable_recording": (_SRV_SCHEMA, "async_enable_recording", ()),
+    "disable_recording": (_SRV_SCHEMA, "async_disable_recording", ()),
+    "enable_audio": (_SRV_SCHEMA, "async_enable_audio", ()),
+    "disable_audio": (_SRV_SCHEMA, "async_disable_audio", ()),
+    "enable_motion_recording": (_SRV_SCHEMA, "async_enable_motion_recording", ()),
+    "disable_motion_recording": (_SRV_SCHEMA, "async_disable_motion_recording", ()),
+    "goto_preset": (_SRV_GOTO_SCHEMA, "async_goto_preset", (_ATTR_PRESET,)),
+    "set_color_bw": (_SRV_CBW_SCHEMA, "async_set_color_bw", (_ATTR_COLOR_BW,)),
+    "start_tour": (_SRV_SCHEMA, "async_start_tour", ()),
+    "stop_tour": (_SRV_SCHEMA, "async_stop_tour", ()),
+    "ptz_control": (
        _SRV_PTZ_SCHEMA,
        "async_ptz_control",
        (_ATTR_PTZ_MOV, _ATTR_PTZ_TT),
@@ -75,7 +75,7 @@
      "name": "Go to preset"
    },
    "ptz_control": {
-      "description": "Moves (pan/tilt) and/or zoom a PTZ camera.",
+      "description": "Moves (pan/tilt) and/or zooms a PTZ camera.",
      "fields": {
        "entity_id": {
          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
@@ -534,6 +534,10 @@ class Analytics:

        payload = await _async_snapshot_payload(self._hass)

+        if not payload:
+            LOGGER.info("Skipping snapshot submission, no data to send")
+            return
+
        headers = {
            "Content-Type": "application/json",
            "User-Agent": f"home-assistant/{HA_VERSION}",
@@ -38,7 +38,6 @@ def get_app_entity_description(
        translation_key="apps",
        name=name_slug,
        state_class=SensorStateClass.TOTAL,
-        native_unit_of_measurement="active installations",
        value_fn=lambda data: data.apps.get(name_slug),
    )

@@ -52,7 +51,6 @@ def get_core_integration_entity_description(
        translation_key="core_integrations",
        name=name,
        state_class=SensorStateClass.TOTAL,
-        native_unit_of_measurement="active installations",
        value_fn=lambda data: data.core_integrations.get(domain),
    )

@@ -66,7 +64,6 @@ def get_custom_integration_entity_description(
        translation_key="custom_integrations",
        translation_placeholders={"custom_integration_domain": domain},
        state_class=SensorStateClass.TOTAL,
-        native_unit_of_measurement="active installations",
        value_fn=lambda data: data.custom_integrations.get(domain),
    )

@@ -77,7 +74,6 @@ GENERAL_SENSORS = [
        translation_key="total_active_installations",
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.TOTAL,
-        native_unit_of_measurement="active installations",
        value_fn=lambda data: data.active_installations,
    ),
    AnalyticsSensorEntityDescription(
@@ -85,7 +81,6 @@ GENERAL_SENSORS = [
        translation_key="total_reports_integrations",
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.TOTAL,
-        native_unit_of_measurement="active installations",
        value_fn=lambda data: data.reports_integrations,
    ),
 ]
@@ -24,14 +24,23 @@
  },
  "entity": {
    "sensor": {
+      "apps": {
+        "unit_of_measurement": "active installations"
+      },
+      "core_integrations": {
+        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
+      },
      "custom_integrations": {
-        "name": "{custom_integration_domain} (custom)"
+        "name": "{custom_integration_domain} (custom)",
+        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
      },
      "total_active_installations": {
-        "name": "Total active installations"
+        "name": "Total active installations",
+        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
      },
      "total_reports_integrations": {
-        "name": "Total reported integrations"
+        "name": "Total reported integrations",
+        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
      }
    }
  },
@@ -36,7 +36,7 @@ from .const import (
    SIGNAL_CONFIG_ENTITY,
 )
 from .entity import AndroidTVEntity, adb_decorator
-from .services import ATTR_ADB_RESPONSE, ATTR_HDMI_INPUT, SERVICE_LEARN_SENDEVENT
+from .services import ATTR_ADB_RESPONSE, ATTR_HDMI_INPUT

 _LOGGER = logging.getLogger(__name__)

@@ -271,7 +271,7 @@ class ADBDevice(AndroidTVEntity, MediaPlayerEntity):
            self.async_write_ha_state()

            msg = (
-                f"Output from service '{SERVICE_LEARN_SENDEVENT}' from"
+                f"Output from service 'learn_sendevent' from"
                f" {self.entity_id}: '{output}'"
            )
            persistent_notification.async_create(
@@ -16,11 +16,6 @@ ATTR_DEVICE_PATH = "device_path"
 ATTR_HDMI_INPUT = "hdmi_input"
 ATTR_LOCAL_PATH = "local_path"

-SERVICE_ADB_COMMAND = "adb_command"
-SERVICE_DOWNLOAD = "download"
-SERVICE_LEARN_SENDEVENT = "learn_sendevent"
-SERVICE_UPLOAD = "upload"
-

@callback
 def async_setup_services(hass: HomeAssistant) -> None:
@@ -29,7 +24,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        SERVICE_ADB_COMMAND,
+        "adb_command",
        entity_domain=MEDIA_PLAYER_DOMAIN,
        schema={vol.Required(ATTR_COMMAND): cv.string},
        func="adb_command",
@@ -37,7 +32,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        SERVICE_LEARN_SENDEVENT,
+        "learn_sendevent",
        entity_domain=MEDIA_PLAYER_DOMAIN,
        schema=None,
        func="learn_sendevent",
@@ -45,7 +40,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        SERVICE_DOWNLOAD,
+        "download",
        entity_domain=MEDIA_PLAYER_DOMAIN,
        schema={
            vol.Required(ATTR_DEVICE_PATH): cv.string,
@@ -56,7 +51,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        SERVICE_UPLOAD,
+        "upload",
        entity_domain=MEDIA_PLAYER_DOMAIN,
        schema={
            vol.Required(ATTR_DEVICE_PATH): cv.string,
@@ -7,7 +7,7 @@ import anthropic
 from homeassistant.config_entries import ConfigEntry, ConfigSubentry
 from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import (
    config_validation as cv,
    device_registry as dr,
@@ -19,7 +19,6 @@ from homeassistant.helpers.typing import ConfigType

 from .const import (
    CONF_CHAT_MODEL,
-    DATA_REPAIR_DEFER_RELOAD,
    DEFAULT_CONVERSATION_NAME,
    DEPRECATED_MODELS,
    DOMAIN,
@@ -34,7 +33,6 @@ type AnthropicConfigEntry = ConfigEntry[anthropic.AsyncClient]

 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
    """Set up Anthropic."""
-    hass.data.setdefault(DOMAIN, {}).setdefault(DATA_REPAIR_DEFER_RELOAD, set())
    await async_migrate_integration(hass)
    return True

@@ -47,8 +45,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AnthropicConfigEntry) ->
    try:
        await client.models.list(timeout=10.0)
    except anthropic.AuthenticationError as err:
-        LOGGER.error("Invalid API key: %s", err)
-        return False
+        raise ConfigEntryAuthFailed(err) from err
    except anthropic.AnthropicError as err:
        raise ConfigEntryNotReady(err) from err

@@ -77,7 +74,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AnthropicConfigEntry) ->
    return True


-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: AnthropicConfigEntry) -> bool:
    """Unload Anthropic."""
    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

@@ -86,11 +83,6 @@ async def async_update_options(
    hass: HomeAssistant, entry: AnthropicConfigEntry
 ) -> None:
    """Update options."""
-    defer_reload_entries: set[str] = hass.data.setdefault(DOMAIN, {}).setdefault(
-        DATA_REPAIR_DEFER_RELOAD, set()
-    )
-    if entry.entry_id in defer_reload_entries:
-        return
    await hass.config_entries.async_reload(entry.entry_id)


@@ -105,7 +97,7 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
    if not any(entry.version == 1 for entry in entries):
        return

-    api_keys_entries: dict[str, tuple[ConfigEntry, bool]] = {}
+    api_keys_entries: dict[str, tuple[AnthropicConfigEntry, bool]] = {}
    entity_registry = er.async_get(hass)
    device_registry = dr.async_get(hass)

@@ -4,9 +4,9 @@ from __future__ import annotations

 from json import JSONDecodeError
 import logging
+from typing import TYPE_CHECKING

 from homeassistant.components import ai_task, conversation
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -14,12 +14,15 @@ from homeassistant.util.json import json_loads

 from .entity import AnthropicBaseLLMEntity

+if TYPE_CHECKING:
+    from . import AnthropicConfigEntry
+
 _LOGGER = logging.getLogger(__name__)


 async def async_setup_entry(
    hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AnthropicConfigEntry,
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up AI Task entities."""
@@ -43,6 +46,7 @@ class AnthropicTaskEntity(
        ai_task.AITaskEntityFeature.GENERATE_DATA
        | ai_task.AITaskEntityFeature.SUPPORT_ATTACHMENTS
    )
+    _attr_translation_key = "ai_task_data"

    async def _async_generate_data(
        self,
@@ -50,7 +54,9 @@ class AnthropicTaskEntity(
        chat_log: conversation.ChatLog,
    ) -> ai_task.GenDataTaskResult:
        """Handle a generate data task."""
-        await self._async_handle_chat_log(chat_log, task.name, task.structure)
+        await self._async_handle_chat_log(
+            chat_log, task.name, task.structure, max_iterations=1000
+        )

        if not isinstance(chat_log.content[-1], conversation.AssistantContent):
            raise HomeAssistantError(
@@ -2,10 +2,11 @@

 from __future__ import annotations

+from collections.abc import Mapping
 import json
 import logging
 import re
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, cast

 import anthropic
 import voluptuous as vol
@@ -13,7 +14,7 @@ from voluptuous_openapi import convert

 from homeassistant.components.zone import ENTITY_ID_HOME
 from homeassistant.config_entries import (
-    ConfigEntry,
+    SOURCE_REAUTH,
    ConfigEntryState,
    ConfigFlow,
    ConfigFlowResult,
@@ -42,7 +43,9 @@ from homeassistant.helpers.selector import (
 from homeassistant.helpers.typing import VolDictType

 from .const import (
+    CODE_EXECUTION_UNSUPPORTED_MODELS,
    CONF_CHAT_MODEL,
+    CONF_CODE_EXECUTION,
    CONF_MAX_TOKENS,
    CONF_PROMPT,
    CONF_RECOMMENDED,
@@ -65,6 +68,9 @@ from .const import (
    WEB_SEARCH_UNSUPPORTED_MODELS,
 )

+if TYPE_CHECKING:
+    from . import AnthropicConfigEntry
+
 _LOGGER = logging.getLogger(__name__)

 STEP_USER_DATA_SCHEMA = vol.Schema(
@@ -108,19 +114,12 @@ async def get_model_list(client: anthropic.AsyncAnthropic) -> list[SelectOptionD
        # Resolve alias from versioned model name:
        model_alias = (
            model_info.id[:-9]
-            if model_info.id
-            not in (
-                "claude-3-haiku-20240307",
-                "claude-3-5-haiku-20241022",
-                "claude-3-opus-20240229",
-            )
+            if model_info.id != "claude-3-haiku-20240307"
            and model_info.id[-2:-1] != "-"
            else model_info.id
        )
        if short_form.search(model_alias):
            model_alias += "-0"
-        if model_alias.endswith(("haiku", "opus", "sonnet")):
-            model_alias += "-latest"
        model_options.append(
            SelectOptionDict(
                label=model_info.display_name,
@@ -162,6 +161,10 @@ class AnthropicConfigFlow(ConfigFlow, domain=DOMAIN):
                _LOGGER.exception("Unexpected exception")
                errors["base"] = "unknown"
            else:
+                if self.source == SOURCE_REAUTH:
+                    return self.async_update_reload_and_abort(
+                        self._get_reauth_entry(), data_updates=user_input
+                    )
                return self.async_create_entry(
                    title="Claude",
                    data=user_input,
@@ -182,13 +185,34 @@ class AnthropicConfigFlow(ConfigFlow, domain=DOMAIN):
                )

        return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors or None
+            step_id="user",
+            data_schema=STEP_USER_DATA_SCHEMA,
+            errors=errors or None,
+            description_placeholders={
+                "instructions_url": "https://www.home-assistant.io/integrations/anthropic/#generating-an-api-key",
+            },
        )

+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Perform reauth upon an API authentication error."""
+        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."""
+        if not user_input:
+            return self.async_show_form(
+                step_id="reauth_confirm", data_schema=STEP_USER_DATA_SCHEMA
+            )
+        return await self.async_step_user(user_input)
+
    @classmethod
    @callback
    def async_get_supported_subentry_types(
-        cls, config_entry: ConfigEntry
+        cls, config_entry: AnthropicConfigEntry
    ) -> dict[str, type[ConfigSubentryFlow]]:
        """Return subentries supported by this integration."""
        return {
@@ -393,6 +417,16 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
        else:
            self.options.pop(CONF_THINKING_EFFORT, None)

+        if not model.startswith(tuple(CODE_EXECUTION_UNSUPPORTED_MODELS)):
+            step_schema[
+                vol.Optional(
+                    CONF_CODE_EXECUTION,
+                    default=DEFAULT[CONF_CODE_EXECUTION],
+                )
+            ] = bool
+        else:
+            self.options.pop(CONF_CODE_EXECUTION, None)
+
        if not model.startswith(tuple(WEB_SEARCH_UNSUPPORTED_MODELS)):
            step_schema.update(
                {
@@ -11,6 +11,7 @@ DEFAULT_AI_TASK_NAME = "Claude AI Task"
 CONF_RECOMMENDED = "recommended"
 CONF_PROMPT = "prompt"
 CONF_CHAT_MODEL = "chat_model"
+CONF_CODE_EXECUTION = "code_execution"
 CONF_MAX_TOKENS = "max_tokens"
 CONF_TEMPERATURE = "temperature"
 CONF_THINKING_BUDGET = "thinking_budget"
@@ -23,10 +24,9 @@ CONF_WEB_SEARCH_REGION = "region"
 CONF_WEB_SEARCH_COUNTRY = "country"
 CONF_WEB_SEARCH_TIMEZONE = "timezone"

-DATA_REPAIR_DEFER_RELOAD = "repair_defer_reload"
-
 DEFAULT = {
    CONF_CHAT_MODEL: "claude-haiku-4-5",
+    CONF_CODE_EXECUTION: False,
    CONF_MAX_TOKENS: 3000,
    CONF_TEMPERATURE: 1.0,
    CONF_THINKING_BUDGET: 0,
@@ -39,8 +39,6 @@ DEFAULT = {
 MIN_THINKING_BUDGET = 1024

 NON_THINKING_MODELS = [
-    "claude-3-5",  # Both sonnet and haiku
-    "claude-3-opus",
    "claude-3-haiku",
 ]

@@ -53,7 +51,7 @@ NON_ADAPTIVE_THINKING_MODELS = [
    "claude-opus-4-20250514",
    "claude-sonnet-4-0",
    "claude-sonnet-4-20250514",
-    "claude-3",
+    "claude-3-haiku",
 ]

 UNSUPPORTED_STRUCTURED_OUTPUT_MODELS = [
@@ -62,19 +60,17 @@ UNSUPPORTED_STRUCTURED_OUTPUT_MODELS = [
    "claude-opus-4-20250514",
    "claude-sonnet-4-0",
    "claude-sonnet-4-20250514",
-    "claude-3",
+    "claude-3-haiku",
 ]

 WEB_SEARCH_UNSUPPORTED_MODELS = [
    "claude-3-haiku",
-    "claude-3-opus",
-    "claude-3-5-sonnet-20240620",
-    "claude-3-5-sonnet-20241022",
+]
+
+CODE_EXECUTION_UNSUPPORTED_MODELS = [
+    "claude-3-haiku",
 ]

 DEPRECATED_MODELS = [
-    "claude-3-5-haiku",
-    "claude-3-7-sonnet",
-    "claude-3-5-sonnet",
-    "claude-3-opus",
+    "claude-3",
 ]
@@ -37,6 +37,7 @@ class AnthropicConversationEntity(
    """Anthropic conversation agent."""

    _attr_supports_streaming = True
+    _attr_translation_key = "conversation"

    def __init__(self, entry: AnthropicConfigEntry, subentry: ConfigSubentry) -> None:
        """Initialize the agent."""
@@ -3,19 +3,23 @@
 import base64
 from collections.abc import AsyncGenerator, Callable, Iterable
 from dataclasses import dataclass, field
+from datetime import UTC, datetime
 import json
 from mimetypes import guess_file_type
 from pathlib import Path
-from typing import Any
+from typing import Any, Literal, cast

 import anthropic
 from anthropic import AsyncStream
 from anthropic.types import (
    Base64ImageSourceParam,
    Base64PDFSourceParam,
+    BashCodeExecutionToolResultBlock,
    CitationsDelta,
    CitationsWebSearchResultLocation,
    CitationWebSearchResultLocationParam,
+    CodeExecutionTool20250825Param,
+    Container,
    ContentBlockParam,
    DocumentBlockParam,
    ImageBlockParam,
@@ -41,6 +45,7 @@ from anthropic.types import (
    TextCitation,
    TextCitationParam,
    TextDelta,
+    TextEditorCodeExecutionToolResultBlock,
    ThinkingBlock,
    ThinkingBlockParam,
    ThinkingConfigAdaptiveParam,
@@ -51,18 +56,21 @@ from anthropic.types import (
    ToolChoiceAutoParam,
    ToolChoiceToolParam,
    ToolParam,
-    ToolResultBlockParam,
    ToolUnionParam,
    ToolUseBlock,
    ToolUseBlockParam,
    Usage,
    WebSearchTool20250305Param,
-    WebSearchToolRequestErrorParam,
    WebSearchToolResultBlock,
-    WebSearchToolResultBlockParam,
-    WebSearchToolResultError,
+    WebSearchToolResultBlockParamContentParam,
+)
+from anthropic.types.bash_code_execution_tool_result_block_param import (
+    Content as BashCodeExecutionToolResultContentParam,
 )
 from anthropic.types.message_create_params import MessageCreateParamsStreaming
+from anthropic.types.text_editor_code_execution_tool_result_block_param import (
+    Content as TextEditorCodeExecutionToolResultContentParam,
+)
 import voluptuous as vol
 from voluptuous_openapi import convert

@@ -74,10 +82,12 @@ from homeassistant.helpers import device_registry as dr, llm
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.json import json_dumps
 from homeassistant.util import slugify
+from homeassistant.util.json import JsonObjectType

 from . import AnthropicConfigEntry
 from .const import (
    CONF_CHAT_MODEL,
+    CONF_CODE_EXECUTION,
    CONF_MAX_TOKENS,
    CONF_TEMPERATURE,
    CONF_THINKING_BUDGET,
@@ -132,11 +142,23 @@ class ContentDetails:
    """Native data for AssistantContent."""

    citation_details: list[CitationDetails] = field(default_factory=list)
+    thinking_signature: str | None = None
+    redacted_thinking: str | None = None
+    container: Container | None = None

    def has_content(self) -> bool:
-        """Check if there is any content."""
+        """Check if there is any text content."""
        return any(detail.length > 0 for detail in self.citation_details)

+    def __bool__(self) -> bool:
+        """Check if there is any thinking content or citations."""
+        return (
+            self.thinking_signature is not None
+            or self.redacted_thinking is not None
+            or self.container is not None
+            or self.has_citations()
+        )
+
    def has_citations(self) -> bool:
        """Check if there are any citations."""
        return any(detail.citations for detail in self.citation_details)
@@ -178,30 +200,53 @@ class ContentDetails:

 def _convert_content(
    chat_content: Iterable[conversation.Content],
-) -> list[MessageParam]:
+) -> tuple[list[MessageParam], str | None]:
    """Transform HA chat_log content into Anthropic API format."""
    messages: list[MessageParam] = []
+    container_id: str | None = None

    for content in chat_content:
        if isinstance(content, conversation.ToolResultContent):
+            external_tool = True
            if content.tool_name == "web_search":
-                tool_result_block: ContentBlockParam = WebSearchToolResultBlockParam(
-                    type="web_search_tool_result",
-                    tool_use_id=content.tool_call_id,
-                    content=content.tool_result["content"]
-                    if "content" in content.tool_result
-                    else WebSearchToolRequestErrorParam(
-                        type="web_search_tool_result_error",
-                        error_code=content.tool_result.get("error_code", "unavailable"),  # type: ignore[typeddict-item]
+                tool_result_block: ContentBlockParam = {
+                    "type": "web_search_tool_result",
+                    "tool_use_id": content.tool_call_id,
+                    "content": cast(
+                        WebSearchToolResultBlockParamContentParam,
+                        content.tool_result["content"]
+                        if "content" in content.tool_result
+                        else {
+                            "type": "web_search_tool_result_error",
+                            "error_code": content.tool_result.get(
+                                "error_code", "unavailable"
+                            ),
+                        },
                    ),
-                )
-                external_tool = True
+                }
+            elif content.tool_name == "bash_code_execution":
+                tool_result_block = {
+                    "type": "bash_code_execution_tool_result",
+                    "tool_use_id": content.tool_call_id,
+                    "content": cast(
+                        BashCodeExecutionToolResultContentParam, content.tool_result
+                    ),
+                }
+            elif content.tool_name == "text_editor_code_execution":
+                tool_result_block = {
+                    "type": "text_editor_code_execution_tool_result",
+                    "tool_use_id": content.tool_call_id,
+                    "content": cast(
+                        TextEditorCodeExecutionToolResultContentParam,
+                        content.tool_result,
+                    ),
+                }
            else:
-                tool_result_block = ToolResultBlockParam(
-                    type="tool_result",
-                    tool_use_id=content.tool_call_id,
-                    content=json_dumps(content.tool_result),
-                )
+                tool_result_block = {
+                    "type": "tool_result",
+                    "tool_use_id": content.tool_call_id,
+                    "content": json_dumps(content.tool_result),
+                }
                external_tool = False
            if not messages or messages[-1]["role"] != (
                "assistant" if external_tool else "user"
@@ -246,29 +291,33 @@ def _convert_content(
                        content=[],
                    )
                )
+            elif isinstance(messages[-1]["content"], str):
+                messages[-1]["content"] = [
+                    TextBlockParam(type="text", text=messages[-1]["content"]),
+                ]

-            if isinstance(content.native, ThinkingBlock):
-                messages[-1]["content"].append(  # type: ignore[union-attr]
-                    ThinkingBlockParam(
-                        type="thinking",
-                        thinking=content.thinking_content or "",
-                        signature=content.native.signature,
+            if isinstance(content.native, ContentDetails):
+                if content.native.thinking_signature:
+                    messages[-1]["content"].append(  # type: ignore[union-attr]
+                        ThinkingBlockParam(
+                            type="thinking",
+                            thinking=content.thinking_content or "",
+                            signature=content.native.thinking_signature,
+                        )
                    )
-                )
-            elif isinstance(content.native, RedactedThinkingBlock):
-                redacted_thinking_block = RedactedThinkingBlockParam(
-                    type="redacted_thinking",
-                    data=content.native.data,
-                )
-                if isinstance(messages[-1]["content"], str):
-                    messages[-1]["content"] = [
-                        TextBlockParam(type="text", text=messages[-1]["content"]),
-                        redacted_thinking_block,
-                    ]
-                else:
-                    messages[-1]["content"].append(  # type: ignore[attr-defined]
-                        redacted_thinking_block
+                if content.native.redacted_thinking:
+                    messages[-1]["content"].append(  # type: ignore[union-attr]
+                        RedactedThinkingBlockParam(
+                            type="redacted_thinking",
+                            data=content.native.redacted_thinking,
+                        )
                    )
+                if (
+                    content.native.container is not None
+                    and content.native.container.expires_at > datetime.now(UTC)
+                ):
+                    container_id = content.native.container.id
+
            if content.content:
                current_index = 0
                for detail in (
@@ -309,16 +358,30 @@ def _convert_content(
                            text=content.content[current_index:],
                        )
                    )
+
            if content.tool_calls:
                messages[-1]["content"].extend(  # type: ignore[union-attr]
                    [
                        ServerToolUseBlockParam(
                            type="server_tool_use",
                            id=tool_call.id,
-                            name="web_search",
+                            name=cast(
+                                Literal[
+                                    "web_search",
+                                    "bash_code_execution",
+                                    "text_editor_code_execution",
+                                ],
+                                tool_call.tool_name,
+                            ),
                            input=tool_call.tool_args,
                        )
-                        if tool_call.external and tool_call.tool_name == "web_search"
+                        if tool_call.external
+                        and tool_call.tool_name
+                        in [
+                            "web_search",
+                            "bash_code_execution",
+                            "text_editor_code_execution",
+                        ]
                        else ToolUseBlockParam(
                            type="tool_use",
                            id=tool_call.id,
@@ -328,11 +391,19 @@ def _convert_content(
                        for tool_call in content.tool_calls
                    ]
                )
+
+            if (
+                isinstance(messages[-1]["content"], list)
+                and len(messages[-1]["content"]) == 1
+                and messages[-1]["content"][0]["type"] == "text"
+            ):
+                # If there is only one text block, simplify the content to a string
+                messages[-1]["content"] = messages[-1]["content"][0]["text"]
        else:
            # Note: We don't pass SystemContent here as its passed to the API as the prompt
            raise TypeError(f"Unexpected content type: {type(content)}")

-    return messages
+    return messages, container_id


 async def _transform_stream(  # noqa: C901 - This is complex, but better to have it in one place
@@ -379,8 +450,7 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
    content_details = ContentDetails()
    content_details.add_citation_detail()
    input_usage: Usage | None = None
-    has_native = False
-    first_block: bool
+    first_block: bool = True

    async for response in stream:
        LOGGER.debug("Received response: %s", response)
@@ -401,13 +471,12 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                current_tool_args = ""
                if response.content_block.name == output_tool:
                    if first_block or content_details.has_content():
-                        if content_details.has_citations():
+                        if content_details:
                            content_details.delete_empty()
                            yield {"native": content_details}
                        content_details = ContentDetails()
                        content_details.add_citation_detail()
                        yield {"role": "assistant"}
-                        has_native = False
                        first_block = False
            elif isinstance(response.content_block, TextBlock):
                if (  # Do not start a new assistant content just for citations, concatenate consecutive blocks with citations instead.
@@ -418,12 +487,11 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                        and content_details.has_content()
                    )
                ):
-                    if content_details.has_citations():
+                    if content_details:
                        content_details.delete_empty()
                        yield {"native": content_details}
                    content_details = ContentDetails()
                    yield {"role": "assistant"}
-                    has_native = False
                    first_block = False
                content_details.add_citation_detail()
                if response.content_block.text:
@@ -432,14 +500,13 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                    )
                    yield {"content": response.content_block.text}
            elif isinstance(response.content_block, ThinkingBlock):
-                if first_block or has_native:
-                    if content_details.has_citations():
+                if first_block or content_details.thinking_signature:
+                    if content_details:
                        content_details.delete_empty()
                        yield {"native": content_details}
                    content_details = ContentDetails()
                    content_details.add_citation_detail()
                    yield {"role": "assistant"}
-                    has_native = False
                    first_block = False
            elif isinstance(response.content_block, RedactedThinkingBlock):
                LOGGER.debug(
@@ -447,17 +514,15 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                    "encrypted for safety reasons. This doesn’t affect the quality of "
                    "responses"
                )
-                if has_native:
-                    if content_details.has_citations():
+                if first_block or content_details.redacted_thinking:
+                    if content_details:
                        content_details.delete_empty()
                        yield {"native": content_details}
                    content_details = ContentDetails()
                    content_details.add_citation_detail()
                    yield {"role": "assistant"}
-                    has_native = False
                    first_block = False
-                yield {"native": response.content_block}
-                has_native = True
+                content_details.redacted_thinking = response.content_block.data
            elif isinstance(response.content_block, ServerToolUseBlock):
                current_tool_block = ServerToolUseBlockParam(
                    type="server_tool_use",
@@ -466,8 +531,15 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                    input={},
                )
                current_tool_args = ""
-            elif isinstance(response.content_block, WebSearchToolResultBlock):
-                if content_details.has_citations():
+            elif isinstance(
+                response.content_block,
+                (
+                    WebSearchToolResultBlock,
+                    BashCodeExecutionToolResultBlock,
+                    TextEditorCodeExecutionToolResultBlock,
+                ),
+            ):
+                if content_details:
                    content_details.delete_empty()
                    yield {"native": content_details}
                content_details = ContentDetails()
@@ -475,26 +547,16 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                yield {
                    "role": "tool_result",
                    "tool_call_id": response.content_block.tool_use_id,
-                    "tool_name": "web_search",
+                    "tool_name": response.content_block.type.removesuffix(
+                        "_tool_result"
+                    ),
                    "tool_result": {
-                        "type": "web_search_tool_result_error",
-                        "error_code": response.content_block.content.error_code,
+                        "content": cast(
+                            JsonObjectType, response.content_block.to_dict()["content"]
+                        )
                    }
-                    if isinstance(
-                        response.content_block.content, WebSearchToolResultError
-                    )
-                    else {
-                        "content": [
-                            {
-                                "type": "web_search_result",
-                                "encrypted_content": block.encrypted_content,
-                                "page_age": block.page_age,
-                                "title": block.title,
-                                "url": block.url,
-                            }
-                            for block in response.content_block.content
-                        ]
-                    },
+                    if isinstance(response.content_block.content, list)
+                    else cast(JsonObjectType, response.content_block.content.to_dict()),
                }
                first_block = True
        elif isinstance(response, RawContentBlockDeltaEvent):
@@ -510,19 +572,16 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                else:
                    current_tool_args += response.delta.partial_json
            elif isinstance(response.delta, TextDelta):
-                content_details.citation_details[-1].length += len(response.delta.text)
-                yield {"content": response.delta.text}
-            elif isinstance(response.delta, ThinkingDelta):
-                yield {"thinking_content": response.delta.thinking}
-            elif isinstance(response.delta, SignatureDelta):
-                yield {
-                    "native": ThinkingBlock(
-                        type="thinking",
-                        thinking="",
-                        signature=response.delta.signature,
+                if response.delta.text:
+                    content_details.citation_details[-1].length += len(
+                        response.delta.text
                    )
-                }
-                has_native = True
+                    yield {"content": response.delta.text}
+            elif isinstance(response.delta, ThinkingDelta):
+                if response.delta.thinking:
+                    yield {"thinking_content": response.delta.thinking}
+            elif isinstance(response.delta, SignatureDelta):
+                content_details.thinking_signature = response.delta.signature
            elif isinstance(response.delta, CitationsDelta):
                content_details.add_citation(response.delta.citation)
        elif isinstance(response, RawContentBlockStopEvent):
@@ -546,10 +605,11 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
        elif isinstance(response, RawMessageDeltaEvent):
            if (usage := response.usage) is not None:
                chat_log.async_trace(_create_token_stats(input_usage, usage))
+            content_details.container = response.delta.container
            if response.delta.stop_reason == "refusal":
                raise HomeAssistantError("Potential policy violation detected")
        elif isinstance(response, RawMessageStopEvent):
-            if content_details.has_citations():
+            if content_details:
                content_details.delete_empty()
                yield {"native": content_details}
            content_details = ContentDetails()
@@ -599,6 +659,7 @@ class AnthropicBaseLLMEntity(Entity):
        chat_log: conversation.ChatLog,
        structure_name: str | None = None,
        structure: vol.Schema | None = None,
+        max_iterations: int = MAX_TOOL_ITERATIONS,
    ) -> None:
        """Generate an answer for the chat log."""
        options = self.subentry.data
@@ -616,7 +677,7 @@ class AnthropicBaseLLMEntity(Entity):
            )
        ]

-        messages = _convert_content(chat_log.content[1:])
+        messages, container_id = _convert_content(chat_log.content[1:])

        model = options.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL])

@@ -626,6 +687,7 @@ class AnthropicBaseLLMEntity(Entity):
            max_tokens=options.get(CONF_MAX_TOKENS, DEFAULT[CONF_MAX_TOKENS]),
            system=system_prompt,
            stream=True,
+            container=container_id,
        )

        if not model.startswith(tuple(NON_ADAPTIVE_THINKING_MODELS)):
@@ -664,6 +726,14 @@ class AnthropicBaseLLMEntity(Entity):
                for tool in chat_log.llm_api.tools
            ]

+        if options.get(CONF_CODE_EXECUTION):
+            tools.append(
+                CodeExecutionTool20250825Param(
+                    name="code_execution",
+                    type="code_execution_20250825",
+                ),
+            )
+
        if options.get(CONF_WEB_SEARCH):
            web_search = WebSearchTool20250305Param(
                name="web_search",
@@ -770,25 +840,29 @@ class AnthropicBaseLLMEntity(Entity):
        client = self.entry.runtime_data

        # To prevent infinite loops, we limit the number of iterations
-        for _iteration in range(MAX_TOOL_ITERATIONS):
+        for _iteration in range(max_iterations):
            try:
                stream = await client.messages.create(**model_args)

-                messages.extend(
-                    _convert_content(
-                        [
-                            content
-                            async for content in chat_log.async_add_delta_content_stream(
-                                self.entity_id,
-                                _transform_stream(
-                                    chat_log,
-                                    stream,
-                                    output_tool=structure_name or None,
-                                ),
-                            )
-                        ]
-                    )
+                new_messages, model_args["container"] = _convert_content(
+                    [
+                        content
+                        async for content in chat_log.async_add_delta_content_stream(
+                            self.entity_id,
+                            _transform_stream(
+                                chat_log,
+                                stream,
+                                output_tool=structure_name or None,
+                            ),
+                        )
+                    ]
                )
+                messages.extend(new_messages)
+            except anthropic.AuthenticationError as err:
+                self.entry.async_start_reauth(self.hass)
+                raise HomeAssistantError(
+                    "Authentication error with Anthropic API, reauthentication required"
+                ) from err
            except anthropic.AnthropicError as err:
                raise HomeAssistantError(
                    f"Sorry, I had a problem talking to Anthropic: {err}"
@@ -0,0 +1,14 @@
+{
+  "entity": {
+    "ai_task": {
+      "ai_task_data": {
+        "default": "mdi:asterisk"
+      }
+    },
+    "conversation": {
+      "conversation": {
+        "default": "mdi:asterisk"
+      }
+    }
+  }
+}
@@ -1,6 +1,6 @@
 {
  "domain": "anthropic",
-  "name": "Anthropic Conversation",
+  "name": "Anthropic",
  "after_dependencies": ["assist_pipeline", "intent"],
  "codeowners": ["@Shulyaka"],
  "config_flow": true,
@@ -8,5 +8,6 @@
  "documentation": "https://www.home-assistant.io/integrations/anthropic",
  "integration_type": "service",
  "iot_class": "cloud_polling",
-  "requirements": ["anthropic==0.78.0"]
+  "quality_scale": "bronze",
+  "requirements": ["anthropic==0.83.0"]
 }
@@ -0,0 +1,108 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: |
+      Integration has no actions.
+  appropriate-polling:
+    status: exempt
+    comment: |
+      Integration does not poll.
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      Integration has no actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: |
+      Integration does not subscribe to events.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+  # Silver
+  action-exceptions:
+    status: todo
+    comment: |
+      Reevaluate exceptions for entity services.
+  config-entry-unloading: done
+  docs-configuration-parameters: done
+  docs-installation-parameters: done
+  entity-unavailable: todo
+  integration-owner: done
+  log-when-unavailable: todo
+  parallel-updates:
+    status: exempt
+    comment: |
+      The API does not limit parallel updates.
+  reauthentication-flow: done
+  test-coverage: done
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info:
+    status: exempt
+    comment: |
+      Service integration, no discovery.
+  discovery:
+    status: exempt
+    comment: |
+      Service integration, no discovery.
+  docs-data-update:
+    status: exempt
+    comment: |
+      No data updates.
+  docs-examples:
+    status: todo
+    comment: |
+      To give examples of how people use the integration
+  docs-known-limitations: done
+  docs-supported-devices:
+    status: todo
+    comment: |
+      To write something about what models we support.
+  docs-supported-functions: done
+  docs-troubleshooting: todo
+  docs-use-cases: done
+  dynamic-devices:
+    status: exempt
+    comment: |
+      Service integration, no devices.
+  entity-category:
+    status: exempt
+    comment: |
+      No entities with categories.
+  entity-device-class:
+    status: exempt
+    comment: |
+      No entities with device classes.
+  entity-disabled-by-default:
+    status: exempt
+    comment: |
+      No entities disabled by default.
+  entity-translations: todo
+  exception-translations: todo
+  icon-translations: done
+  reconfiguration-flow: done
+  repair-issues: done
+  stale-devices:
+    status: exempt
+    comment: |
+      Service integration, no devices.
+  # Platinum
+  async-dependency: done
+  inject-websession:
+    status: done
+    comment: |
+      Uses `httpx` session.
+  strict-typing: done
@@ -3,25 +3,26 @@
 from __future__ import annotations

 from collections.abc import Iterator
-from typing import cast
+from typing import TYPE_CHECKING

 import voluptuous as vol

 from homeassistant import data_entry_flow
 from homeassistant.components.repairs import RepairsFlow
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState, ConfigSubentry
+from homeassistant.config_entries import ConfigEntryState, ConfigSubentry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.selector import SelectSelector, SelectSelectorConfig
+from homeassistant.helpers.selector import (
+    SelectOptionDict,
+    SelectSelector,
+    SelectSelectorConfig,
+)

 from .config_flow import get_model_list
-from .const import (
-    CONF_CHAT_MODEL,
-    DATA_REPAIR_DEFER_RELOAD,
-    DEFAULT,
-    DEPRECATED_MODELS,
-    DOMAIN,
-)
+from .const import CONF_CHAT_MODEL, DEPRECATED_MODELS, DOMAIN
+
+if TYPE_CHECKING:
+    from . import AnthropicConfigEntry


 class ModelDeprecatedRepairFlow(RepairsFlow):
@@ -30,8 +31,7 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
    _subentry_iter: Iterator[tuple[str, str]] | None
    _current_entry_id: str | None
    _current_subentry_id: str | None
-    _reload_pending: set[str]
-    _pending_updates: dict[str, dict[str, str]]
+    _model_list_cache: dict[str, list[SelectOptionDict]] | None

    def __init__(self) -> None:
        """Initialize the flow."""
@@ -39,42 +39,51 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
        self._subentry_iter = None
        self._current_entry_id = None
        self._current_subentry_id = None
-        self._reload_pending = set()
-        self._pending_updates = {}
+        self._model_list_cache = None

    async def async_step_init(
-        self, user_input: dict[str, str] | None = None
+        self, user_input: dict[str, str]
    ) -> data_entry_flow.FlowResult:
-        """Handle the first step of a fix flow."""
-        previous_entry_id: str | None = None
-        if user_input is not None:
-            previous_entry_id = self._async_update_current_subentry(user_input)
-            self._clear_current_target()
+        """Handle the steps of a fix flow."""
+        if user_input.get(CONF_CHAT_MODEL):
+            self._async_update_current_subentry(user_input)

        target = await self._async_next_target()
-        next_entry_id = target[0].entry_id if target else None
-        if previous_entry_id and previous_entry_id != next_entry_id:
-            await self._async_apply_pending_updates(previous_entry_id)
        if target is None:
-            await self._async_apply_all_pending_updates()
            return self.async_create_entry(data={})

        entry, subentry, model = target
-        client = entry.runtime_data
-        model_list = [
-            model_option
-            for model_option in await get_model_list(client)
-            if not model_option["value"].startswith(tuple(DEPRECATED_MODELS))
-        ]
+        if self._model_list_cache is None:
+            self._model_list_cache = {}
+        if entry.entry_id in self._model_list_cache:
+            model_list = self._model_list_cache[entry.entry_id]
+        else:
+            client = entry.runtime_data
+            model_list = [
+                model_option
+                for model_option in await get_model_list(client)
+                if not model_option["value"].startswith(tuple(DEPRECATED_MODELS))
+            ]
+            self._model_list_cache[entry.entry_id] = model_list

        if "opus" in model:
-            suggested_model = "claude-opus-4-5"
-        elif "haiku" in model:
-            suggested_model = "claude-haiku-4-5"
+            family = "claude-opus"
        elif "sonnet" in model:
-            suggested_model = "claude-sonnet-4-5"
+            family = "claude-sonnet"
        else:
-            suggested_model = cast(str, DEFAULT[CONF_CHAT_MODEL])
+            family = "claude-haiku"
+
+        suggested_model = next(
+            (
+                model_option["value"]
+                for model_option in sorted(
+                    (m for m in model_list if family in m["value"]),
+                    key=lambda x: x["value"],
+                    reverse=True,
+                )
+            ),
+            vol.UNDEFINED,
+        )

        schema = vol.Schema(
            {
@@ -110,7 +119,7 @@ class ModelDeprecatedRepairFlow(RepairsFlow):

    async def _async_next_target(
        self,
-    ) -> tuple[ConfigEntry, ConfigSubentry, str] | None:
+    ) -> tuple[AnthropicConfigEntry, ConfigSubentry, str] | None:
        """Return the next deprecated subentry target."""
        if self._subentry_iter is None:
            self._subentry_iter = self._iter_deprecated_subentries()
@@ -121,6 +130,8 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
            except StopIteration:
                return None

+            # Verify that the entry/subentry still exists and the model is still
+            # deprecated. This may have changed since we started the repair flow.
            entry = self.hass.config_entries.async_get_entry(entry_id)
            if entry is None:
                continue
@@ -129,9 +140,7 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
            if subentry is None:
                continue

-            model = self._pending_model(entry_id, subentry_id)
-            if model is None:
-                model = subentry.data.get(CONF_CHAT_MODEL)
+            model = subentry.data.get(CONF_CHAT_MODEL)
            if not model or not model.startswith(tuple(DEPRECATED_MODELS)):
                continue

@@ -139,36 +148,30 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
            self._current_subentry_id = subentry_id
            return entry, subentry, model

-    def _async_update_current_subentry(self, user_input: dict[str, str]) -> str | None:
+    def _async_update_current_subentry(self, user_input: dict[str, str]) -> None:
        """Update the currently selected subentry."""
-        if not self._current_entry_id or not self._current_subentry_id:
-            return None
-
-        entry = self.hass.config_entries.async_get_entry(self._current_entry_id)
-        if entry is None:
-            return None
-
-        subentry = entry.subentries.get(self._current_subentry_id)
-        if subentry is None:
-            return None
+        if (
+            self._current_entry_id is None
+            or self._current_subentry_id is None
+            or (
+                entry := self.hass.config_entries.async_get_entry(
+                    self._current_entry_id
+                )
+            )
+            is None
+            or (subentry := entry.subentries.get(self._current_subentry_id)) is None
+        ):
+            raise HomeAssistantError("Subentry not found")

        updated_data = {
            **subentry.data,
            CONF_CHAT_MODEL: user_input[CONF_CHAT_MODEL],
        }
-        if updated_data == subentry.data:
-            return entry.entry_id
-        self._queue_pending_update(
-            entry.entry_id,
-            subentry.subentry_id,
-            updated_data[CONF_CHAT_MODEL],
+        self.hass.config_entries.async_update_subentry(
+            entry,
+            subentry,
+            data=updated_data,
        )
-        return entry.entry_id
-
-    def _clear_current_target(self) -> None:
-        """Clear current target tracking."""
-        self._current_entry_id = None
-        self._current_subentry_id = None

    def _format_subentry_type(self, subentry_type: str) -> str:
        """Return a user-friendly subentry type label."""
@@ -178,91 +181,6 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
            return "AI task"
        return subentry_type

-    def _queue_pending_update(
-        self, entry_id: str, subentry_id: str, model: str
-    ) -> None:
-        """Store a pending model update for a subentry."""
-        self._pending_updates.setdefault(entry_id, {})[subentry_id] = model
-
-    def _pending_model(self, entry_id: str, subentry_id: str) -> str | None:
-        """Return a pending model update if one exists."""
-        return self._pending_updates.get(entry_id, {}).get(subentry_id)
-
-    def _mark_entry_for_reload(self, entry_id: str) -> None:
-        """Prevent reload until repairs are complete for the entry."""
-        self._reload_pending.add(entry_id)
-        defer_reload_entries: set[str] = self.hass.data.setdefault(
-            DOMAIN, {}
-        ).setdefault(DATA_REPAIR_DEFER_RELOAD, set())
-        defer_reload_entries.add(entry_id)
-
-    async def _async_reload_entry(self, entry_id: str) -> None:
-        """Reload an entry once all repairs are completed."""
-        if entry_id not in self._reload_pending:
-            return
-
-        entry = self.hass.config_entries.async_get_entry(entry_id)
-        if entry is not None and entry.state is not ConfigEntryState.LOADED:
-            self._clear_defer_reload(entry_id)
-            self._reload_pending.discard(entry_id)
-            return
-
-        if entry is not None:
-            await self.hass.config_entries.async_reload(entry_id)
-
-        self._clear_defer_reload(entry_id)
-        self._reload_pending.discard(entry_id)
-
-    def _clear_defer_reload(self, entry_id: str) -> None:
-        """Remove entry from the deferred reload set."""
-        defer_reload_entries: set[str] = self.hass.data.setdefault(
-            DOMAIN, {}
-        ).setdefault(DATA_REPAIR_DEFER_RELOAD, set())
-        defer_reload_entries.discard(entry_id)
-
-    async def _async_apply_pending_updates(self, entry_id: str) -> None:
-        """Apply pending subentry updates for a single entry."""
-        updates = self._pending_updates.pop(entry_id, None)
-        if not updates:
-            return
-
-        entry = self.hass.config_entries.async_get_entry(entry_id)
-        if entry is None or entry.state is not ConfigEntryState.LOADED:
-            return
-
-        changed = False
-        for subentry_id, model in updates.items():
-            subentry = entry.subentries.get(subentry_id)
-            if subentry is None:
-                continue
-
-            updated_data = {
-                **subentry.data,
-                CONF_CHAT_MODEL: model,
-            }
-            if updated_data == subentry.data:
-                continue
-
-            if not changed:
-                self._mark_entry_for_reload(entry_id)
-                changed = True
-
-            self.hass.config_entries.async_update_subentry(
-                entry,
-                subentry,
-                data=updated_data,
-            )
-
-        if not changed:
-            return
-
-        await self._async_reload_entry(entry_id)
-
-    async def _async_apply_all_pending_updates(self) -> None:
-        """Apply all pending updates across entries."""
-        for entry_id in list(self._pending_updates):
-            await self._async_apply_pending_updates(entry_id)
-

 async def async_create_fix_flow(
    hass: HomeAssistant,
@@ -1,7 +1,8 @@
 {
  "config": {
    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
    },
    "error": {
      "authentication_error": "[%key:common::config_flow::error::invalid_auth%]",
@@ -10,10 +11,23 @@
      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "step": {
+      "reauth_confirm": {
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]"
+        },
+        "data_description": {
+          "api_key": "[%key:component::anthropic::config::step::user::data_description::api_key%]"
+        },
+        "description": "Reauthentication required. Please enter your updated API key."
+      },
      "user": {
        "data": {
          "api_key": "[%key:common::config_flow::data::api_key%]"
-        }
+        },
+        "data_description": {
+          "api_key": "Your Anthropic API key."
+        },
+        "description": "Set up Anthropic integration by providing your Anthropic API key. Instructions to obtain an API key can be found in [the documentation]({instructions_url})."
      }
    }
  },
@@ -35,6 +49,11 @@
            "max_tokens": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data::max_tokens%]",
            "temperature": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data::temperature%]"
          },
+          "data_description": {
+            "chat_model": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::chat_model%]",
+            "max_tokens": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::max_tokens%]",
+            "temperature": "[%key:component::anthropic::config_subentries::conversation::step::advanced::data_description::temperature%]"
+          },
          "title": "[%key:component::anthropic::config_subentries::conversation::step::advanced::title%]"
        },
        "init": {
@@ -42,10 +61,15 @@
            "name": "[%key:common::config_flow::data::name%]",
            "recommended": "[%key:component::anthropic::config_subentries::conversation::step::init::data::recommended%]"
          },
+          "data_description": {
+            "name": "[%key:component::anthropic::config_subentries::conversation::step::init::data_description::name%]",
+            "recommended": "[%key:component::anthropic::config_subentries::conversation::step::init::data_description::recommended%]"
+          },
          "title": "[%key:component::anthropic::config_subentries::conversation::step::init::title%]"
        },
        "model": {
          "data": {
+            "code_execution": "[%key:component::anthropic::config_subentries::conversation::step::model::data::code_execution%]",
            "thinking_budget": "[%key:component::anthropic::config_subentries::conversation::step::model::data::thinking_budget%]",
            "thinking_effort": "[%key:component::anthropic::config_subentries::conversation::step::model::data::thinking_effort%]",
            "user_location": "[%key:component::anthropic::config_subentries::conversation::step::model::data::user_location%]",
@@ -53,6 +77,7 @@
            "web_search_max_uses": "[%key:component::anthropic::config_subentries::conversation::step::model::data::web_search_max_uses%]"
          },
          "data_description": {
+            "code_execution": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::code_execution%]",
            "thinking_budget": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::thinking_budget%]",
            "thinking_effort": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::thinking_effort%]",
            "user_location": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::user_location%]",
@@ -80,6 +105,11 @@
            "max_tokens": "Maximum tokens to return in response",
            "temperature": "Temperature"
          },
+          "data_description": {
+            "chat_model": "The model to serve the responses.",
+            "max_tokens": "Limit the number of response tokens.",
+            "temperature": "Control the randomness of the response, trading off between creativity and coherence."
+          },
          "title": "Advanced settings"
        },
        "init": {
@@ -90,12 +120,16 @@
            "recommended": "Recommended model settings"
          },
          "data_description": {
-            "prompt": "Instruct how the LLM should respond. This can be a template."
+            "llm_hass_api": "Allow the LLM to control Home Assistant.",
+            "name": "The name of this configuration",
+            "prompt": "Instruct how the LLM should respond. This can be a template.",
+            "recommended": "Use default configuration"
          },
          "title": "Basic settings"
        },
        "model": {
          "data": {
+            "code_execution": "Code execution",
            "thinking_budget": "Thinking budget",
            "thinking_effort": "Thinking effort",
            "user_location": "Include home location",
@@ -103,6 +137,7 @@
            "web_search_max_uses": "Maximum web searches"
          },
          "data_description": {
+            "code_execution": "Allow the model to execute code in a secure sandbox environment, enabling it to analyze data and perform complex calculations.",
            "thinking_budget": "The number of tokens the model can use to think about the response out of the total maximum number of tokens. Set to 1024 or greater to enable extended thinking.",
            "thinking_effort": "Control how many tokens Claude uses when responding, trading off between response thoroughness and token efficiency",
            "user_location": "Localize search results based on home location",
@@ -122,6 +157,9 @@
            "data": {
              "chat_model": "[%key:common::generic::model%]"
            },
+            "data_description": {
+              "chat_model": "Select the new model to use."
+            },
            "description": "You are updating {subentry_name} ({subentry_type}) in {entry_name}. The current model {model} is deprecated. Select a supported model to continue.",
            "title": "Update model"
          }
@@ -120,7 +120,7 @@ class AOSmithWaterHeaterEntity(AOSmithStatusEntity, WaterHeaterEntity):
        return MODE_AOSMITH_TO_HA.get(self.device.status.current_mode, STATE_OFF)

    @property
-    def is_away_mode_on(self):
+    def is_away_mode_on(self) -> bool:
        """Return True if away mode is on."""
        return self.device.status.current_mode == AOSmithOperationMode.VACATION

@@ -117,6 +117,7 @@ class SharpAquosTVDevice(MediaPlayerEntity):
        | MediaPlayerEntityFeature.VOLUME_SET
        | MediaPlayerEntityFeature.PLAY
    )
+    _attr_volume_step = 2 / 60

    def __init__(
        self, name: str, remote: sharp_aquos_rc.TV, power_on_enabled: bool = False
@@ -161,22 +162,6 @@ class SharpAquosTVDevice(MediaPlayerEntity):
        """Turn off tvplayer."""
        self._remote.power(0)

-    @_retry
-    def volume_up(self) -> None:
-        """Volume up the media player."""
-        if self.volume_level is None:
-            _LOGGER.debug("Unknown volume in volume_up")
-            return
-        self._remote.volume(int(self.volume_level * 60) + 2)
-
-    @_retry
-    def volume_down(self) -> None:
-        """Volume down media player."""
-        if self.volume_level is None:
-            _LOGGER.debug("Unknown volume in volume_down")
-            return
-        self._remote.volume(int(self.volume_level * 60) - 2)
-
    @_retry
    def set_volume_level(self, volume: float) -> None:
        """Set Volume media player."""
@@ -64,6 +64,6 @@ class AtagSensor(AtagEntity, SensorEntity):
        return self.coordinator.atag.report[self._id].state

    @property
-    def icon(self):
+    def icon(self) -> str:
        """Return icon."""
        return self.coordinator.atag.report[self._id].icon
@@ -37,15 +37,15 @@ class AtagWaterHeater(AtagEntity, WaterHeaterEntity):
    _attr_temperature_unit = UnitOfTemperature.CELSIUS

    @property
-    def current_temperature(self):
+    def current_temperature(self) -> float:
        """Return the current temperature."""
        return self.coordinator.atag.dhw.temperature

    @property
-    def current_operation(self):
+    def current_operation(self) -> str:
        """Return current operation."""
        operation = self.coordinator.atag.dhw.current_operation
-        return operation if operation in self.operation_list else STATE_OFF
+        return operation if operation in OPERATION_LIST else STATE_OFF

    async def async_set_temperature(self, **kwargs: Any) -> None:
        """Set new target temperature."""
@@ -53,7 +53,7 @@ class AtagWaterHeater(AtagEntity, WaterHeaterEntity):
            self.async_write_ha_state()

    @property
-    def target_temperature(self):
+    def target_temperature(self) -> float:
        """Return the setpoint if water demand, otherwise return base temp (comfort level)."""
        return self.coordinator.atag.dhw.target_temperature

@@ -363,8 +363,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
    async def reload_service_handler(service_call: ServiceCall) -> None:
        """Remove all automations and load new ones from config."""
        await async_get_blueprints(hass).async_reset_cache()
-        if (conf := await component.async_prepare_reload(skip_reset=True)) is None:
-            return
+        conf = await component.async_prepare_reload(skip_reset=True)
        if automation_id := service_call.data.get(CONF_ID):
            await _async_process_single_config(hass, conf, component, automation_id)
        else:
@@ -5,11 +5,10 @@ from __future__ import annotations
 import logging
 from typing import cast

-from aiobotocore.client import AioBaseClient as S3Client
 from aiobotocore.session import AioSession
 from botocore.exceptions import ClientError, ConnectionError, ParamValidationError

-from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady

@@ -21,9 +20,9 @@ from .const import (
    DATA_BACKUP_AGENT_LISTENERS,
    DOMAIN,
 )
+from .coordinator import S3ConfigEntry, S3DataUpdateCoordinator

-type S3ConfigEntry = ConfigEntry[S3Client]
-
+_PLATFORMS = (Platform.SENSOR,)

 _LOGGER = logging.getLogger(__name__)

@@ -64,7 +63,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
            translation_key="cannot_connect",
        ) from err

-    entry.runtime_data = client
+    coordinator = S3DataUpdateCoordinator(
+        hass,
+        entry=entry,
+        client=client,
+    )
+    await coordinator.async_config_entry_first_refresh()
+    entry.runtime_data = coordinator

    def notify_backup_listeners() -> None:
        for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
@@ -72,11 +77,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:

    entry.async_on_unload(entry.async_on_state_change(notify_backup_listeners))

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


 async def async_unload_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
    """Unload a config entry."""
-    client = entry.runtime_data
-    await client.__aexit__(None, None, None)
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, _PLATFORMS)
+    if not unload_ok:
+        return False
+    coordinator = entry.runtime_data
+    await coordinator.client.__aexit__(None, None, None)
    return True
@@ -5,7 +5,7 @@ import functools
 import json
 import logging
 from time import time
-from typing import Any
+from typing import Any, cast

 from botocore.exceptions import BotoCoreError

@@ -19,7 +19,8 @@ from homeassistant.components.backup import (
 from homeassistant.core import HomeAssistant, callback

 from . import S3ConfigEntry
-from .const import CONF_BUCKET, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+from .const import CONF_BUCKET, CONF_PREFIX, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+from .helpers import async_list_backups_from_s3

 _LOGGER = logging.getLogger(__name__)
 CACHE_TTL = 300
@@ -93,12 +94,19 @@ class S3BackupAgent(BackupAgent):
    def __init__(self, hass: HomeAssistant, entry: S3ConfigEntry) -> None:
        """Initialize the S3 agent."""
        super().__init__()
-        self._client = entry.runtime_data
+        self._client = entry.runtime_data.client
        self._bucket: str = entry.data[CONF_BUCKET]
        self.name = entry.title
        self.unique_id = entry.entry_id
        self._backup_cache: dict[str, AgentBackup] = {}
        self._cache_expiration = time()
+        self._prefix: str = entry.data.get(CONF_PREFIX, "")
+
+    def _with_prefix(self, key: str) -> str:
+        """Add prefix to a key if configured."""
+        if not self._prefix:
+            return key
+        return f"{self._prefix}/{key}"

    @handle_boto_errors
    async def async_download_backup(
@@ -114,7 +122,9 @@ class S3BackupAgent(BackupAgent):
        backup = await self._find_backup_by_id(backup_id)
        tar_filename, _ = suggested_filenames(backup)

-        response = await self._client.get_object(Bucket=self._bucket, Key=tar_filename)
+        response = await self._client.get_object(
+            Bucket=self._bucket, Key=self._with_prefix(tar_filename)
+        )
        return response["Body"].iter_chunks()

    async def async_upload_backup(
@@ -141,7 +151,7 @@ class S3BackupAgent(BackupAgent):
            metadata_content = json.dumps(backup.as_dict())
            await self._client.put_object(
                Bucket=self._bucket,
-                Key=metadata_filename,
+                Key=self._with_prefix(metadata_filename),
                Body=metadata_content,
            )
        except BotoCoreError as err:
@@ -168,7 +178,7 @@ class S3BackupAgent(BackupAgent):

        await self._client.put_object(
            Bucket=self._bucket,
-            Key=tar_filename,
+            Key=self._with_prefix(tar_filename),
            Body=bytes(file_data),
        )

@@ -185,54 +195,74 @@ class S3BackupAgent(BackupAgent):
        _LOGGER.debug("Starting multipart upload for %s", tar_filename)
        multipart_upload = await self._client.create_multipart_upload(
            Bucket=self._bucket,
-            Key=tar_filename,
+            Key=self._with_prefix(tar_filename),
        )
        upload_id = multipart_upload["UploadId"]
        try:
-            parts = []
+            parts: list[dict[str, Any]] = []
            part_number = 1
-            buffer_size = 0  # bytes
-            buffer: list[bytes] = []
+            buffer = bytearray()  # bytes buffer to store the data
+            offset = 0  # start index of unread data inside buffer

            stream = await open_stream()
            async for chunk in stream:
-                buffer_size += len(chunk)
-                buffer.append(chunk)
+                buffer.extend(chunk)

-                # If buffer size meets minimum part size, upload it as a part
-                if buffer_size >= MULTIPART_MIN_PART_SIZE_BYTES:
-                    _LOGGER.debug(
-                        "Uploading part number %d, size %d", part_number, buffer_size
-                    )
-                    part = await self._client.upload_part(
-                        Bucket=self._bucket,
-                        Key=tar_filename,
-                        PartNumber=part_number,
-                        UploadId=upload_id,
-                        Body=b"".join(buffer),
-                    )
-                    parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-                    part_number += 1
-                    buffer_size = 0
-                    buffer = []
+                # Upload parts of exactly MULTIPART_MIN_PART_SIZE_BYTES to ensure
+                # all non-trailing parts have the same size (defensive implementation)
+                view = memoryview(buffer)
+                try:
+                    while len(buffer) - offset >= MULTIPART_MIN_PART_SIZE_BYTES:
+                        start = offset
+                        end = offset + MULTIPART_MIN_PART_SIZE_BYTES
+                        part_data = view[start:end]
+                        offset = end
+
+                        _LOGGER.debug(
+                            "Uploading part number %d, size %d",
+                            part_number,
+                            len(part_data),
+                        )
+                        part = await cast(Any, self._client).upload_part(
+                            Bucket=self._bucket,
+                            Key=self._with_prefix(tar_filename),
+                            PartNumber=part_number,
+                            UploadId=upload_id,
+                            Body=part_data.tobytes(),
+                        )
+                        parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
+                        part_number += 1
+                finally:
+                    view.release()
+
+                # Compact the buffer if the consumed offset has grown large enough. This
+                # avoids unnecessary memory copies when compacting after every part upload.
+                if offset and offset >= MULTIPART_MIN_PART_SIZE_BYTES:
+                    buffer = bytearray(buffer[offset:])
+                    offset = 0

            # Upload the final buffer as the last part (no minimum size requirement)
-            if buffer:
+            # Offset should be 0 after the last compaction, but we use it as the start
+            # index to be defensive in case the buffer was not compacted.
+            if offset < len(buffer):
+                remaining_data = memoryview(buffer)[offset:]
                _LOGGER.debug(
-                    "Uploading final part number %d, size %d", part_number, buffer_size
+                    "Uploading final part number %d, size %d",
+                    part_number,
+                    len(remaining_data),
                )
-                part = await self._client.upload_part(
+                part = await cast(Any, self._client).upload_part(
                    Bucket=self._bucket,
-                    Key=tar_filename,
+                    Key=self._with_prefix(tar_filename),
                    PartNumber=part_number,
                    UploadId=upload_id,
-                    Body=b"".join(buffer),
+                    Body=remaining_data.tobytes(),
                )
                parts.append({"PartNumber": part_number, "ETag": part["ETag"]})

-            await self._client.complete_multipart_upload(
+            await cast(Any, self._client).complete_multipart_upload(
                Bucket=self._bucket,
-                Key=tar_filename,
+                Key=self._with_prefix(tar_filename),
                UploadId=upload_id,
                MultipartUpload={"Parts": parts},
            )
@@ -241,7 +271,7 @@ class S3BackupAgent(BackupAgent):
            try:
                await self._client.abort_multipart_upload(
                    Bucket=self._bucket,
-                    Key=tar_filename,
+                    Key=self._with_prefix(tar_filename),
                    UploadId=upload_id,
                )
            except BotoCoreError:
@@ -262,8 +292,12 @@ class S3BackupAgent(BackupAgent):
        tar_filename, metadata_filename = suggested_filenames(backup)

        # Delete both the backup file and its metadata file
-        await self._client.delete_object(Bucket=self._bucket, Key=tar_filename)
-        await self._client.delete_object(Bucket=self._bucket, Key=metadata_filename)
+        await self._client.delete_object(
+            Bucket=self._bucket, Key=self._with_prefix(tar_filename)
+        )
+        await self._client.delete_object(
+            Bucket=self._bucket, Key=self._with_prefix(metadata_filename)
+        )

        # Reset cache after successful deletion
        self._cache_expiration = time()
@@ -296,35 +330,10 @@ class S3BackupAgent(BackupAgent):
        if time() <= self._cache_expiration:
            return self._backup_cache

-        backups = {}
-        paginator = self._client.get_paginator("list_objects_v2")
-        metadata_files: list[dict[str, Any]] = []
-        async for page in paginator.paginate(Bucket=self._bucket):
-            metadata_files.extend(
-                obj
-                for obj in page.get("Contents", [])
-                if obj["Key"].endswith(".metadata.json")
-            )
-
-        for metadata_file in metadata_files:
-            try:
-                # Download and parse metadata file
-                metadata_response = await self._client.get_object(
-                    Bucket=self._bucket, Key=metadata_file["Key"]
-                )
-                metadata_content = await metadata_response["Body"].read()
-                metadata_json = json.loads(metadata_content)
-            except (BotoCoreError, json.JSONDecodeError) as err:
-                _LOGGER.warning(
-                    "Failed to process metadata file %s: %s",
-                    metadata_file["Key"],
-                    err,
-                )
-                continue
-            backup = AgentBackup.from_dict(metadata_json)
-            backups[backup.backup_id] = backup
-
-        self._backup_cache = backups
+        backups_list = await async_list_backups_from_s3(
+            self._client, self._bucket, self._prefix
+        )
+        self._backup_cache = {b.backup_id: b for b in backups_list}
        self._cache_expiration = time() + CACHE_TTL

        return self._backup_cache
--- a/Show More
+++ b/Show More