Merge branch 'current' into next

Author: frenck

CODEOWNERS

@@ -70,7 +70,6 @@ source/_integrations/application_credentials.markdown @home-assistant/core
 source/_integrations/apprise.markdown @caronc
 source/_integrations/aprilaire.markdown @chamberlain2007
 source/_integrations/aprs.markdown @PhilRW
-source/_integrations/aps.markdown @tronikos
 source/_integrations/apsystems.markdown @mawoka-myblock @SonnenladenGmbH
 source/_integrations/aquacell.markdown @Jordi1990
 source/_integrations/aranet.markdown @aschmitz @thecode @anrijs
@@ -80,7 +79,7 @@ source/_integrations/arve.markdown @ikalnyi
 source/_integrations/aseko_pool_live.markdown @milanmeu
 source/_integrations/assist_pipeline.markdown @balloob @synesthesiam
 source/_integrations/assist_satellite.markdown @home-assistant/core @synesthesiam
-source/_integrations/asuswrt.markdown @kennedyshead @ollo69
+source/_integrations/asuswrt.markdown @kennedyshead @ollo69 @Vaskivskyi
 source/_integrations/atag.markdown @MatsNL
 source/_integrations/aten_pe.markdown @mtdcr
 source/_integrations/atlanticcityelectric.markdown @tronikos
@@ -247,6 +246,7 @@ source/_integrations/elv.markdown @majuss
 source/_integrations/elvia.markdown @ludeeus
 source/_integrations/emby.markdown @mezz64
 source/_integrations/emoncms.markdown @borpin @alexandrecuer
+source/_integrations/emoncms_history.markdown @alexandrecuer
 source/_integrations/emonitor.markdown @bdraco
 source/_integrations/emulated_hue.markdown @bdraco @Tho85
 source/_integrations/emulated_kasa.markdown @kbickar
@@ -257,7 +257,7 @@ source/_integrations/energyzero.markdown @klaasnicolaas
 source/_integrations/enigma2.markdown @autinerd
 source/_integrations/enmax.markdown @tronikos
 source/_integrations/enocean.markdown @bdurrer
-source/_integrations/enphase_envoy.markdown @bdraco @cgarwood @joostlek @catsmanac
+source/_integrations/enphase_envoy.markdown @bdraco @cgarwood @catsmanac
 source/_integrations/entur_public_transport.markdown @hfurubotten
 source/_integrations/environment_canada.markdown @gwww @michaeldavie
 source/_integrations/ephember.markdown @ttroy50 @roberty99
@@ -379,6 +379,7 @@ source/_integrations/home_connect.markdown @DavidMStraub @Diegorro98 @MartinHjel
 source/_integrations/home_plus_control.markdown @cgtobi
 source/_integrations/homeassistant.markdown @home-assistant/core
 source/_integrations/homeassistant_alerts.markdown @home-assistant/core
+source/_integrations/homeassistant_connect_zbt2.markdown @home-assistant/core
 source/_integrations/homeassistant_green.markdown @home-assistant/core
 source/_integrations/homeassistant_hardware.markdown @home-assistant/core
 source/_integrations/homeassistant_sky_connect.markdown @home-assistant/core
@@ -500,7 +501,6 @@ source/_integrations/lidarr.markdown @tkdrob
 source/_integrations/lifx.markdown @Djelibeybi
 source/_integrations/light.markdown @home-assistant/core
 source/_integrations/linak.markdown @abmantis
-source/_integrations/linear_garage_door.markdown @IceBotYT
 source/_integrations/linkedgo.markdown @balloob @bieniu @thecode @chemelli74 @bdraco
 source/_integrations/linkplay.markdown @Velleman
 source/_integrations/linux_battery.markdown @fabaff
@@ -544,7 +544,6 @@ source/_integrations/mediaroom.markdown @dgomes
 source/_integrations/melcloud.markdown @erwindouna
 source/_integrations/melissa.markdown @kennedyshead
 source/_integrations/melnor.markdown @vanstinator
-source/_integrations/mercury_nz.markdown @tronikos
 source/_integrations/met.markdown @danielhiversen
 source/_integrations/met_eireann.markdown @DylanGore
 source/_integrations/meteo_france.markdown @hacf-fr @oncleben31 @Quentame
@@ -828,6 +827,7 @@ source/_integrations/sisyphus.markdown @jkeljo
 source/_integrations/sky_remote.markdown @dunnmj @saty9
 source/_integrations/skybell.markdown @tkdrob
 source/_integrations/slack.markdown @tkdrob @fletcherau
+source/_integrations/sleep_as_android.markdown @tr4nt0r
 source/_integrations/sleepiq.markdown @mfugate1 @kbickar
 source/_integrations/slide.markdown @ualex73
 source/_integrations/slide_local.markdown @dontinelli
@@ -933,6 +933,7 @@ source/_integrations/time_date.markdown @fabaff
 source/_integrations/tmb.markdown @alemuro
 source/_integrations/todo.markdown @home-assistant/core
 source/_integrations/todoist.markdown @boralyl
+source/_integrations/togrill.markdown @elupus
 source/_integrations/tolo.markdown @MatthiasLohr
 source/_integrations/tomorrowio.markdown @raman325 @lymanepp
 source/_integrations/totalconnect.markdown @austinmroczek
@@ -941,7 +942,6 @@ source/_integrations/tplink.markdown @rytilahti @bdraco @sdb9696
 source/_integrations/tplink_omada.markdown @MarkGodwin
 source/_integrations/tplink_tapo.markdown @rytilahti @bdraco @sdb9696
 source/_integrations/traccar.markdown @ludeeus
-source/_integrations/traccar_server.markdown @ludeeus
 source/_integrations/tractive.markdown @Danielhiversen @zhulik @bieniu
 source/_integrations/trafikverket_camera.markdown @gjohansson-ST
 source/_integrations/trafikverket_ferry.markdown @gjohansson-ST

Gemfile

@@ -11,7 +11,7 @@ group :development do
   # > 2.1.0 causes slowdowns https://github.com/sass/sassc-ruby/issues/189
   gem 'sassc', '2.1.0'
   gem 'sass-embedded', '1.91.0'
-  gem 'rubocop', '1.80.0'
+  gem 'rubocop', '1.80.1'
   gem 'ruby-lsp', '0.26.1'
   gem 'rackup', '2.2.1'
 end

Gemfile.lock

@@ -99,7 +99,7 @@ GEM
     prism (1.4.0)
     public_suffix (6.0.2)
     racc (1.8.1)
-    rack (3.2.0)
+    rack (3.2.1)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
@@ -119,7 +119,7 @@ GEM
     regexp_parser (2.11.2)
     rexml (3.4.2)
     rouge (4.6.0)
-    rubocop (1.80.0)
+    rubocop (1.80.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -183,7 +183,7 @@ DEPENDENCIES
   nokogiri (= 1.18.9)
   rackup (= 2.2.1)
   rake (= 13.3.0)
-  rubocop (= 1.80.0)
+  rubocop (= 1.80.1)
   ruby-lsp (= 0.26.1)
   sass-embedded (= 1.91.0)
   sass-globbing (= 1.1.5)

_config.yml

@@ -107,9 +107,9 @@ social:
 
 # Home Assistant release details
 current_major_version: 2025
-current_minor_version: 8
-current_patch_version: 3
-date_released: 2025-08-21
+current_minor_version: 9
+current_patch_version: 0
+date_released: 2025-09-03
 
 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.

sass/homeassistant/homepage/_hero_unit.scss

@@ -153,28 +153,32 @@
     }
   }
 
-  #HAdemo {
-    width: 100%;
-    max-width: 400px;
-    height: 800px;
+  .demo-frame-wrapper{
     border-radius: 48px;
     border: 12px double white;
     box-shadow: 24px 64px 64px hsla(220, 100%, 25%, .5);
-    // animation-name: floaty-demo;
-    // animation-duration: 4s;
-    // animation-iteration-count: infinite;
-    // animation-direction: alternate;
-    // animation-timing-function: linear;
-    // transform: rotateY(346deg) skewY(3deg);
-
-    @media only screen and (max-height: 840px) {
-      border-bottom: 0;
-      margin-bottom: -8px;
-      border-radius: 48px 48px 0 0;
-      height: 750px;
+    height: 800px;
+    margin: 0 auto;
+    max-width: 400px;
+    overflow: hidden;
+    position: relative;
 
+    >img{
+      height: 100%;
+      inset: 0;
+      object-fit: cover;
+      position: absolute;
+      width: 100%;
     }
 
+    #HAdemo{
+      border: 0;
+      height: 100%;
+      overflow: hidden;
+      position: relative;
+      width: 100%;
+      z-index: 1;
+    }
   }
 }
 
@@ -251,13 +255,14 @@
       flex-direction: column;
     }
 
-    #HAdemo {
+    .demo-frame-wrapper {
       display: none;
     }
 
     #HAdemoScreenshot {
       display: inline-block;
       text-align: center;
+
       padding-top: 48px;
     }
   }

source/_data/products.yml

@@ -495,6 +495,11 @@ zwa-2:
   name: "<strong>Home Assistant</strong> Connect ZWA-2"
   distributors:
     # America
+    - name: Amazon
+      ship_from: US
+      ship_to: North America
+      url: https://www.amazon.com/dp/B0FL858V4Q?maas=maas_adg_73AFDD563FE8A4927464DA26BC06556F_afap_abs&ref_=aa_maas&tag=maas
+      logo: /images/distributors/amazon.webp
     - name: Apollo Automation
       ship_from: US & Canada
       ship_to: North America

source/_includes/common-tasks/network_storage.md

@@ -77,7 +77,8 @@ By default, the first network storage of type **Backup** that you add is used as
 If you want to change the local network storage that is used to store your backups, follow these steps:
 
 1. Go to **{% my backup title="Settings > System > Backups" %}**.
-2. In the top-right corner, select the three dots {% icon "mdi:dots-vertical" %} menu and select **Change local backup location**.
-3. Select your preferred network location and save your changes.
+2. Select **Settings and history**.
+3. In the top-right corner, select the three dots {% icon "mdi:dots-vertical" %} menu and select **Change default action location**.
+4. Select your preferred network location and save your changes.
    ![Select default location used for local backup](/images/screenshots/network-storage/backup_select_local_default.png)
-4. **Troubleshooting**: Don't see your external storage location? This list contains only the network storage targets you have added of type **Backup**.
+5. **Troubleshooting**: Don't see your external storage location? This list contains only the network storage targets you have added of type **Backup**.

source/_includes/site/hero_unit.html

@@ -5,9 +5,11 @@
         {% include custom/welcome.html %}
       </div>
       <div class="hero-demo grid__item flex__item two-fifths lap-one-whole palm-one-whole" style="text-align: center;">
-        <iframe id="HAdemo" title="Home Assistant Demo"
-          src="https://demo.home-assistant.io/?frontpage">
-        </iframe>
+        <div class="demo-frame-wrapper">
+          <img src="/images/app-loading.webp">
+          <iframe id="HAdemo" title="Home Assistant Demo" data-src="https://demo.home-assistant.io/?frontpage">
+          </iframe>
+        </div>
 
         <a id="HAdemoScreenshot" href='https://demo.home-assistant.io/' target='_blank'>
           <img src="/images/frontpage/hero_screenshot.png" alt="Home Assistant screenshot" fetchpriority="high">
@@ -27,7 +29,29 @@
             phone.style.transform = `rotateY(${rotation}deg) skewY(${skew}deg)`;
           });
         </script> -->
+
+        <script>
+          document.addEventListener('DOMContentLoaded', function () {
+            let loaded = false;
+            const lazyLoadDemo = () => {
+              if (loaded) return; // Prevent multiple loads
+              loaded = true;
+              const iframe = document.querySelector('#HAdemo[data-src]');
+              if (iframe) {
+                iframe.src = iframe.getAttribute('data-src');
+                iframe.removeAttribute('data-src');
+              }
+            };
+
+            // Load iframe on user interaction
+            document.addEventListener('scroll', lazyLoadDemo, { passive: true, once: true });
+            document.addEventListener('click', lazyLoadDemo, { passive: true, once: true });
+            document.addEventListener('mousemove', lazyLoadDemo, { passive: true, once: true });
+            document.addEventListener('touchstart', lazyLoadDemo, { passive: true, once: true });
+            document.addEventListener('touchmove', lazyLoadDemo, { passive: true, once: true });
+          });
+        </script>
       </div>
     </div>
   </div>
-</div>
+</div>

source/_integrations/ai_task.markdown

@@ -8,7 +8,7 @@ ha_quality_scale: internal
 ha_domain: ai_task
 ha_codeowners:
   - '@home-assistant/core'
-ha_integration_type: system
+ha_integration_type: entity
 ---
 
 The **AI Task** {% term integration %} allows you to use AI to help you configure Home Assistant.

source/_integrations/airos.markdown

@@ -10,6 +10,8 @@ ha_codeowners:
 ha_config_flow: true
 ha_domain: airos
 ha_platforms:
+  - binary_sensor
+  - diagnostics
   - sensor
 ha_integration_type: integration
 ha_quality_scale: bronze