From 31f36df4ba1c42e59eac9e148c76ded1783739bf Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 7 Jul 2025 15:20:40 -0500
Subject: [PATCH 1/8] Reduce LightCall memory usage by 50 bytes per call
 (#9333)

---
 esphome/components/light/addressable_light.h  |   6 +-
 .../components/light/esp_color_correction.h   |   2 +-
 esphome/components/light/light_call.cpp       | 383 ++++++++----------
 esphome/components/light/light_call.h         |  92 ++++-
 esphome/components/light/light_color_values.h |   8 +-
 esphome/components/light/light_state.h        |  21 +-
 esphome/components/light/transformers.h       |   4 +-
 tests/integration/fixtures/light_calls.yaml   |  80 ++++
 tests/integration/test_light_calls.py         | 189 +++++++++
 9 files changed, 522 insertions(+), 263 deletions(-)
 create mode 100644 tests/integration/fixtures/light_calls.yaml
 create mode 100644 tests/integration/test_light_calls.py

diff --git a/esphome/components/light/addressable_light.h b/esphome/components/light/addressable_light.h
index 8302239d6a..baa4507d2f 100644
--- a/esphome/components/light/addressable_light.h
+++ b/esphome/components/light/addressable_light.h
@@ -97,12 +97,12 @@ class AddressableLight : public LightOutput, public Component {
   }
   virtual ESPColorView get_view_internal(int32_t index) const = 0;
 
-  bool effect_active_{false};
   ESPColorCorrection correction_{};
+  LightState *state_parent_{nullptr};
 #ifdef USE_POWER_SUPPLY
   power_supply::PowerSupplyRequester power_;
 #endif
-  LightState *state_parent_{nullptr};
+  bool effect_active_{false};
 };
 
 class AddressableLightTransformer : public LightTransitionTransformer {
@@ -114,9 +114,9 @@ class AddressableLightTransformer : public LightTransitionTransformer {
 
  protected:
   AddressableLight &light_;
-  Color target_color_{};
   float last_transition_progress_{0.0f};
   float accumulated_alpha_{0.0f};
+  Color target_color_{};
 };
 
 }  // namespace light
diff --git a/esphome/components/light/esp_color_correction.h b/esphome/components/light/esp_color_correction.h
index 39ce5700c6..979a1acb07 100644
--- a/esphome/components/light/esp_color_correction.h
+++ b/esphome/components/light/esp_color_correction.h
@@ -69,8 +69,8 @@ class ESPColorCorrection {
  protected:
   uint8_t gamma_table_[256];
   uint8_t gamma_reverse_table_[256];
-  uint8_t local_brightness_{255};
   Color max_brightness_;
+  uint8_t local_brightness_{255};
 };
 
 }  // namespace light
diff --git a/esphome/components/light/light_call.cpp b/esphome/components/light/light_call.cpp
index 78b0ac9feb..a3ffe22591 100644
--- a/esphome/components/light/light_call.cpp
+++ b/esphome/components/light/light_call.cpp
@@ -2,12 +2,28 @@
 #include "light_call.h"
 #include "light_state.h"
 #include "esphome/core/log.h"
+#include "esphome/core/optional.h"
 
 namespace esphome {
 namespace light {
 
 static const char *const TAG = "light";
 
+// Macro to reduce repetitive setter code
+#define IMPLEMENT_LIGHT_CALL_SETTER(name, type, flag) \
+  LightCall &LightCall::set_##name(optional<type>(name)) { \
+    if ((name).has_value()) { \
+      this->name##_ = (name).value(); \
+    } \
+    this->set_flag_(flag, (name).has_value()); \
+    return *this; \
+  } \
+  LightCall &LightCall::set_##name(type name) { \
+    this->name##_ = name; \
+    this->set_flag_(flag, true); \
+    return *this; \
+  }
+
 static const LogString *color_mode_to_human(ColorMode color_mode) {
   if (color_mode == ColorMode::UNKNOWN)
     return LOG_STR("Unknown");
@@ -32,41 +48,43 @@ void LightCall::perform() {
   const char *name = this->parent_->get_name().c_str();
   LightColorValues v = this->validate_();
 
-  if (this->publish_) {
+  if (this->get_publish_()) {
     ESP_LOGD(TAG, "'%s' Setting:", name);
 
     // Only print color mode when it's being changed
     ColorMode current_color_mode = this->parent_->remote_values.get_color_mode();
-    if (this->color_mode_.value_or(current_color_mode) != current_color_mode) {
+    ColorMode target_color_mode = this->has_color_mode() ? this->color_mode_ : current_color_mode;
+    if (target_color_mode != current_color_mode) {
       ESP_LOGD(TAG, "  Color mode: %s", LOG_STR_ARG(color_mode_to_human(v.get_color_mode())));
     }
 
     // Only print state when it's being changed
     bool current_state = this->parent_->remote_values.is_on();
-    if (this->state_.value_or(current_state) != current_state) {
+    bool target_state = this->has_state() ? this->state_ : current_state;
+    if (target_state != current_state) {
       ESP_LOGD(TAG, "  State: %s", ONOFF(v.is_on()));
     }
 
-    if (this->brightness_.has_value()) {
+    if (this->has_brightness()) {
       ESP_LOGD(TAG, "  Brightness: %.0f%%", v.get_brightness() * 100.0f);
     }
 
-    if (this->color_brightness_.has_value()) {
+    if (this->has_color_brightness()) {
       ESP_LOGD(TAG, "  Color brightness: %.0f%%", v.get_color_brightness() * 100.0f);
     }
-    if (this->red_.has_value() || this->green_.has_value() || this->blue_.has_value()) {
+    if (this->has_red() || this->has_green() || this->has_blue()) {
       ESP_LOGD(TAG, "  Red: %.0f%%, Green: %.0f%%, Blue: %.0f%%", v.get_red() * 100.0f, v.get_green() * 100.0f,
                v.get_blue() * 100.0f);
     }
 
-    if (this->white_.has_value()) {
+    if (this->has_white()) {
       ESP_LOGD(TAG, "  White: %.0f%%", v.get_white() * 100.0f);
     }
-    if (this->color_temperature_.has_value()) {
+    if (this->has_color_temperature()) {
       ESP_LOGD(TAG, "  Color temperature: %.1f mireds", v.get_color_temperature());
     }
 
-    if (this->cold_white_.has_value() || this->warm_white_.has_value()) {
+    if (this->has_cold_white() || this->has_warm_white()) {
       ESP_LOGD(TAG, "  Cold white: %.0f%%, warm white: %.0f%%", v.get_cold_white() * 100.0f,
                v.get_warm_white() * 100.0f);
     }
@@ -74,58 +92,57 @@ void LightCall::perform() {
 
   if (this->has_flash_()) {
     // FLASH
-    if (this->publish_) {
-      ESP_LOGD(TAG, "  Flash length: %.1fs", *this->flash_length_ / 1e3f);
+    if (this->get_publish_()) {
+      ESP_LOGD(TAG, "  Flash length: %.1fs", this->flash_length_ / 1e3f);
     }
 
-    this->parent_->start_flash_(v, *this->flash_length_, this->publish_);
+    this->parent_->start_flash_(v, this->flash_length_, this->get_publish_());
   } else if (this->has_transition_()) {
     // TRANSITION
-    if (this->publish_) {
-      ESP_LOGD(TAG, "  Transition length: %.1fs", *this->transition_length_ / 1e3f);
+    if (this->get_publish_()) {
+      ESP_LOGD(TAG, "  Transition length: %.1fs", this->transition_length_ / 1e3f);
     }
 
     // Special case: Transition and effect can be set when turning off
     if (this->has_effect_()) {
-      if (this->publish_) {
+      if (this->get_publish_()) {
         ESP_LOGD(TAG, "  Effect: 'None'");
       }
       this->parent_->stop_effect_();
     }
 
-    this->parent_->start_transition_(v, *this->transition_length_, this->publish_);
+    this->parent_->start_transition_(v, this->transition_length_, this->get_publish_());
 
   } else if (this->has_effect_()) {
     // EFFECT
-    auto effect = this->effect_;
     const char *effect_s;
-    if (effect == 0u) {
+    if (this->effect_ == 0u) {
       effect_s = "None";
     } else {
-      effect_s = this->parent_->effects_[*this->effect_ - 1]->get_name().c_str();
+      effect_s = this->parent_->effects_[this->effect_ - 1]->get_name().c_str();
     }
 
-    if (this->publish_) {
+    if (this->get_publish_()) {
       ESP_LOGD(TAG, "  Effect: '%s'", effect_s);
     }
 
-    this->parent_->start_effect_(*this->effect_);
+    this->parent_->start_effect_(this->effect_);
 
     // Also set light color values when starting an effect
     // For example to turn off the light
     this->parent_->set_immediately_(v, true);
   } else {
     // INSTANT CHANGE
-    this->parent_->set_immediately_(v, this->publish_);
+    this->parent_->set_immediately_(v, this->get_publish_());
   }
 
   if (!this->has_transition_()) {
     this->parent_->target_state_reached_callback_.call();
   }
-  if (this->publish_) {
+  if (this->get_publish_()) {
     this->parent_->publish_state();
   }
-  if (this->save_) {
+  if (this->get_save_()) {
     this->parent_->save_remote_values_();
   }
 }
@@ -135,82 +152,80 @@ LightColorValues LightCall::validate_() {
   auto traits = this->parent_->get_traits();
 
   // Color mode check
-  if (this->color_mode_.has_value() && !traits.supports_color_mode(this->color_mode_.value())) {
-    ESP_LOGW(TAG, "'%s' does not support color mode %s", name,
-             LOG_STR_ARG(color_mode_to_human(this->color_mode_.value())));
-    this->color_mode_.reset();
+  if (this->has_color_mode() && !traits.supports_color_mode(this->color_mode_)) {
+    ESP_LOGW(TAG, "'%s' does not support color mode %s", name, LOG_STR_ARG(color_mode_to_human(this->color_mode_)));
+    this->set_flag_(FLAG_HAS_COLOR_MODE, false);
   }
 
   // Ensure there is always a color mode set
-  if (!this->color_mode_.has_value()) {
+  if (!this->has_color_mode()) {
     this->color_mode_ = this->compute_color_mode_();
+    this->set_flag_(FLAG_HAS_COLOR_MODE, true);
   }
-  auto color_mode = *this->color_mode_;
+  auto color_mode = this->color_mode_;
 
   // Transform calls that use non-native parameters for the current mode.
   this->transform_parameters_();
 
   // Brightness exists check
-  if (this->brightness_.has_value() && *this->brightness_ > 0.0f && !(color_mode & ColorCapability::BRIGHTNESS)) {
+  if (this->has_brightness() && this->brightness_ > 0.0f && !(color_mode & ColorCapability::BRIGHTNESS)) {
     ESP_LOGW(TAG, "'%s': setting brightness not supported", name);
-    this->brightness_.reset();
+    this->set_flag_(FLAG_HAS_BRIGHTNESS, false);
   }
 
   // Transition length possible check
-  if (this->transition_length_.has_value() && *this->transition_length_ != 0 &&
-      !(color_mode & ColorCapability::BRIGHTNESS)) {
+  if (this->has_transition_() && this->transition_length_ != 0 && !(color_mode & ColorCapability::BRIGHTNESS)) {
     ESP_LOGW(TAG, "'%s': transitions not supported", name);
-    this->transition_length_.reset();
+    this->set_flag_(FLAG_HAS_TRANSITION, false);
   }
 
   // Color brightness exists check
-  if (this->color_brightness_.has_value() && *this->color_brightness_ > 0.0f && !(color_mode & ColorCapability::RGB)) {
+  if (this->has_color_brightness() && this->color_brightness_ > 0.0f && !(color_mode & ColorCapability::RGB)) {
     ESP_LOGW(TAG, "'%s': color mode does not support setting RGB brightness", name);
-    this->color_brightness_.reset();
+    this->set_flag_(FLAG_HAS_COLOR_BRIGHTNESS, false);
   }
 
   // RGB exists check
-  if ((this->red_.has_value() && *this->red_ > 0.0f) || (this->green_.has_value() && *this->green_ > 0.0f) ||
-      (this->blue_.has_value() && *this->blue_ > 0.0f)) {
+  if ((this->has_red() && this->red_ > 0.0f) || (this->has_green() && this->green_ > 0.0f) ||
+      (this->has_blue() && this->blue_ > 0.0f)) {
     if (!(color_mode & ColorCapability::RGB)) {
       ESP_LOGW(TAG, "'%s': color mode does not support setting RGB color", name);
-      this->red_.reset();
-      this->green_.reset();
-      this->blue_.reset();
+      this->set_flag_(FLAG_HAS_RED, false);
+      this->set_flag_(FLAG_HAS_GREEN, false);
+      this->set_flag_(FLAG_HAS_BLUE, false);
     }
   }
 
   // White value exists check
-  if (this->white_.has_value() && *this->white_ > 0.0f &&
+  if (this->has_white() && this->white_ > 0.0f &&
       !(color_mode & ColorCapability::WHITE || color_mode & ColorCapability::COLD_WARM_WHITE)) {
     ESP_LOGW(TAG, "'%s': color mode does not support setting white value", name);
-    this->white_.reset();
+    this->set_flag_(FLAG_HAS_WHITE, false);
   }
 
   // Color temperature exists check
-  if (this->color_temperature_.has_value() &&
+  if (this->has_color_temperature() &&
       !(color_mode & ColorCapability::COLOR_TEMPERATURE || color_mode & ColorCapability::COLD_WARM_WHITE)) {
     ESP_LOGW(TAG, "'%s': color mode does not support setting color temperature", name);
-    this->color_temperature_.reset();
+    this->set_flag_(FLAG_HAS_COLOR_TEMPERATURE, false);
   }
 
   // Cold/warm white value exists check
-  if ((this->cold_white_.has_value() && *this->cold_white_ > 0.0f) ||
-      (this->warm_white_.has_value() && *this->warm_white_ > 0.0f)) {
+  if ((this->has_cold_white() && this->cold_white_ > 0.0f) || (this->has_warm_white() && this->warm_white_ > 0.0f)) {
     if (!(color_mode & ColorCapability::COLD_WARM_WHITE)) {
       ESP_LOGW(TAG, "'%s': color mode does not support setting cold/warm white value", name);
-      this->cold_white_.reset();
-      this->warm_white_.reset();
+      this->set_flag_(FLAG_HAS_COLD_WHITE, false);
+      this->set_flag_(FLAG_HAS_WARM_WHITE, false);
     }
   }
 
 #define VALIDATE_RANGE_(name_, upper_name, min, max) \
-  if (name_##_.has_value()) { \
-    auto val = *name_##_; \
+  if (this->has_##name_()) { \
+    auto val = this->name_##_; \
     if (val < (min) || val > (max)) { \
       ESP_LOGW(TAG, "'%s': %s value %.2f is out of range [%.1f - %.1f]", name, LOG_STR_LITERAL(upper_name), val, \
                (min), (max)); \
-      name_##_ = clamp(val, (min), (max)); \
+      this->name_##_ = clamp(val, (min), (max)); \
     } \
   }
 #define VALIDATE_RANGE(name, upper_name) VALIDATE_RANGE_(name, upper_name, 0.0f, 1.0f)
@@ -227,110 +242,116 @@ LightColorValues LightCall::validate_() {
   VALIDATE_RANGE_(color_temperature, "Color temperature", traits.get_min_mireds(), traits.get_max_mireds())
 
   // Flag whether an explicit turn off was requested, in which case we'll also stop the effect.
-  bool explicit_turn_off_request = this->state_.has_value() && !*this->state_;
+  bool explicit_turn_off_request = this->has_state() && !this->state_;
 
   // Turn off when brightness is set to zero, and reset brightness (so that it has nonzero brightness when turned on).
-  if (this->brightness_.has_value() && *this->brightness_ == 0.0f) {
-    this->state_ = optional<float>(false);
-    this->brightness_ = optional<float>(1.0f);
+  if (this->has_brightness() && this->brightness_ == 0.0f) {
+    this->state_ = false;
+    this->set_flag_(FLAG_HAS_STATE, true);
+    this->brightness_ = 1.0f;
   }
 
   // Set color brightness to 100% if currently zero and a color is set.
-  if (this->red_.has_value() || this->green_.has_value() || this->blue_.has_value()) {
-    if (!this->color_brightness_.has_value() && this->parent_->remote_values.get_color_brightness() == 0.0f)
-      this->color_brightness_ = optional<float>(1.0f);
+  if (this->has_red() || this->has_green() || this->has_blue()) {
+    if (!this->has_color_brightness() && this->parent_->remote_values.get_color_brightness() == 0.0f) {
+      this->color_brightness_ = 1.0f;
+      this->set_flag_(FLAG_HAS_COLOR_BRIGHTNESS, true);
+    }
   }
 
   // Create color values for the light with this call applied.
   auto v = this->parent_->remote_values;
-  if (this->color_mode_.has_value())
-    v.set_color_mode(*this->color_mode_);
-  if (this->state_.has_value())
-    v.set_state(*this->state_);
-  if (this->brightness_.has_value())
-    v.set_brightness(*this->brightness_);
-  if (this->color_brightness_.has_value())
-    v.set_color_brightness(*this->color_brightness_);
-  if (this->red_.has_value())
-    v.set_red(*this->red_);
-  if (this->green_.has_value())
-    v.set_green(*this->green_);
-  if (this->blue_.has_value())
-    v.set_blue(*this->blue_);
-  if (this->white_.has_value())
-    v.set_white(*this->white_);
-  if (this->color_temperature_.has_value())
-    v.set_color_temperature(*this->color_temperature_);
-  if (this->cold_white_.has_value())
-    v.set_cold_white(*this->cold_white_);
-  if (this->warm_white_.has_value())
-    v.set_warm_white(*this->warm_white_);
+  if (this->has_color_mode())
+    v.set_color_mode(this->color_mode_);
+  if (this->has_state())
+    v.set_state(this->state_);
+  if (this->has_brightness())
+    v.set_brightness(this->brightness_);
+  if (this->has_color_brightness())
+    v.set_color_brightness(this->color_brightness_);
+  if (this->has_red())
+    v.set_red(this->red_);
+  if (this->has_green())
+    v.set_green(this->green_);
+  if (this->has_blue())
+    v.set_blue(this->blue_);
+  if (this->has_white())
+    v.set_white(this->white_);
+  if (this->has_color_temperature())
+    v.set_color_temperature(this->color_temperature_);
+  if (this->has_cold_white())
+    v.set_cold_white(this->cold_white_);
+  if (this->has_warm_white())
+    v.set_warm_white(this->warm_white_);
 
   v.normalize_color();
 
   // Flash length check
-  if (this->has_flash_() && *this->flash_length_ == 0) {
+  if (this->has_flash_() && this->flash_length_ == 0) {
     ESP_LOGW(TAG, "'%s': flash length must be greater than zero", name);
-    this->flash_length_.reset();
+    this->set_flag_(FLAG_HAS_FLASH, false);
   }
 
   // validate transition length/flash length/effect not used at the same time
   bool supports_transition = color_mode & ColorCapability::BRIGHTNESS;
 
   // If effect is already active, remove effect start
-  if (this->has_effect_() && *this->effect_ == this->parent_->active_effect_index_) {
-    this->effect_.reset();
+  if (this->has_effect_() && this->effect_ == this->parent_->active_effect_index_) {
+    this->set_flag_(FLAG_HAS_EFFECT, false);
   }
 
   // validate effect index
-  if (this->has_effect_() && *this->effect_ > this->parent_->effects_.size()) {
-    ESP_LOGW(TAG, "'%s': invalid effect index %" PRIu32, name, *this->effect_);
-    this->effect_.reset();
+  if (this->has_effect_() && this->effect_ > this->parent_->effects_.size()) {
+    ESP_LOGW(TAG, "'%s': invalid effect index %" PRIu32, name, this->effect_);
+    this->set_flag_(FLAG_HAS_EFFECT, false);
   }
 
   if (this->has_effect_() && (this->has_transition_() || this->has_flash_())) {
     ESP_LOGW(TAG, "'%s': effect cannot be used with transition/flash", name);
-    this->transition_length_.reset();
-    this->flash_length_.reset();
+    this->set_flag_(FLAG_HAS_TRANSITION, false);
+    this->set_flag_(FLAG_HAS_FLASH, false);
   }
 
   if (this->has_flash_() && this->has_transition_()) {
     ESP_LOGW(TAG, "'%s': flash cannot be used with transition", name);
-    this->transition_length_.reset();
+    this->set_flag_(FLAG_HAS_TRANSITION, false);
   }
 
-  if (!this->has_transition_() && !this->has_flash_() && (!this->has_effect_() || *this->effect_ == 0) &&
+  if (!this->has_transition_() && !this->has_flash_() && (!this->has_effect_() || this->effect_ == 0) &&
       supports_transition) {
     // nothing specified and light supports transitions, set default transition length
     this->transition_length_ = this->parent_->default_transition_length_;
+    this->set_flag_(FLAG_HAS_TRANSITION, true);
   }
 
-  if (this->transition_length_.value_or(0) == 0) {
+  if (this->has_transition_() && this->transition_length_ == 0) {
     // 0 transition is interpreted as no transition (instant change)
-    this->transition_length_.reset();
+    this->set_flag_(FLAG_HAS_TRANSITION, false);
   }
 
   if (this->has_transition_() && !supports_transition) {
     ESP_LOGW(TAG, "'%s': transitions not supported", name);
-    this->transition_length_.reset();
+    this->set_flag_(FLAG_HAS_TRANSITION, false);
   }
 
   // If not a flash and turning the light off, then disable the light
   // Do not use light color values directly, so that effects can set 0% brightness
   // Reason: When user turns off the light in frontend, the effect should also stop
-  if (!this->has_flash_() && !this->state_.value_or(v.is_on())) {
+  bool target_state = this->has_state() ? this->state_ : v.is_on();
+  if (!this->has_flash_() && !target_state) {
     if (this->has_effect_()) {
       ESP_LOGW(TAG, "'%s': cannot start effect when turning off", name);
-      this->effect_.reset();
+      this->set_flag_(FLAG_HAS_EFFECT, false);
     } else if (this->parent_->active_effect_index_ != 0 && explicit_turn_off_request) {
       // Auto turn off effect
       this->effect_ = 0;
+      this->set_flag_(FLAG_HAS_EFFECT, true);
     }
   }
 
   // Disable saving for flashes
   if (this->has_flash_())
-    this->save_ = false;
+    this->set_flag_(FLAG_SAVE, false);
 
   return v;
 }
@@ -343,24 +364,27 @@ void LightCall::transform_parameters_() {
   // - RGBWW lights with color_interlock=true, which also sets "brightness" and
   //   "color_temperature" (without color_interlock, CW/WW are set directly)
   // - Legacy Home Assistant (pre-colormode), which sets "white" and "color_temperature"
-  if (((this->white_.has_value() && *this->white_ > 0.0f) || this->color_temperature_.has_value()) &&  //
-      (*this->color_mode_ & ColorCapability::COLD_WARM_WHITE) &&                                       //
-      !(*this->color_mode_ & ColorCapability::WHITE) &&                                                //
-      !(*this->color_mode_ & ColorCapability::COLOR_TEMPERATURE) &&                                    //
+  if (((this->has_white() && this->white_ > 0.0f) || this->has_color_temperature()) &&  //
+      (this->color_mode_ & ColorCapability::COLD_WARM_WHITE) &&                         //
+      !(this->color_mode_ & ColorCapability::WHITE) &&                                  //
+      !(this->color_mode_ & ColorCapability::COLOR_TEMPERATURE) &&                      //
       traits.get_min_mireds() > 0.0f && traits.get_max_mireds() > 0.0f) {
     ESP_LOGD(TAG, "'%s': setting cold/warm white channels using white/color temperature values",
              this->parent_->get_name().c_str());
-    if (this->color_temperature_.has_value()) {
-      const float color_temp = clamp(*this->color_temperature_, traits.get_min_mireds(), traits.get_max_mireds());
+    if (this->has_color_temperature()) {
+      const float color_temp = clamp(this->color_temperature_, traits.get_min_mireds(), traits.get_max_mireds());
       const float ww_fraction =
           (color_temp - traits.get_min_mireds()) / (traits.get_max_mireds() - traits.get_min_mireds());
       const float cw_fraction = 1.0f - ww_fraction;
       const float max_cw_ww = std::max(ww_fraction, cw_fraction);
       this->cold_white_ = gamma_uncorrect(cw_fraction / max_cw_ww, this->parent_->get_gamma_correct());
       this->warm_white_ = gamma_uncorrect(ww_fraction / max_cw_ww, this->parent_->get_gamma_correct());
+      this->set_flag_(FLAG_HAS_COLD_WHITE, true);
+      this->set_flag_(FLAG_HAS_WARM_WHITE, true);
     }
-    if (this->white_.has_value()) {
-      this->brightness_ = *this->white_;
+    if (this->has_white()) {
+      this->brightness_ = this->white_;
+      this->set_flag_(FLAG_HAS_BRIGHTNESS, true);
     }
   }
 }
@@ -378,7 +402,7 @@ ColorMode LightCall::compute_color_mode_() {
 
   // Don't change if the light is being turned off.
   ColorMode current_mode = this->parent_->remote_values.get_color_mode();
-  if (this->state_.has_value() && !*this->state_)
+  if (this->has_state() && !this->state_)
     return current_mode;
 
   // If no color mode is specified, we try to guess the color mode. This is needed for backward compatibility to
@@ -411,12 +435,12 @@ ColorMode LightCall::compute_color_mode_() {
   return color_mode;
 }
 std::set<ColorMode> LightCall::get_suitable_color_modes_() {
-  bool has_white = this->white_.has_value() && *this->white_ > 0.0f;
-  bool has_ct = this->color_temperature_.has_value();
-  bool has_cwww = (this->cold_white_.has_value() && *this->cold_white_ > 0.0f) ||
-                  (this->warm_white_.has_value() && *this->warm_white_ > 0.0f);
-  bool has_rgb = (this->color_brightness_.has_value() && *this->color_brightness_ > 0.0f) ||
-                 (this->red_.has_value() || this->green_.has_value() || this->blue_.has_value());
+  bool has_white = this->has_white() && this->white_ > 0.0f;
+  bool has_ct = this->has_color_temperature();
+  bool has_cwww =
+      (this->has_cold_white() && this->cold_white_ > 0.0f) || (this->has_warm_white() && this->warm_white_ > 0.0f);
+  bool has_rgb = (this->has_color_brightness() && this->color_brightness_ > 0.0f) ||
+                 (this->has_red() || this->has_green() || this->has_blue());
 
 #define KEY(white, ct, cwww, rgb) ((white) << 0 | (ct) << 1 | (cwww) << 2 | (rgb) << 3)
 #define ENTRY(white, ct, cwww, rgb, ...) \
@@ -491,7 +515,7 @@ LightCall &LightCall::from_light_color_values(const LightColorValues &values) {
   return *this;
 }
 ColorMode LightCall::get_active_color_mode_() {
-  return this->color_mode_.value_or(this->parent_->remote_values.get_color_mode());
+  return this->has_color_mode() ? this->color_mode_ : this->parent_->remote_values.get_color_mode();
 }
 LightCall &LightCall::set_transition_length_if_supported(uint32_t transition_length) {
   if (this->get_active_color_mode_() & ColorCapability::BRIGHTNESS)
@@ -505,7 +529,7 @@ LightCall &LightCall::set_brightness_if_supported(float brightness) {
 }
 LightCall &LightCall::set_color_mode_if_supported(ColorMode color_mode) {
   if (this->parent_->get_traits().supports_color_mode(color_mode))
-    this->color_mode_ = color_mode;
+    this->set_color_mode(color_mode);
   return *this;
 }
 LightCall &LightCall::set_color_brightness_if_supported(float brightness) {
@@ -549,110 +573,19 @@ LightCall &LightCall::set_warm_white_if_supported(float warm_white) {
     this->set_warm_white(warm_white);
   return *this;
 }
-LightCall &LightCall::set_state(optional<bool> state) {
-  this->state_ = state;
-  return *this;
-}
-LightCall &LightCall::set_state(bool state) {
-  this->state_ = state;
-  return *this;
-}
-LightCall &LightCall::set_transition_length(optional<uint32_t> transition_length) {
-  this->transition_length_ = transition_length;
-  return *this;
-}
-LightCall &LightCall::set_transition_length(uint32_t transition_length) {
-  this->transition_length_ = transition_length;
-  return *this;
-}
-LightCall &LightCall::set_flash_length(optional<uint32_t> flash_length) {
-  this->flash_length_ = flash_length;
-  return *this;
-}
-LightCall &LightCall::set_flash_length(uint32_t flash_length) {
-  this->flash_length_ = flash_length;
-  return *this;
-}
-LightCall &LightCall::set_brightness(optional<float> brightness) {
-  this->brightness_ = brightness;
-  return *this;
-}
-LightCall &LightCall::set_brightness(float brightness) {
-  this->brightness_ = brightness;
-  return *this;
-}
-LightCall &LightCall::set_color_mode(optional<ColorMode> color_mode) {
-  this->color_mode_ = color_mode;
-  return *this;
-}
-LightCall &LightCall::set_color_mode(ColorMode color_mode) {
-  this->color_mode_ = color_mode;
-  return *this;
-}
-LightCall &LightCall::set_color_brightness(optional<float> brightness) {
-  this->color_brightness_ = brightness;
-  return *this;
-}
-LightCall &LightCall::set_color_brightness(float brightness) {
-  this->color_brightness_ = brightness;
-  return *this;
-}
-LightCall &LightCall::set_red(optional<float> red) {
-  this->red_ = red;
-  return *this;
-}
-LightCall &LightCall::set_red(float red) {
-  this->red_ = red;
-  return *this;
-}
-LightCall &LightCall::set_green(optional<float> green) {
-  this->green_ = green;
-  return *this;
-}
-LightCall &LightCall::set_green(float green) {
-  this->green_ = green;
-  return *this;
-}
-LightCall &LightCall::set_blue(optional<float> blue) {
-  this->blue_ = blue;
-  return *this;
-}
-LightCall &LightCall::set_blue(float blue) {
-  this->blue_ = blue;
-  return *this;
-}
-LightCall &LightCall::set_white(optional<float> white) {
-  this->white_ = white;
-  return *this;
-}
-LightCall &LightCall::set_white(float white) {
-  this->white_ = white;
-  return *this;
-}
-LightCall &LightCall::set_color_temperature(optional<float> color_temperature) {
-  this->color_temperature_ = color_temperature;
-  return *this;
-}
-LightCall &LightCall::set_color_temperature(float color_temperature) {
-  this->color_temperature_ = color_temperature;
-  return *this;
-}
-LightCall &LightCall::set_cold_white(optional<float> cold_white) {
-  this->cold_white_ = cold_white;
-  return *this;
-}
-LightCall &LightCall::set_cold_white(float cold_white) {
-  this->cold_white_ = cold_white;
-  return *this;
-}
-LightCall &LightCall::set_warm_white(optional<float> warm_white) {
-  this->warm_white_ = warm_white;
-  return *this;
-}
-LightCall &LightCall::set_warm_white(float warm_white) {
-  this->warm_white_ = warm_white;
-  return *this;
-}
+IMPLEMENT_LIGHT_CALL_SETTER(state, bool, FLAG_HAS_STATE)
+IMPLEMENT_LIGHT_CALL_SETTER(transition_length, uint32_t, FLAG_HAS_TRANSITION)
+IMPLEMENT_LIGHT_CALL_SETTER(flash_length, uint32_t, FLAG_HAS_FLASH)
+IMPLEMENT_LIGHT_CALL_SETTER(brightness, float, FLAG_HAS_BRIGHTNESS)
+IMPLEMENT_LIGHT_CALL_SETTER(color_mode, ColorMode, FLAG_HAS_COLOR_MODE)
+IMPLEMENT_LIGHT_CALL_SETTER(color_brightness, float, FLAG_HAS_COLOR_BRIGHTNESS)
+IMPLEMENT_LIGHT_CALL_SETTER(red, float, FLAG_HAS_RED)
+IMPLEMENT_LIGHT_CALL_SETTER(green, float, FLAG_HAS_GREEN)
+IMPLEMENT_LIGHT_CALL_SETTER(blue, float, FLAG_HAS_BLUE)
+IMPLEMENT_LIGHT_CALL_SETTER(white, float, FLAG_HAS_WHITE)
+IMPLEMENT_LIGHT_CALL_SETTER(color_temperature, float, FLAG_HAS_COLOR_TEMPERATURE)
+IMPLEMENT_LIGHT_CALL_SETTER(cold_white, float, FLAG_HAS_COLD_WHITE)
+IMPLEMENT_LIGHT_CALL_SETTER(warm_white, float, FLAG_HAS_WARM_WHITE)
 LightCall &LightCall::set_effect(optional<std::string> effect) {
   if (effect.has_value())
     this->set_effect(*effect);
@@ -660,18 +593,22 @@ LightCall &LightCall::set_effect(optional<std::string> effect) {
 }
 LightCall &LightCall::set_effect(uint32_t effect_number) {
   this->effect_ = effect_number;
+  this->set_flag_(FLAG_HAS_EFFECT, true);
   return *this;
 }
 LightCall &LightCall::set_effect(optional<uint32_t> effect_number) {
-  this->effect_ = effect_number;
+  if (effect_number.has_value()) {
+    this->effect_ = effect_number.value();
+  }
+  this->set_flag_(FLAG_HAS_EFFECT, effect_number.has_value());
   return *this;
 }
 LightCall &LightCall::set_publish(bool publish) {
-  this->publish_ = publish;
+  this->set_flag_(FLAG_PUBLISH, publish);
   return *this;
 }
 LightCall &LightCall::set_save(bool save) {
-  this->save_ = save;
+  this->set_flag_(FLAG_SAVE, save);
   return *this;
 }
 LightCall &LightCall::set_rgb(float red, float green, float blue) {
diff --git a/esphome/components/light/light_call.h b/esphome/components/light/light_call.h
index bca2ac7b07..7e04e1a767 100644
--- a/esphome/components/light/light_call.h
+++ b/esphome/components/light/light_call.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "esphome/core/optional.h"
 #include "light_color_values.h"
 #include <set>
 
@@ -10,6 +9,11 @@ namespace light {
 class LightState;
 
 /** This class represents a requested change in a light state.
+ *
+ * Light state changes are tracked using a bitfield flags_ to minimize memory usage.
+ * Each possible light property has a flag indicating whether it has been set.
+ * This design keeps LightCall at ~56 bytes to minimize heap fragmentation on
+ * ESP8266 and other memory-constrained devices.
  */
 class LightCall {
  public:
@@ -131,6 +135,19 @@ class LightCall {
   /// Set whether this light call should trigger a save state to recover them at startup..
   LightCall &set_save(bool save);
 
+  // Getter methods to check if values are set
+  bool has_state() const { return (flags_ & FLAG_HAS_STATE) != 0; }
+  bool has_brightness() const { return (flags_ & FLAG_HAS_BRIGHTNESS) != 0; }
+  bool has_color_brightness() const { return (flags_ & FLAG_HAS_COLOR_BRIGHTNESS) != 0; }
+  bool has_red() const { return (flags_ & FLAG_HAS_RED) != 0; }
+  bool has_green() const { return (flags_ & FLAG_HAS_GREEN) != 0; }
+  bool has_blue() const { return (flags_ & FLAG_HAS_BLUE) != 0; }
+  bool has_white() const { return (flags_ & FLAG_HAS_WHITE) != 0; }
+  bool has_color_temperature() const { return (flags_ & FLAG_HAS_COLOR_TEMPERATURE) != 0; }
+  bool has_cold_white() const { return (flags_ & FLAG_HAS_COLD_WHITE) != 0; }
+  bool has_warm_white() const { return (flags_ & FLAG_HAS_WARM_WHITE) != 0; }
+  bool has_color_mode() const { return (flags_ & FLAG_HAS_COLOR_MODE) != 0; }
+
   /** Set the RGB color of the light by RGB values.
    *
    * Please note that this only changes the color of the light, not the brightness.
@@ -170,27 +187,62 @@ class LightCall {
   /// Some color modes also can be set using non-native parameters, transform those calls.
   void transform_parameters_();
 
-  bool has_transition_() { return this->transition_length_.has_value(); }
-  bool has_flash_() { return this->flash_length_.has_value(); }
-  bool has_effect_() { return this->effect_.has_value(); }
+  // Bitfield flags - each flag indicates whether a corresponding value has been set.
+  enum FieldFlags : uint16_t {
+    FLAG_HAS_STATE = 1 << 0,
+    FLAG_HAS_TRANSITION = 1 << 1,
+    FLAG_HAS_FLASH = 1 << 2,
+    FLAG_HAS_EFFECT = 1 << 3,
+    FLAG_HAS_BRIGHTNESS = 1 << 4,
+    FLAG_HAS_COLOR_BRIGHTNESS = 1 << 5,
+    FLAG_HAS_RED = 1 << 6,
+    FLAG_HAS_GREEN = 1 << 7,
+    FLAG_HAS_BLUE = 1 << 8,
+    FLAG_HAS_WHITE = 1 << 9,
+    FLAG_HAS_COLOR_TEMPERATURE = 1 << 10,
+    FLAG_HAS_COLD_WHITE = 1 << 11,
+    FLAG_HAS_WARM_WHITE = 1 << 12,
+    FLAG_HAS_COLOR_MODE = 1 << 13,
+    FLAG_PUBLISH = 1 << 14,
+    FLAG_SAVE = 1 << 15,
+  };
+
+  bool has_transition_() { return (this->flags_ & FLAG_HAS_TRANSITION) != 0; }
+  bool has_flash_() { return (this->flags_ & FLAG_HAS_FLASH) != 0; }
+  bool has_effect_() { return (this->flags_ & FLAG_HAS_EFFECT) != 0; }
+  bool get_publish_() { return (this->flags_ & FLAG_PUBLISH) != 0; }
+  bool get_save_() { return (this->flags_ & FLAG_SAVE) != 0; }
+
+  // Helper to set flag
+  void set_flag_(FieldFlags flag, bool value) {
+    if (value) {
+      this->flags_ |= flag;
+    } else {
+      this->flags_ &= ~flag;
+    }
+  }
 
   LightState *parent_;
-  optional<bool> state_;
-  optional<uint32_t> transition_length_;
-  optional<uint32_t> flash_length_;
-  optional<ColorMode> color_mode_;
-  optional<float> brightness_;
-  optional<float> color_brightness_;
-  optional<float> red_;
-  optional<float> green_;
-  optional<float> blue_;
-  optional<float> white_;
-  optional<float> color_temperature_;
-  optional<float> cold_white_;
-  optional<float> warm_white_;
-  optional<uint32_t> effect_;
-  bool publish_{true};
-  bool save_{true};
+
+  // Light state values - use flags_ to check if a value has been set.
+  // Group 4-byte aligned members first
+  uint32_t transition_length_;
+  uint32_t flash_length_;
+  uint32_t effect_;
+  float brightness_;
+  float color_brightness_;
+  float red_;
+  float green_;
+  float blue_;
+  float white_;
+  float color_temperature_;
+  float cold_white_;
+  float warm_white_;
+
+  // Smaller members at the end for better packing
+  uint16_t flags_{FLAG_PUBLISH | FLAG_SAVE};  // Tracks which values are set
+  ColorMode color_mode_;
+  bool state_;
 };
 
 }  // namespace light
diff --git a/esphome/components/light/light_color_values.h b/esphome/components/light/light_color_values.h
index d8eaa6ae24..5653a8d2a5 100644
--- a/esphome/components/light/light_color_values.h
+++ b/esphome/components/light/light_color_values.h
@@ -46,8 +46,7 @@ class LightColorValues {
  public:
   /// Construct the LightColorValues with all attributes enabled, but state set to off.
   LightColorValues()
-      : color_mode_(ColorMode::UNKNOWN),
-        state_(0.0f),
+      : state_(0.0f),
         brightness_(1.0f),
         color_brightness_(1.0f),
         red_(1.0f),
@@ -56,7 +55,8 @@ class LightColorValues {
         white_(1.0f),
         color_temperature_{0.0f},
         cold_white_{1.0f},
-        warm_white_{1.0f} {}
+        warm_white_{1.0f},
+        color_mode_(ColorMode::UNKNOWN) {}
 
   LightColorValues(ColorMode color_mode, float state, float brightness, float color_brightness, float red, float green,
                    float blue, float white, float color_temperature, float cold_white, float warm_white) {
@@ -292,7 +292,6 @@ class LightColorValues {
   void set_warm_white(float warm_white) { this->warm_white_ = clamp(warm_white, 0.0f, 1.0f); }
 
  protected:
-  ColorMode color_mode_;
   float state_;  ///< ON / OFF, float for transition
   float brightness_;
   float color_brightness_;
@@ -303,6 +302,7 @@ class LightColorValues {
   float color_temperature_;  ///< Color Temperature in Mired
   float cold_white_;
   float warm_white_;
+  ColorMode color_mode_;
 };
 
 }  // namespace light
diff --git a/esphome/components/light/light_state.h b/esphome/components/light/light_state.h
index f21fb8a06e..72cb99223e 100644
--- a/esphome/components/light/light_state.h
+++ b/esphome/components/light/light_state.h
@@ -31,9 +31,7 @@ enum LightRestoreMode : uint8_t {
 struct LightStateRTCState {
   LightStateRTCState(ColorMode color_mode, bool state, float brightness, float color_brightness, float red, float green,
                      float blue, float white, float color_temp, float cold_white, float warm_white)
-      : color_mode(color_mode),
-        state(state),
-        brightness(brightness),
+      : brightness(brightness),
         color_brightness(color_brightness),
         red(red),
         green(green),
@@ -41,10 +39,12 @@ struct LightStateRTCState {
         white(white),
         color_temp(color_temp),
         cold_white(cold_white),
-        warm_white(warm_white) {}
+        warm_white(warm_white),
+        effect(0),
+        color_mode(color_mode),
+        state(state) {}
   LightStateRTCState() = default;
-  ColorMode color_mode{ColorMode::UNKNOWN};
-  bool state{false};
+  // Group 4-byte aligned members first
   float brightness{1.0f};
   float color_brightness{1.0f};
   float red{1.0f};
@@ -55,6 +55,9 @@ struct LightStateRTCState {
   float cold_white{1.0f};
   float warm_white{1.0f};
   uint32_t effect{0};
+  // Group smaller members at the end
+  ColorMode color_mode{ColorMode::UNKNOWN};
+  bool state{false};
 };
 
 /** This class represents the communication layer between the front-end MQTT layer and the
@@ -216,6 +219,8 @@ class LightState : public EntityBase, public Component {
   std::unique_ptr<LightTransformer> transformer_{nullptr};
   /// List of effects for this light.
   std::vector<LightEffect *> effects_;
+  /// Object used to store the persisted values of the light.
+  ESPPreferenceObject rtc_;
   /// Value for storing the index of the currently active effect. 0 if no effect is active
   uint32_t active_effect_index_{};
   /// Default transition length for all transitions in ms.
@@ -224,15 +229,11 @@ class LightState : public EntityBase, public Component {
   uint32_t flash_transition_length_{};
   /// Gamma correction factor for the light.
   float gamma_correct_{};
-
   /// Whether the light value should be written in the next cycle.
   bool next_write_{true};
   // for effects, true if a transformer (transition) is active.
   bool is_transformer_active_ = false;
 
-  /// Object used to store the persisted values of the light.
-  ESPPreferenceObject rtc_;
-
   /** Callback to call when new values for the frontend are available.
    *
    * "Remote values" are light color values that are reported to the frontend and have a lower
diff --git a/esphome/components/light/transformers.h b/esphome/components/light/transformers.h
index a557bd39b1..8d49acff97 100644
--- a/esphome/components/light/transformers.h
+++ b/esphome/components/light/transformers.h
@@ -59,9 +59,9 @@ class LightTransitionTransformer : public LightTransformer {
   // transition from 0 to 1 on x = [0, 1]
   static float smoothed_progress(float x) { return x * x * x * (x * (x * 6.0f - 15.0f) + 10.0f); }
 
-  bool changing_color_mode_{false};
   LightColorValues end_values_{};
   LightColorValues intermediate_values_{};
+  bool changing_color_mode_{false};
 };
 
 class LightFlashTransformer : public LightTransformer {
@@ -117,8 +117,8 @@ class LightFlashTransformer : public LightTransformer {
 
  protected:
   LightState &state_;
-  uint32_t transition_length_;
   std::unique_ptr<LightTransformer> transformer_{nullptr};
+  uint32_t transition_length_;
   bool begun_lightstate_restore_;
 };
 
diff --git a/tests/integration/fixtures/light_calls.yaml b/tests/integration/fixtures/light_calls.yaml
new file mode 100644
index 0000000000..d692a11765
--- /dev/null
+++ b/tests/integration/fixtures/light_calls.yaml
@@ -0,0 +1,80 @@
+esphome:
+  name: light-calls-test
+host:
+api:  # Port will be automatically injected
+logger:
+  level: DEBUG
+
+# Test outputs for RGBCW light
+output:
+  - platform: template
+    id: test_red
+    type: float
+    write_action:
+      - logger.log:
+          format: "Red output: %.2f"
+          args: [state]
+  - platform: template
+    id: test_green
+    type: float
+    write_action:
+      - logger.log:
+          format: "Green output: %.2f"
+          args: [state]
+  - platform: template
+    id: test_blue
+    type: float
+    write_action:
+      - logger.log:
+          format: "Blue output: %.2f"
+          args: [state]
+  - platform: template
+    id: test_cold_white
+    type: float
+    write_action:
+      - logger.log:
+          format: "Cold white output: %.2f"
+          args: [state]
+  - platform: template
+    id: test_warm_white
+    type: float
+    write_action:
+      - logger.log:
+          format: "Warm white output: %.2f"
+          args: [state]
+
+light:
+  - platform: rgbww
+    name: "Test RGBCW Light"
+    id: test_light
+    red: test_red
+    green: test_green
+    blue: test_blue
+    cold_white: test_cold_white
+    warm_white: test_warm_white
+    cold_white_color_temperature: 6536 K
+    warm_white_color_temperature: 2000 K
+    constant_brightness: true
+    effects:
+      - random:
+          name: "Random Effect"
+          transition_length: 100ms
+          update_interval: 200ms
+      - strobe:
+          name: "Strobe Effect"
+      - pulse:
+          name: "Pulse Effect"
+          transition_length: 100ms
+
+  # Additional lights to test memory with multiple instances
+  - platform: rgb
+    name: "Test RGB Light"
+    id: test_rgb_light
+    red: test_red
+    green: test_green
+    blue: test_blue
+
+  - platform: binary
+    name: "Test Binary Light"
+    id: test_binary_light
+    output: test_red
diff --git a/tests/integration/test_light_calls.py b/tests/integration/test_light_calls.py
new file mode 100644
index 0000000000..8ecb77fb99
--- /dev/null
+++ b/tests/integration/test_light_calls.py
@@ -0,0 +1,189 @@
+"""Integration test for all light call combinations.
+
+Tests that LightCall handles all possible light operations correctly
+including RGB, color temperature, effects, transitions, and flash.
+"""
+
+import asyncio
+from typing import Any
+
+import pytest
+
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+
+@pytest.mark.asyncio
+async def test_light_calls(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+) -> None:
+    """Test all possible LightCall operations and combinations."""
+    async with run_compiled(yaml_config), api_client_connected() as client:
+        # Track state changes with futures
+        state_futures: dict[int, asyncio.Future[Any]] = {}
+        states: dict[int, Any] = {}
+
+        def on_state(state: Any) -> None:
+            states[state.key] = state
+            if state.key in state_futures and not state_futures[state.key].done():
+                state_futures[state.key].set_result(state)
+
+        client.subscribe_states(on_state)
+
+        # Get the light entities
+        entities = await client.list_entities_services()
+        lights = [e for e in entities[0] if e.object_id.startswith("test_")]
+        assert len(lights) >= 2  # Should have RGBCW and RGB lights
+
+        rgbcw_light = next(light for light in lights if "RGBCW" in light.name)
+        rgb_light = next(light for light in lights if "RGB Light" in light.name)
+
+        async def wait_for_state_change(key: int, timeout: float = 1.0) -> Any:
+            """Wait for a state change for the given entity key."""
+            loop = asyncio.get_event_loop()
+            state_futures[key] = loop.create_future()
+            try:
+                return await asyncio.wait_for(state_futures[key], timeout)
+            finally:
+                state_futures.pop(key, None)
+
+        # Test all individual parameters first
+
+        # Test 1: state only
+        client.light_command(key=rgbcw_light.key, state=True)
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.state is True
+
+        # Test 2: brightness only
+        client.light_command(key=rgbcw_light.key, brightness=0.5)
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.brightness == pytest.approx(0.5)
+
+        # Test 3: color_brightness only
+        client.light_command(key=rgbcw_light.key, color_brightness=0.8)
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.color_brightness == pytest.approx(0.8)
+
+        # Test 4-7: RGB values must be set together via rgb parameter
+        client.light_command(key=rgbcw_light.key, rgb=(0.7, 0.3, 0.9))
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.red == pytest.approx(0.7, abs=0.1)
+        assert state.green == pytest.approx(0.3, abs=0.1)
+        assert state.blue == pytest.approx(0.9, abs=0.1)
+
+        # Test 7: white value
+        client.light_command(key=rgbcw_light.key, white=0.6)
+        state = await wait_for_state_change(rgbcw_light.key)
+        # White might need more tolerance or might not be directly settable
+        if hasattr(state, "white"):
+            assert state.white == pytest.approx(0.6, abs=0.1)
+
+        # Test 8: color_temperature only
+        client.light_command(key=rgbcw_light.key, color_temperature=300)
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.color_temperature == pytest.approx(300)
+
+        # Test 9: cold_white only
+        client.light_command(key=rgbcw_light.key, cold_white=0.8)
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.cold_white == pytest.approx(0.8)
+
+        # Test 10: warm_white only
+        client.light_command(key=rgbcw_light.key, warm_white=0.2)
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.warm_white == pytest.approx(0.2)
+
+        # Test 11: transition_length with state change
+        client.light_command(key=rgbcw_light.key, state=False, transition_length=0.1)
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.state is False
+
+        # Test 12: flash_length
+        client.light_command(key=rgbcw_light.key, state=True, flash_length=0.2)
+        state = await wait_for_state_change(rgbcw_light.key)
+        # Flash starts
+        assert state.state is True
+        # Wait for flash to end
+        state = await wait_for_state_change(rgbcw_light.key)
+
+        # Test 13: effect only
+        # First ensure light is on
+        client.light_command(key=rgbcw_light.key, state=True)
+        state = await wait_for_state_change(rgbcw_light.key)
+        # Now set effect
+        client.light_command(key=rgbcw_light.key, effect="Random Effect")
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.effect == "Random Effect"
+
+        # Test 14: stop effect
+        client.light_command(key=rgbcw_light.key, effect="None")
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.effect == "None"
+
+        # Test 15: color_mode parameter
+        client.light_command(
+            key=rgbcw_light.key, state=True, color_mode=5
+        )  # COLD_WARM_WHITE
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.state is True
+
+        # Now test common combinations
+
+        # Test 16: RGB combination (set_rgb) - RGB values get normalized
+        client.light_command(key=rgbcw_light.key, rgb=(1.0, 0.0, 0.5))
+        state = await wait_for_state_change(rgbcw_light.key)
+        # RGB values get normalized - in this case red is already 1.0
+        assert state.red == pytest.approx(1.0, abs=0.1)
+        assert state.green == pytest.approx(0.0, abs=0.1)
+        assert state.blue == pytest.approx(0.5, abs=0.1)
+
+        # Test 17: Multiple RGB changes to test transitions
+        client.light_command(key=rgbcw_light.key, rgb=(0.2, 0.8, 0.4))
+        state = await wait_for_state_change(rgbcw_light.key)
+        # RGB values get normalized so green (highest) becomes 1.0
+        # Expected: (0.2/0.8, 0.8/0.8, 0.4/0.8) = (0.25, 1.0, 0.5)
+        assert state.red == pytest.approx(0.25, abs=0.01)
+        assert state.green == pytest.approx(1.0, abs=0.01)
+        assert state.blue == pytest.approx(0.5, abs=0.01)
+
+        # Test 18: State + brightness + transition
+        client.light_command(
+            key=rgbcw_light.key, state=True, brightness=0.7, transition_length=0.1
+        )
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.state is True
+        assert state.brightness == pytest.approx(0.7)
+
+        # Test 19: RGB + brightness + color_brightness
+        client.light_command(
+            key=rgb_light.key,
+            state=True,
+            brightness=0.8,
+            color_brightness=0.9,
+            rgb=(0.2, 0.4, 0.6),
+        )
+        state = await wait_for_state_change(rgb_light.key)
+        assert state.state is True
+        assert state.brightness == pytest.approx(0.8)
+
+        # Test 20: Color temp + cold/warm white
+        client.light_command(
+            key=rgbcw_light.key, color_temperature=250, cold_white=0.7, warm_white=0.3
+        )
+        state = await wait_for_state_change(rgbcw_light.key)
+        assert state.color_temperature == pytest.approx(250)
+
+        # Test 21: Turn RGB light off
+        client.light_command(key=rgb_light.key, state=False)
+        state = await wait_for_state_change(rgb_light.key)
+        assert state.state is False
+
+        # Final cleanup - turn all lights off
+        for light in lights:
+            client.light_command(
+                key=light.key,
+                state=False,
+            )
+            state = await wait_for_state_change(light.key)
+            assert state.state is False

From 053feb5e3b4a288bae55920f998b06af5094ac60 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 7 Jul 2025 15:22:40 -0500
Subject: [PATCH 2/8] Optimize entity icon memory usage with USE_ENTITY_ICON
 flag (#9337)

---
 esphome/core/defines.h                      |  1 +
 esphome/core/entity_base.cpp                | 12 ++-
 esphome/core/entity_base.h                  |  2 +
 esphome/core/entity_helpers.py              |  3 +
 tests/integration/fixtures/entity_icon.yaml | 78 +++++++++++++++++
 tests/integration/test_entity_icon.py       | 97 +++++++++++++++++++++
 6 files changed, 192 insertions(+), 1 deletion(-)
 create mode 100644 tests/integration/fixtures/entity_icon.yaml
 create mode 100644 tests/integration/test_entity_icon.py

diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 4115b97391..d73009436b 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -33,6 +33,7 @@
 #define USE_DEEP_SLEEP
 #define USE_DEVICES
 #define USE_DISPLAY
+#define USE_ENTITY_ICON
 #define USE_ESP32_IMPROV_STATE_CALLBACK
 #define USE_EVENT
 #define USE_FAN
diff --git a/esphome/core/entity_base.cpp b/esphome/core/entity_base.cpp
index 6afd02ff65..2ea9c77a3e 100644
--- a/esphome/core/entity_base.cpp
+++ b/esphome/core/entity_base.cpp
@@ -27,12 +27,22 @@ void EntityBase::set_name(const char *name) {
 
 // Entity Icon
 std::string EntityBase::get_icon() const {
+#ifdef USE_ENTITY_ICON
   if (this->icon_c_str_ == nullptr) {
     return "";
   }
   return this->icon_c_str_;
+#else
+  return "";
+#endif
+}
+void EntityBase::set_icon(const char *icon) {
+#ifdef USE_ENTITY_ICON
+  this->icon_c_str_ = icon;
+#else
+  // No-op when USE_ENTITY_ICON is not defined
+#endif
 }
-void EntityBase::set_icon(const char *icon) { this->icon_c_str_ = icon; }
 
 // Entity Object ID
 std::string EntityBase::get_object_id() const {
diff --git a/esphome/core/entity_base.h b/esphome/core/entity_base.h
index 4819b66108..00b1264ed0 100644
--- a/esphome/core/entity_base.h
+++ b/esphome/core/entity_base.h
@@ -80,7 +80,9 @@ class EntityBase {
 
   StringRef name_;
   const char *object_id_c_str_{nullptr};
+#ifdef USE_ENTITY_ICON
   const char *icon_c_str_{nullptr};
+#endif
   uint32_t object_id_hash_{};
 #ifdef USE_DEVICES
   Device *device_{};
diff --git a/esphome/core/entity_helpers.py b/esphome/core/entity_helpers.py
index 2442fbca4b..a3244856a2 100644
--- a/esphome/core/entity_helpers.py
+++ b/esphome/core/entity_helpers.py
@@ -1,6 +1,7 @@
 from collections.abc import Callable
 import logging
 
+import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_DEVICE_ID,
@@ -108,6 +109,8 @@ async def setup_entity(var: MockObj, config: ConfigType, platform: str) -> None:
     if CONF_INTERNAL in config:
         add(var.set_internal(config[CONF_INTERNAL]))
     if CONF_ICON in config:
+        # Add USE_ENTITY_ICON define when icons are used
+        cg.add_define("USE_ENTITY_ICON")
         add(var.set_icon(config[CONF_ICON]))
     if CONF_ENTITY_CATEGORY in config:
         add(var.set_entity_category(config[CONF_ENTITY_CATEGORY]))
diff --git a/tests/integration/fixtures/entity_icon.yaml b/tests/integration/fixtures/entity_icon.yaml
new file mode 100644
index 0000000000..2ce633fe2c
--- /dev/null
+++ b/tests/integration/fixtures/entity_icon.yaml
@@ -0,0 +1,78 @@
+esphome:
+  name: icon-test
+
+host:
+
+api:
+
+logger:
+
+# Test entities with custom icons
+sensor:
+  - platform: template
+    name: "Sensor With Icon"
+    icon: "mdi:temperature-celsius"
+    unit_of_measurement: "°C"
+    update_interval: 1s
+    lambda: |-
+      return 25.5;
+
+  - platform: template
+    name: "Sensor Without Icon"
+    unit_of_measurement: "%"
+    update_interval: 1s
+    lambda: |-
+      return 50.0;
+
+binary_sensor:
+  - platform: template
+    name: "Binary Sensor With Icon"
+    icon: "mdi:motion-sensor"
+    lambda: |-
+      return true;
+
+  - platform: template
+    name: "Binary Sensor Without Icon"
+    lambda: |-
+      return false;
+
+text_sensor:
+  - platform: template
+    name: "Text Sensor With Icon"
+    icon: "mdi:text-box"
+    lambda: |-
+      return {"Hello Icons"};
+
+switch:
+  - platform: template
+    name: "Switch With Icon"
+    icon: "mdi:toggle-switch"
+    optimistic: true
+
+button:
+  - platform: template
+    name: "Button With Icon"
+    icon: "mdi:gesture-tap-button"
+    on_press:
+      - logger.log: "Button with icon pressed"
+
+number:
+  - platform: template
+    name: "Number With Icon"
+    icon: "mdi:numeric"
+    initial_value: 42
+    min_value: 0
+    max_value: 100
+    step: 1
+    optimistic: true
+
+select:
+  - platform: template
+    name: "Select With Icon"
+    icon: "mdi:format-list-bulleted"
+    options:
+      - "Option A"
+      - "Option B"
+      - "Option C"
+    initial_option: "Option A"
+    optimistic: true
diff --git a/tests/integration/test_entity_icon.py b/tests/integration/test_entity_icon.py
new file mode 100644
index 0000000000..56e266b486
--- /dev/null
+++ b/tests/integration/test_entity_icon.py
@@ -0,0 +1,97 @@
+"""Integration test for entity icons with USE_ENTITY_ICON feature."""
+
+from __future__ import annotations
+
+import asyncio
+
+from aioesphomeapi import EntityState
+import pytest
+
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+
+@pytest.mark.asyncio
+async def test_entity_icon(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+) -> None:
+    """Test that entities with custom icons work correctly with USE_ENTITY_ICON."""
+    # Write, compile and run the ESPHome device, then connect to API
+    async with run_compiled(yaml_config), api_client_connected() as client:
+        # Get all entities
+        entities = await client.list_entities_services()
+
+        # Create a map of entity names to entity info
+        entity_map = {entity.name: entity for entity in entities[0]}
+
+        # Test entities with icons
+        icon_test_cases = [
+            # (entity_name, expected_icon)
+            ("Sensor With Icon", "mdi:temperature-celsius"),
+            ("Binary Sensor With Icon", "mdi:motion-sensor"),
+            ("Text Sensor With Icon", "mdi:text-box"),
+            ("Switch With Icon", "mdi:toggle-switch"),
+            ("Button With Icon", "mdi:gesture-tap-button"),
+            ("Number With Icon", "mdi:numeric"),
+            ("Select With Icon", "mdi:format-list-bulleted"),
+        ]
+
+        # Test entities without icons (should have empty string)
+        no_icon_test_cases = [
+            "Sensor Without Icon",
+            "Binary Sensor Without Icon",
+        ]
+
+        # Verify entities with icons
+        for entity_name, expected_icon in icon_test_cases:
+            assert entity_name in entity_map, (
+                f"Entity '{entity_name}' not found in API response"
+            )
+            entity = entity_map[entity_name]
+
+            # Check icon field
+            assert hasattr(entity, "icon"), (
+                f"{entity_name}: Entity should have icon attribute"
+            )
+            assert entity.icon == expected_icon, (
+                f"{entity_name}: icon mismatch - "
+                f"expected '{expected_icon}', got '{entity.icon}'"
+            )
+
+        # Verify entities without icons
+        for entity_name in no_icon_test_cases:
+            assert entity_name in entity_map, (
+                f"Entity '{entity_name}' not found in API response"
+            )
+            entity = entity_map[entity_name]
+
+            # Check icon field is empty
+            assert hasattr(entity, "icon"), (
+                f"{entity_name}: Entity should have icon attribute"
+            )
+            assert entity.icon == "", (
+                f"{entity_name}: icon should be empty string for entities without icons, "
+                f"got '{entity.icon}'"
+            )
+
+        # Subscribe to states to ensure everything works normally
+        states: dict[int, EntityState] = {}
+        state_received = asyncio.Event()
+
+        def on_state(state: EntityState) -> None:
+            states[state.key] = state
+            state_received.set()
+
+        client.subscribe_states(on_state)
+
+        # Wait for states
+        try:
+            await asyncio.wait_for(state_received.wait(), timeout=5.0)
+        except asyncio.TimeoutError:
+            pytest.fail("No states received within 5 seconds")
+
+        # Verify we received states
+        assert len(states) > 0, (
+            "No states received - entities may not be working correctly"
+        )

From e2de6ee29d7a7f29df04fd0f869f212cbf33a01d Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 7 Jul 2025 15:28:14 -0500
Subject: [PATCH 3/8] Reduce core RAM usage by 40 bytes with static
 initialization optimizations (#9340)

---
 esphome/core/component.cpp | 46 +++++++++++++++++++-------------------
 esphome/core/helpers.cpp   | 30 +++++++++++++++++++------
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index 9ef30081aa..9d863e56cd 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -26,17 +26,17 @@ static const char *const TAG = "component";
 // 1. Components are never destroyed in ESPHome
 // 2. Failed components remain failed (no recovery mechanism)
 // 3. Memory usage is minimal (only failures with custom messages are stored)
-static std::unique_ptr<std::vector<std::pair<const Component *, const char *>>> &get_component_error_messages() {
-  static std::unique_ptr<std::vector<std::pair<const Component *, const char *>>> instance;
-  return instance;
-}
 
+// Using namespace-scope static to avoid guard variables (saves 16 bytes total)
+// This is safe because ESPHome is single-threaded during initialization
+namespace {
+// Error messages for failed components
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+std::unique_ptr<std::vector<std::pair<const Component *, const char *>>> component_error_messages;
 // Setup priority overrides - freed after setup completes
-// Typically < 5 entries, lazy allocated
-static std::unique_ptr<std::vector<std::pair<const Component *, float>>> &get_setup_priority_overrides() {
-  static std::unique_ptr<std::vector<std::pair<const Component *, float>>> instance;
-  return instance;
-}
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+std::unique_ptr<std::vector<std::pair<const Component *, float>>> setup_priority_overrides;
+}  // namespace
 
 namespace setup_priority {
 
@@ -130,8 +130,8 @@ void Component::call_dump_config() {
   if (this->is_failed()) {
     // Look up error message from global vector
     const char *error_msg = "unspecified";
-    if (get_component_error_messages()) {
-      for (const auto &pair : *get_component_error_messages()) {
+    if (component_error_messages) {
+      for (const auto &pair : *component_error_messages) {
         if (pair.first == this) {
           error_msg = pair.second;
           break;
@@ -285,18 +285,18 @@ void Component::status_set_error(const char *message) {
   ESP_LOGE(TAG, "Component %s set Error flag: %s", this->get_component_source(), message);
   if (strcmp(message, "unspecified") != 0) {
     // Lazy allocate the error messages vector if needed
-    if (!get_component_error_messages()) {
-      get_component_error_messages() = std::make_unique<std::vector<std::pair<const Component *, const char *>>>();
+    if (!component_error_messages) {
+      component_error_messages = std::make_unique<std::vector<std::pair<const Component *, const char *>>>();
     }
     // Check if this component already has an error message
-    for (auto &pair : *get_component_error_messages()) {
+    for (auto &pair : *component_error_messages) {
       if (pair.first == this) {
         pair.second = message;
         return;
       }
     }
     // Add new error message
-    get_component_error_messages()->emplace_back(this, message);
+    component_error_messages->emplace_back(this, message);
   }
 }
 void Component::status_clear_warning() {
@@ -322,9 +322,9 @@ void Component::status_momentary_error(const std::string &name, uint32_t length)
 void Component::dump_config() {}
 float Component::get_actual_setup_priority() const {
   // Check if there's an override in the global vector
-  if (get_setup_priority_overrides()) {
+  if (setup_priority_overrides) {
     // Linear search is fine for small n (typically < 5 overrides)
-    for (const auto &pair : *get_setup_priority_overrides()) {
+    for (const auto &pair : *setup_priority_overrides) {
       if (pair.first == this) {
         return pair.second;
       }
@@ -334,14 +334,14 @@ float Component::get_actual_setup_priority() const {
 }
 void Component::set_setup_priority(float priority) {
   // Lazy allocate the vector if needed
-  if (!get_setup_priority_overrides()) {
-    get_setup_priority_overrides() = std::make_unique<std::vector<std::pair<const Component *, float>>>();
+  if (!setup_priority_overrides) {
+    setup_priority_overrides = std::make_unique<std::vector<std::pair<const Component *, float>>>();
     // Reserve some space to avoid reallocations (most configs have < 10 overrides)
-    get_setup_priority_overrides()->reserve(10);
+    setup_priority_overrides->reserve(10);
   }
 
   // Check if this component already has an override
-  for (auto &pair : *get_setup_priority_overrides()) {
+  for (auto &pair : *setup_priority_overrides) {
     if (pair.first == this) {
       pair.second = priority;
       return;
@@ -349,7 +349,7 @@ void Component::set_setup_priority(float priority) {
   }
 
   // Add new override
-  get_setup_priority_overrides()->emplace_back(this, priority);
+  setup_priority_overrides->emplace_back(this, priority);
 }
 
 bool Component::has_overridden_loop() const {
@@ -414,7 +414,7 @@ WarnIfComponentBlockingGuard::~WarnIfComponentBlockingGuard() {}
 
 void clear_setup_priority_overrides() {
   // Free the setup priority map completely
-  get_setup_priority_overrides().reset();
+  setup_priority_overrides.reset();
 }
 
 }  // namespace esphome
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 72722169d4..22b74e11fa 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -360,9 +360,22 @@ int8_t step_to_accuracy_decimals(float step) {
   return str.length() - dot_pos - 1;
 }
 
-static const std::string BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                        "abcdefghijklmnopqrstuvwxyz"
-                                        "0123456789+/";
+// Use C-style string constant to store in ROM instead of RAM (saves 24 bytes)
+static constexpr const char *BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                                            "abcdefghijklmnopqrstuvwxyz"
+                                            "0123456789+/";
+
+// Helper function to find the index of a base64 character in the lookup table.
+// Returns the character's position (0-63) if found, or 0 if not found.
+// NOTE: This returns 0 for both 'A' (valid base64 char at index 0) and invalid characters.
+// This is safe because is_base64() is ALWAYS checked before calling this function,
+// preventing invalid characters from ever reaching here. The base64_decode function
+// stops processing at the first invalid character due to the is_base64() check in its
+// while loop condition, making this edge case harmless in practice.
+static inline uint8_t base64_find_char(char c) {
+  const char *pos = strchr(BASE64_CHARS, c);
+  return pos ? (pos - BASE64_CHARS) : 0;
+}
 
 static inline bool is_base64(char c) { return (isalnum(c) || (c == '+') || (c == '/')); }
 
@@ -384,7 +397,7 @@ std::string base64_encode(const uint8_t *buf, size_t buf_len) {
       char_array_4[3] = char_array_3[2] & 0x3f;
 
       for (i = 0; (i < 4); i++)
-        ret += BASE64_CHARS[char_array_4[i]];
+        ret += BASE64_CHARS[static_cast<uint8_t>(char_array_4[i])];
       i = 0;
     }
   }
@@ -399,7 +412,7 @@ std::string base64_encode(const uint8_t *buf, size_t buf_len) {
     char_array_4[3] = char_array_3[2] & 0x3f;
 
     for (j = 0; (j < i + 1); j++)
-      ret += BASE64_CHARS[char_array_4[j]];
+      ret += BASE64_CHARS[static_cast<uint8_t>(char_array_4[j])];
 
     while ((i++ < 3))
       ret += '=';
@@ -426,12 +439,15 @@ std::vector<uint8_t> base64_decode(const std::string &encoded_string) {
   uint8_t char_array_4[4], char_array_3[3];
   std::vector<uint8_t> ret;
 
+  // SAFETY: The loop condition checks is_base64() before processing each character.
+  // This ensures base64_find_char() is only called on valid base64 characters,
+  // preventing the edge case where invalid chars would return 0 (same as 'A').
   while (in_len-- && (encoded_string[in] != '=') && is_base64(encoded_string[in])) {
     char_array_4[i++] = encoded_string[in];
     in++;
     if (i == 4) {
       for (i = 0; i < 4; i++)
-        char_array_4[i] = BASE64_CHARS.find(char_array_4[i]);
+        char_array_4[i] = base64_find_char(char_array_4[i]);
 
       char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
       char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
@@ -448,7 +464,7 @@ std::vector<uint8_t> base64_decode(const std::string &encoded_string) {
       char_array_4[j] = 0;
 
     for (j = 0; j < 4; j++)
-      char_array_4[j] = BASE64_CHARS.find(char_array_4[j]);
+      char_array_4[j] = base64_find_char(char_array_4[j]);
 
     char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
     char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);

From 29747fc7307f2ef7105255b6aeb9086de5d8f920 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 7 Jul 2025 15:35:11 -0500
Subject: [PATCH 4/8] Fix flaky test_api_conditional_memory by disabling API
 batch delay (#9360)

---
 tests/integration/fixtures/api_conditional_memory.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/integration/fixtures/api_conditional_memory.yaml b/tests/integration/fixtures/api_conditional_memory.yaml
index 4bbba5084b..49412c3bfe 100644
--- a/tests/integration/fixtures/api_conditional_memory.yaml
+++ b/tests/integration/fixtures/api_conditional_memory.yaml
@@ -2,6 +2,7 @@ esphome:
   name: api-conditional-memory-test
 host:
 api:
+  batch_delay: 0ms
   actions:
     - action: test_simple_service
       then:

From 832a7872719037e420b34046bab728d0b9515695 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 7 Jul 2025 15:35:27 -0500
Subject: [PATCH 5/8] Fix format specifier warnings in QuantileFilter logging
 (#9364)

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

diff --git a/esphome/components/sensor/filter.cpp b/esphome/components/sensor/filter.cpp
index ce23c1f800..dd8635f0c0 100644
--- a/esphome/components/sensor/filter.cpp
+++ b/esphome/components/sensor/filter.cpp
@@ -118,7 +118,7 @@ optional<float> QuantileFilter::new_value(float value) {
       size_t queue_size = quantile_queue.size();
       if (queue_size) {
         size_t position = ceilf(queue_size * this->quantile_) - 1;
-        ESP_LOGVV(TAG, "QuantileFilter(%p)::position: %d/%d", this, position + 1, queue_size);
+        ESP_LOGVV(TAG, "QuantileFilter(%p)::position: %zu/%zu", this, position + 1, queue_size);
         result = quantile_queue[position];
       }
     }

From 90fb3680d47333c7f8278439bb3867a330499c39 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 7 Jul 2025 15:36:36 -0500
Subject: [PATCH 6/8] Optimize logger performance by eliminating redundant
 strlen calls (#9369)

---
 esphome/components/logger/logger.h         | 2 +-
 esphome/components/logger/logger_esp32.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index 38faf73d84..e376d9fbf5 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -355,7 +355,7 @@ class Logger : public Component {
   }
 
   inline void HOT write_footer_to_buffer_(char *buffer, uint16_t *buffer_at, uint16_t buffer_size) {
-    static const uint16_t RESET_COLOR_LEN = strlen(ESPHOME_LOG_RESET_COLOR);
+    static constexpr uint16_t RESET_COLOR_LEN = sizeof(ESPHOME_LOG_RESET_COLOR) - 1;
     this->write_body_to_buffer_(ESPHOME_LOG_RESET_COLOR, RESET_COLOR_LEN, buffer, buffer_at, buffer_size);
   }
 
diff --git a/esphome/components/logger/logger_esp32.cpp b/esphome/components/logger/logger_esp32.cpp
index 41445fa3b4..2fde0f7d49 100644
--- a/esphome/components/logger/logger_esp32.cpp
+++ b/esphome/components/logger/logger_esp32.cpp
@@ -184,7 +184,9 @@ void HOT Logger::write_msg_(const char *msg) {
   ) {
     puts(msg);
   } else {
-    uart_write_bytes(this->uart_num_, msg, strlen(msg));
+    // Use tx_buffer_at_ if msg points to tx_buffer_, otherwise fall back to strlen
+    size_t len = (msg == this->tx_buffer_) ? this->tx_buffer_at_ : strlen(msg);
+    uart_write_bytes(this->uart_num_, msg, len);
     uart_write_bytes(this->uart_num_, "\n", 1);
   }
 }

From e58c793da2cdc5f5ca083606f1d1863b80cba11b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 7 Jul 2025 15:38:41 -0500
Subject: [PATCH 7/8] Replace deprecated sprintf with snprintf in API protobuf
 code generation (#9365)

---
 esphome/components/api/api_pb2_dump.cpp | 536 ++++++++++++------------
 script/api_protobuf/api_protobuf.py     |  24 +-
 2 files changed, 280 insertions(+), 280 deletions(-)

diff --git a/esphome/components/api/api_pb2_dump.cpp b/esphome/components/api/api_pb2_dump.cpp
index 84e765e40f..48ddd42d61 100644
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
@@ -600,12 +600,12 @@ void HelloRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  api_version_major: ");
-  sprintf(buffer, "%" PRIu32, this->api_version_major);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->api_version_major);
   out.append(buffer);
   out.append("\n");
 
   out.append("  api_version_minor: ");
-  sprintf(buffer, "%" PRIu32, this->api_version_minor);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->api_version_minor);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -614,12 +614,12 @@ void HelloResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("HelloResponse {\n");
   out.append("  api_version_major: ");
-  sprintf(buffer, "%" PRIu32, this->api_version_major);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->api_version_major);
   out.append(buffer);
   out.append("\n");
 
   out.append("  api_version_minor: ");
-  sprintf(buffer, "%" PRIu32, this->api_version_minor);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->api_version_minor);
   out.append(buffer);
   out.append("\n");
 
@@ -657,7 +657,7 @@ void AreaInfo::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("AreaInfo {\n");
   out.append("  area_id: ");
-  sprintf(buffer, "%" PRIu32, this->area_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->area_id);
   out.append(buffer);
   out.append("\n");
 
@@ -670,7 +670,7 @@ void DeviceInfo::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("DeviceInfo {\n");
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
 
@@ -679,7 +679,7 @@ void DeviceInfo::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  area_id: ");
-  sprintf(buffer, "%" PRIu32, this->area_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->area_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -724,17 +724,17 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  webserver_port: ");
-  sprintf(buffer, "%" PRIu32, this->webserver_port);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->webserver_port);
   out.append(buffer);
   out.append("\n");
 
   out.append("  legacy_bluetooth_proxy_version: ");
-  sprintf(buffer, "%" PRIu32, this->legacy_bluetooth_proxy_version);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->legacy_bluetooth_proxy_version);
   out.append(buffer);
   out.append("\n");
 
   out.append("  bluetooth_proxy_feature_flags: ");
-  sprintf(buffer, "%" PRIu32, this->bluetooth_proxy_feature_flags);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->bluetooth_proxy_feature_flags);
   out.append(buffer);
   out.append("\n");
 
@@ -747,12 +747,12 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  legacy_voice_assistant_version: ");
-  sprintf(buffer, "%" PRIu32, this->legacy_voice_assistant_version);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->legacy_voice_assistant_version);
   out.append(buffer);
   out.append("\n");
 
   out.append("  voice_assistant_feature_flags: ");
-  sprintf(buffer, "%" PRIu32, this->voice_assistant_feature_flags);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->voice_assistant_feature_flags);
   out.append(buffer);
   out.append("\n");
 
@@ -797,7 +797,7 @@ void ListEntitiesBinarySensorResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -830,7 +830,7 @@ void ListEntitiesBinarySensorResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -839,7 +839,7 @@ void BinarySensorStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BinarySensorStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -852,7 +852,7 @@ void BinarySensorStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -867,7 +867,7 @@ void ListEntitiesCoverResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -912,7 +912,7 @@ void ListEntitiesCoverResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -921,7 +921,7 @@ void CoverStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("CoverStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -930,12 +930,12 @@ void CoverStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  position: ");
-  sprintf(buffer, "%g", this->position);
+  snprintf(buffer, sizeof(buffer), "%g", this->position);
   out.append(buffer);
   out.append("\n");
 
   out.append("  tilt: ");
-  sprintf(buffer, "%g", this->tilt);
+  snprintf(buffer, sizeof(buffer), "%g", this->tilt);
   out.append(buffer);
   out.append("\n");
 
@@ -944,7 +944,7 @@ void CoverStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -953,7 +953,7 @@ void CoverCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("CoverCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -970,7 +970,7 @@ void CoverCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  position: ");
-  sprintf(buffer, "%g", this->position);
+  snprintf(buffer, sizeof(buffer), "%g", this->position);
   out.append(buffer);
   out.append("\n");
 
@@ -979,7 +979,7 @@ void CoverCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  tilt: ");
-  sprintf(buffer, "%g", this->tilt);
+  snprintf(buffer, sizeof(buffer), "%g", this->tilt);
   out.append(buffer);
   out.append("\n");
 
@@ -998,7 +998,7 @@ void ListEntitiesFanResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1023,7 +1023,7 @@ void ListEntitiesFanResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  supported_speed_count: ");
-  sprintf(buffer, "%" PRId32, this->supported_speed_count);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->supported_speed_count);
   out.append(buffer);
   out.append("\n");
 
@@ -1046,7 +1046,7 @@ void ListEntitiesFanResponse::dump_to(std::string &out) const {
   }
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1055,7 +1055,7 @@ void FanStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("FanStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1076,7 +1076,7 @@ void FanStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  speed_level: ");
-  sprintf(buffer, "%" PRId32, this->speed_level);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->speed_level);
   out.append(buffer);
   out.append("\n");
 
@@ -1085,7 +1085,7 @@ void FanStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1094,7 +1094,7 @@ void FanCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("FanCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1135,7 +1135,7 @@ void FanCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  speed_level: ");
-  sprintf(buffer, "%" PRId32, this->speed_level);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->speed_level);
   out.append(buffer);
   out.append("\n");
 
@@ -1158,7 +1158,7 @@ void ListEntitiesLightResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1193,12 +1193,12 @@ void ListEntitiesLightResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  min_mireds: ");
-  sprintf(buffer, "%g", this->min_mireds);
+  snprintf(buffer, sizeof(buffer), "%g", this->min_mireds);
   out.append(buffer);
   out.append("\n");
 
   out.append("  max_mireds: ");
-  sprintf(buffer, "%g", this->max_mireds);
+  snprintf(buffer, sizeof(buffer), "%g", this->max_mireds);
   out.append(buffer);
   out.append("\n");
 
@@ -1221,7 +1221,7 @@ void ListEntitiesLightResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1230,7 +1230,7 @@ void LightStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("LightStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1239,7 +1239,7 @@ void LightStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  brightness: ");
-  sprintf(buffer, "%g", this->brightness);
+  snprintf(buffer, sizeof(buffer), "%g", this->brightness);
   out.append(buffer);
   out.append("\n");
 
@@ -1248,42 +1248,42 @@ void LightStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  color_brightness: ");
-  sprintf(buffer, "%g", this->color_brightness);
+  snprintf(buffer, sizeof(buffer), "%g", this->color_brightness);
   out.append(buffer);
   out.append("\n");
 
   out.append("  red: ");
-  sprintf(buffer, "%g", this->red);
+  snprintf(buffer, sizeof(buffer), "%g", this->red);
   out.append(buffer);
   out.append("\n");
 
   out.append("  green: ");
-  sprintf(buffer, "%g", this->green);
+  snprintf(buffer, sizeof(buffer), "%g", this->green);
   out.append(buffer);
   out.append("\n");
 
   out.append("  blue: ");
-  sprintf(buffer, "%g", this->blue);
+  snprintf(buffer, sizeof(buffer), "%g", this->blue);
   out.append(buffer);
   out.append("\n");
 
   out.append("  white: ");
-  sprintf(buffer, "%g", this->white);
+  snprintf(buffer, sizeof(buffer), "%g", this->white);
   out.append(buffer);
   out.append("\n");
 
   out.append("  color_temperature: ");
-  sprintf(buffer, "%g", this->color_temperature);
+  snprintf(buffer, sizeof(buffer), "%g", this->color_temperature);
   out.append(buffer);
   out.append("\n");
 
   out.append("  cold_white: ");
-  sprintf(buffer, "%g", this->cold_white);
+  snprintf(buffer, sizeof(buffer), "%g", this->cold_white);
   out.append(buffer);
   out.append("\n");
 
   out.append("  warm_white: ");
-  sprintf(buffer, "%g", this->warm_white);
+  snprintf(buffer, sizeof(buffer), "%g", this->warm_white);
   out.append(buffer);
   out.append("\n");
 
@@ -1292,7 +1292,7 @@ void LightStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1301,7 +1301,7 @@ void LightCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("LightCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1318,7 +1318,7 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  brightness: ");
-  sprintf(buffer, "%g", this->brightness);
+  snprintf(buffer, sizeof(buffer), "%g", this->brightness);
   out.append(buffer);
   out.append("\n");
 
@@ -1335,7 +1335,7 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  color_brightness: ");
-  sprintf(buffer, "%g", this->color_brightness);
+  snprintf(buffer, sizeof(buffer), "%g", this->color_brightness);
   out.append(buffer);
   out.append("\n");
 
@@ -1344,17 +1344,17 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  red: ");
-  sprintf(buffer, "%g", this->red);
+  snprintf(buffer, sizeof(buffer), "%g", this->red);
   out.append(buffer);
   out.append("\n");
 
   out.append("  green: ");
-  sprintf(buffer, "%g", this->green);
+  snprintf(buffer, sizeof(buffer), "%g", this->green);
   out.append(buffer);
   out.append("\n");
 
   out.append("  blue: ");
-  sprintf(buffer, "%g", this->blue);
+  snprintf(buffer, sizeof(buffer), "%g", this->blue);
   out.append(buffer);
   out.append("\n");
 
@@ -1363,7 +1363,7 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  white: ");
-  sprintf(buffer, "%g", this->white);
+  snprintf(buffer, sizeof(buffer), "%g", this->white);
   out.append(buffer);
   out.append("\n");
 
@@ -1372,7 +1372,7 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  color_temperature: ");
-  sprintf(buffer, "%g", this->color_temperature);
+  snprintf(buffer, sizeof(buffer), "%g", this->color_temperature);
   out.append(buffer);
   out.append("\n");
 
@@ -1381,7 +1381,7 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  cold_white: ");
-  sprintf(buffer, "%g", this->cold_white);
+  snprintf(buffer, sizeof(buffer), "%g", this->cold_white);
   out.append(buffer);
   out.append("\n");
 
@@ -1390,7 +1390,7 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  warm_white: ");
-  sprintf(buffer, "%g", this->warm_white);
+  snprintf(buffer, sizeof(buffer), "%g", this->warm_white);
   out.append(buffer);
   out.append("\n");
 
@@ -1399,7 +1399,7 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  transition_length: ");
-  sprintf(buffer, "%" PRIu32, this->transition_length);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->transition_length);
   out.append(buffer);
   out.append("\n");
 
@@ -1408,7 +1408,7 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  flash_length: ");
-  sprintf(buffer, "%" PRIu32, this->flash_length);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->flash_length);
   out.append(buffer);
   out.append("\n");
 
@@ -1431,7 +1431,7 @@ void ListEntitiesSensorResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1452,7 +1452,7 @@ void ListEntitiesSensorResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  accuracy_decimals: ");
-  sprintf(buffer, "%" PRId32, this->accuracy_decimals);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->accuracy_decimals);
   out.append(buffer);
   out.append("\n");
 
@@ -1481,7 +1481,7 @@ void ListEntitiesSensorResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1490,12 +1490,12 @@ void SensorStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("SensorStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
   out.append("  state: ");
-  sprintf(buffer, "%g", this->state);
+  snprintf(buffer, sizeof(buffer), "%g", this->state);
   out.append(buffer);
   out.append("\n");
 
@@ -1504,7 +1504,7 @@ void SensorStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1519,7 +1519,7 @@ void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1552,7 +1552,7 @@ void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1561,7 +1561,7 @@ void SwitchStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("SwitchStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1570,7 +1570,7 @@ void SwitchStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1579,7 +1579,7 @@ void SwitchCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("SwitchCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1598,7 +1598,7 @@ void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1627,7 +1627,7 @@ void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1636,7 +1636,7 @@ void TextSensorStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("TextSensorStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1649,7 +1649,7 @@ void TextSensorStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1786,7 +1786,7 @@ void GetTimeResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("GetTimeResponse {\n");
   out.append("  epoch_seconds: ");
-  sprintf(buffer, "%" PRIu32, this->epoch_seconds);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->epoch_seconds);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1811,7 +1811,7 @@ void ListEntitiesServicesResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1830,12 +1830,12 @@ void ExecuteServiceArgument::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  legacy_int: ");
-  sprintf(buffer, "%" PRId32, this->legacy_int);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->legacy_int);
   out.append(buffer);
   out.append("\n");
 
   out.append("  float_: ");
-  sprintf(buffer, "%g", this->float_);
+  snprintf(buffer, sizeof(buffer), "%g", this->float_);
   out.append(buffer);
   out.append("\n");
 
@@ -1844,7 +1844,7 @@ void ExecuteServiceArgument::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  int_: ");
-  sprintf(buffer, "%" PRId32, this->int_);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->int_);
   out.append(buffer);
   out.append("\n");
 
@@ -1856,14 +1856,14 @@ void ExecuteServiceArgument::dump_to(std::string &out) const {
 
   for (const auto &it : this->int_array) {
     out.append("  int_array: ");
-    sprintf(buffer, "%" PRId32, it);
+    snprintf(buffer, sizeof(buffer), "%" PRId32, it);
     out.append(buffer);
     out.append("\n");
   }
 
   for (const auto &it : this->float_array) {
     out.append("  float_array: ");
-    sprintf(buffer, "%g", it);
+    snprintf(buffer, sizeof(buffer), "%g", it);
     out.append(buffer);
     out.append("\n");
   }
@@ -1879,7 +1879,7 @@ void ExecuteServiceRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("ExecuteServiceRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1899,7 +1899,7 @@ void ListEntitiesCameraResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1924,7 +1924,7 @@ void ListEntitiesCameraResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -1933,7 +1933,7 @@ void CameraImageResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("CameraImageResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1968,7 +1968,7 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -1995,17 +1995,17 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   }
 
   out.append("  visual_min_temperature: ");
-  sprintf(buffer, "%g", this->visual_min_temperature);
+  snprintf(buffer, sizeof(buffer), "%g", this->visual_min_temperature);
   out.append(buffer);
   out.append("\n");
 
   out.append("  visual_max_temperature: ");
-  sprintf(buffer, "%g", this->visual_max_temperature);
+  snprintf(buffer, sizeof(buffer), "%g", this->visual_max_temperature);
   out.append(buffer);
   out.append("\n");
 
   out.append("  visual_target_temperature_step: ");
-  sprintf(buffer, "%g", this->visual_target_temperature_step);
+  snprintf(buffer, sizeof(buffer), "%g", this->visual_target_temperature_step);
   out.append(buffer);
   out.append("\n");
 
@@ -2060,7 +2060,7 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  visual_current_temperature_step: ");
-  sprintf(buffer, "%g", this->visual_current_temperature_step);
+  snprintf(buffer, sizeof(buffer), "%g", this->visual_current_temperature_step);
   out.append(buffer);
   out.append("\n");
 
@@ -2073,17 +2073,17 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  visual_min_humidity: ");
-  sprintf(buffer, "%g", this->visual_min_humidity);
+  snprintf(buffer, sizeof(buffer), "%g", this->visual_min_humidity);
   out.append(buffer);
   out.append("\n");
 
   out.append("  visual_max_humidity: ");
-  sprintf(buffer, "%g", this->visual_max_humidity);
+  snprintf(buffer, sizeof(buffer), "%g", this->visual_max_humidity);
   out.append(buffer);
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2092,7 +2092,7 @@ void ClimateStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("ClimateStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2101,22 +2101,22 @@ void ClimateStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  current_temperature: ");
-  sprintf(buffer, "%g", this->current_temperature);
+  snprintf(buffer, sizeof(buffer), "%g", this->current_temperature);
   out.append(buffer);
   out.append("\n");
 
   out.append("  target_temperature: ");
-  sprintf(buffer, "%g", this->target_temperature);
+  snprintf(buffer, sizeof(buffer), "%g", this->target_temperature);
   out.append(buffer);
   out.append("\n");
 
   out.append("  target_temperature_low: ");
-  sprintf(buffer, "%g", this->target_temperature_low);
+  snprintf(buffer, sizeof(buffer), "%g", this->target_temperature_low);
   out.append(buffer);
   out.append("\n");
 
   out.append("  target_temperature_high: ");
-  sprintf(buffer, "%g", this->target_temperature_high);
+  snprintf(buffer, sizeof(buffer), "%g", this->target_temperature_high);
   out.append(buffer);
   out.append("\n");
 
@@ -2149,17 +2149,17 @@ void ClimateStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  current_humidity: ");
-  sprintf(buffer, "%g", this->current_humidity);
+  snprintf(buffer, sizeof(buffer), "%g", this->current_humidity);
   out.append(buffer);
   out.append("\n");
 
   out.append("  target_humidity: ");
-  sprintf(buffer, "%g", this->target_humidity);
+  snprintf(buffer, sizeof(buffer), "%g", this->target_humidity);
   out.append(buffer);
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2168,7 +2168,7 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("ClimateCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2185,7 +2185,7 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  target_temperature: ");
-  sprintf(buffer, "%g", this->target_temperature);
+  snprintf(buffer, sizeof(buffer), "%g", this->target_temperature);
   out.append(buffer);
   out.append("\n");
 
@@ -2194,7 +2194,7 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  target_temperature_low: ");
-  sprintf(buffer, "%g", this->target_temperature_low);
+  snprintf(buffer, sizeof(buffer), "%g", this->target_temperature_low);
   out.append(buffer);
   out.append("\n");
 
@@ -2203,7 +2203,7 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  target_temperature_high: ");
-  sprintf(buffer, "%g", this->target_temperature_high);
+  snprintf(buffer, sizeof(buffer), "%g", this->target_temperature_high);
   out.append(buffer);
   out.append("\n");
 
@@ -2260,7 +2260,7 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  target_humidity: ");
-  sprintf(buffer, "%g", this->target_humidity);
+  snprintf(buffer, sizeof(buffer), "%g", this->target_humidity);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2275,7 +2275,7 @@ void ListEntitiesNumberResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2292,17 +2292,17 @@ void ListEntitiesNumberResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  min_value: ");
-  sprintf(buffer, "%g", this->min_value);
+  snprintf(buffer, sizeof(buffer), "%g", this->min_value);
   out.append(buffer);
   out.append("\n");
 
   out.append("  max_value: ");
-  sprintf(buffer, "%g", this->max_value);
+  snprintf(buffer, sizeof(buffer), "%g", this->max_value);
   out.append(buffer);
   out.append("\n");
 
   out.append("  step: ");
-  sprintf(buffer, "%g", this->step);
+  snprintf(buffer, sizeof(buffer), "%g", this->step);
   out.append(buffer);
   out.append("\n");
 
@@ -2327,7 +2327,7 @@ void ListEntitiesNumberResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2336,12 +2336,12 @@ void NumberStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("NumberStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
   out.append("  state: ");
-  sprintf(buffer, "%g", this->state);
+  snprintf(buffer, sizeof(buffer), "%g", this->state);
   out.append(buffer);
   out.append("\n");
 
@@ -2350,7 +2350,7 @@ void NumberStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2359,12 +2359,12 @@ void NumberCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("NumberCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
   out.append("  state: ");
-  sprintf(buffer, "%g", this->state);
+  snprintf(buffer, sizeof(buffer), "%g", this->state);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2379,7 +2379,7 @@ void ListEntitiesSelectResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2410,7 +2410,7 @@ void ListEntitiesSelectResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2419,7 +2419,7 @@ void SelectStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("SelectStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2432,7 +2432,7 @@ void SelectStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2441,7 +2441,7 @@ void SelectCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("SelectCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2460,7 +2460,7 @@ void ListEntitiesSirenResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2499,7 +2499,7 @@ void ListEntitiesSirenResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2508,7 +2508,7 @@ void SirenStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("SirenStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2517,7 +2517,7 @@ void SirenStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2526,7 +2526,7 @@ void SirenCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("SirenCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2551,7 +2551,7 @@ void SirenCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  duration: ");
-  sprintf(buffer, "%" PRIu32, this->duration);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->duration);
   out.append(buffer);
   out.append("\n");
 
@@ -2560,7 +2560,7 @@ void SirenCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  volume: ");
-  sprintf(buffer, "%g", this->volume);
+  snprintf(buffer, sizeof(buffer), "%g", this->volume);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2575,7 +2575,7 @@ void ListEntitiesLockResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2616,7 +2616,7 @@ void ListEntitiesLockResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2625,7 +2625,7 @@ void LockStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("LockStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2634,7 +2634,7 @@ void LockStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2643,7 +2643,7 @@ void LockCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("LockCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2670,7 +2670,7 @@ void ListEntitiesButtonResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2699,7 +2699,7 @@ void ListEntitiesButtonResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2708,7 +2708,7 @@ void ButtonCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("ButtonCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2723,12 +2723,12 @@ void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  sample_rate: ");
-  sprintf(buffer, "%" PRIu32, this->sample_rate);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->sample_rate);
   out.append(buffer);
   out.append("\n");
 
   out.append("  num_channels: ");
-  sprintf(buffer, "%" PRIu32, this->num_channels);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->num_channels);
   out.append(buffer);
   out.append("\n");
 
@@ -2737,7 +2737,7 @@ void MediaPlayerSupportedFormat::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  sample_bytes: ");
-  sprintf(buffer, "%" PRIu32, this->sample_bytes);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->sample_bytes);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2750,7 +2750,7 @@ void ListEntitiesMediaPlayerResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2785,7 +2785,7 @@ void ListEntitiesMediaPlayerResponse::dump_to(std::string &out) const {
   }
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2794,7 +2794,7 @@ void MediaPlayerStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("MediaPlayerStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2803,7 +2803,7 @@ void MediaPlayerStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  volume: ");
-  sprintf(buffer, "%g", this->volume);
+  snprintf(buffer, sizeof(buffer), "%g", this->volume);
   out.append(buffer);
   out.append("\n");
 
@@ -2812,7 +2812,7 @@ void MediaPlayerStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2821,7 +2821,7 @@ void MediaPlayerCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("MediaPlayerCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -2838,7 +2838,7 @@ void MediaPlayerCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  volume: ");
-  sprintf(buffer, "%g", this->volume);
+  snprintf(buffer, sizeof(buffer), "%g", this->volume);
   out.append(buffer);
   out.append("\n");
 
@@ -2865,7 +2865,7 @@ void SubscribeBluetoothLEAdvertisementsRequest::dump_to(std::string &out) const
   __attribute__((unused)) char buffer[64];
   out.append("SubscribeBluetoothLEAdvertisementsRequest {\n");
   out.append("  flags: ");
-  sprintf(buffer, "%" PRIu32, this->flags);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->flags);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2879,7 +2879,7 @@ void BluetoothServiceData::dump_to(std::string &out) const {
 
   for (const auto &it : this->legacy_data) {
     out.append("  legacy_data: ");
-    sprintf(buffer, "%" PRIu32, it);
+    snprintf(buffer, sizeof(buffer), "%" PRIu32, it);
     out.append(buffer);
     out.append("\n");
   }
@@ -2893,7 +2893,7 @@ void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothLEAdvertisementResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
@@ -2902,7 +2902,7 @@ void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  rssi: ");
-  sprintf(buffer, "%" PRId32, this->rssi);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->rssi);
   out.append(buffer);
   out.append("\n");
 
@@ -2925,7 +2925,7 @@ void BluetoothLEAdvertisementResponse::dump_to(std::string &out) const {
   }
 
   out.append("  address_type: ");
-  sprintf(buffer, "%" PRIu32, this->address_type);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->address_type);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2934,17 +2934,17 @@ void BluetoothLERawAdvertisement::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothLERawAdvertisement {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  rssi: ");
-  sprintf(buffer, "%" PRId32, this->rssi);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->rssi);
   out.append(buffer);
   out.append("\n");
 
   out.append("  address_type: ");
-  sprintf(buffer, "%" PRIu32, this->address_type);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->address_type);
   out.append(buffer);
   out.append("\n");
 
@@ -2967,7 +2967,7 @@ void BluetoothDeviceRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothDeviceRequest {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
@@ -2980,7 +2980,7 @@ void BluetoothDeviceRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  address_type: ");
-  sprintf(buffer, "%" PRIu32, this->address_type);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->address_type);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -2989,7 +2989,7 @@ void BluetoothDeviceConnectionResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothDeviceConnectionResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
@@ -2998,12 +2998,12 @@ void BluetoothDeviceConnectionResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  mtu: ");
-  sprintf(buffer, "%" PRIu32, this->mtu);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->mtu);
   out.append(buffer);
   out.append("\n");
 
   out.append("  error: ");
-  sprintf(buffer, "%" PRId32, this->error);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->error);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3012,7 +3012,7 @@ void BluetoothGATTGetServicesRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTGetServicesRequest {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3022,13 +3022,13 @@ void BluetoothGATTDescriptor::dump_to(std::string &out) const {
   out.append("BluetoothGATTDescriptor {\n");
   for (const auto &it : this->uuid) {
     out.append("  uuid: ");
-    sprintf(buffer, "%llu", it);
+    snprintf(buffer, sizeof(buffer), "%llu", it);
     out.append(buffer);
     out.append("\n");
   }
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3038,18 +3038,18 @@ void BluetoothGATTCharacteristic::dump_to(std::string &out) const {
   out.append("BluetoothGATTCharacteristic {\n");
   for (const auto &it : this->uuid) {
     out.append("  uuid: ");
-    sprintf(buffer, "%llu", it);
+    snprintf(buffer, sizeof(buffer), "%llu", it);
     out.append(buffer);
     out.append("\n");
   }
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
 
   out.append("  properties: ");
-  sprintf(buffer, "%" PRIu32, this->properties);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->properties);
   out.append(buffer);
   out.append("\n");
 
@@ -3065,13 +3065,13 @@ void BluetoothGATTService::dump_to(std::string &out) const {
   out.append("BluetoothGATTService {\n");
   for (const auto &it : this->uuid) {
     out.append("  uuid: ");
-    sprintf(buffer, "%llu", it);
+    snprintf(buffer, sizeof(buffer), "%llu", it);
     out.append(buffer);
     out.append("\n");
   }
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
 
@@ -3086,7 +3086,7 @@ void BluetoothGATTGetServicesResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTGetServicesResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
@@ -3101,7 +3101,7 @@ void BluetoothGATTGetServicesDoneResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTGetServicesDoneResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3110,12 +3110,12 @@ void BluetoothGATTReadRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTReadRequest {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3124,12 +3124,12 @@ void BluetoothGATTReadResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTReadResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
 
@@ -3142,12 +3142,12 @@ void BluetoothGATTWriteRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTWriteRequest {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
 
@@ -3164,12 +3164,12 @@ void BluetoothGATTReadDescriptorRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTReadDescriptorRequest {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3178,12 +3178,12 @@ void BluetoothGATTWriteDescriptorRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTWriteDescriptorRequest {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
 
@@ -3196,12 +3196,12 @@ void BluetoothGATTNotifyRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTNotifyRequest {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
 
@@ -3214,12 +3214,12 @@ void BluetoothGATTNotifyDataResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTNotifyDataResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
 
@@ -3235,18 +3235,18 @@ void BluetoothConnectionsFreeResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothConnectionsFreeResponse {\n");
   out.append("  free: ");
-  sprintf(buffer, "%" PRIu32, this->free);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->free);
   out.append(buffer);
   out.append("\n");
 
   out.append("  limit: ");
-  sprintf(buffer, "%" PRIu32, this->limit);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->limit);
   out.append(buffer);
   out.append("\n");
 
   for (const auto &it : this->allocated) {
     out.append("  allocated: ");
-    sprintf(buffer, "%llu", it);
+    snprintf(buffer, sizeof(buffer), "%llu", it);
     out.append(buffer);
     out.append("\n");
   }
@@ -3256,17 +3256,17 @@ void BluetoothGATTErrorResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTErrorResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
 
   out.append("  error: ");
-  sprintf(buffer, "%" PRId32, this->error);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->error);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3275,12 +3275,12 @@ void BluetoothGATTWriteResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTWriteResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3289,12 +3289,12 @@ void BluetoothGATTNotifyResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothGATTNotifyResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
   out.append("  handle: ");
-  sprintf(buffer, "%" PRIu32, this->handle);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->handle);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3303,7 +3303,7 @@ void BluetoothDevicePairingResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothDevicePairingResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
@@ -3312,7 +3312,7 @@ void BluetoothDevicePairingResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  error: ");
-  sprintf(buffer, "%" PRId32, this->error);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->error);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3321,7 +3321,7 @@ void BluetoothDeviceUnpairingResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothDeviceUnpairingResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
@@ -3330,7 +3330,7 @@ void BluetoothDeviceUnpairingResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  error: ");
-  sprintf(buffer, "%" PRId32, this->error);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->error);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3342,7 +3342,7 @@ void BluetoothDeviceClearCacheResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("BluetoothDeviceClearCacheResponse {\n");
   out.append("  address: ");
-  sprintf(buffer, "%llu", this->address);
+  snprintf(buffer, sizeof(buffer), "%llu", this->address);
   out.append(buffer);
   out.append("\n");
 
@@ -3351,7 +3351,7 @@ void BluetoothDeviceClearCacheResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  error: ");
-  sprintf(buffer, "%" PRId32, this->error);
+  snprintf(buffer, sizeof(buffer), "%" PRId32, this->error);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3386,7 +3386,7 @@ void SubscribeVoiceAssistantRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  flags: ");
-  sprintf(buffer, "%" PRIu32, this->flags);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->flags);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3395,17 +3395,17 @@ void VoiceAssistantAudioSettings::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("VoiceAssistantAudioSettings {\n");
   out.append("  noise_suppression_level: ");
-  sprintf(buffer, "%" PRIu32, this->noise_suppression_level);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->noise_suppression_level);
   out.append(buffer);
   out.append("\n");
 
   out.append("  auto_gain: ");
-  sprintf(buffer, "%" PRIu32, this->auto_gain);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->auto_gain);
   out.append(buffer);
   out.append("\n");
 
   out.append("  volume_multiplier: ");
-  sprintf(buffer, "%g", this->volume_multiplier);
+  snprintf(buffer, sizeof(buffer), "%g", this->volume_multiplier);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3422,7 +3422,7 @@ void VoiceAssistantRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  flags: ");
-  sprintf(buffer, "%" PRIu32, this->flags);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->flags);
   out.append(buffer);
   out.append("\n");
 
@@ -3439,7 +3439,7 @@ void VoiceAssistantResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("VoiceAssistantResponse {\n");
   out.append("  port: ");
-  sprintf(buffer, "%" PRIu32, this->port);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->port);
   out.append(buffer);
   out.append("\n");
 
@@ -3502,12 +3502,12 @@ void VoiceAssistantTimerEventResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  total_seconds: ");
-  sprintf(buffer, "%" PRIu32, this->total_seconds);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->total_seconds);
   out.append(buffer);
   out.append("\n");
 
   out.append("  seconds_left: ");
-  sprintf(buffer, "%" PRIu32, this->seconds_left);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->seconds_left);
   out.append(buffer);
   out.append("\n");
 
@@ -3581,7 +3581,7 @@ void VoiceAssistantConfigurationResponse::dump_to(std::string &out) const {
   }
 
   out.append("  max_active_wake_words: ");
-  sprintf(buffer, "%" PRIu32, this->max_active_wake_words);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->max_active_wake_words);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3606,7 +3606,7 @@ void ListEntitiesAlarmControlPanelResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -3631,7 +3631,7 @@ void ListEntitiesAlarmControlPanelResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  supported_features: ");
-  sprintf(buffer, "%" PRIu32, this->supported_features);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->supported_features);
   out.append(buffer);
   out.append("\n");
 
@@ -3644,7 +3644,7 @@ void ListEntitiesAlarmControlPanelResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3653,7 +3653,7 @@ void AlarmControlPanelStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("AlarmControlPanelStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -3662,7 +3662,7 @@ void AlarmControlPanelStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3671,7 +3671,7 @@ void AlarmControlPanelCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("AlarmControlPanelCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -3694,7 +3694,7 @@ void ListEntitiesTextResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -3719,12 +3719,12 @@ void ListEntitiesTextResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  min_length: ");
-  sprintf(buffer, "%" PRIu32, this->min_length);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->min_length);
   out.append(buffer);
   out.append("\n");
 
   out.append("  max_length: ");
-  sprintf(buffer, "%" PRIu32, this->max_length);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->max_length);
   out.append(buffer);
   out.append("\n");
 
@@ -3737,7 +3737,7 @@ void ListEntitiesTextResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3746,7 +3746,7 @@ void TextStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("TextStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -3759,7 +3759,7 @@ void TextStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3768,7 +3768,7 @@ void TextCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("TextCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -3787,7 +3787,7 @@ void ListEntitiesDateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -3812,7 +3812,7 @@ void ListEntitiesDateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3821,7 +3821,7 @@ void DateStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("DateStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -3830,22 +3830,22 @@ void DateStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  year: ");
-  sprintf(buffer, "%" PRIu32, this->year);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->year);
   out.append(buffer);
   out.append("\n");
 
   out.append("  month: ");
-  sprintf(buffer, "%" PRIu32, this->month);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->month);
   out.append(buffer);
   out.append("\n");
 
   out.append("  day: ");
-  sprintf(buffer, "%" PRIu32, this->day);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->day);
   out.append(buffer);
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3854,22 +3854,22 @@ void DateCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("DateCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
   out.append("  year: ");
-  sprintf(buffer, "%" PRIu32, this->year);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->year);
   out.append(buffer);
   out.append("\n");
 
   out.append("  month: ");
-  sprintf(buffer, "%" PRIu32, this->month);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->month);
   out.append(buffer);
   out.append("\n");
 
   out.append("  day: ");
-  sprintf(buffer, "%" PRIu32, this->day);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->day);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3884,7 +3884,7 @@ void ListEntitiesTimeResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -3909,7 +3909,7 @@ void ListEntitiesTimeResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3918,7 +3918,7 @@ void TimeStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("TimeStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -3927,22 +3927,22 @@ void TimeStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  hour: ");
-  sprintf(buffer, "%" PRIu32, this->hour);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->hour);
   out.append(buffer);
   out.append("\n");
 
   out.append("  minute: ");
-  sprintf(buffer, "%" PRIu32, this->minute);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->minute);
   out.append(buffer);
   out.append("\n");
 
   out.append("  second: ");
-  sprintf(buffer, "%" PRIu32, this->second);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->second);
   out.append(buffer);
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3951,22 +3951,22 @@ void TimeCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("TimeCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
   out.append("  hour: ");
-  sprintf(buffer, "%" PRIu32, this->hour);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->hour);
   out.append(buffer);
   out.append("\n");
 
   out.append("  minute: ");
-  sprintf(buffer, "%" PRIu32, this->minute);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->minute);
   out.append(buffer);
   out.append("\n");
 
   out.append("  second: ");
-  sprintf(buffer, "%" PRIu32, this->second);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->second);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -3981,7 +3981,7 @@ void ListEntitiesEventResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -4016,7 +4016,7 @@ void ListEntitiesEventResponse::dump_to(std::string &out) const {
   }
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -4025,7 +4025,7 @@ void EventResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("EventResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -4034,7 +4034,7 @@ void EventResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -4049,7 +4049,7 @@ void ListEntitiesValveResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -4090,7 +4090,7 @@ void ListEntitiesValveResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -4099,12 +4099,12 @@ void ValveStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("ValveStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
   out.append("  position: ");
-  sprintf(buffer, "%g", this->position);
+  snprintf(buffer, sizeof(buffer), "%g", this->position);
   out.append(buffer);
   out.append("\n");
 
@@ -4113,7 +4113,7 @@ void ValveStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -4122,7 +4122,7 @@ void ValveCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("ValveCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -4131,7 +4131,7 @@ void ValveCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  position: ");
-  sprintf(buffer, "%g", this->position);
+  snprintf(buffer, sizeof(buffer), "%g", this->position);
   out.append(buffer);
   out.append("\n");
 
@@ -4150,7 +4150,7 @@ void ListEntitiesDateTimeResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -4175,7 +4175,7 @@ void ListEntitiesDateTimeResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -4184,7 +4184,7 @@ void DateTimeStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("DateTimeStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -4193,12 +4193,12 @@ void DateTimeStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  epoch_seconds: ");
-  sprintf(buffer, "%" PRIu32, this->epoch_seconds);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->epoch_seconds);
   out.append(buffer);
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -4207,12 +4207,12 @@ void DateTimeCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("DateTimeCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
   out.append("  epoch_seconds: ");
-  sprintf(buffer, "%" PRIu32, this->epoch_seconds);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->epoch_seconds);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -4227,7 +4227,7 @@ void ListEntitiesUpdateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -4256,7 +4256,7 @@ void ListEntitiesUpdateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -4265,7 +4265,7 @@ void UpdateStateResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("UpdateStateResponse {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
@@ -4282,7 +4282,7 @@ void UpdateStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  progress: ");
-  sprintf(buffer, "%g", this->progress);
+  snprintf(buffer, sizeof(buffer), "%g", this->progress);
   out.append(buffer);
   out.append("\n");
 
@@ -4307,7 +4307,7 @@ void UpdateStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  device_id: ");
-  sprintf(buffer, "%" PRIu32, this->device_id);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
   out.append(buffer);
   out.append("\n");
   out.append("}");
@@ -4316,7 +4316,7 @@ void UpdateCommandRequest::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("UpdateCommandRequest {\n");
   out.append("  key: ");
-  sprintf(buffer, "%" PRIu32, this->key);
+  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
 
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 2266dda81c..df1f3f8caa 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -290,7 +290,7 @@ class DoubleType(TypeInfo):
     wire_type = WireType.FIXED64  # Uses wire type 1 according to protobuf spec
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%g", {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%g", {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -312,7 +312,7 @@ class FloatType(TypeInfo):
     wire_type = WireType.FIXED32  # Uses wire type 5
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%g", {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%g", {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -334,7 +334,7 @@ class Int64Type(TypeInfo):
     wire_type = WireType.VARINT  # Uses wire type 0
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%lld", {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%lld", {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -356,7 +356,7 @@ class UInt64Type(TypeInfo):
     wire_type = WireType.VARINT  # Uses wire type 0
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%llu", {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%llu", {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -378,7 +378,7 @@ class Int32Type(TypeInfo):
     wire_type = WireType.VARINT  # Uses wire type 0
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%" PRId32, {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%" PRId32, {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -400,7 +400,7 @@ class Fixed64Type(TypeInfo):
     wire_type = WireType.FIXED64  # Uses wire type 1
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%llu", {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%llu", {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -422,7 +422,7 @@ class Fixed32Type(TypeInfo):
     wire_type = WireType.FIXED32  # Uses wire type 5
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%" PRIu32, {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%" PRIu32, {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -555,7 +555,7 @@ class UInt32Type(TypeInfo):
     wire_type = WireType.VARINT  # Uses wire type 0
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%" PRIu32, {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%" PRIu32, {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -607,7 +607,7 @@ class SFixed32Type(TypeInfo):
     wire_type = WireType.FIXED32  # Uses wire type 5
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%" PRId32, {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%" PRId32, {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -629,7 +629,7 @@ class SFixed64Type(TypeInfo):
     wire_type = WireType.FIXED64  # Uses wire type 1
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%lld", {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%lld", {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -651,7 +651,7 @@ class SInt32Type(TypeInfo):
     wire_type = WireType.VARINT  # Uses wire type 0
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%" PRId32, {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%" PRId32, {name});\n'
         o += "out.append(buffer);"
         return o
 
@@ -673,7 +673,7 @@ class SInt64Type(TypeInfo):
     wire_type = WireType.VARINT  # Uses wire type 0
 
     def dump(self, name: str) -> str:
-        o = f'sprintf(buffer, "%lld", {name});\n'
+        o = f'snprintf(buffer, sizeof(buffer), "%lld", {name});\n'
         o += "out.append(buffer);"
         return o
 

From 3976fd02eaea2faaa56954b15772c5ed33a007b8 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 7 Jul 2025 15:39:13 -0500
Subject: [PATCH 8/8] Refactor duplicate socket read error handling in API
 frame helper (#9370)

---
 esphome/components/api/api_frame_helper.cpp | 72 ++++++++-------------
 esphome/components/api/api_frame_helper.h   |  3 +
 2 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/esphome/components/api/api_frame_helper.cpp b/esphome/components/api/api_frame_helper.cpp
index 6ed9c95354..2f5acc3bfa 100644
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -225,6 +225,22 @@ APIError APIFrameHelper::init_common_() {
 }
 
 #define HELPER_LOG(msg, ...) ESP_LOGVV(TAG, "%s: " msg, this->info_.c_str(), ##__VA_ARGS__)
+
+APIError APIFrameHelper::handle_socket_read_result_(ssize_t received) {
+  if (received == -1) {
+    if (errno == EWOULDBLOCK || errno == EAGAIN) {
+      return APIError::WOULD_BLOCK;
+    }
+    state_ = State::FAILED;
+    HELPER_LOG("Socket read failed with errno %d", errno);
+    return APIError::SOCKET_READ_FAILED;
+  } else if (received == 0) {
+    state_ = State::FAILED;
+    HELPER_LOG("Connection closed");
+    return APIError::CONNECTION_CLOSED;
+  }
+  return APIError::OK;
+}
 // uncomment to log raw packets
 //#define HELPER_LOG_PACKETS
 
@@ -327,17 +343,9 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
     // no header information yet
     uint8_t to_read = 3 - rx_header_buf_len_;
     ssize_t received = this->socket_->read(&rx_header_buf_[rx_header_buf_len_], to_read);
-    if (received == -1) {
-      if (errno == EWOULDBLOCK || errno == EAGAIN) {
-        return APIError::WOULD_BLOCK;
-      }
-      state_ = State::FAILED;
-      HELPER_LOG("Socket read failed with errno %d", errno);
-      return APIError::SOCKET_READ_FAILED;
-    } else if (received == 0) {
-      state_ = State::FAILED;
-      HELPER_LOG("Connection closed");
-      return APIError::CONNECTION_CLOSED;
+    APIError err = handle_socket_read_result_(received);
+    if (err != APIError::OK) {
+      return err;
     }
     rx_header_buf_len_ += static_cast<uint8_t>(received);
     if (static_cast<uint8_t>(received) != to_read) {
@@ -372,17 +380,9 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
     // more data to read
     uint16_t to_read = msg_size - rx_buf_len_;
     ssize_t received = this->socket_->read(&rx_buf_[rx_buf_len_], to_read);
-    if (received == -1) {
-      if (errno == EWOULDBLOCK || errno == EAGAIN) {
-        return APIError::WOULD_BLOCK;
-      }
-      state_ = State::FAILED;
-      HELPER_LOG("Socket read failed with errno %d", errno);
-      return APIError::SOCKET_READ_FAILED;
-    } else if (received == 0) {
-      state_ = State::FAILED;
-      HELPER_LOG("Connection closed");
-      return APIError::CONNECTION_CLOSED;
+    APIError err = handle_socket_read_result_(received);
+    if (err != APIError::OK) {
+      return err;
     }
     rx_buf_len_ += static_cast<uint16_t>(received);
     if (static_cast<uint16_t>(received) != to_read) {
@@ -855,17 +855,9 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
     // Try to get to at least 3 bytes total (indicator + 2 varint bytes), then read one byte at a time
     ssize_t received =
         this->socket_->read(&rx_header_buf_[rx_header_buf_pos_], rx_header_buf_pos_ < 3 ? 3 - rx_header_buf_pos_ : 1);
-    if (received == -1) {
-      if (errno == EWOULDBLOCK || errno == EAGAIN) {
-        return APIError::WOULD_BLOCK;
-      }
-      state_ = State::FAILED;
-      HELPER_LOG("Socket read failed with errno %d", errno);
-      return APIError::SOCKET_READ_FAILED;
-    } else if (received == 0) {
-      state_ = State::FAILED;
-      HELPER_LOG("Connection closed");
-      return APIError::CONNECTION_CLOSED;
+    APIError err = handle_socket_read_result_(received);
+    if (err != APIError::OK) {
+      return err;
     }
 
     // If this was the first read, validate the indicator byte
@@ -949,17 +941,9 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
     // more data to read
     uint16_t to_read = rx_header_parsed_len_ - rx_buf_len_;
     ssize_t received = this->socket_->read(&rx_buf_[rx_buf_len_], to_read);
-    if (received == -1) {
-      if (errno == EWOULDBLOCK || errno == EAGAIN) {
-        return APIError::WOULD_BLOCK;
-      }
-      state_ = State::FAILED;
-      HELPER_LOG("Socket read failed with errno %d", errno);
-      return APIError::SOCKET_READ_FAILED;
-    } else if (received == 0) {
-      state_ = State::FAILED;
-      HELPER_LOG("Connection closed");
-      return APIError::CONNECTION_CLOSED;
+    APIError err = handle_socket_read_result_(received);
+    if (err != APIError::OK) {
+      return err;
     }
     rx_buf_len_ += static_cast<uint16_t>(received);
     if (static_cast<uint16_t>(received) != to_read) {
diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h
index 1bb6bc7ed3..eae83a3484 100644
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -176,6 +176,9 @@ class APIFrameHelper {
 
   // Common initialization for both plaintext and noise protocols
   APIError init_common_();
+
+  // Helper method to handle socket read results
+  APIError handle_socket_read_result_(ssize_t received);
 };
 
 #ifdef USE_API_NOISE