From 0e05ae56e5f8eb6646c5bd49e886ecad58637d8a Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Thu, 26 Feb 2026 23:18:55 -1000
Subject: [PATCH 01/10] Fix friend declaration for ESP8266 clang-tidy

The fully-qualified friend uint64_t ::esphome::millis_64() syntax
causes 'uint64_t is not a class, namespace, or enumeration' errors
on the ESP8266 clang-tidy toolchain. Use unqualified form which
resolves correctly within the esphome namespace.
---
 esphome/core/scheduler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h
index 757f60c2ce3..c6053258103 100644
--- a/esphome/core/scheduler.h
+++ b/esphome/core/scheduler.h
@@ -299,7 +299,7 @@ class Scheduler {
   // On non-ESP32 platforms, millis_64() HAL function delegates to this method
   // which tracks 32-bit millis() rollover using millis_major_ and last_millis_.
   // On ESP32, millis_64() uses esp_timer_get_time() directly.
-  friend uint64_t ::esphome::millis_64();
+  friend uint64_t millis_64();
   uint64_t millis_64_impl_(uint32_t now);
 #endif
   // Cleanup logically deleted items from the scheduler

From c7182404a304ec66d930783da97dbf280f0cd9d7 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Thu, 26 Feb 2026 23:36:22 -1000
Subject: [PATCH 02/10] [host] Use native clock_gettime for millis_64()

The host platform already uses clock_gettime(CLOCK_MONOTONIC) for
millis(). Use it directly for millis_64() instead of delegating to
the Scheduler's rollover tracking.

This eliminates the MULTI_ATOMICS rollover code path (CAS/atomic)
on host builds and removes the dependency on App.scheduler for
millis_64() to work.
---
 esphome/components/host/core.cpp |  7 +++++--
 esphome/core/scheduler.cpp       | 10 +++++-----
 esphome/core/scheduler.h         | 15 +++++++--------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/esphome/components/host/core.cpp b/esphome/components/host/core.cpp
index 5c08717ac99..94ce60e2a85 100644
--- a/esphome/components/host/core.cpp
+++ b/esphome/components/host/core.cpp
@@ -1,6 +1,5 @@
 #ifdef USE_HOST
 
-#include "esphome/core/application.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "preferences.h"
@@ -20,7 +19,11 @@ uint32_t IRAM_ATTR HOT millis() {
   uint32_t ms = round(spec.tv_nsec / 1e6);
   return ((uint32_t) seconds) * 1000U + ms;
 }
-uint64_t millis_64() { return App.scheduler.millis_64_impl_(millis()); }
+uint64_t millis_64() {
+  struct timespec spec;
+  clock_gettime(CLOCK_MONOTONIC, &spec);
+  return static_cast<uint64_t>(spec.tv_sec) * 1000ULL + static_cast<uint64_t>(spec.tv_nsec) / 1000000ULL;
+}
 void HOT delay(uint32_t ms) {
   struct timespec ts;
   ts.tv_sec = ms / 1000;
diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index 06c0bb8b1bf..97735c48760 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -28,7 +28,7 @@ static constexpr size_t MAX_POOL_SIZE = 5;
 // Set to 5 to match the pool size - when we have as many cancelled items as our
 // pool can hold, it's time to clean up and recycle them.
 static constexpr uint32_t MAX_LOGICALLY_DELETED_ITEMS = 5;
-#ifndef USE_ESP32
+#if !defined(USE_ESP32) && !defined(USE_HOST)
 // Half the 32-bit range - used to detect rollovers vs normal time progression
 static constexpr uint32_t HALF_MAX_UINT32 = std::numeric_limits<uint32_t>::max() / 2;
 #endif
@@ -475,12 +475,12 @@ void HOT Scheduler::call(uint32_t now) {
   if (now_64 - last_print > 2000) {
     last_print = now_64;
     std::vector<SchedulerItemPtr> old_items;
-#if !defined(USE_ESP32) && defined(ESPHOME_THREAD_MULTI_ATOMICS)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && defined(ESPHOME_THREAD_MULTI_ATOMICS)
     const auto last_dbg = this->last_millis_.load(std::memory_order_relaxed);
     const auto major_dbg = this->millis_major_.load(std::memory_order_relaxed);
     ESP_LOGD(TAG, "Items: count=%zu, pool=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(),
              this->scheduler_item_pool_.size(), now_64, major_dbg, last_dbg);
-#elif !defined(USE_ESP32)
+#elif !defined(USE_ESP32) && !defined(USE_HOST)
     ESP_LOGD(TAG, "Items: count=%zu, pool=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(),
              this->scheduler_item_pool_.size(), now_64, this->millis_major_, this->last_millis_);
 #else
@@ -714,7 +714,7 @@ bool HOT Scheduler::cancel_item_locked_(Component *component, NameType name_type
   return total_cancelled > 0;
 }
 
-#ifndef USE_ESP32
+#if !defined(USE_ESP32) && !defined(USE_HOST)
 uint64_t Scheduler::millis_64_impl_(uint32_t now) {
   // THREAD SAFETY NOTE:
   // This function has three implementations, based on the precompiler flags
@@ -872,7 +872,7 @@ uint64_t Scheduler::millis_64_impl_(uint32_t now) {
     "No platform threading model defined. One of ESPHOME_THREAD_SINGLE, ESPHOME_THREAD_MULTI_NO_ATOMICS, or ESPHOME_THREAD_MULTI_ATOMICS must be defined."
 #endif
 }
-#endif  // not USE_ESP32
+#endif  // !USE_ESP32 && !USE_HOST
 
 bool HOT Scheduler::SchedulerItem::cmp(const SchedulerItemPtr &a, const SchedulerItemPtr &b) {
   // High bits are almost always equal (change only on 32-bit rollover ~49 days)
diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h
index c6053258103..9a62ac16347 100644
--- a/esphome/core/scheduler.h
+++ b/esphome/core/scheduler.h
@@ -287,7 +287,7 @@ class Scheduler {
   // On ESP32, ignores now and uses esp_timer_get_time() directly (native 64-bit).
   // On non-ESP32, extends now to 64-bit using rollover tracking.
   uint64_t millis_64_from_(uint32_t now) {
-#ifdef USE_ESP32
+#if defined(USE_ESP32) || defined(USE_HOST)
     (void) now;
     return millis_64();
 #else
@@ -295,10 +295,9 @@ class Scheduler {
 #endif
   }
 
-#ifndef USE_ESP32
-  // On non-ESP32 platforms, millis_64() HAL function delegates to this method
-  // which tracks 32-bit millis() rollover using millis_major_ and last_millis_.
-  // On ESP32, millis_64() uses esp_timer_get_time() directly.
+#if !defined(USE_ESP32) && !defined(USE_HOST)
+  // On platforms without native 64-bit time, millis_64() HAL function delegates to this
+  // method which tracks 32-bit millis() rollover using millis_major_ and last_millis_.
   friend uint64_t millis_64();
   uint64_t millis_64_impl_(uint32_t now);
 #endif
@@ -568,8 +567,8 @@ class Scheduler {
   //   to synchronize between tasks (see https://github.com/esphome/backlog/issues/52)
   std::vector<SchedulerItemPtr> scheduler_item_pool_;
 
-#ifndef USE_ESP32
-  // On ESP32, millis_64() uses esp_timer_get_time() directly; no rollover tracking needed.
+#if !defined(USE_ESP32) && !defined(USE_HOST)
+  // On platforms with native 64-bit time (ESP32, Host), no rollover tracking needed.
   // On other platforms, these fields track 32-bit millis() rollover for millis_64_impl_().
 #ifdef ESPHOME_THREAD_MULTI_ATOMICS
   /*
@@ -599,7 +598,7 @@ class Scheduler {
 #else  /* not ESPHOME_THREAD_MULTI_ATOMICS */
   uint16_t millis_major_{0};
 #endif /* else ESPHOME_THREAD_MULTI_ATOMICS */
-#endif /* not USE_ESP32 */
+#endif /* !USE_ESP32 && !USE_HOST */
 };
 
 }  // namespace esphome

From 77baa0a1870b6677c83805345d2da80a969c6484 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Fri, 27 Feb 2026 08:00:14 -1000
Subject: [PATCH 03/10] [zephyr] Use native k_uptime_get() for millis_64()

Zephyr's k_uptime_get() returns int64_t milliseconds directly,
eliminating the need for 32-bit rollover tracking on this platform.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 esphome/components/zephyr/core.cpp |  3 +--
 esphome/core/scheduler.cpp         | 10 +++++-----
 esphome/core/scheduler.h           | 10 +++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/esphome/components/zephyr/core.cpp b/esphome/components/zephyr/core.cpp
index 7f5d6d44faa..9d00e6027f6 100644
--- a/esphome/components/zephyr/core.cpp
+++ b/esphome/components/zephyr/core.cpp
@@ -4,7 +4,6 @@
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/random/random.h>
-#include "esphome/core/application.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/defines.h"
@@ -18,7 +17,7 @@ static const device *const WDT = DEVICE_DT_GET(DT_ALIAS(watchdog0));
 
 void yield() { ::k_yield(); }
 uint32_t millis() { return k_ticks_to_ms_floor32(k_uptime_ticks()); }
-uint64_t millis_64() { return App.scheduler.millis_64_impl_(millis()); }
+uint64_t millis_64() { return static_cast<uint64_t>(k_uptime_get()); }
 uint32_t micros() { return k_ticks_to_us_floor32(k_uptime_ticks()); }
 void delayMicroseconds(uint32_t us) { ::k_usleep(us); }
 void delay(uint32_t ms) { ::k_msleep(ms); }
diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index 97735c48760..73b6a6c9b3d 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -28,7 +28,7 @@ static constexpr size_t MAX_POOL_SIZE = 5;
 // Set to 5 to match the pool size - when we have as many cancelled items as our
 // pool can hold, it's time to clean up and recycle them.
 static constexpr uint32_t MAX_LOGICALLY_DELETED_ITEMS = 5;
-#if !defined(USE_ESP32) && !defined(USE_HOST)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
 // Half the 32-bit range - used to detect rollovers vs normal time progression
 static constexpr uint32_t HALF_MAX_UINT32 = std::numeric_limits<uint32_t>::max() / 2;
 #endif
@@ -475,12 +475,12 @@ void HOT Scheduler::call(uint32_t now) {
   if (now_64 - last_print > 2000) {
     last_print = now_64;
     std::vector<SchedulerItemPtr> old_items;
-#if !defined(USE_ESP32) && !defined(USE_HOST) && defined(ESPHOME_THREAD_MULTI_ATOMICS)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR) && defined(ESPHOME_THREAD_MULTI_ATOMICS)
     const auto last_dbg = this->last_millis_.load(std::memory_order_relaxed);
     const auto major_dbg = this->millis_major_.load(std::memory_order_relaxed);
     ESP_LOGD(TAG, "Items: count=%zu, pool=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(),
              this->scheduler_item_pool_.size(), now_64, major_dbg, last_dbg);
-#elif !defined(USE_ESP32) && !defined(USE_HOST)
+#elif !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
     ESP_LOGD(TAG, "Items: count=%zu, pool=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(),
              this->scheduler_item_pool_.size(), now_64, this->millis_major_, this->last_millis_);
 #else
@@ -714,7 +714,7 @@ bool HOT Scheduler::cancel_item_locked_(Component *component, NameType name_type
   return total_cancelled > 0;
 }
 
-#if !defined(USE_ESP32) && !defined(USE_HOST)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
 uint64_t Scheduler::millis_64_impl_(uint32_t now) {
   // THREAD SAFETY NOTE:
   // This function has three implementations, based on the precompiler flags
@@ -872,7 +872,7 @@ uint64_t Scheduler::millis_64_impl_(uint32_t now) {
     "No platform threading model defined. One of ESPHOME_THREAD_SINGLE, ESPHOME_THREAD_MULTI_NO_ATOMICS, or ESPHOME_THREAD_MULTI_ATOMICS must be defined."
 #endif
 }
-#endif  // !USE_ESP32 && !USE_HOST
+#endif  // !USE_ESP32 && !USE_HOST && !USE_ZEPHYR
 
 bool HOT Scheduler::SchedulerItem::cmp(const SchedulerItemPtr &a, const SchedulerItemPtr &b) {
   // High bits are almost always equal (change only on 32-bit rollover ~49 days)
diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h
index 9a62ac16347..282f4c66ef8 100644
--- a/esphome/core/scheduler.h
+++ b/esphome/core/scheduler.h
@@ -287,7 +287,7 @@ class Scheduler {
   // On ESP32, ignores now and uses esp_timer_get_time() directly (native 64-bit).
   // On non-ESP32, extends now to 64-bit using rollover tracking.
   uint64_t millis_64_from_(uint32_t now) {
-#if defined(USE_ESP32) || defined(USE_HOST)
+#if defined(USE_ESP32) || defined(USE_HOST) || defined(USE_ZEPHYR)
     (void) now;
     return millis_64();
 #else
@@ -295,7 +295,7 @@ class Scheduler {
 #endif
   }
 
-#if !defined(USE_ESP32) && !defined(USE_HOST)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
   // On platforms without native 64-bit time, millis_64() HAL function delegates to this
   // method which tracks 32-bit millis() rollover using millis_major_ and last_millis_.
   friend uint64_t millis_64();
@@ -567,8 +567,8 @@ class Scheduler {
   //   to synchronize between tasks (see https://github.com/esphome/backlog/issues/52)
   std::vector<SchedulerItemPtr> scheduler_item_pool_;
 
-#if !defined(USE_ESP32) && !defined(USE_HOST)
-  // On platforms with native 64-bit time (ESP32, Host), no rollover tracking needed.
+#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
+  // On platforms with native 64-bit time (ESP32, Host, Zephyr), no rollover tracking needed.
   // On other platforms, these fields track 32-bit millis() rollover for millis_64_impl_().
 #ifdef ESPHOME_THREAD_MULTI_ATOMICS
   /*
@@ -598,7 +598,7 @@ class Scheduler {
 #else  /* not ESPHOME_THREAD_MULTI_ATOMICS */
   uint16_t millis_major_{0};
 #endif /* else ESPHOME_THREAD_MULTI_ATOMICS */
-#endif /* !USE_ESP32 && !USE_HOST */
+#endif /* !USE_ESP32 && !USE_HOST && !USE_ZEPHYR */
 };
 
 }  // namespace esphome

From 40632cb9417c7b516a0a0f0120fad63b0b703d93 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Fri, 27 Feb 2026 08:03:34 -1000
Subject: [PATCH 04/10] Revert "[zephyr] Use native k_uptime_get() for
 millis_64()"

This reverts commit 77baa0a1870b6677c83805345d2da80a969c6484.
---
 esphome/components/zephyr/core.cpp |  3 ++-
 esphome/core/scheduler.cpp         | 10 +++++-----
 esphome/core/scheduler.h           | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/esphome/components/zephyr/core.cpp b/esphome/components/zephyr/core.cpp
index 9d00e6027f6..7f5d6d44faa 100644
--- a/esphome/components/zephyr/core.cpp
+++ b/esphome/components/zephyr/core.cpp
@@ -4,6 +4,7 @@
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/random/random.h>
+#include "esphome/core/application.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/defines.h"
@@ -17,7 +18,7 @@ static const device *const WDT = DEVICE_DT_GET(DT_ALIAS(watchdog0));
 
 void yield() { ::k_yield(); }
 uint32_t millis() { return k_ticks_to_ms_floor32(k_uptime_ticks()); }
-uint64_t millis_64() { return static_cast<uint64_t>(k_uptime_get()); }
+uint64_t millis_64() { return App.scheduler.millis_64_impl_(millis()); }
 uint32_t micros() { return k_ticks_to_us_floor32(k_uptime_ticks()); }
 void delayMicroseconds(uint32_t us) { ::k_usleep(us); }
 void delay(uint32_t ms) { ::k_msleep(ms); }
diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index 73b6a6c9b3d..97735c48760 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -28,7 +28,7 @@ static constexpr size_t MAX_POOL_SIZE = 5;
 // Set to 5 to match the pool size - when we have as many cancelled items as our
 // pool can hold, it's time to clean up and recycle them.
 static constexpr uint32_t MAX_LOGICALLY_DELETED_ITEMS = 5;
-#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
+#if !defined(USE_ESP32) && !defined(USE_HOST)
 // Half the 32-bit range - used to detect rollovers vs normal time progression
 static constexpr uint32_t HALF_MAX_UINT32 = std::numeric_limits<uint32_t>::max() / 2;
 #endif
@@ -475,12 +475,12 @@ void HOT Scheduler::call(uint32_t now) {
   if (now_64 - last_print > 2000) {
     last_print = now_64;
     std::vector<SchedulerItemPtr> old_items;
-#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR) && defined(ESPHOME_THREAD_MULTI_ATOMICS)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && defined(ESPHOME_THREAD_MULTI_ATOMICS)
     const auto last_dbg = this->last_millis_.load(std::memory_order_relaxed);
     const auto major_dbg = this->millis_major_.load(std::memory_order_relaxed);
     ESP_LOGD(TAG, "Items: count=%zu, pool=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(),
              this->scheduler_item_pool_.size(), now_64, major_dbg, last_dbg);
-#elif !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
+#elif !defined(USE_ESP32) && !defined(USE_HOST)
     ESP_LOGD(TAG, "Items: count=%zu, pool=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(),
              this->scheduler_item_pool_.size(), now_64, this->millis_major_, this->last_millis_);
 #else
@@ -714,7 +714,7 @@ bool HOT Scheduler::cancel_item_locked_(Component *component, NameType name_type
   return total_cancelled > 0;
 }
 
-#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
+#if !defined(USE_ESP32) && !defined(USE_HOST)
 uint64_t Scheduler::millis_64_impl_(uint32_t now) {
   // THREAD SAFETY NOTE:
   // This function has three implementations, based on the precompiler flags
@@ -872,7 +872,7 @@ uint64_t Scheduler::millis_64_impl_(uint32_t now) {
     "No platform threading model defined. One of ESPHOME_THREAD_SINGLE, ESPHOME_THREAD_MULTI_NO_ATOMICS, or ESPHOME_THREAD_MULTI_ATOMICS must be defined."
 #endif
 }
-#endif  // !USE_ESP32 && !USE_HOST && !USE_ZEPHYR
+#endif  // !USE_ESP32 && !USE_HOST
 
 bool HOT Scheduler::SchedulerItem::cmp(const SchedulerItemPtr &a, const SchedulerItemPtr &b) {
   // High bits are almost always equal (change only on 32-bit rollover ~49 days)
diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h
index 282f4c66ef8..9a62ac16347 100644
--- a/esphome/core/scheduler.h
+++ b/esphome/core/scheduler.h
@@ -287,7 +287,7 @@ class Scheduler {
   // On ESP32, ignores now and uses esp_timer_get_time() directly (native 64-bit).
   // On non-ESP32, extends now to 64-bit using rollover tracking.
   uint64_t millis_64_from_(uint32_t now) {
-#if defined(USE_ESP32) || defined(USE_HOST) || defined(USE_ZEPHYR)
+#if defined(USE_ESP32) || defined(USE_HOST)
     (void) now;
     return millis_64();
 #else
@@ -295,7 +295,7 @@ class Scheduler {
 #endif
   }
 
-#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
+#if !defined(USE_ESP32) && !defined(USE_HOST)
   // On platforms without native 64-bit time, millis_64() HAL function delegates to this
   // method which tracks 32-bit millis() rollover using millis_major_ and last_millis_.
   friend uint64_t millis_64();
@@ -567,8 +567,8 @@ class Scheduler {
   //   to synchronize between tasks (see https://github.com/esphome/backlog/issues/52)
   std::vector<SchedulerItemPtr> scheduler_item_pool_;
 
-#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
-  // On platforms with native 64-bit time (ESP32, Host, Zephyr), no rollover tracking needed.
+#if !defined(USE_ESP32) && !defined(USE_HOST)
+  // On platforms with native 64-bit time (ESP32, Host), no rollover tracking needed.
   // On other platforms, these fields track 32-bit millis() rollover for millis_64_impl_().
 #ifdef ESPHOME_THREAD_MULTI_ATOMICS
   /*
@@ -598,7 +598,7 @@ class Scheduler {
 #else  /* not ESPHOME_THREAD_MULTI_ATOMICS */
   uint16_t millis_major_{0};
 #endif /* else ESPHOME_THREAD_MULTI_ATOMICS */
-#endif /* !USE_ESP32 && !USE_HOST && !USE_ZEPHYR */
+#endif /* !USE_ESP32 && !USE_HOST */
 };
 
 }  // namespace esphome

From 8d932ed855ffe91790badfb0a18d3d98eae9d624 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Fri, 27 Feb 2026 08:00:14 -1000
Subject: [PATCH 05/10] [zephyr] Use native k_uptime_get() for millis_64()

Zephyr's k_uptime_get() returns int64_t milliseconds directly,
eliminating the need for 32-bit rollover tracking on this platform.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 esphome/components/zephyr/core.cpp |  3 +--
 esphome/core/scheduler.cpp         | 10 +++++-----
 esphome/core/scheduler.h           | 10 +++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/esphome/components/zephyr/core.cpp b/esphome/components/zephyr/core.cpp
index 7f5d6d44faa..9d00e6027f6 100644
--- a/esphome/components/zephyr/core.cpp
+++ b/esphome/components/zephyr/core.cpp
@@ -4,7 +4,6 @@
 #include <zephyr/drivers/watchdog.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/random/random.h>
-#include "esphome/core/application.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/defines.h"
@@ -18,7 +17,7 @@ static const device *const WDT = DEVICE_DT_GET(DT_ALIAS(watchdog0));
 
 void yield() { ::k_yield(); }
 uint32_t millis() { return k_ticks_to_ms_floor32(k_uptime_ticks()); }
-uint64_t millis_64() { return App.scheduler.millis_64_impl_(millis()); }
+uint64_t millis_64() { return static_cast<uint64_t>(k_uptime_get()); }
 uint32_t micros() { return k_ticks_to_us_floor32(k_uptime_ticks()); }
 void delayMicroseconds(uint32_t us) { ::k_usleep(us); }
 void delay(uint32_t ms) { ::k_msleep(ms); }
diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index 97735c48760..73b6a6c9b3d 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -28,7 +28,7 @@ static constexpr size_t MAX_POOL_SIZE = 5;
 // Set to 5 to match the pool size - when we have as many cancelled items as our
 // pool can hold, it's time to clean up and recycle them.
 static constexpr uint32_t MAX_LOGICALLY_DELETED_ITEMS = 5;
-#if !defined(USE_ESP32) && !defined(USE_HOST)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
 // Half the 32-bit range - used to detect rollovers vs normal time progression
 static constexpr uint32_t HALF_MAX_UINT32 = std::numeric_limits<uint32_t>::max() / 2;
 #endif
@@ -475,12 +475,12 @@ void HOT Scheduler::call(uint32_t now) {
   if (now_64 - last_print > 2000) {
     last_print = now_64;
     std::vector<SchedulerItemPtr> old_items;
-#if !defined(USE_ESP32) && !defined(USE_HOST) && defined(ESPHOME_THREAD_MULTI_ATOMICS)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR) && defined(ESPHOME_THREAD_MULTI_ATOMICS)
     const auto last_dbg = this->last_millis_.load(std::memory_order_relaxed);
     const auto major_dbg = this->millis_major_.load(std::memory_order_relaxed);
     ESP_LOGD(TAG, "Items: count=%zu, pool=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(),
              this->scheduler_item_pool_.size(), now_64, major_dbg, last_dbg);
-#elif !defined(USE_ESP32) && !defined(USE_HOST)
+#elif !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
     ESP_LOGD(TAG, "Items: count=%zu, pool=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(),
              this->scheduler_item_pool_.size(), now_64, this->millis_major_, this->last_millis_);
 #else
@@ -714,7 +714,7 @@ bool HOT Scheduler::cancel_item_locked_(Component *component, NameType name_type
   return total_cancelled > 0;
 }
 
-#if !defined(USE_ESP32) && !defined(USE_HOST)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
 uint64_t Scheduler::millis_64_impl_(uint32_t now) {
   // THREAD SAFETY NOTE:
   // This function has three implementations, based on the precompiler flags
@@ -872,7 +872,7 @@ uint64_t Scheduler::millis_64_impl_(uint32_t now) {
     "No platform threading model defined. One of ESPHOME_THREAD_SINGLE, ESPHOME_THREAD_MULTI_NO_ATOMICS, or ESPHOME_THREAD_MULTI_ATOMICS must be defined."
 #endif
 }
-#endif  // !USE_ESP32 && !USE_HOST
+#endif  // !USE_ESP32 && !USE_HOST && !USE_ZEPHYR
 
 bool HOT Scheduler::SchedulerItem::cmp(const SchedulerItemPtr &a, const SchedulerItemPtr &b) {
   // High bits are almost always equal (change only on 32-bit rollover ~49 days)
diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h
index 9a62ac16347..282f4c66ef8 100644
--- a/esphome/core/scheduler.h
+++ b/esphome/core/scheduler.h
@@ -287,7 +287,7 @@ class Scheduler {
   // On ESP32, ignores now and uses esp_timer_get_time() directly (native 64-bit).
   // On non-ESP32, extends now to 64-bit using rollover tracking.
   uint64_t millis_64_from_(uint32_t now) {
-#if defined(USE_ESP32) || defined(USE_HOST)
+#if defined(USE_ESP32) || defined(USE_HOST) || defined(USE_ZEPHYR)
     (void) now;
     return millis_64();
 #else
@@ -295,7 +295,7 @@ class Scheduler {
 #endif
   }
 
-#if !defined(USE_ESP32) && !defined(USE_HOST)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
   // On platforms without native 64-bit time, millis_64() HAL function delegates to this
   // method which tracks 32-bit millis() rollover using millis_major_ and last_millis_.
   friend uint64_t millis_64();
@@ -567,8 +567,8 @@ class Scheduler {
   //   to synchronize between tasks (see https://github.com/esphome/backlog/issues/52)
   std::vector<SchedulerItemPtr> scheduler_item_pool_;
 
-#if !defined(USE_ESP32) && !defined(USE_HOST)
-  // On platforms with native 64-bit time (ESP32, Host), no rollover tracking needed.
+#if !defined(USE_ESP32) && !defined(USE_HOST) && !defined(USE_ZEPHYR)
+  // On platforms with native 64-bit time (ESP32, Host, Zephyr), no rollover tracking needed.
   // On other platforms, these fields track 32-bit millis() rollover for millis_64_impl_().
 #ifdef ESPHOME_THREAD_MULTI_ATOMICS
   /*
@@ -598,7 +598,7 @@ class Scheduler {
 #else  /* not ESPHOME_THREAD_MULTI_ATOMICS */
   uint16_t millis_major_{0};
 #endif /* else ESPHOME_THREAD_MULTI_ATOMICS */
-#endif /* !USE_ESP32 && !USE_HOST */
+#endif /* !USE_ESP32 && !USE_HOST && !USE_ZEPHYR */
 };
 
 }  // namespace esphome

From 67003efcb58fe9daba8735c0b47c19e6897d15b6 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Fri, 27 Feb 2026 08:29:15 -1000
Subject: [PATCH 06/10] [zephyr] Derive millis() from millis_64() to unify time
 source

---
 esphome/components/zephyr/core.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/zephyr/core.cpp b/esphome/components/zephyr/core.cpp
index 9d00e6027f6..f0772a4422f 100644
--- a/esphome/components/zephyr/core.cpp
+++ b/esphome/components/zephyr/core.cpp
@@ -16,7 +16,7 @@ static const device *const WDT = DEVICE_DT_GET(DT_ALIAS(watchdog0));
 #endif
 
 void yield() { ::k_yield(); }
-uint32_t millis() { return k_ticks_to_ms_floor32(k_uptime_ticks()); }
+uint32_t millis() { return static_cast<uint32_t>(millis_64()); }
 uint64_t millis_64() { return static_cast<uint64_t>(k_uptime_get()); }
 uint32_t micros() { return k_ticks_to_us_floor32(k_uptime_ticks()); }
 void delayMicroseconds(uint32_t us) { ::k_usleep(us); }

From 317dd5b2da73d39839695abb066cb976443dba05 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 27 Feb 2026 11:42:08 -0700
Subject: [PATCH 07/10] [ci] Skip memory impact target branch build when tests
 don't exist (#14316)

---
 .github/workflows/ci.yml | 49 ++++++++++++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2a93d37fdb..b752701920a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -686,7 +686,7 @@ jobs:
       ram_usage: ${{ steps.extract.outputs.ram_usage }}
       flash_usage: ${{ steps.extract.outputs.flash_usage }}
       cache_hit: ${{ steps.cache-memory-analysis.outputs.cache-hit }}
-      skip: ${{ steps.check-script.outputs.skip }}
+      skip: ${{ steps.check-script.outputs.skip || steps.check-tests.outputs.skip }}
     steps:
       - name: Check out target branch
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -705,10 +705,39 @@ jobs:
             echo "::warning::ci_memory_impact_extract.py not found on target branch, skipping memory impact analysis"
           fi
 
-      # All remaining steps only run if script exists
+      # Check if test files exist on the target branch for the requested
+      # components and platform. When a PR adds new test files for a platform,
+      # the target branch won't have them yet, so skip instead of failing.
+      # This check must be done here (not in determine-jobs.py) because
+      # determine-jobs runs on the PR branch and cannot see what the target
+      # branch has.
+      - name: Check for test files on target branch
+        id: check-tests
+        if: steps.check-script.outputs.skip != 'true'
+        run: |
+          components='${{ toJSON(fromJSON(needs.determine-jobs.outputs.memory_impact).components) }}'
+          platform="${{ fromJSON(needs.determine-jobs.outputs.memory_impact).platform }}"
+          found=false
+          for component in $(echo "$components" | jq -r '.[]'); do
+            # Check for test files matching the platform (test.platform.yaml or test-*.platform.yaml)
+            for f in tests/components/${component}/test*.${platform}.yaml; do
+              if [ -f "$f" ]; then
+                found=true
+                break 2
+              fi
+            done
+          done
+          if [ "$found" = false ]; then
+            echo "skip=true" >> $GITHUB_OUTPUT
+            echo "::warning::No test files found on target branch for platform ${platform}, skipping memory impact analysis"
+          else
+            echo "skip=false" >> $GITHUB_OUTPUT
+          fi
+
+      # All remaining steps only run if script and tests exist
       - name: Generate cache key
         id: cache-key
-        if: steps.check-script.outputs.skip != 'true'
+        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true'
         run: |
           # Get the commit SHA of the target branch
           target_sha=$(git rev-parse HEAD)
@@ -735,14 +764,14 @@ jobs:
 
       - name: Restore cached memory analysis
         id: cache-memory-analysis
-        if: steps.check-script.outputs.skip != 'true'
+        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true'
         uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: memory-analysis-target.json
           key: ${{ steps.cache-key.outputs.cache-key }}
 
       - name: Cache status
-        if: steps.check-script.outputs.skip != 'true'
+        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true'
         run: |
           if [ "${{ steps.cache-memory-analysis.outputs.cache-hit }}" == "true" ]; then
             echo "✓ Cache hit! Using cached memory analysis results."
@@ -752,21 +781,21 @@ jobs:
           fi
 
       - name: Restore Python
-        if: steps.check-script.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true'
+        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true'
         uses: ./.github/actions/restore-python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
 
       - name: Cache platformio
-        if: steps.check-script.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true'
+        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true'
         uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.platformio
           key: platformio-memory-${{ fromJSON(needs.determine-jobs.outputs.memory_impact).platform }}-${{ hashFiles('platformio.ini') }}
 
       - name: Build, compile, and analyze memory
-        if: steps.check-script.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true'
+        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true'
         id: build
         run: |
           . venv/bin/activate
@@ -800,7 +829,7 @@ jobs:
             --platform "$platform"
 
       - name: Save memory analysis to cache
-        if: steps.check-script.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true' && steps.build.outcome == 'success'
+        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true' && steps.build.outcome == 'success'
         uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: memory-analysis-target.json
@@ -808,7 +837,7 @@ jobs:
 
       - name: Extract memory usage for outputs
         id: extract
-        if: steps.check-script.outputs.skip != 'true'
+        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true'
         run: |
           if [ -f memory-analysis-target.json ]; then
             ram=$(jq -r '.ram_bytes' memory-analysis-target.json)

From 29e1e8bdfd9ce8068cb97f8e0b1c8e8f64af50c4 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 27 Feb 2026 11:45:20 -0700
Subject: [PATCH 08/10] [wifi] Add LibreTiny component test configs (#14351)

---
 tests/components/wifi/test.bk72xx-ard.yaml  | 1 +
 tests/components/wifi/test.ln882x-ard.yaml  | 1 +
 tests/components/wifi/test.rtl87xx-ard.yaml | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 tests/components/wifi/test.bk72xx-ard.yaml
 create mode 100644 tests/components/wifi/test.ln882x-ard.yaml
 create mode 100644 tests/components/wifi/test.rtl87xx-ard.yaml

diff --git a/tests/components/wifi/test.bk72xx-ard.yaml b/tests/components/wifi/test.bk72xx-ard.yaml
new file mode 100644
index 00000000000..dade44d145b
--- /dev/null
+++ b/tests/components/wifi/test.bk72xx-ard.yaml
@@ -0,0 +1 @@
+<<: !include common.yaml
diff --git a/tests/components/wifi/test.ln882x-ard.yaml b/tests/components/wifi/test.ln882x-ard.yaml
new file mode 100644
index 00000000000..dade44d145b
--- /dev/null
+++ b/tests/components/wifi/test.ln882x-ard.yaml
@@ -0,0 +1 @@
+<<: !include common.yaml
diff --git a/tests/components/wifi/test.rtl87xx-ard.yaml b/tests/components/wifi/test.rtl87xx-ard.yaml
new file mode 100644
index 00000000000..dade44d145b
--- /dev/null
+++ b/tests/components/wifi/test.rtl87xx-ard.yaml
@@ -0,0 +1 @@
+<<: !include common.yaml

From 3411ce21505cd8fdcf74885199ba7627f5ac105b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 27 Feb 2026 11:49:57 -0700
Subject: [PATCH 09/10] [core] Fix Application asm label for Mach-O using
 __USER_LABEL_PREFIX__ (#14334)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 esphome/core/application.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/esphome/core/application.cpp b/esphome/core/application.cpp
index 3bd4c1c6703..e27c2cdfc6f 100644
--- a/esphome/core/application.cpp
+++ b/esphome/core/application.cpp
@@ -727,8 +727,17 @@ void Application::yield_with_select_(uint32_t delay_ms) {
 #error "Application placement new requires Itanium C++ ABI (GCC/Clang)"
 #endif
 static_assert(std::is_default_constructible<Application>::value, "Application must be default-constructible");
+// __USER_LABEL_PREFIX__ is "_" on Mach-O (macOS) and empty on ELF (embedded targets).
+// String literal concatenation produces the correct platform-specific mangled symbol.
+// Two-level macro needed: # stringifies before expansion, so the
+// indirection forces __USER_LABEL_PREFIX__ to expand first.
+#define ESPHOME_STRINGIFY_IMPL_(x) #x
+#define ESPHOME_STRINGIFY_(x) ESPHOME_STRINGIFY_IMPL_(x)
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-alignas(Application) char app_storage[sizeof(Application)] asm("_ZN7esphome3AppE");
+alignas(Application) char app_storage[sizeof(Application)] asm(
+    ESPHOME_STRINGIFY_(__USER_LABEL_PREFIX__) "_ZN7esphome3AppE");
+#undef ESPHOME_STRINGIFY_
+#undef ESPHOME_STRINGIFY_IMPL_
 
 #if defined(USE_SOCKET_SELECT_SUPPORT) && defined(USE_WAKE_LOOP_THREADSAFE)
 

From 8698b01bc7314443867327e11f8431a7f14bf7e7 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 27 Feb 2026 11:54:13 -0700
Subject: [PATCH 10/10] [host] Use native clock_gettime for millis_64()
 (#14340)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
---
 esphome/components/host/core.cpp |  6 +++++-
 esphome/core/scheduler.cpp       | 10 +++++-----
 esphome/core/scheduler.h         | 15 +++++++--------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/esphome/components/host/core.cpp b/esphome/components/host/core.cpp
index 5c08717ac99..9af85bec58a 100644
--- a/esphome/components/host/core.cpp
+++ b/esphome/components/host/core.cpp
@@ -20,7 +20,11 @@ uint32_t IRAM_ATTR HOT millis() {
   uint32_t ms = round(spec.tv_nsec / 1e6);
   return ((uint32_t) seconds) * 1000U + ms;
 }
-uint64_t millis_64() { return App.scheduler.millis_64_impl_(millis()); }
+uint64_t millis_64() {
+  struct timespec spec;
+  clock_gettime(CLOCK_MONOTONIC, &spec);
+  return static_cast<uint64_t>(spec.tv_sec) * 1000ULL + static_cast<uint64_t>(spec.tv_nsec) / 1000000ULL;
+}
 void HOT delay(uint32_t ms) {
   struct timespec ts;
   ts.tv_sec = ms / 1000;
diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index 06c0bb8b1bf..97735c48760 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -28,7 +28,7 @@ static constexpr size_t MAX_POOL_SIZE = 5;
 // Set to 5 to match the pool size - when we have as many cancelled items as our
 // pool can hold, it's time to clean up and recycle them.
 static constexpr uint32_t MAX_LOGICALLY_DELETED_ITEMS = 5;
-#ifndef USE_ESP32
+#if !defined(USE_ESP32) && !defined(USE_HOST)
 // Half the 32-bit range - used to detect rollovers vs normal time progression
 static constexpr uint32_t HALF_MAX_UINT32 = std::numeric_limits<uint32_t>::max() / 2;
 #endif
@@ -475,12 +475,12 @@ void HOT Scheduler::call(uint32_t now) {
   if (now_64 - last_print > 2000) {
     last_print = now_64;
     std::vector<SchedulerItemPtr> old_items;
-#if !defined(USE_ESP32) && defined(ESPHOME_THREAD_MULTI_ATOMICS)
+#if !defined(USE_ESP32) && !defined(USE_HOST) && defined(ESPHOME_THREAD_MULTI_ATOMICS)
     const auto last_dbg = this->last_millis_.load(std::memory_order_relaxed);
     const auto major_dbg = this->millis_major_.load(std::memory_order_relaxed);
     ESP_LOGD(TAG, "Items: count=%zu, pool=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(),
              this->scheduler_item_pool_.size(), now_64, major_dbg, last_dbg);
-#elif !defined(USE_ESP32)
+#elif !defined(USE_ESP32) && !defined(USE_HOST)
     ESP_LOGD(TAG, "Items: count=%zu, pool=%zu, now=%" PRIu64 " (%" PRIu16 ", %" PRIu32 ")", this->items_.size(),
              this->scheduler_item_pool_.size(), now_64, this->millis_major_, this->last_millis_);
 #else
@@ -714,7 +714,7 @@ bool HOT Scheduler::cancel_item_locked_(Component *component, NameType name_type
   return total_cancelled > 0;
 }
 
-#ifndef USE_ESP32
+#if !defined(USE_ESP32) && !defined(USE_HOST)
 uint64_t Scheduler::millis_64_impl_(uint32_t now) {
   // THREAD SAFETY NOTE:
   // This function has three implementations, based on the precompiler flags
@@ -872,7 +872,7 @@ uint64_t Scheduler::millis_64_impl_(uint32_t now) {
     "No platform threading model defined. One of ESPHOME_THREAD_SINGLE, ESPHOME_THREAD_MULTI_NO_ATOMICS, or ESPHOME_THREAD_MULTI_ATOMICS must be defined."
 #endif
 }
-#endif  // not USE_ESP32
+#endif  // !USE_ESP32 && !USE_HOST
 
 bool HOT Scheduler::SchedulerItem::cmp(const SchedulerItemPtr &a, const SchedulerItemPtr &b) {
   // High bits are almost always equal (change only on 32-bit rollover ~49 days)
diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h
index c6053258103..9a62ac16347 100644
--- a/esphome/core/scheduler.h
+++ b/esphome/core/scheduler.h
@@ -287,7 +287,7 @@ class Scheduler {
   // On ESP32, ignores now and uses esp_timer_get_time() directly (native 64-bit).
   // On non-ESP32, extends now to 64-bit using rollover tracking.
   uint64_t millis_64_from_(uint32_t now) {
-#ifdef USE_ESP32
+#if defined(USE_ESP32) || defined(USE_HOST)
     (void) now;
     return millis_64();
 #else
@@ -295,10 +295,9 @@ class Scheduler {
 #endif
   }
 
-#ifndef USE_ESP32
-  // On non-ESP32 platforms, millis_64() HAL function delegates to this method
-  // which tracks 32-bit millis() rollover using millis_major_ and last_millis_.
-  // On ESP32, millis_64() uses esp_timer_get_time() directly.
+#if !defined(USE_ESP32) && !defined(USE_HOST)
+  // On platforms without native 64-bit time, millis_64() HAL function delegates to this
+  // method which tracks 32-bit millis() rollover using millis_major_ and last_millis_.
   friend uint64_t millis_64();
   uint64_t millis_64_impl_(uint32_t now);
 #endif
@@ -568,8 +567,8 @@ class Scheduler {
   //   to synchronize between tasks (see https://github.com/esphome/backlog/issues/52)
   std::vector<SchedulerItemPtr> scheduler_item_pool_;
 
-#ifndef USE_ESP32
-  // On ESP32, millis_64() uses esp_timer_get_time() directly; no rollover tracking needed.
+#if !defined(USE_ESP32) && !defined(USE_HOST)
+  // On platforms with native 64-bit time (ESP32, Host), no rollover tracking needed.
   // On other platforms, these fields track 32-bit millis() rollover for millis_64_impl_().
 #ifdef ESPHOME_THREAD_MULTI_ATOMICS
   /*
@@ -599,7 +598,7 @@ class Scheduler {
 #else  /* not ESPHOME_THREAD_MULTI_ATOMICS */
   uint16_t millis_major_{0};
 #endif /* else ESPHOME_THREAD_MULTI_ATOMICS */
-#endif /* not USE_ESP32 */
+#endif /* !USE_ESP32 && !USE_HOST */
 };
 
 }  // namespace esphome