Update homeassistant/components/websocket_api/commands.py

Co-authored-by: Artur Pragacz <49985303+arturpragacz@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -8,6 +8,8 @@
     "PYTHONASYNCIODEBUG": "1"
   },
   "features": {
+    // Node feature required for Claude Code until fixed https://github.com/anthropics/devcontainer-features/issues/28
+    "ghcr.io/devcontainers/features/node:1": {},
     "ghcr.io/anthropics/devcontainer-features/claude-code:1.0": {},
     "ghcr.io/devcontainers/features/github-cli:1": {}
   },

.github/workflows/builder.yml

@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -116,7 +116,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -457,7 +457,7 @@ jobs:
         uses: actions/checkout@v5.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -480,7 +480,7 @@ jobs:
           python -m build
 
       - name: Upload package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.12.4
+        uses: pypa/gh-action-pypi-publish@v1.13.0
         with:
           skip-existing: true
 
@@ -531,7 +531,7 @@ jobs:
 
       - name: Generate artifact attestation
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0
+        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
         with:
           subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
           subject-digest: ${{ steps.push.outputs.digest }}

.github/workflows/ci.yaml

@@ -40,7 +40,7 @@ env:
   CACHE_VERSION: 7
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.9"
+  HA_SHORT_VERSION: "2025.10"
   DEFAULT_PYTHON: "3.13"
   ALL_PYTHON_VERSIONS: "['3.13']"
   # 10.3 is the oldest supported version
@@ -249,7 +249,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -294,7 +294,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -334,7 +334,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -374,7 +374,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -484,7 +484,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -517,6 +517,7 @@ jobs:
             env.HA_SHORT_VERSION }}-
       - name: Install additional OS dependencies
         if: steps.cache-venv.outputs.cache-hit != 'true'
+        timeout-minutes: 5
         run: |
           sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
@@ -578,6 +579,7 @@ jobs:
       - base
     steps:
       - name: Install additional OS dependencies
+        timeout-minutes: 5
         run: |
           sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
@@ -587,7 +589,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -620,7 +622,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -677,7 +679,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -720,7 +722,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -767,7 +769,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -812,7 +814,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -877,6 +879,7 @@ jobs:
     name: Split tests for full run
     steps:
       - name: Install additional OS dependencies
+        timeout-minutes: 5
         run: |
           sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
@@ -889,7 +892,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -937,6 +940,7 @@ jobs:
       Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
     steps:
       - name: Install additional OS dependencies
+        timeout-minutes: 5
         run: |
           sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
@@ -950,7 +954,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1070,6 +1074,7 @@ jobs:
       Run ${{ matrix.mariadb-group }} tests Python ${{ matrix.python-version }}
     steps:
       - name: Install additional OS dependencies
+        timeout-minutes: 5
         run: |
           sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
@@ -1083,7 +1088,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1210,6 +1215,7 @@ jobs:
       Run ${{ matrix.postgresql-group }} tests Python ${{ matrix.python-version }}
     steps:
       - name: Install additional OS dependencies
+        timeout-minutes: 5
         run: |
           sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
@@ -1225,7 +1231,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1341,7 +1347,7 @@ jobs:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@v5.5.0
+        uses: codecov/codecov-action@v5.5.1
         with:
           fail_ci_if_error: true
           flags: full-suite
@@ -1371,6 +1377,7 @@ jobs:
       Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
     steps:
       - name: Install additional OS dependencies
+        timeout-minutes: 5
         run: |
           sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
@@ -1384,7 +1391,7 @@ jobs:
         uses: actions/checkout@v5.0.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1491,7 +1498,7 @@ jobs:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@v5.5.0
+        uses: codecov/codecov-action@v5.5.1
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@v5.0.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.29.11
+        uses: github/codeql-action/init@v3.30.1
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.29.11
+        uses: github/codeql-action/analyze@v3.30.1
         with:
           category: "/language:python"

.github/workflows/detect-duplicate-issues.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Check if integration label was added and extract details
         id: extract
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@v8
         with:
           script: |
             // Debug: Log the event payload
@@ -113,7 +113,7 @@ jobs:
       - name: Fetch similar issues
         id: fetch_similar
         if: steps.extract.outputs.should_continue == 'true'
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@v8
         env:
           INTEGRATION_LABELS: ${{ steps.extract.outputs.integration_labels }}
           CURRENT_NUMBER: ${{ steps.extract.outputs.current_number }}
@@ -280,7 +280,7 @@ jobs:
       - name: Post duplicate detection results
         id: post_results
         if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@v8
         env:
           AI_RESPONSE: ${{ steps.ai_detection.outputs.response }}
           SIMILAR_ISSUES: ${{ steps.fetch_similar.outputs.similar_issues }}

.github/workflows/detect-non-english-issues.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Check issue language
         id: detect_language
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@v8
         env:
           ISSUE_NUMBER: ${{ github.event.issue.number }}
           ISSUE_TITLE: ${{ github.event.issue.title }}
@@ -90,7 +90,7 @@ jobs:
 
       - name: Process non-English issues
         if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/github-script@v7.0.1
+        uses: actions/github-script@v8
         env:
           AI_RESPONSE: ${{ steps.ai_language_detection.outputs.response }}
           ISSUE_NUMBER: ${{ steps.detect_language.outputs.issue_number }}

.github/workflows/restrict-task-creation.yml

@@ -12,7 +12,7 @@ jobs:
     if: github.event.issue.type.name == 'Task'
     steps:
       - name: Check if user is authorized
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             const issueAuthor = context.payload.issue.user.login;

.github/workflows/stale.yml

@@ -17,7 +17,7 @@ jobs:
       # - No PRs marked as no-stale
       # - No issues (-1)
       - name: 60 days stale PRs policy
-        uses: actions/stale@v9.1.0
+        uses: actions/stale@v10.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 60
@@ -57,7 +57,7 @@ jobs:
       # - No issues marked as no-stale or help-wanted
       # - No PRs (-1)
       - name: 90 days stale issues
-        uses: actions/stale@v9.1.0
+        uses: actions/stale@v10.0.0
         with:
           repo-token: ${{ steps.token.outputs.token }}
           days-before-stale: 90
@@ -87,7 +87,7 @@ jobs:
       # - No Issues marked as no-stale or help-wanted
       # - No PRs (-1)
       - name: Needs more information stale issues policy
-        uses: actions/stale@v9.1.0
+        uses: actions/stale@v10.0.0
         with:
           repo-token: ${{ steps.token.outputs.token }}
           only-labels: "needs-more-information"

.github/workflows/translations.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v5.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 

.github/workflows/wheels.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true

.strict-typing

@@ -307,6 +307,7 @@ homeassistant.components.ld2410_ble.*
 homeassistant.components.led_ble.*
 homeassistant.components.lektrico.*
 homeassistant.components.letpot.*
+homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*
 homeassistant.components.light.*
@@ -382,6 +383,7 @@ homeassistant.components.openai_conversation.*
 homeassistant.components.openexchangerates.*
 homeassistant.components.opensky.*
 homeassistant.components.openuv.*
+homeassistant.components.opnsense.*
 homeassistant.components.opower.*
 homeassistant.components.oralb.*
 homeassistant.components.otbr.*
@@ -458,6 +460,7 @@ homeassistant.components.sensorpush_cloud.*
 homeassistant.components.sensoterra.*
 homeassistant.components.senz.*
 homeassistant.components.sfr_box.*
+homeassistant.components.sftp_storage.*
 homeassistant.components.shell_command.*
 homeassistant.components.shelly.*
 homeassistant.components.shopping_list.*

CODEOWNERS

@@ -154,10 +154,10 @@ build.json @home-assistant/supervisor
 /tests/components/arve/ @ikalnyi
 /homeassistant/components/aseko_pool_live/ @milanmeu
 /tests/components/aseko_pool_live/ @milanmeu
-/homeassistant/components/assist_pipeline/ @balloob @synesthesiam
-/tests/components/assist_pipeline/ @balloob @synesthesiam
-/homeassistant/components/assist_satellite/ @home-assistant/core @synesthesiam
-/tests/components/assist_satellite/ @home-assistant/core @synesthesiam
+/homeassistant/components/assist_pipeline/ @synesthesiam @arturpragacz
+/tests/components/assist_pipeline/ @synesthesiam @arturpragacz
+/homeassistant/components/assist_satellite/ @home-assistant/core @synesthesiam @arturpragacz
+/tests/components/assist_satellite/ @home-assistant/core @synesthesiam @arturpragacz
 /homeassistant/components/asuswrt/ @kennedyshead @ollo69 @Vaskivskyi
 /tests/components/asuswrt/ @kennedyshead @ollo69 @Vaskivskyi
 /homeassistant/components/atag/ @MatsNL
@@ -298,8 +298,8 @@ build.json @home-assistant/supervisor
 /tests/components/configurator/ @home-assistant/core
 /homeassistant/components/control4/ @lawtancool
 /tests/components/control4/ @lawtancool
-/homeassistant/components/conversation/ @home-assistant/core @synesthesiam
-/tests/components/conversation/ @home-assistant/core @synesthesiam
+/homeassistant/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
+/tests/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
 /homeassistant/components/cookidoo/ @miaucl
 /tests/components/cookidoo/ @miaucl
 /homeassistant/components/coolmaster/ @OnFreund
@@ -464,8 +464,6 @@ build.json @home-assistant/supervisor
 /tests/components/eufylife_ble/ @bdr99
 /homeassistant/components/event/ @home-assistant/core
 /tests/components/event/ @home-assistant/core
-/homeassistant/components/evil_genius_labs/ @balloob
-/tests/components/evil_genius_labs/ @balloob
 /homeassistant/components/evohome/ @zxdavb
 /tests/components/evohome/ @zxdavb
 /homeassistant/components/ezviz/ @RenierM26
@@ -515,8 +513,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/forked_daapd/ @uvjustin
 /tests/components/forked_daapd/ @uvjustin
 /homeassistant/components/fortios/ @kimfrellsen
-/homeassistant/components/foscam/ @krmarien
-/tests/components/foscam/ @krmarien
+/homeassistant/components/foscam/ @Foscam-wangzhengyu
+/tests/components/foscam/ @Foscam-wangzhengyu
 /homeassistant/components/freebox/ @hacf-fr @Quentame
 /tests/components/freebox/ @hacf-fr @Quentame
 /homeassistant/components/freedompro/ @stefano055415
@@ -650,6 +648,8 @@ build.json @home-assistant/supervisor
 /tests/components/homeassistant/ @home-assistant/core
 /homeassistant/components/homeassistant_alerts/ @home-assistant/core
 /tests/components/homeassistant_alerts/ @home-assistant/core
+/homeassistant/components/homeassistant_connect_zbt2/ @home-assistant/core
+/tests/components/homeassistant_connect_zbt2/ @home-assistant/core
 /homeassistant/components/homeassistant_green/ @home-assistant/core
 /tests/components/homeassistant_green/ @home-assistant/core
 /homeassistant/components/homeassistant_hardware/ @home-assistant/core
@@ -678,8 +678,8 @@ build.json @home-assistant/supervisor
 /tests/components/http/ @home-assistant/core
 /homeassistant/components/huawei_lte/ @scop @fphammerle
 /tests/components/huawei_lte/ @scop @fphammerle
-/homeassistant/components/hue/ @balloob @marcelveldt
-/tests/components/hue/ @balloob @marcelveldt
+/homeassistant/components/hue/ @marcelveldt
+/tests/components/hue/ @marcelveldt
 /homeassistant/components/huisbaasje/ @dennisschroer
 /tests/components/huisbaasje/ @dennisschroer
 /homeassistant/components/humidifier/ @home-assistant/core @Shulyaka
@@ -751,8 +751,8 @@ build.json @home-assistant/supervisor
 /tests/components/integration/ @dgomes
 /homeassistant/components/intellifire/ @jeeftor
 /tests/components/intellifire/ @jeeftor
-/homeassistant/components/intent/ @home-assistant/core @synesthesiam
-/tests/components/intent/ @home-assistant/core @synesthesiam
+/homeassistant/components/intent/ @home-assistant/core @synesthesiam @arturpragacz
+/tests/components/intent/ @home-assistant/core @synesthesiam @arturpragacz
 /homeassistant/components/intesishome/ @jnimmo
 /homeassistant/components/iometer/ @MaestroOnICe
 /tests/components/iometer/ @MaestroOnICe
@@ -860,6 +860,8 @@ build.json @home-assistant/supervisor
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
 /tests/components/lg_thinq/ @LG-ThinQ-Integration
+/homeassistant/components/libre_hardware_monitor/ @Sab44
+/tests/components/libre_hardware_monitor/ @Sab44
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/lifx/ @Djelibeybi
@@ -1108,8 +1110,6 @@ build.json @home-assistant/supervisor
 /tests/components/open_meteo/ @frenck
 /homeassistant/components/open_router/ @joostlek
 /tests/components/open_router/ @joostlek
-/homeassistant/components/openai_conversation/ @balloob
-/tests/components/openai_conversation/ @balloob
 /homeassistant/components/openerz/ @misialq
 /tests/components/openerz/ @misialq
 /homeassistant/components/openexchangerates/ @MartinHjelmare
@@ -1208,8 +1208,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/proximity/ @mib1185
 /tests/components/proximity/ @mib1185
 /homeassistant/components/proxmoxve/ @jhollowe @Corbeno
-/homeassistant/components/prusalink/ @balloob
-/tests/components/prusalink/ @balloob
 /homeassistant/components/ps4/ @ktnrg45
 /tests/components/ps4/ @ktnrg45
 /homeassistant/components/pterodactyl/ @elmurato
@@ -1303,8 +1301,8 @@ build.json @home-assistant/supervisor
 /tests/components/rflink/ @javicalle
 /homeassistant/components/rfxtrx/ @danielhiversen @elupus @RobBie1221
 /tests/components/rfxtrx/ @danielhiversen @elupus @RobBie1221
-/homeassistant/components/rhasspy/ @balloob @synesthesiam
-/tests/components/rhasspy/ @balloob @synesthesiam
+/homeassistant/components/rhasspy/ @synesthesiam
+/tests/components/rhasspy/ @synesthesiam
 /homeassistant/components/ridwell/ @bachya
 /tests/components/ridwell/ @bachya
 /homeassistant/components/ring/ @sdb9696
@@ -1392,12 +1390,14 @@ build.json @home-assistant/supervisor
 /tests/components/seventeentrack/ @shaiu
 /homeassistant/components/sfr_box/ @epenet
 /tests/components/sfr_box/ @epenet
+/homeassistant/components/sftp_storage/ @maretodoric
+/tests/components/sftp_storage/ @maretodoric
 /homeassistant/components/sharkiq/ @JeffResc @funkybunch
 /tests/components/sharkiq/ @JeffResc @funkybunch
 /homeassistant/components/shell_command/ @home-assistant/core
 /tests/components/shell_command/ @home-assistant/core
-/homeassistant/components/shelly/ @balloob @bieniu @thecode @chemelli74 @bdraco
-/tests/components/shelly/ @balloob @bieniu @thecode @chemelli74 @bdraco
+/homeassistant/components/shelly/ @bieniu @thecode @chemelli74 @bdraco
+/tests/components/shelly/ @bieniu @thecode @chemelli74 @bdraco
 /homeassistant/components/shodan/ @fabaff
 /homeassistant/components/sia/ @eavanvalkenburg
 /tests/components/sia/ @eavanvalkenburg
@@ -1544,8 +1544,8 @@ build.json @home-assistant/supervisor
 /tests/components/systemmonitor/ @gjohansson-ST
 /homeassistant/components/tado/ @erwindouna
 /tests/components/tado/ @erwindouna
-/homeassistant/components/tag/ @balloob @dmulcahey
-/tests/components/tag/ @balloob @dmulcahey
+/homeassistant/components/tag/ @home-assistant/core
+/tests/components/tag/ @home-assistant/core
 /homeassistant/components/tailscale/ @frenck
 /tests/components/tailscale/ @frenck
 /homeassistant/components/tailwind/ @frenck
@@ -1690,15 +1690,15 @@ build.json @home-assistant/supervisor
 /tests/components/vegehub/ @ghowevege
 /homeassistant/components/velbus/ @Cereal2nd @brefra
 /tests/components/velbus/ @Cereal2nd @brefra
-/homeassistant/components/velux/ @Julius2342 @DeerMaximum @pawlizio
-/tests/components/velux/ @Julius2342 @DeerMaximum @pawlizio
+/homeassistant/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
+/tests/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
 /homeassistant/components/venstar/ @garbled1 @jhollowe
 /tests/components/venstar/ @garbled1 @jhollowe
 /homeassistant/components/versasense/ @imstevenxyz
 /homeassistant/components/version/ @ludeeus
 /tests/components/version/ @ludeeus
-/homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak
-/tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak
+/homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
+/tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
 /homeassistant/components/vicare/ @CFenner
 /tests/components/vicare/ @CFenner
 /homeassistant/components/vilfo/ @ManneW
@@ -1710,16 +1710,14 @@ build.json @home-assistant/supervisor
 /tests/components/vlc_telnet/ @rodripf @MartinHjelmare
 /homeassistant/components/vodafone_station/ @paoloantinori @chemelli74
 /tests/components/vodafone_station/ @paoloantinori @chemelli74
-/homeassistant/components/voip/ @balloob @synesthesiam @jaminh
-/tests/components/voip/ @balloob @synesthesiam @jaminh
+/homeassistant/components/voip/ @synesthesiam @jaminh
+/tests/components/voip/ @synesthesiam @jaminh
 /homeassistant/components/volumio/ @OnFreund
 /tests/components/volumio/ @OnFreund
 /homeassistant/components/volvo/ @thomasddn
 /tests/components/volvo/ @thomasddn
 /homeassistant/components/volvooncall/ @molobrakos
 /tests/components/volvooncall/ @molobrakos
-/homeassistant/components/vulcan/ @Antoni-Czaplicki
-/tests/components/vulcan/ @Antoni-Czaplicki
 /homeassistant/components/wake_on_lan/ @ntilley905
 /tests/components/wake_on_lan/ @ntilley905
 /homeassistant/components/wake_word/ @home-assistant/core @synesthesiam
@@ -1784,8 +1782,8 @@ build.json @home-assistant/supervisor
 /tests/components/worldclock/ @fabaff
 /homeassistant/components/ws66i/ @ssaenger
 /tests/components/ws66i/ @ssaenger
-/homeassistant/components/wyoming/ @balloob @synesthesiam
-/tests/components/wyoming/ @balloob @synesthesiam
+/homeassistant/components/wyoming/ @synesthesiam
+/tests/components/wyoming/ @synesthesiam
 /homeassistant/components/xbox/ @hunterjm
 /tests/components/xbox/ @hunterjm
 /homeassistant/components/xiaomi_aqara/ @danielhiversen @syssi

Dockerfile.dev

@@ -3,8 +3,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:debian
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 RUN \
-    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && apt-get update \
+    apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         # Additional library needed by some tests and accordingly by VScode Tests Discovery
         bluez \

build.yaml

@@ -1,10 +1,10 @@
 image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.05.0
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.05.0
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.05.0
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.05.0
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.05.0
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.09.0
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.09.0
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.09.0
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.09.0
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.09.0
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io

homeassistant/__main__.py

@@ -187,36 +187,42 @@ def main() -> int:
 
     from . import config, runner  # noqa: PLC0415
 
-    safe_mode = config.safe_mode_enabled(config_dir)
+    # Ensure only one instance runs per config directory
+    with runner.ensure_single_execution(config_dir) as single_execution_lock:
+        # Check if another instance is already running
+        if single_execution_lock.exit_code is not None:
+            return single_execution_lock.exit_code
 
-    runtime_conf = runner.RuntimeConfig(
-        config_dir=config_dir,
-        verbose=args.verbose,
-        log_rotate_days=args.log_rotate_days,
-        log_file=args.log_file,
-        log_no_color=args.log_no_color,
-        skip_pip=args.skip_pip,
-        skip_pip_packages=args.skip_pip_packages,
-        recovery_mode=args.recovery_mode,
-        debug=args.debug,
-        open_ui=args.open_ui,
-        safe_mode=safe_mode,
-    )
+        safe_mode = config.safe_mode_enabled(config_dir)
 
-    fault_file_name = os.path.join(config_dir, FAULT_LOG_FILENAME)
-    with open(fault_file_name, mode="a", encoding="utf8") as fault_file:
-        faulthandler.enable(fault_file)
-        exit_code = runner.run(runtime_conf)
-        faulthandler.disable()
+        runtime_conf = runner.RuntimeConfig(
+            config_dir=config_dir,
+            verbose=args.verbose,
+            log_rotate_days=args.log_rotate_days,
+            log_file=args.log_file,
+            log_no_color=args.log_no_color,
+            skip_pip=args.skip_pip,
+            skip_pip_packages=args.skip_pip_packages,
+            recovery_mode=args.recovery_mode,
+            debug=args.debug,
+            open_ui=args.open_ui,
+            safe_mode=safe_mode,
+        )
 
-    # It's possible for the fault file to disappear, so suppress obvious errors
-    with suppress(FileNotFoundError):
-        if os.path.getsize(fault_file_name) == 0:
-            os.remove(fault_file_name)
+        fault_file_name = os.path.join(config_dir, FAULT_LOG_FILENAME)
+        with open(fault_file_name, mode="a", encoding="utf8") as fault_file:
+            faulthandler.enable(fault_file)
+            exit_code = runner.run(runtime_conf)
+            faulthandler.disable()
 
-    check_threads()
+        # It's possible for the fault file to disappear, so suppress obvious errors
+        with suppress(FileNotFoundError):
+            if os.path.getsize(fault_file_name) == 0:
+                os.remove(fault_file_name)
 
-    return exit_code
+        check_threads()
+
+        return exit_code
 
 
 if __name__ == "__main__":

homeassistant/auth/mfa_modules/notify.py

@@ -27,7 +27,7 @@ from . import (
     SetupFlow,
 )
 
-REQUIREMENTS = ["pyotp==2.8.0"]
+REQUIREMENTS = ["pyotp==2.9.0"]
 
 CONF_MESSAGE = "message"
 

homeassistant/auth/mfa_modules/totp.py

@@ -20,7 +20,7 @@ from . import (
     SetupFlow,
 )
 
-REQUIREMENTS = ["pyotp==2.8.0", "PyQRCode==1.2.1"]
+REQUIREMENTS = ["pyotp==2.9.0", "PyQRCode==1.2.1"]
 
 CONFIG_SCHEMA = MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend({}, extra=vol.PREVENT_EXTRA)
 

homeassistant/brands/fritzbox.json

@@ -1,5 +1,5 @@
 {
   "domain": "fritzbox",
-  "name": "FRITZ!Box",
+  "name": "FRITZ!",
   "integrations": ["fritz", "fritzbox", "fritzbox_callmonitor"]
 }

homeassistant/components/ai_task/__init__.py

@@ -211,7 +211,6 @@ class ImageView(HomeAssistantView):
 
     url = f"/api/{DOMAIN}/images/{{filename}}"
     name = f"api:{DOMAIN}/images"
-    requires_auth = False
 
     async def get(
         self,

homeassistant/components/ai_task/media_source.py

@@ -2,8 +2,10 @@
 
 from __future__ import annotations
 
+from datetime import timedelta
 import logging
 
+from homeassistant.components.http.auth import async_sign_path
 from homeassistant.components.media_player import BrowseError, MediaClass
 from homeassistant.components.media_source import (
     BrowseMediaSource,
@@ -14,7 +16,7 @@ from homeassistant.components.media_source import (
 )
 from homeassistant.core import HomeAssistant
 
-from .const import DATA_IMAGES, DOMAIN
+from .const import DATA_IMAGES, DOMAIN, IMAGE_EXPIRY_TIME
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -43,7 +45,14 @@ class ImageMediaSource(MediaSource):
         if image is None:
             raise Unresolvable(f"Could not resolve media item: {item.identifier}")
 
-        return PlayMedia(f"/api/{DOMAIN}/images/{item.identifier}", image.mime_type)
+        return PlayMedia(
+            async_sign_path(
+                self.hass,
+                f"/api/{DOMAIN}/images/{item.identifier}",
+                timedelta(seconds=IMAGE_EXPIRY_TIME or 1800),
+            ),
+            image.mime_type,
+        )
 
     async def async_browse_media(
         self,

homeassistant/components/ai_task/services.yaml

@@ -20,7 +20,6 @@ generate_data:
             supported_features:
               - ai_task.AITaskEntityFeature.GENERATE_DATA
     structure:
-      advanced: true
       required: false
       example: '{ "name": { "selector": { "text": }, "description": "Name of the user", "required": "True" } } }, "age": { "selector": { "number": }, "description": "Age of the user" } }'
       selector:

homeassistant/components/ai_task/task.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import datetime, timedelta
 from functools import partial
 import mimetypes
 from pathlib import Path
@@ -13,6 +13,7 @@ from typing import Any
 import voluptuous as vol
 
 from homeassistant.components import camera, conversation, media_source
+from homeassistant.components.http.auth import async_sign_path
 from homeassistant.core import HomeAssistant, ServiceResponse, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.chat_session import ChatSession, async_get_chat_session
@@ -239,7 +240,11 @@ async def async_generate_image(
     if IMAGE_EXPIRY_TIME > 0:
         async_call_later(hass, IMAGE_EXPIRY_TIME, partial(_purge_image, filename))
 
-    service_result["url"] = get_url(hass) + f"/api/{DOMAIN}/images/{filename}"
+    service_result["url"] = get_url(hass) + async_sign_path(
+        hass,
+        f"/api/{DOMAIN}/images/{filename}",
+        timedelta(seconds=IMAGE_EXPIRY_TIME or 1800),
+    )
     service_result["media_source_id"] = f"media-source://{DOMAIN}/images/{filename}"
 
     return service_result

homeassistant/components/airos/__init__.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from airos.airos8 import AirOS
+from airos.airos8 import AirOS8
 
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
@@ -23,7 +23,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> boo
     # with no option in the web UI to change or upload a custom certificate.
     session = async_get_clientsession(hass, verify_ssl=False)
 
-    airos_device = AirOS(
+    airos_device = AirOS8(
         host=entry.data[CONF_HOST],
         username=entry.data[CONF_USERNAME],
         password=entry.data[CONF_PASSWORD],

homeassistant/components/airos/binary_sensor.py

@@ -15,7 +15,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import AirOSConfigEntry, AirOSData, AirOSDataUpdateCoordinator
+from .coordinator import AirOS8Data, AirOSConfigEntry, AirOSDataUpdateCoordinator
 from .entity import AirOSEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -27,7 +27,7 @@ PARALLEL_UPDATES = 0
 class AirOSBinarySensorEntityDescription(BinarySensorEntityDescription):
     """Describe an AirOS binary sensor."""
 
-    value_fn: Callable[[AirOSData], bool]
+    value_fn: Callable[[AirOS8Data], bool]
 
 
 BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (

homeassistant/components/airos/config_flow.py

@@ -19,7 +19,7 @@ from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
-from .coordinator import AirOS
+from .coordinator import AirOS8
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -48,7 +48,7 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
             # with no option in the web UI to change or upload a custom certificate.
             session = async_get_clientsession(self.hass, verify_ssl=False)
 
-            airos_device = AirOS(
+            airos_device = AirOS8(
                 host=user_input[CONF_HOST],
                 username=user_input[CONF_USERNAME],
                 password=user_input[CONF_PASSWORD],

homeassistant/components/airos/coordinator.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 
-from airos.airos8 import AirOS, AirOSData
+from airos.airos8 import AirOS8, AirOS8Data
 from airos.exceptions import (
     AirOSConnectionAuthenticationError,
     AirOSConnectionSetupError,
@@ -24,13 +24,13 @@ _LOGGER = logging.getLogger(__name__)
 type AirOSConfigEntry = ConfigEntry[AirOSDataUpdateCoordinator]
 
 
-class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOSData]):
+class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
     """Class to manage fetching AirOS data from single endpoint."""
 
     config_entry: AirOSConfigEntry
 
     def __init__(
-        self, hass: HomeAssistant, config_entry: AirOSConfigEntry, airos_device: AirOS
+        self, hass: HomeAssistant, config_entry: AirOSConfigEntry, airos_device: AirOS8
     ) -> None:
         """Initialize the coordinator."""
         self.airos_device = airos_device
@@ -42,7 +42,7 @@ class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOSData]):
             update_interval=SCAN_INTERVAL,
         )
 
-    async def _async_update_data(self) -> AirOSData:
+    async def _async_update_data(self) -> AirOS8Data:
         """Fetch data from AirOS."""
         try:
             await self.airos_device.login()

homeassistant/components/airos/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airos",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["airos==0.4.4"]
+  "requirements": ["airos==0.5.1"]
 }

homeassistant/components/airos/sensor.py

@@ -26,7 +26,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from .coordinator import AirOSConfigEntry, AirOSData, AirOSDataUpdateCoordinator
+from .coordinator import AirOS8Data, AirOSConfigEntry, AirOSDataUpdateCoordinator
 from .entity import AirOSEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -42,7 +42,7 @@ PARALLEL_UPDATES = 0
 class AirOSSensorEntityDescription(SensorEntityDescription):
     """Describe an AirOS sensor."""
 
-    value_fn: Callable[[AirOSData], StateType]
+    value_fn: Callable[[AirOS8Data], StateType]
 
 
 SENSORS: tuple[AirOSSensorEntityDescription, ...] = (

homeassistant/components/aladdin_connect/manifest.json

@@ -5,7 +5,7 @@
   "config_flow": true,
   "dependencies": ["application_credentials"],
   "documentation": "https://www.home-assistant.io/integrations/aladdin_connect",
-  "integration_type": "system",
+  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "requirements": ["genie-partner-sdk==1.0.10"]
 }

homeassistant/components/alert/__init__.py

@@ -1,4 +1,7 @@
-"""Support for repeating alerts when conditions are met."""
+"""Support for repeating alerts when conditions are met.
+
+DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
+"""
 
 from __future__ import annotations
 
@@ -63,7 +66,10 @@ CONFIG_SCHEMA = vol.Schema(
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Alert component."""
+    """Set up the Alert component.
+
+    DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
+    """
     component = EntityComponent[AlertEntity](LOGGER, DOMAIN, hass)
 
     entities: list[AlertEntity] = []

homeassistant/components/alert/entity.py

@@ -1,4 +1,7 @@
-"""Support for repeating alerts when conditions are met."""
+"""Support for repeating alerts when conditions are met.
+
+DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
+"""
 
 from __future__ import annotations
 
@@ -27,7 +30,10 @@ from .const import DOMAIN, LOGGER
 
 
 class AlertEntity(Entity):
-    """Representation of an alert."""
+    """Representation of an alert.
+
+    DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
+    """
 
     _attr_should_poll = False
 

homeassistant/components/alert/reproduce_state.py

@@ -1,4 +1,7 @@
-"""Reproduce an Alert state."""
+"""Reproduce an Alert state.
+
+DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
+"""
 
 from __future__ import annotations
 

homeassistant/components/alexa_devices/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aioamazondevices"],
   "quality_scale": "silver",
-  "requirements": ["aioamazondevices==5.0.1"]
+  "requirements": ["aioamazondevices==6.0.0"]
 }

homeassistant/components/alexa_devices/services.py

@@ -14,14 +14,12 @@ from .coordinator import AmazonConfigEntry
 
 ATTR_TEXT_COMMAND = "text_command"
 ATTR_SOUND = "sound"
-ATTR_SOUND_VARIANT = "sound_variant"
 SERVICE_TEXT_COMMAND = "send_text_command"
 SERVICE_SOUND_NOTIFICATION = "send_sound"
 
 SCHEMA_SOUND_SERVICE = vol.Schema(
     {
         vol.Required(ATTR_SOUND): cv.string,
-        vol.Required(ATTR_SOUND_VARIANT): cv.positive_int,
         vol.Required(ATTR_DEVICE_ID): cv.string,
     },
 )
@@ -75,17 +73,14 @@ async def _async_execute_action(call: ServiceCall, attribute: str) -> None:
     coordinator = config_entry.runtime_data
 
     if attribute == ATTR_SOUND:
-        variant: int = call.data[ATTR_SOUND_VARIANT]
-        pad = "_" if variant > 10 else "_0"
-        file = f"{value}{pad}{variant!s}"
-        if value not in SOUNDS_LIST or variant > SOUNDS_LIST[value]:
+        if value not in SOUNDS_LIST:
             raise ServiceValidationError(
                 translation_domain=DOMAIN,
                 translation_key="invalid_sound_value",
-                translation_placeholders={"sound": value, "variant": str(variant)},
+                translation_placeholders={"sound": value},
             )
         await coordinator.api.call_alexa_sound(
-            coordinator.data[device.serial_number], file
+            coordinator.data[device.serial_number], value
         )
     elif attribute == ATTR_TEXT_COMMAND:
         await coordinator.api.call_alexa_text_command(

homeassistant/components/alexa_devices/services.yaml

@@ -18,14 +18,6 @@ send_sound:
       selector:
         device:
           integration: alexa_devices
-    sound_variant:
-      required: true
-      example: 1
-      default: 1
-      selector:
-        number:
-          min: 1
-          max: 50
     sound:
       required: true
       example: amzn_sfx_doorbell_chime
@@ -33,472 +25,45 @@ send_sound:
       selector:
         select:
           options:
-            - air_horn
-            - air_horns
-            - airboat
-            - airport
-            - aliens
-            - amzn_sfx_airplane_takeoff_whoosh
-            - amzn_sfx_army_march_clank_7x
-            - amzn_sfx_army_march_large_8x
-            - amzn_sfx_army_march_small_8x
-            - amzn_sfx_baby_big_cry
-            - amzn_sfx_baby_cry
-            - amzn_sfx_baby_fuss
-            - amzn_sfx_battle_group_clanks
-            - amzn_sfx_battle_man_grunts
-            - amzn_sfx_battle_men_grunts
-            - amzn_sfx_battle_men_horses
-            - amzn_sfx_battle_noisy_clanks
-            - amzn_sfx_battle_yells_men
-            - amzn_sfx_battle_yells_men_run
-            - amzn_sfx_bear_groan_roar
-            - amzn_sfx_bear_roar_grumble
-            - amzn_sfx_bear_roar_small
-            - amzn_sfx_beep_1x
-            - amzn_sfx_bell_med_chime
-            - amzn_sfx_bell_short_chime
-            - amzn_sfx_bell_timer
-            - amzn_sfx_bicycle_bell_ring
-            - amzn_sfx_bird_chickadee_chirp_1x
-            - amzn_sfx_bird_chickadee_chirps
-            - amzn_sfx_bird_forest
-            - amzn_sfx_bird_forest_short
-            - amzn_sfx_bird_robin_chirp_1x
-            - amzn_sfx_boing_long_1x
-            - amzn_sfx_boing_med_1x
-            - amzn_sfx_boing_short_1x
-            - amzn_sfx_bus_drive_past
-            - amzn_sfx_buzz_electronic
-            - amzn_sfx_buzzer_loud_alarm
-            - amzn_sfx_buzzer_small
-            - amzn_sfx_car_accelerate
-            - amzn_sfx_car_accelerate_noisy
-            - amzn_sfx_car_click_seatbelt
-            - amzn_sfx_car_close_door_1x
-            - amzn_sfx_car_drive_past
-            - amzn_sfx_car_honk_1x
-            - amzn_sfx_car_honk_2x
-            - amzn_sfx_car_honk_3x
-            - amzn_sfx_car_honk_long_1x
-            - amzn_sfx_car_into_driveway
-            - amzn_sfx_car_into_driveway_fast
-            - amzn_sfx_car_slam_door_1x
-            - amzn_sfx_car_undo_seatbelt
-            - amzn_sfx_cat_angry_meow_1x
-            - amzn_sfx_cat_angry_screech_1x
-            - amzn_sfx_cat_long_meow_1x
-            - amzn_sfx_cat_meow_1x
-            - amzn_sfx_cat_purr
-            - amzn_sfx_cat_purr_meow
-            - amzn_sfx_chicken_cluck
-            - amzn_sfx_church_bell_1x
-            - amzn_sfx_church_bells_ringing
-            - amzn_sfx_clear_throat_ahem
-            - amzn_sfx_clock_ticking
-            - amzn_sfx_clock_ticking_long
-            - amzn_sfx_copy_machine
-            - amzn_sfx_cough
-            - amzn_sfx_crow_caw_1x
-            - amzn_sfx_crowd_applause
-            - amzn_sfx_crowd_bar
-            - amzn_sfx_crowd_bar_rowdy
-            - amzn_sfx_crowd_boo
-            - amzn_sfx_crowd_cheer_med
-            - amzn_sfx_crowd_excited_cheer
-            - amzn_sfx_dog_med_bark_1x
-            - amzn_sfx_dog_med_bark_2x
-            - amzn_sfx_dog_med_bark_growl
-            - amzn_sfx_dog_med_growl_1x
-            - amzn_sfx_dog_med_woof_1x
-            - amzn_sfx_dog_small_bark_2x
-            - amzn_sfx_door_open
-            - amzn_sfx_door_shut
-            - amzn_sfx_doorbell
-            - amzn_sfx_doorbell_buzz
-            - amzn_sfx_doorbell_chime
-            - amzn_sfx_drinking_slurp
-            - amzn_sfx_drum_and_cymbal
-            - amzn_sfx_drum_comedy
-            - amzn_sfx_earthquake_rumble
-            - amzn_sfx_electric_guitar
-            - amzn_sfx_electronic_beep
-            - amzn_sfx_electronic_major_chord
-            - amzn_sfx_elephant
-            - amzn_sfx_elevator_bell_1x
-            - amzn_sfx_elevator_open_bell
-            - amzn_sfx_fairy_melodic_chimes
-            - amzn_sfx_fairy_sparkle_chimes
-            - amzn_sfx_faucet_drip
-            - amzn_sfx_faucet_running
-            - amzn_sfx_fireplace_crackle
-            - amzn_sfx_fireworks
-            - amzn_sfx_fireworks_firecrackers
-            - amzn_sfx_fireworks_launch
-            - amzn_sfx_fireworks_whistles
-            - amzn_sfx_food_frying
-            - amzn_sfx_footsteps
-            - amzn_sfx_footsteps_muffled
-            - amzn_sfx_ghost_spooky
-            - amzn_sfx_glass_on_table
-            - amzn_sfx_glasses_clink
-            - amzn_sfx_horse_gallop_4x
-            - amzn_sfx_horse_huff_whinny
-            - amzn_sfx_horse_neigh
-            - amzn_sfx_horse_neigh_low
-            - amzn_sfx_horse_whinny
-            - amzn_sfx_human_walking
-            - amzn_sfx_jar_on_table_1x
-            - amzn_sfx_kitchen_ambience
-            - amzn_sfx_large_crowd_cheer
-            - amzn_sfx_large_fire_crackling
-            - amzn_sfx_laughter
-            - amzn_sfx_laughter_giggle
-            - amzn_sfx_lightning_strike
-            - amzn_sfx_lion_roar
-            - amzn_sfx_magic_blast_1x
-            - amzn_sfx_monkey_calls_3x
-            - amzn_sfx_monkey_chimp
-            - amzn_sfx_monkeys_chatter
-            - amzn_sfx_motorcycle_accelerate
-            - amzn_sfx_motorcycle_engine_idle
-            - amzn_sfx_motorcycle_engine_rev
-            - amzn_sfx_musical_drone_intro
-            - amzn_sfx_oars_splashing_rowboat
-            - amzn_sfx_object_on_table_2x
-            - amzn_sfx_ocean_wave_1x
-            - amzn_sfx_ocean_wave_on_rocks_1x
-            - amzn_sfx_ocean_wave_surf
-            - amzn_sfx_people_walking
-            - amzn_sfx_person_running
-            - amzn_sfx_piano_note_1x
-            - amzn_sfx_punch
-            - amzn_sfx_rain
-            - amzn_sfx_rain_on_roof
-            - amzn_sfx_rain_thunder
-            - amzn_sfx_rat_squeak_2x
-            - amzn_sfx_rat_squeaks
-            - amzn_sfx_raven_caw_1x
-            - amzn_sfx_raven_caw_2x
-            - amzn_sfx_restaurant_ambience
-            - amzn_sfx_rooster_crow
-            - amzn_sfx_scifi_air_escaping
-            - amzn_sfx_scifi_alarm
-            - amzn_sfx_scifi_alien_voice
-            - amzn_sfx_scifi_boots_walking
-            - amzn_sfx_scifi_close_large_explosion
-            - amzn_sfx_scifi_door_open
-            - amzn_sfx_scifi_engines_on
-            - amzn_sfx_scifi_engines_on_large
-            - amzn_sfx_scifi_engines_on_short_burst
-            - amzn_sfx_scifi_explosion
-            - amzn_sfx_scifi_explosion_2x
-            - amzn_sfx_scifi_incoming_explosion
-            - amzn_sfx_scifi_laser_gun_battle
-            - amzn_sfx_scifi_laser_gun_fires
-            - amzn_sfx_scifi_laser_gun_fires_large
-            - amzn_sfx_scifi_long_explosion_1x
-            - amzn_sfx_scifi_missile
-            - amzn_sfx_scifi_motor_short_1x
-            - amzn_sfx_scifi_open_airlock
-            - amzn_sfx_scifi_radar_high_ping
-            - amzn_sfx_scifi_radar_low
-            - amzn_sfx_scifi_radar_medium
-            - amzn_sfx_scifi_run_away
-            - amzn_sfx_scifi_sheilds_up
-            - amzn_sfx_scifi_short_low_explosion
-            - amzn_sfx_scifi_small_whoosh_flyby
-            - amzn_sfx_scifi_small_zoom_flyby
-            - amzn_sfx_scifi_sonar_ping_3x
-            - amzn_sfx_scifi_sonar_ping_4x
-            - amzn_sfx_scifi_spaceship_flyby
-            - amzn_sfx_scifi_timer_beep
-            - amzn_sfx_scifi_zap_backwards
-            - amzn_sfx_scifi_zap_electric
-            - amzn_sfx_sheep_baa
-            - amzn_sfx_sheep_bleat
-            - amzn_sfx_silverware_clank
-            - amzn_sfx_sirens
-            - amzn_sfx_sleigh_bells
-            - amzn_sfx_small_stream
-            - amzn_sfx_sneeze
-            - amzn_sfx_stream
-            - amzn_sfx_strong_wind_desert
-            - amzn_sfx_strong_wind_whistling
-            - amzn_sfx_subway_leaving
-            - amzn_sfx_subway_passing
-            - amzn_sfx_subway_stopping
-            - amzn_sfx_swoosh_cartoon_fast
-            - amzn_sfx_swoosh_fast_1x
-            - amzn_sfx_swoosh_fast_6x
-            - amzn_sfx_test_tone
-            - amzn_sfx_thunder_rumble
-            - amzn_sfx_toilet_flush
-            - amzn_sfx_trumpet_bugle
-            - amzn_sfx_turkey_gobbling
-            - amzn_sfx_typing_medium
-            - amzn_sfx_typing_short
-            - amzn_sfx_typing_typewriter
-            - amzn_sfx_vacuum_off
-            - amzn_sfx_vacuum_on
-            - amzn_sfx_walking_in_mud
-            - amzn_sfx_walking_in_snow
-            - amzn_sfx_walking_on_grass
-            - amzn_sfx_water_dripping
-            - amzn_sfx_water_droplets
-            - amzn_sfx_wind_strong_gusting
-            - amzn_sfx_wind_whistling_desert
-            - amzn_sfx_wings_flap_4x
-            - amzn_sfx_wings_flap_fast
-            - amzn_sfx_wolf_howl
-            - amzn_sfx_wolf_young_howl
-            - amzn_sfx_wooden_door
-            - amzn_sfx_wooden_door_creaks_long
-            - amzn_sfx_wooden_door_creaks_multiple
-            - amzn_sfx_wooden_door_creaks_open
-            - amzn_ui_sfx_gameshow_bridge
-            - amzn_ui_sfx_gameshow_countdown_loop_32s_full
-            - amzn_ui_sfx_gameshow_countdown_loop_64s_full
-            - amzn_ui_sfx_gameshow_countdown_loop_64s_minimal
-            - amzn_ui_sfx_gameshow_intro
-            - amzn_ui_sfx_gameshow_negative_response
-            - amzn_ui_sfx_gameshow_neutral_response
-            - amzn_ui_sfx_gameshow_outro
-            - amzn_ui_sfx_gameshow_player1
-            - amzn_ui_sfx_gameshow_player2
-            - amzn_ui_sfx_gameshow_player3
-            - amzn_ui_sfx_gameshow_player4
-            - amzn_ui_sfx_gameshow_positive_response
-            - amzn_ui_sfx_gameshow_tally_negative
-            - amzn_ui_sfx_gameshow_tally_positive
-            - amzn_ui_sfx_gameshow_waiting_loop_30s
-            - anchor
-            - answering_machines
-            - arcs_sparks
-            - arrows_bows
-            - baby
-            - back_up_beeps
-            - bars_restaurants
-            - baseball
-            - basketball
-            - battles
-            - beeps_tones
-            - bell
-            - bikes
-            - billiards
-            - board_games
-            - body
-            - boing
-            - books
-            - bow_wash
-            - box
-            - break_shatter_smash
-            - breaks
-            - brooms_mops
-            - bullets
-            - buses
-            - buzz
-            - buzz_hums
-            - buzzers
-            - buzzers_pistols
-            - cables_metal
-            - camera
-            - cannons
-            - car_alarm
-            - car_alarms
-            - car_cell_phones
-            - carnivals_fairs
-            - cars
-            - casino
-            - casinos
-            - cellar
-            - chimes
-            - chimes_bells
-            - chorus
-            - christmas
-            - church_bells
-            - clock
-            - cloth
-            - concrete
-            - construction
-            - construction_factory
-            - crashes
-            - crowds
-            - debris
-            - dining_kitchens
-            - dinosaurs
-            - dripping
-            - drops
-            - electric
-            - electrical
-            - elevator
-            - evolution_monsters
-            - explosions
-            - factory
-            - falls
-            - fax_scanner_copier
-            - feedback_mics
-            - fight
-            - fire
-            - fire_extinguisher
-            - fireballs
-            - fireworks
-            - fishing_pole
-            - flags
-            - football
-            - footsteps
-            - futuristic
-            - futuristic_ship
-            - gameshow
-            - gear
-            - ghosts_demons
-            - giant_monster
-            - glass
-            - glasses_clink
-            - golf
-            - gorilla
-            - grenade_lanucher
-            - griffen
-            - gyms_locker_rooms
-            - handgun_loading
-            - handgun_shot
-            - handle
-            - hands
-            - heartbeats_ekg
-            - helicopter
-            - high_tech
-            - hit_punch_slap
-            - hits
-            - horns
-            - horror
-            - hot_tub_filling_up
-            - human
-            - human_vocals
-            - hygene # codespell:ignore
-            - ice_skating
-            - ignitions
-            - infantry
-            - intro
-            - jet
-            - juggling
-            - key_lock
-            - kids
-            - knocks
-            - lab_equip
-            - lacrosse
-            - lamps_lanterns
-            - leather
-            - liquid_suction
-            - locker_doors
-            - machine_gun
-            - magic_spells
-            - medium_large_explosions
-            - metal
-            - modern_rings
-            - money_coins
-            - motorcycles
-            - movement
-            - moves
-            - nature
-            - oar_boat
-            - pagers
-            - paintball
-            - paper
-            - parachute
-            - pay_phones
-            - phone_beeps
-            - pigmy_bats
-            - pills
-            - pour_water
-            - power_up_down
-            - printers
-            - prison
-            - public_space
-            - racquetball
-            - radios_static
-            - rain
-            - rc_airplane
-            - rc_car
-            - refrigerators_freezers
-            - regular
-            - respirator
-            - rifle
-            - roller_coaster
-            - rollerskates_rollerblades
-            - room_tones
-            - ropes_climbing
-            - rotary_rings
-            - rowboat_canoe
-            - rubber
-            - running
-            - sails
-            - sand_gravel
-            - screen_doors
-            - screens
-            - seats_stools
-            - servos
-            - shoes_boots
-            - shotgun
-            - shower
-            - sink_faucet
-            - sink_filling_water
-            - sink_run_and_off
-            - sink_water_splatter
-            - sirens
-            - skateboards
-            - ski
-            - skids_tires
-            - sled
-            - slides
-            - small_explosions
-            - snow
-            - snowmobile
-            - soldiers
-            - splash_water
-            - splashes_sprays
-            - sports_whistles
-            - squeaks
-            - squeaky
-            - stairs
-            - steam
-            - submarine_diesel
-            - swing_doors
-            - switches_levers
-            - swords
-            - tape
-            - tape_machine
-            - televisions_shows
-            - tennis_pingpong
-            - textile
-            - throw
-            - thunder
-            - ticks
-            - timer
-            - toilet_flush
-            - tone
-            - tones_noises
-            - toys
-            - tractors
-            - traffic
-            - train
-            - trucks_vans
-            - turnstiles
-            - typing
-            - umbrella
-            - underwater
-            - vampires
-            - various
-            - video_tunes
-            - volcano_earthquake
-            - watches
-            - water
-            - water_running
-            - werewolves
-            - winches_gears
-            - wind
-            - wood
-            - wood_boat
-            - woosh
-            - zap
-            - zippers
+            - air_horn_03
+            - amzn_sfx_cat_meow_1x_01
+            - amzn_sfx_church_bell_1x_02
+            - amzn_sfx_crowd_applause_01
+            - amzn_sfx_dog_med_bark_1x_02
+            - amzn_sfx_doorbell_01
+            - amzn_sfx_doorbell_chime_01
+            - amzn_sfx_doorbell_chime_02
+            - amzn_sfx_large_crowd_cheer_01
+            - amzn_sfx_lion_roar_02
+            - amzn_sfx_rooster_crow_01
+            - amzn_sfx_scifi_alarm_01
+            - amzn_sfx_scifi_alarm_04
+            - amzn_sfx_scifi_engines_on_02
+            - amzn_sfx_scifi_sheilds_up_01
+            - amzn_sfx_trumpet_bugle_04
+            - amzn_sfx_wolf_howl_02
+            - bell_02
+            - boing_01
+            - boing_03
+            - buzzers_pistols_01
+            - camera_01
+            - christmas_05
+            - clock_01
+            - futuristic_10
+            - halloween_bats
+            - halloween_crows
+            - halloween_footsteps
+            - halloween_wind
+            - halloween_wolf
+            - holiday_halloween_ghost
+            - horror_10
+            - med_system_alerts_minimal_dragon_short
+            - med_system_alerts_minimal_owl_short
+            - med_system_alerts_minimals_blue_wave_small
+            - med_system_alerts_minimals_galaxy_short
+            - med_system_alerts_minimals_panda_short
+            - med_system_alerts_minimals_tiger_short
+            - med_ui_success_generic_1-1
+            - squeaky_12
+            - zap_01
           translation_key: sound

homeassistant/components/alexa_devices/strings.json

@@ -129,474 +129,47 @@
   "selector": {
     "sound": {
       "options": {
-        "air_horn": "Air Horn",
-        "air_horns": "Air Horns",
-        "airboat": "Airboat",
-        "airport": "Airport",
-        "aliens": "Aliens",
-        "amzn_sfx_airplane_takeoff_whoosh": "Airplane Takeoff Whoosh",
-        "amzn_sfx_army_march_clank_7x": "Army March Clank 7x",
-        "amzn_sfx_army_march_large_8x": "Army March Large 8x",
-        "amzn_sfx_army_march_small_8x": "Army March Small 8x",
-        "amzn_sfx_baby_big_cry": "Baby Big Cry",
-        "amzn_sfx_baby_cry": "Baby Cry",
-        "amzn_sfx_baby_fuss": "Baby Fuss",
-        "amzn_sfx_battle_group_clanks": "Battle Group Clanks",
-        "amzn_sfx_battle_man_grunts": "Battle Man Grunts",
-        "amzn_sfx_battle_men_grunts": "Battle Men Grunts",
-        "amzn_sfx_battle_men_horses": "Battle Men Horses",
-        "amzn_sfx_battle_noisy_clanks": "Battle Noisy Clanks",
-        "amzn_sfx_battle_yells_men": "Battle Yells Men",
-        "amzn_sfx_battle_yells_men_run": "Battle Yells Men Run",
-        "amzn_sfx_bear_groan_roar": "Bear Groan Roar",
-        "amzn_sfx_bear_roar_grumble": "Bear Roar Grumble",
-        "amzn_sfx_bear_roar_small": "Bear Roar Small",
-        "amzn_sfx_beep_1x": "Beep 1x",
-        "amzn_sfx_bell_med_chime": "Bell Med Chime",
-        "amzn_sfx_bell_short_chime": "Bell Short Chime",
-        "amzn_sfx_bell_timer": "Bell Timer",
-        "amzn_sfx_bicycle_bell_ring": "Bicycle Bell Ring",
-        "amzn_sfx_bird_chickadee_chirp_1x": "Bird Chickadee Chirp 1x",
-        "amzn_sfx_bird_chickadee_chirps": "Bird Chickadee Chirps",
-        "amzn_sfx_bird_forest": "Bird Forest",
-        "amzn_sfx_bird_forest_short": "Bird Forest Short",
-        "amzn_sfx_bird_robin_chirp_1x": "Bird Robin Chirp 1x",
-        "amzn_sfx_boing_long_1x": "Boing Long 1x",
-        "amzn_sfx_boing_med_1x": "Boing Med 1x",
-        "amzn_sfx_boing_short_1x": "Boing Short 1x",
-        "amzn_sfx_bus_drive_past": "Bus Drive Past",
-        "amzn_sfx_buzz_electronic": "Buzz Electronic",
-        "amzn_sfx_buzzer_loud_alarm": "Buzzer Loud Alarm",
-        "amzn_sfx_buzzer_small": "Buzzer Small",
-        "amzn_sfx_car_accelerate": "Car Accelerate",
-        "amzn_sfx_car_accelerate_noisy": "Car Accelerate Noisy",
-        "amzn_sfx_car_click_seatbelt": "Car Click Seatbelt",
-        "amzn_sfx_car_close_door_1x": "Car Close Door 1x",
-        "amzn_sfx_car_drive_past": "Car Drive Past",
-        "amzn_sfx_car_honk_1x": "Car Honk 1x",
-        "amzn_sfx_car_honk_2x": "Car Honk 2x",
-        "amzn_sfx_car_honk_3x": "Car Honk 3x",
-        "amzn_sfx_car_honk_long_1x": "Car Honk Long 1x",
-        "amzn_sfx_car_into_driveway": "Car Into Driveway",
-        "amzn_sfx_car_into_driveway_fast": "Car Into Driveway Fast",
-        "amzn_sfx_car_slam_door_1x": "Car Slam Door 1x",
-        "amzn_sfx_car_undo_seatbelt": "Car Undo Seatbelt",
-        "amzn_sfx_cat_angry_meow_1x": "Cat Angry Meow 1x",
-        "amzn_sfx_cat_angry_screech_1x": "Cat Angry Screech 1x",
-        "amzn_sfx_cat_long_meow_1x": "Cat Long Meow 1x",
-        "amzn_sfx_cat_meow_1x": "Cat Meow 1x",
-        "amzn_sfx_cat_purr": "Cat Purr",
-        "amzn_sfx_cat_purr_meow": "Cat Purr Meow",
-        "amzn_sfx_chicken_cluck": "Chicken Cluck",
-        "amzn_sfx_church_bell_1x": "Church Bell 1x",
-        "amzn_sfx_church_bells_ringing": "Church Bells Ringing",
-        "amzn_sfx_clear_throat_ahem": "Clear Throat Ahem",
-        "amzn_sfx_clock_ticking": "Clock Ticking",
-        "amzn_sfx_clock_ticking_long": "Clock Ticking Long",
-        "amzn_sfx_copy_machine": "Copy Machine",
-        "amzn_sfx_cough": "Cough",
-        "amzn_sfx_crow_caw_1x": "Crow Caw 1x",
-        "amzn_sfx_crowd_applause": "Crowd Applause",
-        "amzn_sfx_crowd_bar": "Crowd Bar",
-        "amzn_sfx_crowd_bar_rowdy": "Crowd Bar Rowdy",
-        "amzn_sfx_crowd_boo": "Crowd Boo",
-        "amzn_sfx_crowd_cheer_med": "Crowd Cheer Med",
-        "amzn_sfx_crowd_excited_cheer": "Crowd Excited Cheer",
-        "amzn_sfx_dog_med_bark_1x": "Dog Med Bark 1x",
-        "amzn_sfx_dog_med_bark_2x": "Dog Med Bark 2x",
-        "amzn_sfx_dog_med_bark_growl": "Dog Med Bark Growl",
-        "amzn_sfx_dog_med_growl_1x": "Dog Med Growl 1x",
-        "amzn_sfx_dog_med_woof_1x": "Dog Med Woof 1x",
-        "amzn_sfx_dog_small_bark_2x": "Dog Small Bark 2x",
-        "amzn_sfx_door_open": "Door Open",
-        "amzn_sfx_door_shut": "Door Shut",
-        "amzn_sfx_doorbell": "Doorbell",
-        "amzn_sfx_doorbell_buzz": "Doorbell Buzz",
-        "amzn_sfx_doorbell_chime": "Doorbell Chime",
-        "amzn_sfx_drinking_slurp": "Drinking Slurp",
-        "amzn_sfx_drum_and_cymbal": "Drum And Cymbal",
-        "amzn_sfx_drum_comedy": "Drum Comedy",
-        "amzn_sfx_earthquake_rumble": "Earthquake Rumble",
-        "amzn_sfx_electric_guitar": "Electric Guitar",
-        "amzn_sfx_electronic_beep": "Electronic Beep",
-        "amzn_sfx_electronic_major_chord": "Electronic Major Chord",
-        "amzn_sfx_elephant": "Elephant",
-        "amzn_sfx_elevator_bell_1x": "Elevator Bell 1x",
-        "amzn_sfx_elevator_open_bell": "Elevator Open Bell",
-        "amzn_sfx_fairy_melodic_chimes": "Fairy Melodic Chimes",
-        "amzn_sfx_fairy_sparkle_chimes": "Fairy Sparkle Chimes",
-        "amzn_sfx_faucet_drip": "Faucet Drip",
-        "amzn_sfx_faucet_running": "Faucet Running",
-        "amzn_sfx_fireplace_crackle": "Fireplace Crackle",
-        "amzn_sfx_fireworks": "Fireworks",
-        "amzn_sfx_fireworks_firecrackers": "Fireworks Firecrackers",
-        "amzn_sfx_fireworks_launch": "Fireworks Launch",
-        "amzn_sfx_fireworks_whistles": "Fireworks Whistles",
-        "amzn_sfx_food_frying": "Food Frying",
-        "amzn_sfx_footsteps": "Footsteps",
-        "amzn_sfx_footsteps_muffled": "Footsteps Muffled",
-        "amzn_sfx_ghost_spooky": "Ghost Spooky",
-        "amzn_sfx_glass_on_table": "Glass On Table",
-        "amzn_sfx_glasses_clink": "Glasses Clink",
-        "amzn_sfx_horse_gallop_4x": "Horse Gallop 4x",
-        "amzn_sfx_horse_huff_whinny": "Horse Huff Whinny",
-        "amzn_sfx_horse_neigh": "Horse Neigh",
-        "amzn_sfx_horse_neigh_low": "Horse Neigh Low",
-        "amzn_sfx_horse_whinny": "Horse Whinny",
-        "amzn_sfx_human_walking": "Human Walking",
-        "amzn_sfx_jar_on_table_1x": "Jar On Table 1x",
-        "amzn_sfx_kitchen_ambience": "Kitchen Ambience",
-        "amzn_sfx_large_crowd_cheer": "Large Crowd Cheer",
-        "amzn_sfx_large_fire_crackling": "Large Fire Crackling",
-        "amzn_sfx_laughter": "Laughter",
-        "amzn_sfx_laughter_giggle": "Laughter Giggle",
-        "amzn_sfx_lightning_strike": "Lightning Strike",
-        "amzn_sfx_lion_roar": "Lion Roar",
-        "amzn_sfx_magic_blast_1x": "Magic Blast 1x",
-        "amzn_sfx_monkey_calls_3x": "Monkey Calls 3x",
-        "amzn_sfx_monkey_chimp": "Monkey Chimp",
-        "amzn_sfx_monkeys_chatter": "Monkeys Chatter",
-        "amzn_sfx_motorcycle_accelerate": "Motorcycle Accelerate",
-        "amzn_sfx_motorcycle_engine_idle": "Motorcycle Engine Idle",
-        "amzn_sfx_motorcycle_engine_rev": "Motorcycle Engine Rev",
-        "amzn_sfx_musical_drone_intro": "Musical Drone Intro",
-        "amzn_sfx_oars_splashing_rowboat": "Oars Splashing Rowboat",
-        "amzn_sfx_object_on_table_2x": "Object On Table 2x",
-        "amzn_sfx_ocean_wave_1x": "Ocean Wave 1x",
-        "amzn_sfx_ocean_wave_on_rocks_1x": "Ocean Wave On Rocks 1x",
-        "amzn_sfx_ocean_wave_surf": "Ocean Wave Surf",
-        "amzn_sfx_people_walking": "People Walking",
-        "amzn_sfx_person_running": "Person Running",
-        "amzn_sfx_piano_note_1x": "Piano Note 1x",
-        "amzn_sfx_punch": "Punch",
-        "amzn_sfx_rain": "Rain",
-        "amzn_sfx_rain_on_roof": "Rain On Roof",
-        "amzn_sfx_rain_thunder": "Rain Thunder",
-        "amzn_sfx_rat_squeak_2x": "Rat Squeak 2x",
-        "amzn_sfx_rat_squeaks": "Rat Squeaks",
-        "amzn_sfx_raven_caw_1x": "Raven Caw 1x",
-        "amzn_sfx_raven_caw_2x": "Raven Caw 2x",
-        "amzn_sfx_restaurant_ambience": "Restaurant Ambience",
-        "amzn_sfx_rooster_crow": "Rooster Crow",
-        "amzn_sfx_scifi_air_escaping": "Scifi Air Escaping",
-        "amzn_sfx_scifi_alarm": "Scifi Alarm",
-        "amzn_sfx_scifi_alien_voice": "Scifi Alien Voice",
-        "amzn_sfx_scifi_boots_walking": "Scifi Boots Walking",
-        "amzn_sfx_scifi_close_large_explosion": "Scifi Close Large Explosion",
-        "amzn_sfx_scifi_door_open": "Scifi Door Open",
-        "amzn_sfx_scifi_engines_on": "Scifi Engines On",
-        "amzn_sfx_scifi_engines_on_large": "Scifi Engines On Large",
-        "amzn_sfx_scifi_engines_on_short_burst": "Scifi Engines On Short Burst",
-        "amzn_sfx_scifi_explosion": "Scifi Explosion",
-        "amzn_sfx_scifi_explosion_2x": "Scifi Explosion 2x",
-        "amzn_sfx_scifi_incoming_explosion": "Scifi Incoming Explosion",
-        "amzn_sfx_scifi_laser_gun_battle": "Scifi Laser Gun Battle",
-        "amzn_sfx_scifi_laser_gun_fires": "Scifi Laser Gun Fires",
-        "amzn_sfx_scifi_laser_gun_fires_large": "Scifi Laser Gun Fires Large",
-        "amzn_sfx_scifi_long_explosion_1x": "Scifi Long Explosion 1x",
-        "amzn_sfx_scifi_missile": "Scifi Missile",
-        "amzn_sfx_scifi_motor_short_1x": "Scifi Motor Short 1x",
-        "amzn_sfx_scifi_open_airlock": "Scifi Open Airlock",
-        "amzn_sfx_scifi_radar_high_ping": "Scifi Radar High Ping",
-        "amzn_sfx_scifi_radar_low": "Scifi Radar Low",
-        "amzn_sfx_scifi_radar_medium": "Scifi Radar Medium",
-        "amzn_sfx_scifi_run_away": "Scifi Run Away",
-        "amzn_sfx_scifi_sheilds_up": "Scifi Sheilds Up",
-        "amzn_sfx_scifi_short_low_explosion": "Scifi Short Low Explosion",
-        "amzn_sfx_scifi_small_whoosh_flyby": "Scifi Small Whoosh Flyby",
-        "amzn_sfx_scifi_small_zoom_flyby": "Scifi Small Zoom Flyby",
-        "amzn_sfx_scifi_sonar_ping_3x": "Scifi Sonar Ping 3x",
-        "amzn_sfx_scifi_sonar_ping_4x": "Scifi Sonar Ping 4x",
-        "amzn_sfx_scifi_spaceship_flyby": "Scifi Spaceship Flyby",
-        "amzn_sfx_scifi_timer_beep": "Scifi Timer Beep",
-        "amzn_sfx_scifi_zap_backwards": "Scifi Zap Backwards",
-        "amzn_sfx_scifi_zap_electric": "Scifi Zap Electric",
-        "amzn_sfx_sheep_baa": "Sheep Baa",
-        "amzn_sfx_sheep_bleat": "Sheep Bleat",
-        "amzn_sfx_silverware_clank": "Silverware Clank",
-        "amzn_sfx_sirens": "Sirens",
-        "amzn_sfx_sleigh_bells": "Sleigh Bells",
-        "amzn_sfx_small_stream": "Small Stream",
-        "amzn_sfx_sneeze": "Sneeze",
-        "amzn_sfx_stream": "Stream",
-        "amzn_sfx_strong_wind_desert": "Strong Wind Desert",
-        "amzn_sfx_strong_wind_whistling": "Strong Wind Whistling",
-        "amzn_sfx_subway_leaving": "Subway Leaving",
-        "amzn_sfx_subway_passing": "Subway Passing",
-        "amzn_sfx_subway_stopping": "Subway Stopping",
-        "amzn_sfx_swoosh_cartoon_fast": "Swoosh Cartoon Fast",
-        "amzn_sfx_swoosh_fast_1x": "Swoosh Fast 1x",
-        "amzn_sfx_swoosh_fast_6x": "Swoosh Fast 6x",
-        "amzn_sfx_test_tone": "Test Tone",
-        "amzn_sfx_thunder_rumble": "Thunder Rumble",
-        "amzn_sfx_toilet_flush": "Toilet Flush",
-        "amzn_sfx_trumpet_bugle": "Trumpet Bugle",
-        "amzn_sfx_turkey_gobbling": "Turkey Gobbling",
-        "amzn_sfx_typing_medium": "Typing Medium",
-        "amzn_sfx_typing_short": "Typing Short",
-        "amzn_sfx_typing_typewriter": "Typing Typewriter",
-        "amzn_sfx_vacuum_off": "Vacuum Off",
-        "amzn_sfx_vacuum_on": "Vacuum On",
-        "amzn_sfx_walking_in_mud": "Walking In Mud",
-        "amzn_sfx_walking_in_snow": "Walking In Snow",
-        "amzn_sfx_walking_on_grass": "Walking On Grass",
-        "amzn_sfx_water_dripping": "Water Dripping",
-        "amzn_sfx_water_droplets": "Water Droplets",
-        "amzn_sfx_wind_strong_gusting": "Wind Strong Gusting",
-        "amzn_sfx_wind_whistling_desert": "Wind Whistling Desert",
-        "amzn_sfx_wings_flap_4x": "Wings Flap 4x",
-        "amzn_sfx_wings_flap_fast": "Wings Flap Fast",
-        "amzn_sfx_wolf_howl": "Wolf Howl",
-        "amzn_sfx_wolf_young_howl": "Wolf Young Howl",
-        "amzn_sfx_wooden_door": "Wooden Door",
-        "amzn_sfx_wooden_door_creaks_long": "Wooden Door Creaks Long",
-        "amzn_sfx_wooden_door_creaks_multiple": "Wooden Door Creaks Multiple",
-        "amzn_sfx_wooden_door_creaks_open": "Wooden Door Creaks Open",
-        "amzn_ui_sfx_gameshow_bridge": "Gameshow Bridge",
-        "amzn_ui_sfx_gameshow_countdown_loop_32s_full": "Gameshow Countdown Loop 32s Full",
-        "amzn_ui_sfx_gameshow_countdown_loop_64s_full": "Gameshow Countdown Loop 64s Full",
-        "amzn_ui_sfx_gameshow_countdown_loop_64s_minimal": "Gameshow Countdown Loop 64s Minimal",
-        "amzn_ui_sfx_gameshow_intro": "Gameshow Intro",
-        "amzn_ui_sfx_gameshow_negative_response": "Gameshow Negative Response",
-        "amzn_ui_sfx_gameshow_neutral_response": "Gameshow Neutral Response",
-        "amzn_ui_sfx_gameshow_outro": "Gameshow Outro",
-        "amzn_ui_sfx_gameshow_player1": "Gameshow Player1",
-        "amzn_ui_sfx_gameshow_player2": "Gameshow Player2",
-        "amzn_ui_sfx_gameshow_player3": "Gameshow Player3",
-        "amzn_ui_sfx_gameshow_player4": "Gameshow Player4",
-        "amzn_ui_sfx_gameshow_positive_response": "Gameshow Positive Response",
-        "amzn_ui_sfx_gameshow_tally_negative": "Gameshow Tally Negative",
-        "amzn_ui_sfx_gameshow_tally_positive": "Gameshow Tally Positive",
-        "amzn_ui_sfx_gameshow_waiting_loop_30s": "Gameshow Waiting Loop 30s",
-        "anchor": "Anchor",
-        "answering_machines": "Answering Machines",
-        "arcs_sparks": "Arcs Sparks",
-        "arrows_bows": "Arrows Bows",
-        "baby": "Baby",
-        "back_up_beeps": "Back Up Beeps",
-        "bars_restaurants": "Bars Restaurants",
-        "baseball": "Baseball",
-        "basketball": "Basketball",
-        "battles": "Battles",
-        "beeps_tones": "Beeps Tones",
-        "bell": "Bell",
-        "bikes": "Bikes",
-        "billiards": "Billiards",
-        "board_games": "Board Games",
-        "body": "Body",
-        "boing": "Boing",
-        "books": "Books",
-        "bow_wash": "Bow Wash",
-        "box": "Box",
-        "break_shatter_smash": "Break Shatter Smash",
-        "breaks": "Breaks",
-        "brooms_mops": "Brooms Mops",
-        "bullets": "Bullets",
-        "buses": "Buses",
-        "buzz": "Buzz",
-        "buzz_hums": "Buzz Hums",
-        "buzzers": "Buzzers",
-        "buzzers_pistols": "Buzzers Pistols",
-        "cables_metal": "Cables Metal",
-        "camera": "Camera",
-        "cannons": "Cannons",
-        "car_alarm": "Car Alarm",
-        "car_alarms": "Car Alarms",
-        "car_cell_phones": "Car Cell Phones",
-        "carnivals_fairs": "Carnivals Fairs",
-        "cars": "Cars",
-        "casino": "Casino",
-        "casinos": "Casinos",
-        "cellar": "Cellar",
-        "chimes": "Chimes",
-        "chimes_bells": "Chimes Bells",
-        "chorus": "Chorus",
-        "christmas": "Christmas",
-        "church_bells": "Church Bells",
-        "clock": "Clock",
-        "cloth": "Cloth",
-        "concrete": "Concrete",
-        "construction": "Construction",
-        "construction_factory": "Construction Factory",
-        "crashes": "Crashes",
-        "crowds": "Crowds",
-        "debris": "Debris",
-        "dining_kitchens": "Dining Kitchens",
-        "dinosaurs": "Dinosaurs",
-        "dripping": "Dripping",
-        "drops": "Drops",
-        "electric": "Electric",
-        "electrical": "Electrical",
-        "elevator": "Elevator",
-        "evolution_monsters": "Evolution Monsters",
-        "explosions": "Explosions",
-        "factory": "Factory",
-        "falls": "Falls",
-        "fax_scanner_copier": "Fax Scanner Copier",
-        "feedback_mics": "Feedback Mics",
-        "fight": "Fight",
-        "fire": "Fire",
-        "fire_extinguisher": "Fire Extinguisher",
-        "fireballs": "Fireballs",
-        "fireworks": "Fireworks",
-        "fishing_pole": "Fishing Pole",
-        "flags": "Flags",
-        "football": "Football",
-        "footsteps": "Footsteps",
-        "futuristic": "Futuristic",
-        "futuristic_ship": "Futuristic Ship",
-        "gameshow": "Gameshow",
-        "gear": "Gear",
-        "ghosts_demons": "Ghosts Demons",
-        "giant_monster": "Giant Monster",
-        "glass": "Glass",
-        "glasses_clink": "Glasses Clink",
-        "golf": "Golf",
-        "gorilla": "Gorilla",
-        "grenade_lanucher": "Grenade Lanucher",
-        "griffen": "Griffen",
-        "gyms_locker_rooms": "Gyms Locker Rooms",
-        "handgun_loading": "Handgun Loading",
-        "handgun_shot": "Handgun Shot",
-        "handle": "Handle",
-        "hands": "Hands",
-        "heartbeats_ekg": "Heartbeats EKG",
-        "helicopter": "Helicopter",
-        "high_tech": "High Tech",
-        "hit_punch_slap": "Hit Punch Slap",
-        "hits": "Hits",
-        "horns": "Horns",
-        "horror": "Horror",
-        "hot_tub_filling_up": "Hot Tub Filling Up",
-        "human": "Human",
-        "human_vocals": "Human Vocals",
-        "hygene": "Hygene",
-        "ice_skating": "Ice Skating",
-        "ignitions": "Ignitions",
-        "infantry": "Infantry",
-        "intro": "Intro",
-        "jet": "Jet",
-        "juggling": "Juggling",
-        "key_lock": "Key Lock",
-        "kids": "Kids",
-        "knocks": "Knocks",
-        "lab_equip": "Lab Equip",
-        "lacrosse": "Lacrosse",
-        "lamps_lanterns": "Lamps Lanterns",
-        "leather": "Leather",
-        "liquid_suction": "Liquid Suction",
-        "locker_doors": "Locker Doors",
-        "machine_gun": "Machine Gun",
-        "magic_spells": "Magic Spells",
-        "medium_large_explosions": "Medium Large Explosions",
-        "metal": "Metal",
-        "modern_rings": "Modern Rings",
-        "money_coins": "Money Coins",
-        "motorcycles": "Motorcycles",
-        "movement": "Movement",
-        "moves": "Moves",
-        "nature": "Nature",
-        "oar_boat": "Oar Boat",
-        "pagers": "Pagers",
-        "paintball": "Paintball",
-        "paper": "Paper",
-        "parachute": "Parachute",
-        "pay_phones": "Pay Phones",
-        "phone_beeps": "Phone Beeps",
-        "pigmy_bats": "Pigmy Bats",
-        "pills": "Pills",
-        "pour_water": "Pour Water",
-        "power_up_down": "Power Up Down",
-        "printers": "Printers",
-        "prison": "Prison",
-        "public_space": "Public Space",
-        "racquetball": "Racquetball",
-        "radios_static": "Radios Static",
-        "rain": "Rain",
-        "rc_airplane": "RC Airplane",
-        "rc_car": "RC Car",
-        "refrigerators_freezers": "Refrigerators Freezers",
-        "regular": "Regular",
-        "respirator": "Respirator",
-        "rifle": "Rifle",
-        "roller_coaster": "Roller Coaster",
-        "rollerskates_rollerblades": "RollerSkates RollerBlades",
-        "room_tones": "Room Tones",
-        "ropes_climbing": "Ropes Climbing",
-        "rotary_rings": "Rotary Rings",
-        "rowboat_canoe": "Rowboat Canoe",
-        "rubber": "Rubber",
-        "running": "Running",
-        "sails": "Sails",
-        "sand_gravel": "Sand Gravel",
-        "screen_doors": "Screen Doors",
-        "screens": "Screens",
-        "seats_stools": "Seats Stools",
-        "servos": "Servos",
-        "shoes_boots": "Shoes Boots",
-        "shotgun": "Shotgun",
-        "shower": "Shower",
-        "sink_faucet": "Sink Faucet",
-        "sink_filling_water": "Sink Filling Water",
-        "sink_run_and_off": "Sink Run And Off",
-        "sink_water_splatter": "Sink Water Splatter",
-        "sirens": "Sirens",
-        "skateboards": "Skateboards",
-        "ski": "Ski",
-        "skids_tires": "Skids Tires",
-        "sled": "Sled",
-        "slides": "Slides",
-        "small_explosions": "Small Explosions",
-        "snow": "Snow",
-        "snowmobile": "Snowmobile",
-        "soldiers": "Soldiers",
-        "splash_water": "Splash Water",
-        "splashes_sprays": "Splashes Sprays",
-        "sports_whistles": "Sports Whistles",
-        "squeaks": "Squeaks",
-        "squeaky": "Squeaky",
-        "stairs": "Stairs",
-        "steam": "Steam",
-        "submarine_diesel": "Submarine Diesel",
-        "swing_doors": "Swing Doors",
-        "switches_levers": "Switches Levers",
-        "swords": "Swords",
-        "tape": "Tape",
-        "tape_machine": "Tape Machine",
-        "televisions_shows": "Televisions Shows",
-        "tennis_pingpong": "Tennis PingPong",
-        "textile": "Textile",
-        "throw": "Throw",
-        "thunder": "Thunder",
-        "ticks": "Ticks",
-        "timer": "Timer",
-        "toilet_flush": "Toilet Flush",
-        "tone": "Tone",
-        "tones_noises": "Tones Noises",
-        "toys": "Toys",
-        "tractors": "Tractors",
-        "traffic": "Traffic",
-        "train": "Train",
-        "trucks_vans": "Trucks Vans",
-        "turnstiles": "Turnstiles",
-        "typing": "Typing",
-        "umbrella": "Umbrella",
-        "underwater": "Underwater",
-        "vampires": "Vampires",
-        "various": "Various",
-        "video_tunes": "Video Tunes",
-        "volcano_earthquake": "Volcano Earthquake",
-        "watches": "Watches",
-        "water": "Water",
-        "water_running": "Water Running",
-        "werewolves": "Werewolves",
-        "winches_gears": "Winches Gears",
-        "wind": "Wind",
-        "wood": "Wood",
-        "wood_boat": "Wood Boat",
-        "woosh": "Woosh",
-        "zap": "Zap",
-        "zippers": "Zippers"
+        "air_horn_03": "Air horn",
+        "amzn_sfx_cat_meow_1x_01": "Cat meow",
+        "amzn_sfx_church_bell_1x_02": "Church bell",
+        "amzn_sfx_crowd_applause_01": "Crowd applause",
+        "amzn_sfx_dog_med_bark_1x_02": "Dog bark",
+        "amzn_sfx_doorbell_01": "Doorbell 1",
+        "amzn_sfx_doorbell_chime_01": "Doorbell 2",
+        "amzn_sfx_doorbell_chime_02": "Doorbell 3",
+        "amzn_sfx_large_crowd_cheer_01": "Crowd cheers",
+        "amzn_sfx_lion_roar_02": "Lion roar",
+        "amzn_sfx_rooster_crow_01": "Rooster",
+        "amzn_sfx_scifi_alarm_01": "Sirens",
+        "amzn_sfx_scifi_alarm_04": "Red alert",
+        "amzn_sfx_scifi_engines_on_02": "Engines on",
+        "amzn_sfx_scifi_sheilds_up_01": "Shields up",
+        "amzn_sfx_trumpet_bugle_04": "Trumpet",
+        "amzn_sfx_wolf_howl_02": "Wolf howl",
+        "bell_02": "Bells",
+        "boing_01": "Boing 1",
+        "boing_03": "Boing 2",
+        "buzzers_pistols_01": "Buzzer",
+        "camera_01": "Camera",
+        "christmas_05": "Christmas bells",
+        "clock_01": "Ticking clock",
+        "futuristic_10": "Aircraft",
+        "halloween_bats": "Halloween bats",
+        "halloween_crows": "Halloween crows",
+        "halloween_footsteps": "Halloween spooky footsteps",
+        "halloween_wind": "Halloween wind",
+        "halloween_wolf": "Halloween wolf",
+        "holiday_halloween_ghost": "Halloween ghost",
+        "horror_10": "Halloween creepy door",
+        "med_system_alerts_minimal_dragon_short": "Friendly dragon",
+        "med_system_alerts_minimal_owl_short": "Happy owl",
+        "med_system_alerts_minimals_blue_wave_small": "Underwater World Sonata",
+        "med_system_alerts_minimals_galaxy_short": "Infinite Galaxy",
+        "med_system_alerts_minimals_panda_short": "Baby panda",
+        "med_system_alerts_minimals_tiger_short": "Playful tiger",
+        "med_ui_success_generic_1-1": "Success 1",
+        "squeaky_12": "Squeaky door",
+        "zap_01": "Zap"
       }
     }
   },
@@ -614,7 +187,7 @@
       "message": "Invalid device ID specified: {device_id}"
     },
     "invalid_sound_value": {
-      "message": "Invalid sound {sound} with variant {variant} specified"
+      "message": "Invalid sound {sound} specified"
     },
     "entry_not_loaded": {
       "message": "Entry not loaded: {entry}"

homeassistant/components/analytics/analytics.py

@@ -24,7 +24,12 @@ from homeassistant.components.recorder import (
     get_instance as get_recorder_instance,
 )
 from homeassistant.config_entries import SOURCE_IGNORE
-from homeassistant.const import ATTR_DOMAIN, BASE_PLATFORMS, __version__ as HA_VERSION
+from homeassistant.const import (
+    ATTR_ASSUMED_STATE,
+    ATTR_DOMAIN,
+    BASE_PLATFORMS,
+    __version__ as HA_VERSION,
+)
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -389,66 +394,117 @@ def _domains_from_yaml_config(yaml_configuration: dict[str, Any]) -> set[str]:
 
 
 async def async_devices_payload(hass: HomeAssistant) -> dict:
-    """Return the devices payload."""
-    devices: list[dict[str, Any]] = []
+    """Return detailed information about entities and devices."""
+    integrations_info: dict[str, dict[str, Any]] = {}
+
     dev_reg = dr.async_get(hass)
-    # Devices that need via device info set
-    new_indexes: dict[str, int] = {}
-    via_devices: dict[str, str] = {}
 
-    seen_integrations = set()
+    # We need to refer to other devices, for example in `via_device` field.
+    # We don't however send the original device ids outside of Home Assistant,
+    # instead we refer to devices by (integration_domain, index_in_integration_device_list).
+    device_id_mapping: dict[str, tuple[str, int]] = {}
 
-    for device in dev_reg.devices.values():
-        if not device.primary_config_entry:
+    for device_entry in dev_reg.devices.values():
+        if not device_entry.primary_config_entry:
             continue
 
-        config_entry = hass.config_entries.async_get_entry(device.primary_config_entry)
+        config_entry = hass.config_entries.async_get_entry(
+            device_entry.primary_config_entry
+        )
 
         if config_entry is None:
             continue
 
-        seen_integrations.add(config_entry.domain)
+        integration_domain = config_entry.domain
+        integration_info = integrations_info.setdefault(
+            integration_domain, {"devices": [], "entities": []}
+        )
 
-        new_indexes[device.id] = len(devices)
-        devices.append(
+        devices_info = integration_info["devices"]
+
+        device_id_mapping[device_entry.id] = (integration_domain, len(devices_info))
+
+        devices_info.append(
             {
-                "integration": config_entry.domain,
-                "manufacturer": device.manufacturer,
-                "model_id": device.model_id,
-                "model": device.model,
-                "sw_version": device.sw_version,
-                "hw_version": device.hw_version,
-                "has_configuration_url": device.configuration_url is not None,
-                "via_device": None,
-                "entry_type": device.entry_type.value if device.entry_type else None,
+                "entities": [],
+                "entry_type": device_entry.entry_type,
+                "has_configuration_url": device_entry.configuration_url is not None,
+                "hw_version": device_entry.hw_version,
+                "manufacturer": device_entry.manufacturer,
+                "model": device_entry.model,
+                "model_id": device_entry.model_id,
+                "sw_version": device_entry.sw_version,
+                "via_device": device_entry.via_device_id,
             }
         )
 
-        if device.via_device_id:
-            via_devices[device.id] = device.via_device_id
+    # Fill out via_device with new device ids
+    for integration_info in integrations_info.values():
+        for device_info in integration_info["devices"]:
+            if device_info["via_device"] is None:
+                continue
+            device_info["via_device"] = device_id_mapping.get(device_info["via_device"])
 
-    for from_device, via_device in via_devices.items():
-        if via_device not in new_indexes:
-            continue
-        devices[new_indexes[from_device]]["via_device"] = new_indexes[via_device]
+    ent_reg = er.async_get(hass)
+
+    for entity_entry in ent_reg.entities.values():
+        integration_domain = entity_entry.platform
+        integration_info = integrations_info.setdefault(
+            integration_domain, {"devices": [], "entities": []}
+        )
+
+        devices_info = integration_info["devices"]
+        entities_info = integration_info["entities"]
+
+        entity_state = hass.states.get(entity_entry.entity_id)
+
+        entity_info = {
+            # LIMITATION: `assumed_state` can be overridden by users;
+            # we should replace it with the original value in the future.
+            # It is also not present, if entity is not in the state machine,
+            # which can happen for disabled entities.
+            "assumed_state": entity_state.attributes.get(ATTR_ASSUMED_STATE, False)
+            if entity_state is not None
+            else None,
+            "capabilities": entity_entry.capabilities,
+            "domain": entity_entry.domain,
+            "entity_category": entity_entry.entity_category,
+            "has_entity_name": entity_entry.has_entity_name,
+            "original_device_class": entity_entry.original_device_class,
+            # LIMITATION: `unit_of_measurement` can be overridden by users;
+            # we should replace it with the original value in the future.
+            "unit_of_measurement": entity_entry.unit_of_measurement,
+        }
+
+        if (
+            ((device_id := entity_entry.device_id) is not None)
+            and ((new_device_id := device_id_mapping.get(device_id)) is not None)
+            and (new_device_id[0] == integration_domain)
+        ):
+            device_info = devices_info[new_device_id[1]]
+            device_info["entities"].append(entity_info)
+        else:
+            entities_info.append(entity_info)
 
     integrations = {
         domain: integration
         for domain, integration in (
-            await async_get_integrations(hass, seen_integrations)
+            await async_get_integrations(hass, integrations_info.keys())
         ).items()
         if isinstance(integration, Integration)
     }
 
-    for device_info in devices:
-        if integration := integrations.get(device_info["integration"]):
-            device_info["is_custom_integration"] = not integration.is_built_in
+    for domain, integration_info in integrations_info.items():
+        if integration := integrations.get(domain):
+            integration_info["is_custom_integration"] = not integration.is_built_in
             # Include version for custom integrations
             if not integration.is_built_in and integration.version:
-                device_info["custom_integration_version"] = str(integration.version)
+                integration_info["custom_integration_version"] = str(
+                    integration.version
+                )
 
     return {
         "version": "home-assistant:1",
         "home_assistant": HA_VERSION,
-        "devices": devices,
+        "integrations": integrations_info,
     }

homeassistant/components/androidtv_remote/config_flow.py

@@ -66,9 +66,14 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
         if user_input is not None:
             self.host = user_input[CONF_HOST]
             api = create_api(self.hass, self.host, enable_ime=False)
+            await api.async_generate_cert_if_missing()
             try:
-                await api.async_generate_cert_if_missing()
                 self.name, self.mac = await api.async_get_name_and_mac()
+            except CannotConnect:
+                # Likely invalid IP address or device is network unreachable. Stay
+                # in the user step allowing the user to enter a different host.
+                errors["base"] = "cannot_connect"
+            else:
                 await self.async_set_unique_id(format_mac(self.mac))
                 if self.source == SOURCE_RECONFIGURE:
                     self._abort_if_unique_id_mismatch()
@@ -81,11 +86,10 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
                         },
                     )
                 self._abort_if_unique_id_configured(updates={CONF_HOST: self.host})
-                return await self._async_start_pair()
-            except (CannotConnect, ConnectionClosed):
-                # Likely invalid IP address or device is network unreachable. Stay
-                # in the user step allowing the user to enter a different host.
-                errors["base"] = "cannot_connect"
+                try:
+                    return await self._async_start_pair()
+                except (CannotConnect, ConnectionClosed):
+                    errors["base"] = "cannot_connect"
         else:
             user_input = {}
         default_host = user_input.get(CONF_HOST, vol.UNDEFINED)
@@ -112,22 +116,9 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
         """Handle the pair step."""
         errors: dict[str, str] = {}
         if user_input is not None:
+            pin = user_input["pin"]
             try:
-                pin = user_input["pin"]
                 await self.api.async_finish_pairing(pin)
-                if self.source == SOURCE_REAUTH:
-                    return self.async_update_reload_and_abort(
-                        self._get_reauth_entry(), reload_even_if_entry_is_unchanged=True
-                    )
-
-                return self.async_create_entry(
-                    title=self.name,
-                    data={
-                        CONF_HOST: self.host,
-                        CONF_NAME: self.name,
-                        CONF_MAC: self.mac,
-                    },
-                )
             except InvalidAuth:
                 # Invalid PIN. Stay in the pair step allowing the user to enter
                 # a different PIN.
@@ -145,6 +136,20 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
                     # them to enter a new IP address but we cannot do that for the zeroconf
                     # flow. Simpler to abort for both flows.
                     return self.async_abort(reason="cannot_connect")
+            else:
+                if self.source == SOURCE_REAUTH:
+                    return self.async_update_reload_and_abort(
+                        self._get_reauth_entry(), reload_even_if_entry_is_unchanged=True
+                    )
+
+                return self.async_create_entry(
+                    title=self.name,
+                    data={
+                        CONF_HOST: self.host,
+                        CONF_NAME: self.name,
+                        CONF_MAC: self.mac,
+                    },
+                )
         return self.async_show_form(
             step_id="pair",
             data_schema=STEP_PAIR_DATA_SCHEMA,

homeassistant/components/androidtv_remote/entity.py

@@ -6,7 +6,7 @@ from typing import Any
 
 from androidtvremote2 import AndroidTVRemote, ConnectionClosed
 
-from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
+from homeassistant.const import CONF_MAC, CONF_NAME
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
@@ -28,8 +28,6 @@ class AndroidTVRemoteBaseEntity(Entity):
     ) -> None:
         """Initialize the entity."""
         self._api = api
-        self._host = config_entry.data[CONF_HOST]
-        self._name = config_entry.data[CONF_NAME]
         self._apps: dict[str, Any] = config_entry.options.get(CONF_APPS, {})
         self._attr_unique_id = config_entry.unique_id
         self._attr_is_on = api.is_on
@@ -39,7 +37,7 @@ class AndroidTVRemoteBaseEntity(Entity):
         self._attr_device_info = DeviceInfo(
             connections={(CONNECTION_NETWORK_MAC, config_entry.data[CONF_MAC])},
             identifiers={(DOMAIN, config_entry.unique_id)},
-            name=self._name,
+            name=config_entry.data[CONF_NAME],
             manufacturer=device_info["manufacturer"],
             model=device_info["model"],
         )

homeassistant/components/androidtv_remote/media_player.py

@@ -175,7 +175,11 @@ class AndroidTVRemoteMediaPlayerEntity(AndroidTVRemoteBaseEntity, MediaPlayerEnt
         """Play a piece of media."""
         if media_type == MediaType.CHANNEL:
             if not media_id.isnumeric():
-                raise ValueError(f"Channel must be numeric: {media_id}")
+                raise HomeAssistantError(
+                    translation_domain=DOMAIN,
+                    translation_key="invalid_channel",
+                    translation_placeholders={"media_id": media_id},
+                )
             if self._channel_set_task:
                 self._channel_set_task.cancel()
             self._channel_set_task = asyncio.create_task(
@@ -188,7 +192,11 @@ class AndroidTVRemoteMediaPlayerEntity(AndroidTVRemoteBaseEntity, MediaPlayerEnt
             self._send_launch_app_command(media_id)
             return
 
-        raise ValueError(f"Invalid media type: {media_type}")
+        raise HomeAssistantError(
+            translation_domain=DOMAIN,
+            translation_key="invalid_media_type",
+            translation_placeholders={"media_type": media_type},
+        )
 
     async def async_browse_media(
         self,

homeassistant/components/androidtv_remote/strings.json

@@ -22,7 +22,7 @@
       },
       "zeroconf_confirm": {
         "title": "Discovered Android TV",
-        "description": "Do you want to add the Android TV ({name}) to Home Assistant?  It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen."
+        "description": "Do you want to add the Android TV ({name}) to Home Assistant? It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen."
       },
       "pair": {
         "description": "Enter the pairing code displayed on the Android TV ({name}).",
@@ -85,6 +85,12 @@
   "exceptions": {
     "connection_closed": {
       "message": "Connection to the Android TV device is closed"
+    },
+    "invalid_channel": {
+      "message": "Channel must be numeric: {media_id}"
+    },
+    "invalid_media_type": {
+      "message": "Invalid media type: {media_type}"
     }
   }
 }

homeassistant/components/aosmith/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/aosmith",
   "iot_class": "cloud_polling",
-  "requirements": ["py-aosmith==1.0.12"]
+  "requirements": ["py-aosmith==1.0.14"]
 }

homeassistant/components/apcupsd/__init__.py

@@ -9,7 +9,7 @@ from homeassistant.core import HomeAssistant
 
 from .coordinator import APCUPSdConfigEntry, APCUPSdCoordinator
 
-PLATFORMS: Final = (Platform.BINARY_SENSOR, Platform.SENSOR)
+PLATFORMS: Final = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
 
 async def async_setup_entry(

homeassistant/components/apcupsd/coordinator.py

@@ -100,6 +100,7 @@ class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):
             name=self.data.name or "APC UPS",
             hw_version=self.data.get("FIRMWARE"),
             sw_version=self.data.get("VERSION"),
+            serial_number=self.data.serial_no,
         )
 
     async def _async_update_data(self) -> APCUPSdData:

homeassistant/components/apcupsd/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/apcupsd",
   "iot_class": "local_polling",
   "loggers": ["apcaccess"],
-  "quality_scale": "bronze",
+  "quality_scale": "platinum",
   "requirements": ["aioapcaccess==0.4.2"]
 }

homeassistant/components/apcupsd/quality_scale.yaml

@@ -43,10 +43,7 @@ rules:
     status: exempt
     comment: |
       The integration does not require authentication.
-  test-coverage:
-    status: todo
-    comment: |
-      Patch `aioapcaccess.request_status` where we use it.
+  test-coverage: done
   # Gold
   devices: done
   diagnostics: done

homeassistant/components/assist_pipeline/manifest.json

@@ -2,7 +2,7 @@
   "domain": "assist_pipeline",
   "name": "Assist pipeline",
   "after_dependencies": ["repairs"],
-  "codeowners": ["@balloob", "@synesthesiam"],
+  "codeowners": ["@synesthesiam", "@arturpragacz"],
   "dependencies": ["conversation", "stt", "tts", "wake_word"],
   "documentation": "https://www.home-assistant.io/integrations/assist_pipeline",
   "integration_type": "system",

homeassistant/components/assist_satellite/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "assist_satellite",
   "name": "Assist Satellite",
-  "codeowners": ["@home-assistant/core", "@synesthesiam"],
+  "codeowners": ["@home-assistant/core", "@synesthesiam", "@arturpragacz"],
   "dependencies": ["assist_pipeline", "http", "stt", "tts"],
   "documentation": "https://www.home-assistant.io/integrations/assist_satellite",
   "integration_type": "entity",

homeassistant/components/asuswrt/bridge.py

@@ -12,6 +12,7 @@ from typing import Any, cast
 from aioasuswrt.asuswrt import AsusWrt as AsusWrtLegacy
 from aiohttp import ClientSession
 from asusrouter import AsusRouter, AsusRouterError
+from asusrouter.config import ARConfigKey
 from asusrouter.modules.client import AsusClient
 from asusrouter.modules.data import AsusData
 from asusrouter.modules.homeassistant import convert_to_ha_data, convert_to_ha_sensors
@@ -123,6 +124,8 @@ class AsusWrtBridge(ABC):
         self._firmware: str | None = None
         self._label_mac: str | None = None
         self._model: str | None = None
+        self._model_id: str | None = None
+        self._serial_number: str | None = None
 
     @property
     def host(self) -> str:
@@ -144,6 +147,16 @@ class AsusWrtBridge(ABC):
         """Return model information."""
         return self._model
 
+    @property
+    def model_id(self) -> str | None:
+        """Return model_id information."""
+        return self._model_id
+
+    @property
+    def serial_number(self) -> str | None:
+        """Return serial number information."""
+        return self._serial_number
+
     @property
     @abstractmethod
     def is_connected(self) -> bool:
@@ -314,10 +327,14 @@ class AsusWrtHttpBridge(AsusWrtBridge):
     def __init__(self, conf: dict[str, Any], session: ClientSession) -> None:
         """Initialize Bridge that use HTTP library."""
         super().__init__(conf[CONF_HOST])
-        self._api = self._get_api(conf, session)
+        # Get API configuration
+        config = self._get_api_config()
+        self._api = self._get_api(conf, session, config)
 
     @staticmethod
-    def _get_api(conf: dict[str, Any], session: ClientSession) -> AsusRouter:
+    def _get_api(
+        conf: dict[str, Any], session: ClientSession, config: dict[ARConfigKey, Any]
+    ) -> AsusRouter:
         """Get the AsusRouter API."""
         return AsusRouter(
             hostname=conf[CONF_HOST],
@@ -326,8 +343,19 @@ class AsusWrtHttpBridge(AsusWrtBridge):
             use_ssl=conf[CONF_PROTOCOL] == PROTOCOL_HTTPS,
             port=conf.get(CONF_PORT),
             session=session,
+            config=config,
         )
 
+    def _get_api_config(self) -> dict[ARConfigKey, Any]:
+        """Get configuration for the API."""
+        return {
+            # Enable automatic temperature data correction in the library
+            ARConfigKey.OPTIMISTIC_TEMPERATURE: True,
+            # Disable `warning`-level log message when temperature
+            # is corrected by setting it to already notified.
+            ARConfigKey.NOTIFIED_OPTIMISTIC_TEMPERATURE: True,
+        }
+
     @property
     def is_connected(self) -> bool:
         """Get connected status."""
@@ -345,6 +373,8 @@ class AsusWrtHttpBridge(AsusWrtBridge):
             self._label_mac = format_mac(mac)
         self._firmware = str(_identity.firmware)
         self._model = _identity.model
+        self._model_id = _identity.product_id
+        self._serial_number = _identity.serial
 
     async def async_disconnect(self) -> None:
         """Disconnect to the device."""

homeassistant/components/asuswrt/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aioasuswrt", "asusrouter", "asyncssh"],
-  "requirements": ["aioasuswrt==1.4.0", "asusrouter==1.20.1"]
+  "requirements": ["aioasuswrt==1.4.0", "asusrouter==1.21.0"]
 }

homeassistant/components/asuswrt/router.py

@@ -391,6 +391,8 @@ class AsusWrtRouter:
             identifiers={(DOMAIN, self._entry.unique_id or "AsusWRT")},
             name=self.host,
             model=self._api.model or "Asus Router",
+            model_id=self._api.model_id,
+            serial_number=self._api.serial_number,
             manufacturer="Asus",
             configuration_url=f"http://{self.host}",
         )

homeassistant/components/backup/manager.py

@@ -896,7 +896,8 @@ class BackupManager:
         )
         agent_errors = {
             backup_id: error
-            for backup_id, error in zip(backup_ids, delete_results, strict=True)
+            for backup_id, error_dict in zip(backup_ids, delete_results, strict=True)
+            for error in error_dict.values()
             if error and not isinstance(error, BackupNotFound)
         }
         if agent_errors:

homeassistant/components/bayesian/binary_sensor.py

@@ -555,10 +555,6 @@ class BayesianBinarySensor(BinarySensorEntity):
         for observation in self._observations:
             if observation.value_template is None:
                 continue
-            if isinstance(observation.value_template, str):
-                observation.value_template = Template(
-                    observation.value_template, hass=self.hass
-                )
             template = observation.value_template
             observations_by_template.setdefault(template, []).append(observation)
 

homeassistant/components/bayesian/strings.json

@@ -96,7 +96,7 @@
       },
       "numeric_state": {
         "title": "[%key:component::bayesian::config_subentries::observation::step::state::title%]",
-        "description": "[%key:component::bayesian::config_subentries::observation::step::state::description%]",
+        "description": "[%key:component::bayesian::config_subentries::observation::step::numeric_state::description%]",
         "data": {
           "name": "[%key:common::config_flow::data::name%]",
           "entity_id": "[%key:component::bayesian::config_subentries::observation::step::state::data::entity_id%]",

homeassistant/components/bluesound/manifest.json

@@ -6,7 +6,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/bluesound",
   "iot_class": "local_polling",
-  "requirements": ["pyblu==2.0.4"],
+  "requirements": ["pyblu==2.0.5"],
   "zeroconf": [
     {
       "type": "_musc._tcp.local."

homeassistant/components/bluesound/media_player.py

@@ -321,8 +321,14 @@ class BluesoundPlayer(CoordinatorEntity[BluesoundCoordinator], MediaPlayerEntity
         if self.available is False or (self.is_grouped and not self.is_leader):
             return None
 
-        sources = [x.text for x in self._inputs]
-        sources += [x.name for x in self._presets]
+        sources = [x.name for x in self._presets]
+
+        # ignore if both id and text are None
+        for input_ in self._inputs:
+            if input_.text is not None:
+                sources.append(input_.text)
+            elif input_.id is not None:
+                sources.append(input_.id)
 
         return sources
 
@@ -340,7 +346,7 @@ class BluesoundPlayer(CoordinatorEntity[BluesoundCoordinator], MediaPlayerEntity
                     input_.id == self._status.input_id
                     or input_.url == self._status.stream_url
                 ):
-                    return input_.text
+                    return input_.text if input_.text is not None else input_.id
 
         for preset in self._presets:
             if preset.url == self._status.stream_url:
@@ -537,7 +543,7 @@ class BluesoundPlayer(CoordinatorEntity[BluesoundCoordinator], MediaPlayerEntity
 
         # presets and inputs might have the same name; presets have priority
         for input_ in self._inputs:
-            if input_.text == source:
+            if source in (input_.text, input_.id):
                 await self._player.play_url(input_.url)
                 return
         for preset in self._presets:

homeassistant/components/bluetooth/__init__.py

@@ -385,10 +385,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             f"Bluetooth adapter {adapter} with address {address} not found"
         )
     passive = entry.options.get(CONF_PASSIVE)
+    adapters = await manager.async_get_bluetooth_adapters()
     mode = BluetoothScanningMode.PASSIVE if passive else BluetoothScanningMode.ACTIVE
     scanner = HaScanner(mode, adapter, address)
     scanner.async_setup()
-    adapters = await manager.async_get_bluetooth_adapters()
     details = adapters[adapter]
     if entry.title == address:
         hass.config_entries.async_update_entry(

homeassistant/components/bluetooth/manifest.json

@@ -17,10 +17,10 @@
   "requirements": [
     "bleak==1.0.1",
     "bleak-retry-connector==4.4.3",
-    "bluetooth-adapters==2.0.0",
+    "bluetooth-adapters==2.1.0",
     "bluetooth-auto-recovery==1.5.2",
     "bluetooth-data-tools==1.28.2",
     "dbus-fast==2.44.3",
-    "habluetooth==5.2.0"
+    "habluetooth==5.3.1"
   ]
 }

homeassistant/components/bluetooth/websocket_api.py

@@ -8,8 +8,10 @@ import time
 from typing import Any
 
 from habluetooth import (
+    BaseHaScanner,
     BluetoothScanningMode,
     HaBluetoothSlotAllocations,
+    HaScannerModeChange,
     HaScannerRegistration,
     HaScannerRegistrationEvent,
 )
@@ -27,12 +29,54 @@ from .models import BluetoothChange
 from .util import InvalidConfigEntryID, InvalidSource, config_entry_id_to_source
 
 
+@callback
+def _async_get_source_from_config_entry(
+    hass: HomeAssistant,
+    connection: websocket_api.ActiveConnection,
+    msg_id: int,
+    config_entry_id: str | None,
+    validate_source: bool = True,
+) -> str | None:
+    """Get source from config entry id.
+
+    Returns None if no config_entry_id provided or on error (after sending error response).
+    If validate_source is True, also validates that the scanner exists.
+    """
+    if not config_entry_id:
+        return None
+
+    if validate_source:
+        # Use the full validation that checks if scanner exists
+        try:
+            return config_entry_id_to_source(hass, config_entry_id)
+        except InvalidConfigEntryID as err:
+            connection.send_error(msg_id, "invalid_config_entry_id", str(err))
+            return None
+        except InvalidSource as err:
+            connection.send_error(msg_id, "invalid_source", str(err))
+            return None
+
+    # Just check if config entry exists and belongs to bluetooth
+    if (
+        not (entry := hass.config_entries.async_get_entry(config_entry_id))
+        or entry.domain != DOMAIN
+    ):
+        connection.send_error(
+            msg_id,
+            "invalid_config_entry_id",
+            f"Config entry {config_entry_id} not found",
+        )
+        return None
+    return entry.unique_id
+
+
 @callback
 def async_setup(hass: HomeAssistant) -> None:
     """Set up the bluetooth websocket API."""
     websocket_api.async_register_command(hass, ws_subscribe_advertisements)
     websocket_api.async_register_command(hass, ws_subscribe_connection_allocations)
     websocket_api.async_register_command(hass, ws_subscribe_scanner_details)
+    websocket_api.async_register_command(hass, ws_subscribe_scanner_state)
 
 
 @lru_cache(maxsize=1024)
@@ -180,16 +224,12 @@ async def ws_subscribe_connection_allocations(
 ) -> None:
     """Handle subscribe advertisements websocket command."""
     ws_msg_id = msg["id"]
-    source: str | None = None
-    if config_entry_id := msg.get("config_entry_id"):
-        try:
-            source = config_entry_id_to_source(hass, config_entry_id)
-        except InvalidConfigEntryID as err:
-            connection.send_error(ws_msg_id, "invalid_config_entry_id", str(err))
-            return
-        except InvalidSource as err:
-            connection.send_error(ws_msg_id, "invalid_source", str(err))
-            return
+    config_entry_id = msg.get("config_entry_id")
+    source = _async_get_source_from_config_entry(
+        hass, connection, ws_msg_id, config_entry_id
+    )
+    if config_entry_id and source is None:
+        return  # Error already sent by helper
 
     def _async_allocations_changed(allocations: HaBluetoothSlotAllocations) -> None:
         connection.send_message(
@@ -220,20 +260,12 @@ async def ws_subscribe_scanner_details(
 ) -> None:
     """Handle subscribe scanner details websocket command."""
     ws_msg_id = msg["id"]
-    source: str | None = None
-    if config_entry_id := msg.get("config_entry_id"):
-        if (
-            not (entry := hass.config_entries.async_get_entry(config_entry_id))
-            or entry.domain != DOMAIN
-        ):
-            connection.send_error(
-                ws_msg_id,
-                "invalid_config_entry_id",
-                f"Invalid config entry id: {config_entry_id}",
-            )
-            return
-        source = entry.unique_id
-        assert source is not None
+    config_entry_id = msg.get("config_entry_id")
+    source = _async_get_source_from_config_entry(
+        hass, connection, ws_msg_id, config_entry_id, validate_source=False
+    )
+    if config_entry_id and source is None:
+        return  # Error already sent by helper
 
     def _async_event_message(message: dict[str, Any]) -> None:
         connection.send_message(
@@ -260,3 +292,70 @@ async def ws_subscribe_scanner_details(
         ]
     ):
         _async_event_message({"add": matching_scanners})
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command(
+    {
+        vol.Required("type"): "bluetooth/subscribe_scanner_state",
+        vol.Optional("config_entry_id"): str,
+    }
+)
+@websocket_api.async_response
+async def ws_subscribe_scanner_state(
+    hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
+) -> None:
+    """Handle subscribe scanner state websocket command."""
+    ws_msg_id = msg["id"]
+    config_entry_id = msg.get("config_entry_id")
+    source = _async_get_source_from_config_entry(
+        hass, connection, ws_msg_id, config_entry_id, validate_source=False
+    )
+    if config_entry_id and source is None:
+        return  # Error already sent by helper
+
+    @callback
+    def _async_send_scanner_state(
+        scanner: BaseHaScanner,
+        current_mode: BluetoothScanningMode | None,
+        requested_mode: BluetoothScanningMode | None,
+    ) -> None:
+        payload = {
+            "source": scanner.source,
+            "adapter": scanner.adapter,
+            "current_mode": current_mode.value if current_mode else None,
+            "requested_mode": requested_mode.value if requested_mode else None,
+        }
+        connection.send_message(
+            json_bytes(
+                websocket_api.event_message(
+                    ws_msg_id,
+                    payload,
+                )
+            )
+        )
+
+    @callback
+    def _async_scanner_state_changed(mode_change: HaScannerModeChange) -> None:
+        _async_send_scanner_state(
+            mode_change.scanner,
+            mode_change.current_mode,
+            mode_change.requested_mode,
+        )
+
+    manager = _get_manager(hass)
+    connection.subscriptions[ws_msg_id] = (
+        manager.async_register_scanner_mode_change_callback(
+            _async_scanner_state_changed, source
+        )
+    )
+    connection.send_message(json_bytes(websocket_api.result_message(ws_msg_id)))
+
+    # Send initial state for all matching scanners
+    for scanner in manager.async_current_scanners():
+        if source is None or scanner.source == source:
+            _async_send_scanner_state(
+                scanner,
+                scanner.current_mode,
+                scanner.requested_mode,
+            )

homeassistant/components/bmw_connected_drive/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/bmw_connected_drive",
   "iot_class": "cloud_polling",
   "loggers": ["bimmer_connected"],
-  "requirements": ["bimmer-connected[china]==0.17.2"]
+  "requirements": ["bimmer-connected[china]==0.17.3"]
 }

homeassistant/components/braviatv/entity.py

@@ -1,5 +1,7 @@
 """A entity class for Bravia TV integration."""
 
+from typing import TYPE_CHECKING
+
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -17,11 +19,15 @@ class BraviaTVEntity(CoordinatorEntity[BraviaTVCoordinator]):
         super().__init__(coordinator)
 
         self._attr_unique_id = unique_id
+
+        if TYPE_CHECKING:
+            assert coordinator.client.mac is not None
+
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            connections={(CONNECTION_NETWORK_MAC, coordinator.system_info["macAddr"])},
+            connections={(CONNECTION_NETWORK_MAC, coordinator.client.mac)},
             manufacturer=ATTR_MANUFACTURER,
-            model_id=coordinator.system_info["model"],
-            hw_version=coordinator.system_info["generation"],
-            serial_number=coordinator.system_info["serial"],
+            model_id=coordinator.system_info.get("model"),
+            hw_version=coordinator.system_info.get("generation"),
+            serial_number=coordinator.system_info.get("serial"),
         )

homeassistant/components/brother/manifest.json

@@ -8,7 +8,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["brother", "pyasn1", "pysmi", "pysnmp"],
-  "requirements": ["brother==5.0.1"],
+  "requirements": ["brother==5.1.0"],
   "zeroconf": [
     {
       "type": "_printer._tcp.local.",

homeassistant/components/bsblan/climate.py

@@ -81,11 +81,15 @@ class BSBLANClimate(BSBLanEntity, ClimateEntity):
     @property
     def current_temperature(self) -> float | None:
         """Return the current temperature."""
+        if self.coordinator.data.state.current_temperature is None:
+            return None
         return self.coordinator.data.state.current_temperature.value
 
     @property
     def target_temperature(self) -> float | None:
         """Return the temperature we try to reach."""
+        if self.coordinator.data.state.target_temperature is None:
+            return None
         return self.coordinator.data.state.target_temperature.value
 
     @property

homeassistant/components/bsblan/config_flow.py

@@ -25,7 +25,7 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
 
     def __init__(self) -> None:
         """Initialize BSBLan flow."""
-        self.host: str | None = None
+        self.host: str = ""
         self.port: int = DEFAULT_PORT
         self.mac: str | None = None
         self.passkey: str | None = None

homeassistant/components/bsblan/sensor.py

@@ -28,6 +28,7 @@ class BSBLanSensorEntityDescription(SensorEntityDescription):
     """Describes BSB-Lan sensor entity."""
 
     value_fn: Callable[[BSBLanCoordinatorData], StateType]
+    exists_fn: Callable[[BSBLanCoordinatorData], bool] = lambda data: True
 
 
 SENSOR_TYPES: tuple[BSBLanSensorEntityDescription, ...] = (
@@ -37,7 +38,12 @@ SENSOR_TYPES: tuple[BSBLanSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.sensor.current_temperature.value,
+        value_fn=lambda data: (
+            data.sensor.current_temperature.value
+            if data.sensor.current_temperature is not None
+            else None
+        ),
+        exists_fn=lambda data: data.sensor.current_temperature is not None,
     ),
     BSBLanSensorEntityDescription(
         key="outside_temperature",
@@ -45,7 +51,12 @@ SENSOR_TYPES: tuple[BSBLanSensorEntityDescription, ...] = (
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.sensor.outside_temperature.value,
+        value_fn=lambda data: (
+            data.sensor.outside_temperature.value
+            if data.sensor.outside_temperature is not None
+            else None
+        ),
+        exists_fn=lambda data: data.sensor.outside_temperature is not None,
     ),
 )
 
@@ -57,7 +68,16 @@ async def async_setup_entry(
 ) -> None:
     """Set up BSB-Lan sensor based on a config entry."""
     data = entry.runtime_data
-    async_add_entities(BSBLanSensor(data, description) for description in SENSOR_TYPES)
+
+    # Only create sensors for available data points
+    entities = [
+        BSBLanSensor(data, description)
+        for description in SENSOR_TYPES
+        if description.exists_fn(data.coordinator.data)
+    ]
+
+    if entities:
+        async_add_entities(entities)
 
 
 class BSBLanSensor(BSBLanEntity, SensorEntity):

homeassistant/components/bsblan/strings.json

@@ -85,10 +85,10 @@
   "entity": {
     "sensor": {
       "current_temperature": {
-        "name": "Current Temperature"
+        "name": "Current temperature"
       },
       "outside_temperature": {
-        "name": "Outside Temperature"
+        "name": "Outside temperature"
       }
     }
   }

homeassistant/components/bsblan/water_heater.py

@@ -41,6 +41,18 @@ async def async_setup_entry(
 ) -> None:
     """Set up BSBLAN water heater based on a config entry."""
     data = entry.runtime_data
+
+    # Only create water heater entity if DHW (Domestic Hot Water) is available
+    # Check if we have any DHW-related data indicating water heater support
+    dhw_data = data.coordinator.data.dhw
+    if (
+        dhw_data.operating_mode is None
+        and dhw_data.nominal_setpoint is None
+        and dhw_data.dhw_actual_value_top_temperature is None
+    ):
+        # No DHW functionality available, skip water heater setup
+        return
+
     async_add_entities([BSBLANWaterHeater(data)])
 
 
@@ -61,23 +73,31 @@ class BSBLANWaterHeater(BSBLanEntity, WaterHeaterEntity):
 
         # Set temperature limits based on device capabilities
         self._attr_temperature_unit = data.coordinator.client.get_temperature_unit
-        self._attr_min_temp = data.coordinator.data.dhw.reduced_setpoint.value
-        self._attr_max_temp = data.coordinator.data.dhw.nominal_setpoint_max.value
+        if data.coordinator.data.dhw.reduced_setpoint is not None:
+            self._attr_min_temp = data.coordinator.data.dhw.reduced_setpoint.value
+        if data.coordinator.data.dhw.nominal_setpoint_max is not None:
+            self._attr_max_temp = data.coordinator.data.dhw.nominal_setpoint_max.value
 
     @property
     def current_operation(self) -> str | None:
         """Return current operation."""
+        if self.coordinator.data.dhw.operating_mode is None:
+            return None
         current_mode = self.coordinator.data.dhw.operating_mode.desc
         return OPERATION_MODES.get(current_mode)
 
     @property
     def current_temperature(self) -> float | None:
         """Return the current temperature."""
+        if self.coordinator.data.dhw.dhw_actual_value_top_temperature is None:
+            return None
         return self.coordinator.data.dhw.dhw_actual_value_top_temperature.value
 
     @property
     def target_temperature(self) -> float | None:
         """Return the temperature we try to reach."""
+        if self.coordinator.data.dhw.nominal_setpoint is None:
+            return None
         return self.coordinator.data.dhw.nominal_setpoint.value
 
     async def async_set_temperature(self, **kwargs: Any) -> None:

homeassistant/components/camera/__init__.py

@@ -81,7 +81,11 @@ from .const import (
 )
 from .helper import get_camera_from_entity_id
 from .img_util import scale_jpeg_camera_image
-from .prefs import CameraPreferences, DynamicStreamSettings  # noqa: F401
+from .prefs import (
+    CameraPreferences,
+    DynamicStreamSettings,  # noqa: F401
+    get_dynamic_camera_stream_settings,
+)
 from .webrtc import (
     DATA_ICE_SERVERS,
     CameraWebRTCProvider,
@@ -550,9 +554,9 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
                     self.hass,
                     source,
                     options=self.stream_options,
-                    dynamic_stream_settings=await self.hass.data[
-                        DATA_CAMERA_PREFS
-                    ].get_dynamic_stream_settings(self.entity_id),
+                    dynamic_stream_settings=await get_dynamic_camera_stream_settings(
+                        self.hass, self.entity_id
+                    ),
                     stream_label=self.entity_id,
                 )
                 self.stream.set_update_callback(self.async_write_ha_state)
@@ -942,9 +946,7 @@ async def websocket_get_prefs(
     hass: HomeAssistant, connection: ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Handle request for account info."""
-    stream_prefs = await hass.data[DATA_CAMERA_PREFS].get_dynamic_stream_settings(
-        msg["entity_id"]
-    )
+    stream_prefs = await get_dynamic_camera_stream_settings(hass, msg["entity_id"])
     connection.send_result(msg["id"], asdict(stream_prefs))
 
 

homeassistant/components/camera/prefs.py

@@ -13,7 +13,7 @@ from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.storage import Store
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 
-from .const import DOMAIN, PREF_ORIENTATION, PREF_PRELOAD_STREAM
+from .const import DATA_CAMERA_PREFS, DOMAIN, PREF_ORIENTATION, PREF_PRELOAD_STREAM
 
 STORAGE_KEY: Final = DOMAIN
 STORAGE_VERSION: Final = 1
@@ -106,3 +106,12 @@ class CameraPreferences:
         )
         self._dynamic_stream_settings_by_entity_id[entity_id] = settings
         return settings
+
+
+async def get_dynamic_camera_stream_settings(
+    hass: HomeAssistant, entity_id: str
+) -> DynamicStreamSettings:
+    """Get dynamic stream settings for a camera entity."""
+    if DATA_CAMERA_PREFS not in hass.data:
+        raise HomeAssistantError("Camera integration not set up")
+    return await hass.data[DATA_CAMERA_PREFS].get_dynamic_stream_settings(entity_id)

homeassistant/components/cast/discovery.py

@@ -3,7 +3,8 @@
 import logging
 import threading
 
-import pychromecast
+import pychromecast.discovery
+import pychromecast.models
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP

homeassistant/components/cast/helpers.py

@@ -11,10 +11,13 @@ from uuid import UUID
 
 import aiohttp
 import attr
-import pychromecast
 from pychromecast import dial
 from pychromecast.const import CAST_TYPE_GROUP
+import pychromecast.controllers.media
+import pychromecast.controllers.multizone
+import pychromecast.controllers.receiver
 from pychromecast.models import CastInfo
+import pychromecast.socket_client
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client

homeassistant/components/cast/media_player.py

@@ -10,8 +10,10 @@ import json
 import logging
 from typing import TYPE_CHECKING, Any, Concatenate
 
-import pychromecast
+import pychromecast.config
+import pychromecast.const
 from pychromecast.controllers.homeassistant import HomeAssistantController
+import pychromecast.controllers.media
 from pychromecast.controllers.media import (
     MEDIA_PLAYER_ERROR_CODES,
     MEDIA_PLAYER_STATE_BUFFERING,

homeassistant/components/climate/strings.json

@@ -274,16 +274,16 @@
       "message": "Provided temperature {check_temp} is not valid. Accepted range is {min_temp} to {max_temp}."
     },
     "low_temp_higher_than_high_temp": {
-      "message": "Target temperature low can not be higher than Target temperature high."
+      "message": "'Lower target temperature' can not be higher than 'Upper target temperature'."
     },
     "humidity_out_of_range": {
       "message": "Provided humidity {humidity} is not valid. Accepted range is {min_humidity} to {max_humidity}."
     },
     "missing_target_temperature_entity_feature": {
-      "message": "Set temperature action was used with the target temperature parameter but the entity does not support it."
+      "message": "Set temperature action was used with the 'Target temperature' parameter but the entity does not support it."
     },
     "missing_target_temperature_range_entity_feature": {
-      "message": "Set temperature action was used with the target temperature low/high parameter but the entity does not support it."
+      "message": "Set temperature action was used with the 'Lower/Upper target temperature' parameter but the entity does not support it."
     }
   }
 }

homeassistant/components/cloud/manifest.json

@@ -13,6 +13,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==1.0.0"],
+  "requirements": ["hass-nabucasa==1.1.0"],
   "single_config_entry": true
 }

homeassistant/components/conversation/default_agent.py

@@ -35,7 +35,7 @@ from hassil.recognize import (
 )
 from hassil.string_matcher import UnmatchedRangeEntity, UnmatchedTextEntity
 from hassil.trie import Trie
-from hassil.util import merge_dict
+from hassil.util import merge_dict, remove_punctuation
 from home_assistant_intents import (
     ErrorKey,
     FuzzyConfig,
@@ -327,12 +327,10 @@ class DefaultAgent(ConversationEntity):
 
         if self._exposed_names_trie is not None:
             # Filter by input string
-            text_lower = user_input.text.strip().lower()
+            text = remove_punctuation(user_input.text).strip().lower()
             slot_lists["name"] = TextSlotList(
                 name="name",
-                values=[
-                    result[2] for result in self._exposed_names_trie.find(text_lower)
-                ],
+                values=[result[2] for result in self._exposed_names_trie.find(text)],
             )
 
         start = time.monotonic()
@@ -1263,7 +1261,7 @@ class DefaultAgent(ConversationEntity):
         name_list = TextSlotList.from_tuples(exposed_entity_names, allow_template=False)
         for name_value in name_list.values:
             assert isinstance(name_value.text_in, TextChunk)
-            name_text = name_value.text_in.text.strip().lower()
+            name_text = remove_punctuation(name_value.text_in.text).strip().lower()
             self._exposed_names_trie.insert(name_text, name_value)
 
         self._slot_lists = {

homeassistant/components/conversation/manifest.json

@@ -1,10 +1,10 @@
 {
   "domain": "conversation",
   "name": "Conversation",
-  "codeowners": ["@home-assistant/core", "@synesthesiam"],
+  "codeowners": ["@home-assistant/core", "@synesthesiam", "@arturpragacz"],
   "dependencies": ["http", "intent"],
   "documentation": "https://www.home-assistant.io/integrations/conversation",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["hassil==3.2.0", "home-assistant-intents==2025.8.27"]
+  "requirements": ["hassil==3.2.0", "home-assistant-intents==2025.9.3"]
 }

homeassistant/components/debugpy/manifest.json

@@ -6,5 +6,5 @@
   "integration_type": "service",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["debugpy==1.8.14"]
+  "requirements": ["debugpy==1.8.16"]
 }

homeassistant/components/deconz/entity.py

@@ -177,7 +177,7 @@ class DeconzSceneMixin(DeconzDevice[PydeconzScene]):
         """Return a device description for device registry."""
         return DeviceInfo(
             identifiers={(DOMAIN, self._group_identifier)},
-            manufacturer="Dresden Elektronik",
+            manufacturer="dresden elektronik",
             model="deCONZ group",
             name=self.group.name,
             via_device=(DOMAIN, self.hub.api.config.bridge_id),

homeassistant/components/deconz/hub/hub.py

@@ -14,7 +14,6 @@ from pydeconz.models.event import EventType
 from homeassistant.config_entries import SOURCE_HASSIO
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr, entity_registry as er
-from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 from ..const import CONF_MASTER_GATEWAY, DOMAIN, HASSIO_CONFIGURATION_URL, PLATFORMS
@@ -169,17 +168,8 @@ class DeconzHub:
 
     async def async_update_device_registry(self) -> None:
         """Update device registry."""
-        if self.api.config.mac is None:
-            return
-
         device_registry = dr.async_get(self.hass)
 
-        # Host device
-        device_registry.async_get_or_create(
-            config_entry_id=self.config_entry.entry_id,
-            connections={(CONNECTION_NETWORK_MAC, self.api.config.mac)},
-        )
-
         # Gateway service
         configuration_url = f"http://{self.config.host}:{self.config.port}"
         if self.config_entry.source == SOURCE_HASSIO:
@@ -189,11 +179,10 @@ class DeconzHub:
             configuration_url=configuration_url,
             entry_type=dr.DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, self.api.config.bridge_id)},
-            manufacturer="Dresden Elektronik",
+            manufacturer="dresden elektronik",
             model=self.api.config.model_id,
             name=self.api.config.name,
             sw_version=self.api.config.software_version,
-            via_device=(CONNECTION_NETWORK_MAC, self.api.config.mac),
         )
 
     @staticmethod

homeassistant/components/deconz/light.py

@@ -396,7 +396,7 @@ class DeconzGroup(DeconzBaseLight[Group]):
         """Return a device description for device registry."""
         return DeviceInfo(
             identifiers={(DOMAIN, self.unique_id)},
-            manufacturer="Dresden Elektronik",
+            manufacturer="dresden elektronik",
             model="deCONZ group",
             name=self._device.name,
             via_device=(DOMAIN, self.hub.api.config.bridge_id),

homeassistant/components/deconz/services.py

@@ -11,7 +11,6 @@ from homeassistant.helpers import (
     device_registry as dr,
     entity_registry as er,
 )
-from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from homeassistant.util.read_only_dict import ReadOnlyDict
 
 from .const import CONF_BRIDGE_ID, DOMAIN, LOGGER
@@ -120,8 +119,8 @@ async def async_configure_service(hub: DeconzHub, data: ReadOnlyDict) -> None:
         "field": "/lights/1/state",
         "data": {"on": true}
     }
-    See Dresden Elektroniks REST API documentation for details:
-    http://dresden-elektronik.github.io/deconz-rest-doc/rest/
+    See deCONZ REST-API documentation for details:
+    https://dresden-elektronik.github.io/deconz-rest-doc/
     """
     field = data.get(SERVICE_FIELD, "")
     entity_id = data.get(SERVICE_ENTITY)
@@ -162,14 +161,6 @@ async def async_remove_orphaned_entries_service(hub: DeconzHub) -> None:
         )
     ]
 
-    # Don't remove the Gateway host entry
-    if hub.api.config.mac:
-        hub_host = device_registry.async_get_device(
-            connections={(CONNECTION_NETWORK_MAC, hub.api.config.mac)},
-        )
-        if hub_host and hub_host.id in devices_to_be_removed:
-            devices_to_be_removed.remove(hub_host.id)
-
     # Don't remove the Gateway service entry
     hub_service = device_registry.async_get_device(
         identifiers={(DOMAIN, hub.api.config.bridge_id)}

homeassistant/components/ecowitt/manifest.json

@@ -6,5 +6,5 @@
   "dependencies": ["webhook"],
   "documentation": "https://www.home-assistant.io/integrations/ecowitt",
   "iot_class": "local_push",
-  "requirements": ["aioecowitt==2025.3.1"]
+  "requirements": ["aioecowitt==2025.9.1"]
 }

homeassistant/components/ecowitt/sensor.py

@@ -218,6 +218,12 @@ ECOWITT_SENSORS_MAPPING: Final = {
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
+    EcoWittSensorTypes.SOIL_MOISTURE: SensorEntityDescription(
+        key="SOIL_MOISTURE",
+        device_class=SensorDeviceClass.MOISTURE,
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
 }
 
 

homeassistant/components/energy/sensor.py

@@ -48,6 +48,7 @@ VALID_ENERGY_UNITS_GAS = {
     UnitOfVolume.CUBIC_FEET,
     UnitOfVolume.CUBIC_METERS,
     UnitOfVolume.LITERS,
+    UnitOfVolume.MILLE_CUBIC_FEET,
     *VALID_ENERGY_UNITS,
 }
 VALID_VOLUME_UNITS_WATER: set[str] = {
@@ -56,6 +57,7 @@ VALID_VOLUME_UNITS_WATER: set[str] = {
     UnitOfVolume.CUBIC_METERS,
     UnitOfVolume.GALLONS,
     UnitOfVolume.LITERS,
+    UnitOfVolume.MILLE_CUBIC_FEET,
 }
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/energy/validate.py

@@ -42,6 +42,7 @@ GAS_USAGE_UNITS: dict[str, tuple[UnitOfEnergy | UnitOfVolume, ...]] = {
         UnitOfVolume.CUBIC_FEET,
         UnitOfVolume.CUBIC_METERS,
         UnitOfVolume.LITERS,
+        UnitOfVolume.MILLE_CUBIC_FEET,
     ),
 }
 GAS_PRICE_UNITS = tuple(
@@ -57,6 +58,7 @@ WATER_USAGE_UNITS: dict[str, tuple[UnitOfVolume, ...]] = {
         UnitOfVolume.CUBIC_METERS,
         UnitOfVolume.GALLONS,
         UnitOfVolume.LITERS,
+        UnitOfVolume.MILLE_CUBIC_FEET,
     ),
 }
 WATER_PRICE_UNITS = tuple(

homeassistant/components/enphase_envoy/diagnostics.py

@@ -118,7 +118,6 @@ async def async_get_config_entry_diagnostics(
         device_dict.pop("_cache", None)
         # This can be removed when suggested_area is removed from DeviceEntry
         device_dict.pop("_suggested_area")
-        device_dict.pop("is_new", None)
         device_entities.append({"device": device_dict, "entities": entities})
 
     # remove envoy serial

homeassistant/components/esphome/manifest.json

@@ -17,7 +17,7 @@
   "mqtt": ["esphome/discover/#"],
   "quality_scale": "platinum",
   "requirements": [
-    "aioesphomeapi==39.0.1",
+    "aioesphomeapi==40.0.1",
     "esphome-dashboard-api==1.3.0",
     "bleak-esphome==3.2.0"
   ],

homeassistant/components/evil_genius_labs/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "evil_genius_labs",
   "name": "Evil Genius Labs",
-  "codeowners": ["@balloob"],
+  "codeowners": [],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/evil_genius_labs",
   "iot_class": "local_polling",

homeassistant/components/fan/strings.json

@@ -14,6 +14,9 @@
       "toggle": "[%key:common::device_automation::action_type::toggle%]",
       "turn_on": "[%key:common::device_automation::action_type::turn_on%]",
       "turn_off": "[%key:common::device_automation::action_type::turn_off%]"
+    },
+    "extra_fields": {
+      "for": "[%key:common::device_automation::extra_fields::for%]"
     }
   },
   "entity_component": {

homeassistant/components/fjaraskupan/manifest.json

@@ -14,5 +14,5 @@
   "documentation": "https://www.home-assistant.io/integrations/fjaraskupan",
   "iot_class": "local_polling",
   "loggers": ["bleak", "fjaraskupan"],
-  "requirements": ["fjaraskupan==2.3.2"]
+  "requirements": ["fjaraskupan==2.3.3"]
 }

homeassistant/components/flo/coordinator.py

@@ -190,7 +190,7 @@ class FloDeviceDataUpdateCoordinator(DataUpdateCoordinator):
         return bool(
             self.pending_info_alerts_count
             or self.pending_warning_alerts_count
-            or self.pending_warning_alerts_count
+            or self.pending_critical_alerts_count
         )
 
     @property

homeassistant/components/foscam/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "foscam",
   "name": "Foscam",
-  "codeowners": ["@krmarien"],
+  "codeowners": ["@Foscam-wangzhengyu"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/foscam",
   "iot_class": "local_polling",

homeassistant/components/fritz/coordinator.py

@@ -151,7 +151,7 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
             configuration_url=f"http://{self.host}",
             connections={(dr.CONNECTION_NETWORK_MAC, self.mac)},
             identifiers={(DOMAIN, self.unique_id)},
-            manufacturer="AVM",
+            manufacturer="FRITZ!",
             model=self.model,
             name=self.config_entry.title,
             sw_version=self.current_firmware,
@@ -471,7 +471,7 @@ class FritzBoxTools(DataUpdateCoordinator[UpdateCoordinatorDataType]):
         dr.async_get(self.hass).async_get_or_create(
             config_entry_id=self.config_entry.entry_id,
             connections={(CONNECTION_NETWORK_MAC, dev_mac)},
-            default_manufacturer="AVM",
+            default_manufacturer="FRITZ!",
             default_model="FRITZ!Box Tracked device",
             default_name=device.hostname,
             via_device=(DOMAIN, self.unique_id),

homeassistant/components/fritz/entity.py

@@ -125,7 +125,7 @@ class FritzBoxBaseCoordinatorEntity(CoordinatorEntity[AvmWrapper]):
             configuration_url=f"http://{self.coordinator.host}",
             connections={(dr.CONNECTION_NETWORK_MAC, self.coordinator.mac)},
             identifiers={(DOMAIN, self.coordinator.unique_id)},
-            manufacturer="AVM",
+            manufacturer="FRITZ!",
             model=self.coordinator.model,
             name=self._device_name,
             sw_version=self.coordinator.current_firmware,

homeassistant/components/fritz/manifest.json

@@ -1,13 +1,13 @@
 {
   "domain": "fritz",
-  "name": "AVM FRITZ!Box Tools",
+  "name": "FRITZ!Box Tools",
   "codeowners": ["@AaronDavidSchneider", "@chemelli74", "@mib1185"],
   "config_flow": true,
   "dependencies": ["network"],
   "documentation": "https://www.home-assistant.io/integrations/fritz",
   "iot_class": "local_polling",
   "loggers": ["fritzconnection"],
-  "requirements": ["fritzconnection[qr]==1.14.0", "xmltodict==0.13.0"],
+  "requirements": ["fritzconnection[qr]==1.15.0", "xmltodict==0.13.0"],
   "ssdp": [
     {
       "st": "urn:schemas-upnp-org:device:fritzbox:1"

homeassistant/components/fritz/strings.json

@@ -28,7 +28,7 @@
         }
       },
       "reauth_confirm": {
-        "title": "Updating FRITZ!Box Tools - credentials",
+        "title": "FRITZ!Box Tools - Update credentials",
         "description": "Update FRITZ!Box Tools credentials for: {host}.\n\nFRITZ!Box Tools is unable to log in to your FRITZ!Box.",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
@@ -40,7 +40,7 @@
         }
       },
       "reconfigure": {
-        "title": "Updating FRITZ!Box Tools - configuration",
+        "title": "FRITZ!Box Tools - Update configuration",
         "description": "Update FRITZ!Box Tools configuration for: {host}.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
@@ -183,8 +183,8 @@
       "description": "Sets a new password for the guest Wi-Fi. The password must be between 8 and 63 characters long. If no additional parameter is set, the password will be auto-generated with a length of 12 characters.",
       "fields": {
         "device_id": {
-          "name": "Fritz!Box Device",
-          "description": "Select the Fritz!Box to configure."
+          "name": "FRITZ!Box device",
+          "description": "Select the FRITZ!Box to configure."
         },
         "password": {
           "name": "[%key:common::config_flow::data::password%]",
@@ -192,7 +192,7 @@
         },
         "length": {
           "name": "Password length",
-          "description": "Length of the new password. The password will be auto-generated, if no password is set."
+          "description": "Length of the new password. It will be auto-generated if no password is set."
         }
       }
     }

homeassistant/components/fritz/switch.py

@@ -276,7 +276,7 @@ class FritzBoxBaseCoordinatorSwitch(CoordinatorEntity[AvmWrapper], SwitchEntity)
             configuration_url=f"http://{self.coordinator.host}",
             connections={(CONNECTION_NETWORK_MAC, self.coordinator.mac)},
             identifiers={(DOMAIN, self.coordinator.unique_id)},
-            manufacturer="AVM",
+            manufacturer="FRITZ!",
             model=self.coordinator.model,
             name=self._device_name,
             sw_version=self.coordinator.current_firmware,

homeassistant/components/fritzbox/button.py

@@ -49,7 +49,7 @@ class FritzBoxTemplate(FritzBoxEntity, ButtonEntity):
             name=self.data.name,
             identifiers={(DOMAIN, self.ain)},
             configuration_url=self.coordinator.configuration_url,
-            manufacturer="AVM",
+            manufacturer="FRITZ!",
             model="SmartHome Template",
         )
 

homeassistant/components/fritzbox/manifest.json

@@ -1,6 +1,6 @@
 {
   "domain": "fritzbox",
-  "name": "AVM FRITZ!SmartHome",
+  "name": "FRITZ!SmartHome",
   "codeowners": ["@mib1185", "@flabbamann"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/fritzbox",

homeassistant/components/fritzbox/strings.json

@@ -3,7 +3,7 @@
     "flow_title": "{name}",
     "step": {
       "user": {
-        "description": "Enter your AVM FRITZ!Box information.",
+        "description": "Enter your FRITZ!Box information.",
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "username": "[%key:common::config_flow::data::username%]",
@@ -42,7 +42,7 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "ignore_ip6_link_local": "IPv6 link local address is not supported.",
       "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
-      "not_supported": "Connected to AVM FRITZ!Box but it's unable to control Smart Home devices.",
+      "not_supported": "Connected to FRITZ!Box but it's unable to control Smart Home devices.",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
     },