From 2a5933e4f728580b4b95de13c4783c4d8c9396a5 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 3 Apr 2026 08:27:13 -1000
Subject: [PATCH] [host] Add graceful shutdown on SIGINT/SIGTERM (#15387)

---
 esphome/components/host/core.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/esphome/components/host/core.cpp b/esphome/components/host/core.cpp
index a662e842ee..0ade4274fe 100644
--- a/esphome/components/host/core.cpp
+++ b/esphome/components/host/core.cpp
@@ -5,11 +5,17 @@
 #include "esphome/core/helpers.h"
 #include "preferences.h"
 
+#include <csignal>
 #include <sched.h>
 #include <time.h>
 #include <cmath>
 #include <cstdlib>
 
+namespace {
+volatile sig_atomic_t s_signal_received = 0;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+void signal_handler(int signal) { s_signal_received = signal; }
+}  // namespace
+
 namespace esphome {
 
 void HOT yield() { ::sched_yield(); }
@@ -72,11 +78,17 @@ uint32_t arch_get_cpu_freq_hz() { return 1000000000U; }
 void setup();
 void loop();
 int main() {
+  // Install signal handlers for graceful shutdown (flushes preferences to disk)
+  std::signal(SIGINT, signal_handler);
+  std::signal(SIGTERM, signal_handler);
+
   esphome::host::setup_preferences();
   setup();
-  while (true) {
+  while (s_signal_received == 0) {
     loop();
   }
+  esphome::App.run_safe_shutdown_hooks();
+  return 0;
 }
 
 #endif  // USE_HOST