Merge branch 'unbound_queued_script_fix' into ci_impact_analysis_script

esphome/components/script/__init__.py

@@ -45,13 +45,26 @@ def get_script(script_id):
 
 
 def check_max_runs(value):
+    # Set default for queued mode to prevent unbounded queue growth
+    if CONF_MAX_RUNS not in value and value[CONF_MODE] == CONF_QUEUED:
+        value[CONF_MAX_RUNS] = 5
+
     if CONF_MAX_RUNS not in value:
         return value
+
     if value[CONF_MODE] not in [CONF_QUEUED, CONF_PARALLEL]:
         raise cv.Invalid(
-            "The option 'max_runs' is only valid in 'queue' and 'parallel' mode.",
+            "The option 'max_runs' is only valid in 'queued' and 'parallel' mode.",
             path=[CONF_MAX_RUNS],
         )
+
+    # Queued mode must have bounded queue (min 1), parallel mode can be unlimited (0)
+    if value[CONF_MODE] == CONF_QUEUED and value[CONF_MAX_RUNS] < 1:
+        raise cv.Invalid(
+            "The option 'max_runs' must be at least 1 for queued mode.",
+            path=[CONF_MAX_RUNS],
+        )
+
     return value
 
 
@@ -106,7 +119,7 @@ CONFIG_SCHEMA = automation.validate_automation(
         cv.Optional(CONF_MODE, default=CONF_SINGLE): cv.one_of(
             *SCRIPT_MODES, lower=True
         ),
-        cv.Optional(CONF_MAX_RUNS): cv.positive_int,
+        cv.Optional(CONF_MAX_RUNS): cv.int_range(min=0, max=100),
         cv.Optional(CONF_PARAMETERS, default={}): cv.Schema(
             {
                 validate_parameter_name: validate_parameter_type,

esphome/components/script/script.h

@@ -1,10 +1,11 @@
 #pragma once
 
+#include <memory>
+#include <tuple>
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-
-#include <queue>
 namespace esphome {
 namespace script {
 
@@ -96,14 +97,27 @@ template<typename... Ts> class RestartScript : public Script<Ts...> {
 /** A script type that queues new instances that are created.
  *
  * Only one instance of the script can be active at a time.
+ *
+ * Ring buffer implementation:
+ * - num_queued_ tracks the number of queued (waiting) instances, NOT including the currently running one
+ * - queue_front_ points to the next item to execute (read position)
+ * - Buffer size is max_runs_ - 1 (max total instances minus the running one)
+ * - Write position is calculated as: (queue_front_ + num_queued_) % (max_runs_ - 1)
+ * - When an item finishes, queue_front_ advances: (queue_front_ + 1) % (max_runs_ - 1)
+ * - First execute() runs immediately without queuing (num_queued_ stays 0)
+ * - Subsequent executes while running are queued starting at position 0
+ * - Maximum total instances = max_runs_ (includes 1 running + (max_runs_ - 1) queued)
  */
 template<typename... Ts> class QueueingScript : public Script<Ts...>, public Component {
  public:
   void execute(Ts... x) override {
-    if (this->is_action_running() || this->num_runs_ > 0) {
-      // num_runs_ is the number of *queued* instances, so total number of instances is
-      // num_runs_ + 1
-      if (this->max_runs_ != 0 && this->num_runs_ + 1 >= this->max_runs_) {
+    this->lazy_init_queue_();
+
+    if (this->is_action_running() || this->num_queued_ > 0) {
+      // num_queued_ is the number of *queued* instances (waiting, not including currently running)
+      // max_runs_ is the maximum *total* instances (running + queued)
+      // So we reject when num_queued_ + 1 >= max_runs_ (queued + running >= max)
+      if (this->num_queued_ + 1 >= this->max_runs_) {
         this->esp_logw_(__LINE__, ESPHOME_LOG_FORMAT("Script '%s' maximum number of queued runs exceeded!"),
                         LOG_STR_ARG(this->name_));
         return;
@@ -111,8 +125,11 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
 
       this->esp_logd_(__LINE__, ESPHOME_LOG_FORMAT("Script '%s' queueing new instance (mode: queued)"),
                       LOG_STR_ARG(this->name_));
-      this->num_runs_++;
-      this->var_queue_.push(std::make_tuple(x...));
+      // Ring buffer: write to (queue_front_ + num_queued_) % (max_runs_ - 1)
+      size_t write_pos = (this->queue_front_ + this->num_queued_) % (this->max_runs_ - 1);
+      // Use reset() to replace the unique_ptr
+      this->var_queue_[write_pos].reset(new std::tuple<Ts...>(std::make_tuple(x...)));
+      this->num_queued_++;
       return;
     }
 
@@ -122,29 +139,49 @@ template<typename... Ts> class QueueingScript : public Script<Ts...>, public Com
   }
 
   void stop() override {
-    this->num_runs_ = 0;
+    // Clear all queued items to free memory immediately
+    for (int i = 0; i < this->max_runs_ - 1; i++) {
+      this->var_queue_[i].reset();
+    }
+    this->num_queued_ = 0;
+    this->queue_front_ = 0;
     Script<Ts...>::stop();
   }
 
   void loop() override {
-    if (this->num_runs_ != 0 && !this->is_action_running()) {
-      this->num_runs_--;
-      auto &vars = this->var_queue_.front();
-      this->var_queue_.pop();
-      this->trigger_tuple_(vars, typename gens<sizeof...(Ts)>::type());
+    if (this->num_queued_ != 0 && !this->is_action_running()) {
+      // Dequeue: decrement count, move tuple out (frees slot), advance read position
+      this->num_queued_--;
+      auto tuple_ptr = std::move(this->var_queue_[this->queue_front_]);
+      this->queue_front_ = (this->queue_front_ + 1) % (this->max_runs_ - 1);
+      this->trigger_tuple_(*tuple_ptr, typename gens<sizeof...(Ts)>::type());
     }
   }
 
   void set_max_runs(int max_runs) { max_runs_ = max_runs; }
 
  protected:
+  // Lazy init queue on first use - avoids setup() ordering issues and saves memory
+  // if script is never executed during this boot cycle
+  inline void lazy_init_queue_() {
+    if (this->var_queue_.capacity() == 0) {
+      // Allocate max_runs_ - 1 slots for queued items (running item is separate)
+      this->var_queue_.init(this->max_runs_ - 1);
+      // Initialize all unique_ptr slots to nullptr
+      for (int i = 0; i < this->max_runs_ - 1; i++) {
+        this->var_queue_.push_back(nullptr);
+      }
+    }
+  }
+
   template<int... S> void trigger_tuple_(const std::tuple<Ts...> &tuple, seq<S...> /*unused*/) {
     this->trigger(std::get<S>(tuple)...);
   }
 
-  int num_runs_ = 0;
-  int max_runs_ = 0;
-  std::queue<std::tuple<Ts...>> var_queue_;
+  int num_queued_ = 0;      // Number of queued instances (not including currently running)
+  int max_runs_ = 0;        // Maximum total instances (running + queued)
+  size_t queue_front_ = 0;  // Ring buffer read position (next item to execute)
+  FixedVector<std::unique_ptr<std::tuple<Ts...>>> var_queue_;  // Ring buffer of queued parameters
 };
 
 /** A script type that executes new instances in parallel.

esphome/components/thermostat/climate.py

@@ -71,14 +71,9 @@ from esphome.const import (
     CONF_VISUAL,
 )
 
-CONF_DEFAULT_PRESET = "default_preset"
-CONF_HUMIDITY_CONTROL_DEHUMIDIFY_ACTION = "humidity_control_dehumidify_action"
-CONF_HUMIDITY_CONTROL_HUMIDIFY_ACTION = "humidity_control_humidify_action"
-CONF_HUMIDITY_CONTROL_OFF_ACTION = "humidity_control_off_action"
-CONF_HUMIDITY_HYSTERESIS = "humidity_hysteresis"
-CONF_ON_BOOT_RESTORE_FROM = "on_boot_restore_from"
 CONF_PRESET_CHANGE = "preset_change"
-CONF_TARGET_HUMIDITY_CHANGE_ACTION = "target_humidity_change_action"
+CONF_DEFAULT_PRESET = "default_preset"
+CONF_ON_BOOT_RESTORE_FROM = "on_boot_restore_from"
 
 CODEOWNERS = ["@kbx81"]
 
@@ -246,14 +241,6 @@ def validate_thermostat(config):
             CONF_MAX_HEATING_RUN_TIME,
             CONF_SUPPLEMENTAL_HEATING_ACTION,
         ],
-        CONF_HUMIDITY_CONTROL_DEHUMIDIFY_ACTION: [
-            CONF_HUMIDITY_CONTROL_OFF_ACTION,
-            CONF_HUMIDITY_SENSOR,
-        ],
-        CONF_HUMIDITY_CONTROL_HUMIDIFY_ACTION: [
-            CONF_HUMIDITY_CONTROL_OFF_ACTION,
-            CONF_HUMIDITY_SENSOR,
-        ],
     }
     for config_trigger, req_triggers in requirements.items():
         for req_trigger in req_triggers:
@@ -351,7 +338,7 @@ def validate_thermostat(config):
     # Warn about using the removed CONF_DEFAULT_MODE and advise users
     if CONF_DEFAULT_MODE in config and config[CONF_DEFAULT_MODE] is not None:
         raise cv.Invalid(
-            f"{CONF_DEFAULT_MODE} is no longer valid. Please switch to using presets and specify a {CONF_DEFAULT_PRESET}"
+            f"{CONF_DEFAULT_MODE} is no longer valid. Please switch to using presets and specify a {CONF_DEFAULT_PRESET}."
         )
 
     default_mode = config[CONF_DEFAULT_MODE]
@@ -601,24 +588,9 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_SWING_VERTICAL_ACTION): automation.validate_automation(
                 single=True
             ),
-            cv.Optional(
-                CONF_TARGET_HUMIDITY_CHANGE_ACTION
-            ): automation.validate_automation(single=True),
             cv.Optional(
                 CONF_TARGET_TEMPERATURE_CHANGE_ACTION
             ): automation.validate_automation(single=True),
-            cv.Exclusive(
-                CONF_HUMIDITY_CONTROL_DEHUMIDIFY_ACTION,
-                group_of_exclusion="humidity_control",
-            ): automation.validate_automation(single=True),
-            cv.Exclusive(
-                CONF_HUMIDITY_CONTROL_HUMIDIFY_ACTION,
-                group_of_exclusion="humidity_control",
-            ): automation.validate_automation(single=True),
-            cv.Optional(
-                CONF_HUMIDITY_CONTROL_OFF_ACTION
-            ): automation.validate_automation(single=True),
-            cv.Optional(CONF_HUMIDITY_HYSTERESIS, default=1.0): cv.percentage,
             cv.Optional(CONF_DEFAULT_MODE, default=None): cv.valid,
             cv.Optional(CONF_DEFAULT_PRESET): cv.templatable(cv.string),
             cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
@@ -910,39 +882,12 @@ async def to_code(config):
             config[CONF_SWING_VERTICAL_ACTION],
         )
         cg.add(var.set_supports_swing_mode_vertical(True))
-    if CONF_TARGET_HUMIDITY_CHANGE_ACTION in config:
-        await automation.build_automation(
-            var.get_humidity_change_trigger(),
-            [],
-            config[CONF_TARGET_HUMIDITY_CHANGE_ACTION],
-        )
     if CONF_TARGET_TEMPERATURE_CHANGE_ACTION in config:
         await automation.build_automation(
             var.get_temperature_change_trigger(),
             [],
             config[CONF_TARGET_TEMPERATURE_CHANGE_ACTION],
         )
-    if CONF_HUMIDITY_CONTROL_DEHUMIDIFY_ACTION in config:
-        cg.add(var.set_supports_dehumidification(True))
-        await automation.build_automation(
-            var.get_humidity_control_dehumidify_action_trigger(),
-            [],
-            config[CONF_HUMIDITY_CONTROL_DEHUMIDIFY_ACTION],
-        )
-    if CONF_HUMIDITY_CONTROL_HUMIDIFY_ACTION in config:
-        cg.add(var.set_supports_humidification(True))
-        await automation.build_automation(
-            var.get_humidity_control_humidify_action_trigger(),
-            [],
-            config[CONF_HUMIDITY_CONTROL_HUMIDIFY_ACTION],
-        )
-    if CONF_HUMIDITY_CONTROL_OFF_ACTION in config:
-        await automation.build_automation(
-            var.get_humidity_control_off_action_trigger(),
-            [],
-            config[CONF_HUMIDITY_CONTROL_OFF_ACTION],
-        )
-    cg.add(var.set_humidity_hysteresis(config[CONF_HUMIDITY_HYSTERESIS]))
 
     if CONF_PRESET in config:
         for preset_config in config[CONF_PRESET]:

esphome/components/thermostat/thermostat_climate.cpp

@@ -32,7 +32,6 @@ void ThermostatClimate::setup() {
   if (this->humidity_sensor_ != nullptr) {
     this->humidity_sensor_->add_on_state_callback([this](float state) {
       this->current_humidity = state;
-      this->switch_to_humidity_control_action_(this->compute_humidity_control_action_());
       this->publish_state();
     });
     this->current_humidity = this->humidity_sensor_->state;
@@ -85,8 +84,6 @@ void ThermostatClimate::refresh() {
   this->switch_to_supplemental_action_(this->compute_supplemental_action_());
   this->switch_to_fan_mode_(this->fan_mode.value(), false);
   this->switch_to_swing_mode_(this->swing_mode, false);
-  this->switch_to_humidity_control_action_(this->compute_humidity_control_action_());
-  this->check_humidity_change_trigger_();
   this->check_temperature_change_trigger_();
   this->publish_state();
 }
@@ -132,11 +129,6 @@ bool ThermostatClimate::hysteresis_valid() {
   return true;
 }
 
-bool ThermostatClimate::humidity_hysteresis_valid() {
-  return !std::isnan(this->humidity_hysteresis_) && this->humidity_hysteresis_ >= 0.0f &&
-         this->humidity_hysteresis_ < 100.0f;
-}
-
 bool ThermostatClimate::limit_setpoints_for_heat_cool() {
   return this->mode == climate::CLIMATE_MODE_HEAT_COOL ||
          (this->mode == climate::CLIMATE_MODE_AUTO && this->supports_heat_cool_);
@@ -197,16 +189,6 @@ void ThermostatClimate::validate_target_temperature_high() {
   }
 }
 
-void ThermostatClimate::validate_target_humidity() {
-  if (std::isnan(this->target_humidity)) {
-    this->target_humidity =
-        (this->get_traits().get_visual_max_humidity() - this->get_traits().get_visual_min_humidity()) / 2.0f;
-  } else {
-    this->target_humidity = clamp<float>(this->target_humidity, this->get_traits().get_visual_min_humidity(),
-                                         this->get_traits().get_visual_max_humidity());
-  }
-}
-
 void ThermostatClimate::control(const climate::ClimateCall &call) {
   bool target_temperature_high_changed = false;
 
@@ -253,10 +235,6 @@ void ThermostatClimate::control(const climate::ClimateCall &call) {
       this->validate_target_temperature();
     }
   }
-  if (call.get_target_humidity().has_value()) {
-    this->target_humidity = call.get_target_humidity().value();
-    this->validate_target_humidity();
-  }
   // make any changes happen
   this->refresh();
 }
@@ -272,9 +250,6 @@ climate::ClimateTraits ThermostatClimate::traits() {
   if (this->humidity_sensor_ != nullptr)
     traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_HUMIDITY);
 
-  if (this->supports_humidification_ || this->supports_dehumidification_)
-    traits.add_feature_flags(climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY);
-
   if (this->supports_auto_)
     traits.add_supported_mode(climate::CLIMATE_MODE_AUTO);
   if (this->supports_heat_cool_)
@@ -448,28 +423,6 @@ climate::ClimateAction ThermostatClimate::compute_supplemental_action_() {
   return target_action;
 }
 
-HumidificationAction ThermostatClimate::compute_humidity_control_action_() {
-  auto target_action = THERMOSTAT_HUMIDITY_CONTROL_ACTION_OFF;
-  // if hysteresis value or current_humidity is not valid, we go to OFF
-  if (std::isnan(this->current_humidity) || !this->humidity_hysteresis_valid()) {
-    return THERMOSTAT_HUMIDITY_CONTROL_ACTION_OFF;
-  }
-
-  // ensure set point is valid before computing the action
-  this->validate_target_humidity();
-  // everything has been validated so we can now safely compute the action
-  if (this->dehumidification_required_() && this->humidification_required_()) {
-    // this is bad and should never happen, so just stop.
-    // target_action = THERMOSTAT_HUMIDITY_CONTROL_ACTION_OFF;
-  } else if (this->supports_dehumidification_ && this->dehumidification_required_()) {
-    target_action = THERMOSTAT_HUMIDITY_CONTROL_ACTION_DEHUMIDIFY;
-  } else if (this->supports_humidification_ && this->humidification_required_()) {
-    target_action = THERMOSTAT_HUMIDITY_CONTROL_ACTION_HUMIDIFY;
-  }
-
-  return target_action;
-}
-
 void ThermostatClimate::switch_to_action_(climate::ClimateAction action, bool publish_state) {
   // setup_complete_ helps us ensure an action is called immediately after boot
   if ((action == this->action) && this->setup_complete_) {
@@ -643,44 +596,6 @@ void ThermostatClimate::trigger_supplemental_action_() {
   }
 }
 
-void ThermostatClimate::switch_to_humidity_control_action_(HumidificationAction action) {
-  // setup_complete_ helps us ensure an action is called immediately after boot
-  if ((action == this->humidification_action_) && this->setup_complete_) {
-    // already in target mode
-    return;
-  }
-
-  Trigger<> *trig = this->humidity_control_off_action_trigger_;
-  switch (action) {
-    case THERMOSTAT_HUMIDITY_CONTROL_ACTION_OFF:
-      // trig = this->humidity_control_off_action_trigger_;
-      ESP_LOGVV(TAG, "Switching to HUMIDIFICATION_OFF action");
-      break;
-    case THERMOSTAT_HUMIDITY_CONTROL_ACTION_DEHUMIDIFY:
-      trig = this->humidity_control_dehumidify_action_trigger_;
-      ESP_LOGVV(TAG, "Switching to DEHUMIDIFY action");
-      break;
-    case THERMOSTAT_HUMIDITY_CONTROL_ACTION_HUMIDIFY:
-      trig = this->humidity_control_humidify_action_trigger_;
-      ESP_LOGVV(TAG, "Switching to HUMIDIFY action");
-      break;
-    case THERMOSTAT_HUMIDITY_CONTROL_ACTION_NONE:
-    default:
-      action = THERMOSTAT_HUMIDITY_CONTROL_ACTION_OFF;
-      // trig = this->humidity_control_off_action_trigger_;
-  }
-
-  if (this->prev_humidity_control_trigger_ != nullptr) {
-    this->prev_humidity_control_trigger_->stop_action();
-    this->prev_humidity_control_trigger_ = nullptr;
-  }
-  this->humidification_action_ = action;
-  this->prev_humidity_control_trigger_ = trig;
-  if (trig != nullptr) {
-    trig->trigger();
-  }
-}
-
 void ThermostatClimate::switch_to_fan_mode_(climate::ClimateFanMode fan_mode, bool publish_state) {
   // setup_complete_ helps us ensure an action is called immediately after boot
   if ((fan_mode == this->prev_fan_mode_) && this->setup_complete_) {
@@ -972,20 +887,6 @@ void ThermostatClimate::idle_on_timer_callback_() {
   this->switch_to_supplemental_action_(this->compute_supplemental_action_());
 }
 
-void ThermostatClimate::check_humidity_change_trigger_() {
-  if ((this->prev_target_humidity_ == this->target_humidity) && this->setup_complete_) {
-    return;  // nothing changed, no reason to trigger
-  } else {
-    // save the new temperature so we can check it again later; the trigger will fire below
-    this->prev_target_humidity_ = this->target_humidity;
-  }
-  // trigger the action
-  Trigger<> *trig = this->humidity_change_trigger_;
-  if (trig != nullptr) {
-    trig->trigger();
-  }
-}
-
 void ThermostatClimate::check_temperature_change_trigger_() {
   if (this->supports_two_points_) {
     // setup_complete_ helps us ensure an action is called immediately after boot
@@ -1095,32 +996,6 @@ bool ThermostatClimate::supplemental_heating_required_() {
           (this->supplemental_action_ == climate::CLIMATE_ACTION_HEATING));
 }
 
-bool ThermostatClimate::dehumidification_required_() {
-  if (this->current_humidity > this->target_humidity + this->humidity_hysteresis_) {
-    // if the current humidity exceeds the target + hysteresis, dehumidification is required
-    return true;
-  } else if (this->current_humidity < this->target_humidity - this->humidity_hysteresis_) {
-    // if the current humidity is less than the target - hysteresis, dehumidification should stop
-    return false;
-  }
-  // if we get here, the current humidity is between target + hysteresis and target - hysteresis,
-  //  so the action should not change
-  return this->humidification_action_ == THERMOSTAT_HUMIDITY_CONTROL_ACTION_DEHUMIDIFY;
-}
-
-bool ThermostatClimate::humidification_required_() {
-  if (this->current_humidity < this->target_humidity - this->humidity_hysteresis_) {
-    // if the current humidity is below the target - hysteresis, humidification is required
-    return true;
-  } else if (this->current_humidity > this->target_humidity + this->humidity_hysteresis_) {
-    // if the current humidity is above the target + hysteresis, humidification should stop
-    return false;
-  }
-  // if we get here, the current humidity is between target - hysteresis and target + hysteresis,
-  //  so the action should not change
-  return this->humidification_action_ == THERMOSTAT_HUMIDITY_CONTROL_ACTION_HUMIDIFY;
-}
-
 void ThermostatClimate::dump_preset_config_(const char *preset_name, const ThermostatClimateTargetTempConfig &config) {
   if (this->supports_heat_) {
     ESP_LOGCONFIG(TAG, "      Default Target Temperature Low: %.1f°C",
@@ -1277,12 +1152,8 @@ ThermostatClimate::ThermostatClimate()
       swing_mode_off_trigger_(new Trigger<>()),
       swing_mode_horizontal_trigger_(new Trigger<>()),
       swing_mode_vertical_trigger_(new Trigger<>()),
-      humidity_change_trigger_(new Trigger<>()),
       temperature_change_trigger_(new Trigger<>()),
-      preset_change_trigger_(new Trigger<>()),
-      humidity_control_dehumidify_action_trigger_(new Trigger<>()),
-      humidity_control_humidify_action_trigger_(new Trigger<>()),
-      humidity_control_off_action_trigger_(new Trigger<>()) {}
+      preset_change_trigger_(new Trigger<>()) {}
 
 void ThermostatClimate::set_default_preset(const std::string &custom_preset) {
   this->default_custom_preset_ = custom_preset;
@@ -1346,9 +1217,6 @@ void ThermostatClimate::set_sensor(sensor::Sensor *sensor) { this->sensor_ = sen
 void ThermostatClimate::set_humidity_sensor(sensor::Sensor *humidity_sensor) {
   this->humidity_sensor_ = humidity_sensor;
 }
-void ThermostatClimate::set_humidity_hysteresis(float humidity_hysteresis) {
-  this->humidity_hysteresis_ = std::clamp<float>(humidity_hysteresis, 0.0f, 100.0f);
-}
 void ThermostatClimate::set_use_startup_delay(bool use_startup_delay) { this->use_startup_delay_ = use_startup_delay; }
 void ThermostatClimate::set_supports_heat_cool(bool supports_heat_cool) {
   this->supports_heat_cool_ = supports_heat_cool;
@@ -1416,18 +1284,6 @@ void ThermostatClimate::set_supports_swing_mode_vertical(bool supports_swing_mod
 void ThermostatClimate::set_supports_two_points(bool supports_two_points) {
   this->supports_two_points_ = supports_two_points;
 }
-void ThermostatClimate::set_supports_dehumidification(bool supports_dehumidification) {
-  this->supports_dehumidification_ = supports_dehumidification;
-  if (supports_dehumidification) {
-    this->supports_humidification_ = false;
-  }
-}
-void ThermostatClimate::set_supports_humidification(bool supports_humidification) {
-  this->supports_humidification_ = supports_humidification;
-  if (supports_humidification) {
-    this->supports_dehumidification_ = false;
-  }
-}
 
 Trigger<> *ThermostatClimate::get_cool_action_trigger() const { return this->cool_action_trigger_; }
 Trigger<> *ThermostatClimate::get_supplemental_cool_action_trigger() const {
@@ -1461,18 +1317,8 @@ Trigger<> *ThermostatClimate::get_swing_mode_both_trigger() const { return this-
 Trigger<> *ThermostatClimate::get_swing_mode_off_trigger() const { return this->swing_mode_off_trigger_; }
 Trigger<> *ThermostatClimate::get_swing_mode_horizontal_trigger() const { return this->swing_mode_horizontal_trigger_; }
 Trigger<> *ThermostatClimate::get_swing_mode_vertical_trigger() const { return this->swing_mode_vertical_trigger_; }
-Trigger<> *ThermostatClimate::get_humidity_change_trigger() const { return this->humidity_change_trigger_; }
 Trigger<> *ThermostatClimate::get_temperature_change_trigger() const { return this->temperature_change_trigger_; }
 Trigger<> *ThermostatClimate::get_preset_change_trigger() const { return this->preset_change_trigger_; }
-Trigger<> *ThermostatClimate::get_humidity_control_dehumidify_action_trigger() const {
-  return this->humidity_control_dehumidify_action_trigger_;
-}
-Trigger<> *ThermostatClimate::get_humidity_control_humidify_action_trigger() const {
-  return this->humidity_control_humidify_action_trigger_;
-}
-Trigger<> *ThermostatClimate::get_humidity_control_off_action_trigger() const {
-  return this->humidity_control_off_action_trigger_;
-}
 
 void ThermostatClimate::dump_config() {
   LOG_CLIMATE("", "Thermostat", this);
@@ -1576,12 +1422,7 @@ void ThermostatClimate::dump_config() {
                 "    OFF: %s\n"
                 "    HORIZONTAL: %s\n"
                 "    VERTICAL: %s\n"
-                "  Supports TWO SET POINTS: %s\n"
-                "  Supported Humidity Parameters:\n"
-                "    CURRENT: %s\n"
-                "    TARGET: %s\n"
-                "    DEHUMIDIFICATION: %s\n"
-                "    HUMIDIFICATION: %s",
+                "  Supports TWO SET POINTS: %s",
                 YESNO(this->supports_fan_mode_on_), YESNO(this->supports_fan_mode_off_),
                 YESNO(this->supports_fan_mode_auto_), YESNO(this->supports_fan_mode_low_),
                 YESNO(this->supports_fan_mode_medium_), YESNO(this->supports_fan_mode_high_),
@@ -1589,10 +1430,7 @@ void ThermostatClimate::dump_config() {
                 YESNO(this->supports_fan_mode_diffuse_), YESNO(this->supports_fan_mode_quiet_),
                 YESNO(this->supports_swing_mode_both_), YESNO(this->supports_swing_mode_off_),
                 YESNO(this->supports_swing_mode_horizontal_), YESNO(this->supports_swing_mode_vertical_),
-                YESNO(this->supports_two_points_),
-                YESNO(this->get_traits().has_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_HUMIDITY)),
-                YESNO(this->supports_dehumidification_ || this->supports_humidification_),
-                YESNO(this->supports_dehumidification_), YESNO(this->supports_humidification_));
+                YESNO(this->supports_two_points_));
 
   if (!this->preset_config_.empty()) {
     ESP_LOGCONFIG(TAG, "  Supported PRESETS:");

esphome/components/thermostat/thermostat_climate.h

@@ -13,13 +13,6 @@
 namespace esphome {
 namespace thermostat {
 
-enum HumidificationAction : uint8_t {
-  THERMOSTAT_HUMIDITY_CONTROL_ACTION_OFF = 0,
-  THERMOSTAT_HUMIDITY_CONTROL_ACTION_DEHUMIDIFY = 1,
-  THERMOSTAT_HUMIDITY_CONTROL_ACTION_HUMIDIFY = 2,
-  THERMOSTAT_HUMIDITY_CONTROL_ACTION_NONE,
-};
-
 enum ThermostatClimateTimerIndex : uint8_t {
   THERMOSTAT_TIMER_COOLING_MAX_RUN_TIME = 0,
   THERMOSTAT_TIMER_COOLING_OFF = 1,
@@ -97,7 +90,6 @@ class ThermostatClimate : public climate::Climate, public Component {
   void set_idle_minimum_time_in_sec(uint32_t time);
   void set_sensor(sensor::Sensor *sensor);
   void set_humidity_sensor(sensor::Sensor *humidity_sensor);
-  void set_humidity_hysteresis(float humidity_hysteresis);
   void set_use_startup_delay(bool use_startup_delay);
   void set_supports_auto(bool supports_auto);
   void set_supports_heat_cool(bool supports_heat_cool);
@@ -123,8 +115,6 @@ class ThermostatClimate : public climate::Climate, public Component {
   void set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal);
   void set_supports_swing_mode_off(bool supports_swing_mode_off);
   void set_supports_swing_mode_vertical(bool supports_swing_mode_vertical);
-  void set_supports_dehumidification(bool supports_dehumidification);
-  void set_supports_humidification(bool supports_humidification);
   void set_supports_two_points(bool supports_two_points);
 
   void set_preset_config(climate::ClimatePreset preset, const ThermostatClimateTargetTempConfig &config);
@@ -158,12 +148,8 @@ class ThermostatClimate : public climate::Climate, public Component {
   Trigger<> *get_swing_mode_horizontal_trigger() const;
   Trigger<> *get_swing_mode_off_trigger() const;
   Trigger<> *get_swing_mode_vertical_trigger() const;
-  Trigger<> *get_humidity_change_trigger() const;
   Trigger<> *get_temperature_change_trigger() const;
   Trigger<> *get_preset_change_trigger() const;
-  Trigger<> *get_humidity_control_dehumidify_action_trigger() const;
-  Trigger<> *get_humidity_control_humidify_action_trigger() const;
-  Trigger<> *get_humidity_control_off_action_trigger() const;
   /// Get current hysteresis values
   float cool_deadband();
   float cool_overrun();
@@ -180,13 +166,11 @@ class ThermostatClimate : public climate::Climate, public Component {
   climate::ClimateFanMode locked_fan_mode();
   /// Set point and hysteresis validation
   bool hysteresis_valid();               // returns true if valid
-  bool humidity_hysteresis_valid();      // returns true if valid
   bool limit_setpoints_for_heat_cool();  // returns true if set points should be further limited within visual range
   void validate_target_temperature();
   void validate_target_temperatures(bool pin_target_temperature_high);
   void validate_target_temperature_low();
   void validate_target_temperature_high();
-  void validate_target_humidity();
 
  protected:
   /// Override control to change settings of the climate device.
@@ -208,13 +192,11 @@ class ThermostatClimate : public climate::Climate, public Component {
   /// Re-compute the required action of this climate controller.
   climate::ClimateAction compute_action_(bool ignore_timers = false);
   climate::ClimateAction compute_supplemental_action_();
-  HumidificationAction compute_humidity_control_action_();
 
   /// Switch the climate device to the given climate action.
   void switch_to_action_(climate::ClimateAction action, bool publish_state = true);
   void switch_to_supplemental_action_(climate::ClimateAction action);
   void trigger_supplemental_action_();
-  void switch_to_humidity_control_action_(HumidificationAction action);
 
   /// Switch the climate device to the given climate fan mode.
   void switch_to_fan_mode_(climate::ClimateFanMode fan_mode, bool publish_state = true);
@@ -225,9 +207,6 @@ class ThermostatClimate : public climate::Climate, public Component {
   /// Switch the climate device to the given climate swing mode.
   void switch_to_swing_mode_(climate::ClimateSwingMode swing_mode, bool publish_state = true);
 
-  /// Check if the humidity change trigger should be called.
-  void check_humidity_change_trigger_();
-
   /// Check if the temperature change trigger should be called.
   void check_temperature_change_trigger_();
 
@@ -264,8 +243,6 @@ class ThermostatClimate : public climate::Climate, public Component {
   bool heating_required_();
   bool supplemental_cooling_required_();
   bool supplemental_heating_required_();
-  bool dehumidification_required_();
-  bool humidification_required_();
 
   void dump_preset_config_(const char *preset_name, const ThermostatClimateTargetTempConfig &config);
 
@@ -282,9 +259,6 @@ class ThermostatClimate : public climate::Climate, public Component {
   /// The current supplemental action
   climate::ClimateAction supplemental_action_{climate::CLIMATE_ACTION_OFF};
 
-  /// The current humidification action
-  HumidificationAction humidification_action_{THERMOSTAT_HUMIDITY_CONTROL_ACTION_NONE};
-
   /// Default standard preset to use on start up
   climate::ClimatePreset default_preset_{};
 
@@ -347,12 +321,6 @@ class ThermostatClimate : public climate::Climate, public Component {
   /// A false value means that the controller has no such support.
   bool supports_two_points_{false};
 
-  /// Whether the controller supports dehumidification and/or humidification
-  ///
-  /// A false value means that the controller has no such support.
-  bool supports_dehumidification_{false};
-  bool supports_humidification_{false};
-
   /// Flags indicating if maximum allowable run time was exceeded
   bool cooling_max_runtime_exceeded_{false};
   bool heating_max_runtime_exceeded_{false};
@@ -363,10 +331,9 @@ class ThermostatClimate : public climate::Climate, public Component {
   /// setup_complete_ blocks modifying/resetting the temps immediately after boot
   bool setup_complete_{false};
 
-  /// Store previously-known humidity and temperatures
+  /// Store previously-known temperatures
   ///
-  /// These are used to determine when a temperature/humidity has changed
-  float prev_target_humidity_{NAN};
+  /// These are used to determine when the temperature change trigger/action needs to be called
   float prev_target_temperature_{NAN};
   float prev_target_temperature_low_{NAN};
   float prev_target_temperature_high_{NAN};
@@ -380,9 +347,6 @@ class ThermostatClimate : public climate::Climate, public Component {
   float heating_deadband_{0};
   float heating_overrun_{0};
 
-  /// Hysteresis values used for computing humidification action
-  float humidity_hysteresis_{0};
-
   /// Maximum allowable temperature deltas before engaging supplemental cooling/heating actions
   float supplemental_cool_delta_{0};
   float supplemental_heat_delta_{0};
@@ -484,24 +448,12 @@ class ThermostatClimate : public climate::Climate, public Component {
   /// The trigger to call when the controller should switch the swing mode to "vertical".
   Trigger<> *swing_mode_vertical_trigger_{nullptr};
 
-  /// The trigger to call when the target humidity changes.
-  Trigger<> *humidity_change_trigger_{nullptr};
-
   /// The trigger to call when the target temperature(s) change(es).
   Trigger<> *temperature_change_trigger_{nullptr};
 
   /// The trigger to call when the preset mode changes
   Trigger<> *preset_change_trigger_{nullptr};
 
-  /// The trigger to call when dehumidification is required
-  Trigger<> *humidity_control_dehumidify_action_trigger_{nullptr};
-
-  /// The trigger to call when humidification is required
-  Trigger<> *humidity_control_humidify_action_trigger_{nullptr};
-
-  /// The trigger to call when (de)humidification should stop
-  Trigger<> *humidity_control_off_action_trigger_{nullptr};
-
   /// A reference to the trigger that was previously active.
   ///
   /// This is so that the previous trigger can be stopped before enabling a new one
@@ -510,7 +462,6 @@ class ThermostatClimate : public climate::Climate, public Component {
   Trigger<> *prev_fan_mode_trigger_{nullptr};
   Trigger<> *prev_mode_trigger_{nullptr};
   Trigger<> *prev_swing_mode_trigger_{nullptr};
-  Trigger<> *prev_humidity_control_trigger_{nullptr};
 
   /// Default custom preset to use on start up
   std::string default_custom_preset_{};

esphome/core/helpers.h

@@ -298,6 +298,7 @@ template<typename T> class FixedVector {
   const T &back() const { return data_[size_ - 1]; }
 
   size_t size() const { return size_; }
+  size_t capacity() const { return capacity_; }
   bool empty() const { return size_ == 0; }
 
   /// Access element without bounds checking (matches std::vector behavior)

esphome/dashboard/web_server.py

@@ -1058,8 +1058,7 @@ class DownloadBinaryRequestHandler(BaseHandler):
             "download",
             f"{storage_json.name}-{file_name}",
         )
-
-        path = storage_json.firmware_bin_path.parent.joinpath(file_name)
+        path = storage_json.firmware_bin_path.with_name(file_name)
 
         if not path.is_file():
             args = ["esphome", "idedata", settings.rel_path(configuration)]

requirements.txt

@@ -12,7 +12,7 @@ platformio==6.1.18  # When updating platformio, also update /docker/Dockerfile
 esptool==5.1.0
 click==8.1.7
 esphome-dashboard==20251013.0
-aioesphomeapi==42.2.0
+aioesphomeapi==42.0.0
 zeroconf==0.148.0
 puremagic==1.30
 ruamel.yaml==0.18.15 # dashboard_import

tests/components/absolute_humidity/common.yaml

@@ -8,12 +8,14 @@ sensor:
     lambda: |-
       if (millis() > 10000) {
         return 0.6;
+      } else {
+        return 0.0;
       }
-      return 0.0;
   - platform: template
     id: template_temperature
     lambda: |-
       if (millis() > 10000) {
         return 42.0;
+      } else {
+        return 0.0;
       }
-      return 0.0;

tests/components/analog_threshold/common.yaml

@@ -5,8 +5,9 @@ sensor:
     lambda: |-
       if (millis() > 10000) {
         return 42.0;
+      } else {
+        return 0.0;
       }
-      return 0.0;
     update_interval: 15s
 
 binary_sensor:

tests/components/binary_sensor/common.yaml

@@ -23,8 +23,9 @@ binary_sensor:
       - lambda: |-
           if (id(some_binary_sensor).state) {
             return x;
+          } else {
+            return {};
           }
-          return {};
       - settle: 100ms
       - timeout: 10s
 

tests/components/binary_sensor_map/common.yaml

@@ -4,22 +4,25 @@ binary_sensor:
     lambda: |-
       if (millis() > 10000) {
         return true;
+      } else {
+        return false;
       }
-      return false;
   - platform: template
     id: bin2
     lambda: |-
       if (millis() > 20000) {
         return true;
+      } else {
+        return false;
       }
-      return false;
   - platform: template
     id: bin3
     lambda: |-
       if (millis() > 30000) {
         return true;
+      } else {
+        return false;
       }
-      return false;
 
 sensor:
   - platform: binary_sensor_map

tests/components/combination/common.yaml

@@ -4,15 +4,17 @@ sensor:
     lambda: |-
       if (millis() > 10000) {
         return 0.6;
+      } else {
+        return 0.0;
       }
-      return 0.0;
   - platform: template
     id: template_temperature2
     lambda: |-
       if (millis() > 20000) {
         return 0.8;
+      } else {
+        return 0.0;
       }
-      return 0.0;
   - platform: combination
     type: kalman
     name: Kalman-filtered temperature

tests/components/duty_time/common.yaml

@@ -4,8 +4,9 @@ binary_sensor:
     lambda: |-
       if (millis() > 10000) {
         return true;
+      } else {
+        return false;
       }
-      return false;
 
 sensor:
   - platform: duty_time

tests/components/endstop/common.yaml

@@ -4,8 +4,9 @@ binary_sensor:
     lambda: |-
       if (millis() > 10000) {
         return true;
+      } else {
+        return false;
       }
-      return false;
 
 switch:
   - platform: template

tests/components/lock/common.yaml

@@ -17,8 +17,9 @@ lock:
     lambda: |-
       if (millis() > 10000) {
         return LOCK_STATE_LOCKED;
+      } else {
+        return LOCK_STATE_UNLOCKED;
       }
-      return LOCK_STATE_UNLOCKED;
     optimistic: true
     assumed_state: false
     on_unlock:

tests/components/mqtt/common.yaml

@@ -72,9 +72,10 @@ binary_sensor:
       if (id(template_sens).state > 30) {
         // Garage Door is open.
         return true;
+      } else {
+        // Garage Door is closed.
+        return false;
       }
-      // Garage Door is closed.
-      return false;
     on_state:
       - mqtt.publish:
           topic: some/topic/binary_sensor
@@ -216,8 +217,9 @@ cover:
     lambda: |-
       if (id(some_binary_sensor).state) {
         return COVER_OPEN;
+      } else {
+        return COVER_CLOSED;
       }
-      return COVER_CLOSED;
     open_action:
       - logger.log: open_action
     close_action:
@@ -319,8 +321,9 @@ lock:
     lambda: |-
       if (id(some_binary_sensor).state) {
         return LOCK_STATE_LOCKED;
+      } else {
+        return LOCK_STATE_UNLOCKED;
       }
-      return LOCK_STATE_UNLOCKED;
     lock_action:
       - logger.log: lock_action
     unlock_action:
@@ -357,8 +360,9 @@ sensor:
     lambda: |-
       if (id(some_binary_sensor).state) {
         return 42.0;
+      } else {
+        return 0.0;
       }
-      return 0.0;
     update_interval: 60s
     on_value:
       - mqtt.publish:
@@ -386,8 +390,9 @@ switch:
     lambda: |-
       if (id(some_binary_sensor).state) {
         return true;
+      } else {
+        return false;
       }
-      return false;
     turn_on_action:
       - logger.log: turn_on_action
     turn_off_action:
@@ -431,8 +436,9 @@ valve:
     lambda: |-
       if (id(some_binary_sensor).state) {
         return VALVE_OPEN;
+      } else {
+        return VALVE_CLOSED;
       }
-      return VALVE_CLOSED;
 
 alarm_control_panel:
   - platform: template

tests/components/pid/common.yaml

@@ -27,8 +27,9 @@ sensor:
     lambda: |-
       if (millis() > 10000) {
         return 42.0;
+      } else {
+        return 0.0;
       }
-      return 0.0;
     update_interval: 60s
 
 climate:

tests/components/prometheus/common.yaml

@@ -35,8 +35,9 @@ sensor:
     lambda: |-
       if (millis() > 10000) {
         return 42.0;
+      } else {
+        return 0.0;
       }
-      return 0.0;
     update_interval: 60s
 
 text_sensor:
@@ -48,8 +49,9 @@ text_sensor:
     lambda: |-
       if (millis() > 10000) {
         return {"Hello World"};
+      } else {
+        return {"Goodbye (cruel) World"};
       }
-      return {"Goodbye (cruel) World"};
     update_interval: 60s
 
 binary_sensor:
@@ -58,8 +60,9 @@ binary_sensor:
     lambda: |-
       if (millis() > 10000) {
         return true;
+      } else {
+        return false;
       }
-      return false;
 
 switch:
   - platform: template
@@ -67,8 +70,9 @@ switch:
     lambda: |-
       if (millis() > 10000) {
         return true;
+      } else {
+        return false;
       }
-      return false;
     optimistic: true
 
 fan:
@@ -81,8 +85,9 @@ cover:
     lambda: |-
       if (millis() > 10000) {
         return COVER_OPEN;
+      } else {
+        return COVER_CLOSED;
       }
-      return COVER_CLOSED;
 
 lock:
   - platform: template
@@ -90,8 +95,9 @@ lock:
     lambda: |-
       if (millis() > 10000) {
         return LOCK_STATE_LOCKED;
+      } else {
+        return LOCK_STATE_UNLOCKED;
       }
-      return LOCK_STATE_UNLOCKED;
     optimistic: true
 
 select:

tests/components/template/common-base.yaml

@@ -59,8 +59,9 @@ binary_sensor:
       - lambda: |-
           if (id(other_binary_sensor).state) {
             return x;
+          } else {
+            return {};
           }
-          return {};
       - settle: 500ms
       - timeout: 5s
 
@@ -71,8 +72,9 @@ sensor:
     lambda: |-
       if (id(some_binary_sensor).state) {
         return 42.0;
+      } else {
+        return 0.0;
       }
-      return 0.0;
     update_interval: 60s
     filters:
       - calibrate_linear:
@@ -181,8 +183,9 @@ switch:
     lambda: |-
       if (id(some_binary_sensor).state) {
         return true;
+      } else {
+        return false;
       }
-      return false;
     turn_on_action:
       - logger.log: "turn_on_action"
     turn_off_action:
@@ -200,8 +203,9 @@ cover:
     lambda: |-
       if (id(some_binary_sensor).state) {
         return COVER_OPEN;
+      } else {
+        return COVER_CLOSED;
       }
-      return COVER_CLOSED;
     open_action:
       - logger.log: open_action
     close_action:
@@ -234,8 +238,9 @@ lock:
     lambda: |-
       if (id(some_binary_sensor).state) {
         return LOCK_STATE_LOCKED;
+      } else {
+        return LOCK_STATE_UNLOCKED;
       }
-      return LOCK_STATE_UNLOCKED;
     lock_action:
       - logger.log: lock_action
     unlock_action:
@@ -250,8 +255,9 @@ valve:
     lambda: |-
       if (id(some_binary_sensor).state) {
         return VALVE_OPEN;
+      } else {
+        return VALVE_CLOSED;
       }
-      return VALVE_CLOSED;
     open_action:
       - logger.log: open_action
     close_action:

tests/components/thermostat/common.yaml

@@ -69,11 +69,6 @@ climate:
       - logger.log: swing_vertical_action
     swing_both_action:
       - logger.log: swing_both_action
-    humidity_control_humidify_action:
-      - logger.log: humidity_control_humidify_action
-    humidity_control_off_action:
-      - logger.log: humidity_control_off_action
-    humidity_hysteresis: 1.0
     startup_delay: true
     supplemental_cooling_delta: 2.0
     cool_deadband: 0.5

tests/components/total_daily_energy/common.yaml

@@ -17,10 +17,10 @@ sensor:
       name: HLW8012 Voltage
     power:
       name: HLW8012 Power
-      id: total_daily_energy_hlw8012_power
+      id: hlw8012_power
     energy:
       name: HLW8012 Energy
-      id: total_daily_energy_hlw8012_energy
+      id: hlw8012_energy
     update_interval: 15s
     current_resistor: 0.001 ohm
     voltage_divider: 2351
@@ -29,4 +29,4 @@ sensor:
     model: hlw8012
   - platform: total_daily_energy
     name: HLW8012 Total Daily Energy
-    power_id: total_daily_energy_hlw8012_power
+    power_id: hlw8012_power

tests/dashboard/test_web_server.py

@@ -35,26 +35,6 @@ from esphome.zeroconf import DiscoveredImport
 from .common import get_fixture_path
 
 
-def get_build_path(base_path: Path, device_name: str) -> Path:
-    """Get the build directory path for a device.
-
-    This is a test helper that constructs the standard ESPHome build directory
-    structure. Note: This helper does NOT perform path traversal sanitization
-    because it's only used in tests where we control the inputs. The actual
-    web_server.py code handles sanitization in DownloadBinaryRequestHandler.get()
-    via file_name.replace("..", "").lstrip("/").
-
-    Args:
-        base_path: The base temporary path (typically tmp_path from pytest)
-        device_name: The name of the device (should not contain path separators
-                     in production use, but tests may use it for specific scenarios)
-
-    Returns:
-        Path to the build directory (.esphome/build/device_name)
-    """
-    return base_path / ".esphome" / "build" / device_name
-
-
 class DashboardTestHelper:
     def __init__(self, io_loop: IOLoop, client: AsyncHTTPClient, port: int) -> None:
         self.io_loop = io_loop
@@ -437,180 +417,6 @@ async def test_download_binary_handler_idedata_fallback(
     assert response.body == b"bootloader content"
 
 
-@pytest.mark.asyncio
-@pytest.mark.usefixtures("mock_ext_storage_path")
-async def test_download_binary_handler_subdirectory_file(
-    dashboard: DashboardTestHelper,
-    tmp_path: Path,
-    mock_storage_json: MagicMock,
-) -> None:
-    """Test the DownloadBinaryRequestHandler.get with file in subdirectory (nRF52 case).
-
-    This is a regression test for issue #11343 where the Path migration broke
-    downloads for nRF52 firmware files in subdirectories like 'zephyr/zephyr.uf2'.
-
-    The issue was that with_name() doesn't accept path separators:
-    - Before: path = storage_json.firmware_bin_path.with_name(file_name)
-      ValueError: Invalid name 'zephyr/zephyr.uf2'
-    - After: path = storage_json.firmware_bin_path.parent.joinpath(file_name)
-      Works correctly with subdirectory paths
-    """
-    # Create a fake nRF52 build structure with firmware in subdirectory
-    build_dir = get_build_path(tmp_path, "nrf52-device")
-    zephyr_dir = build_dir / "zephyr"
-    zephyr_dir.mkdir(parents=True)
-
-    # Create the main firmware binary (would be in build root)
-    firmware_file = build_dir / "firmware.bin"
-    firmware_file.write_bytes(b"main firmware")
-
-    # Create the UF2 file in zephyr subdirectory (nRF52 specific)
-    uf2_file = zephyr_dir / "zephyr.uf2"
-    uf2_file.write_bytes(b"nRF52 UF2 firmware content")
-
-    # Mock storage JSON
-    mock_storage = Mock()
-    mock_storage.name = "nrf52-device"
-    mock_storage.firmware_bin_path = firmware_file
-    mock_storage_json.load.return_value = mock_storage
-
-    # Request the UF2 file with subdirectory path
-    response = await dashboard.fetch(
-        "/download.bin?configuration=nrf52-device.yaml&file=zephyr/zephyr.uf2",
-        method="GET",
-    )
-    assert response.code == 200
-    assert response.body == b"nRF52 UF2 firmware content"
-    assert response.headers["Content-Type"] == "application/octet-stream"
-    assert "attachment" in response.headers["Content-Disposition"]
-    # Download name should be device-name + full file path
-    assert "nrf52-device-zephyr/zephyr.uf2" in response.headers["Content-Disposition"]
-
-
-@pytest.mark.asyncio
-@pytest.mark.usefixtures("mock_ext_storage_path")
-async def test_download_binary_handler_subdirectory_file_url_encoded(
-    dashboard: DashboardTestHelper,
-    tmp_path: Path,
-    mock_storage_json: MagicMock,
-) -> None:
-    """Test the DownloadBinaryRequestHandler.get with URL-encoded subdirectory path.
-
-    Verifies that URL-encoded paths (e.g., zephyr%2Fzephyr.uf2) are correctly
-    decoded and handled, and that custom download names work with subdirectories.
-    """
-    # Create a fake build structure with firmware in subdirectory
-    build_dir = get_build_path(tmp_path, "test")
-    zephyr_dir = build_dir / "zephyr"
-    zephyr_dir.mkdir(parents=True)
-
-    firmware_file = build_dir / "firmware.bin"
-    firmware_file.write_bytes(b"content")
-
-    uf2_file = zephyr_dir / "zephyr.uf2"
-    uf2_file.write_bytes(b"content")
-
-    # Mock storage JSON
-    mock_storage = Mock()
-    mock_storage.name = "test_device"
-    mock_storage.firmware_bin_path = firmware_file
-    mock_storage_json.load.return_value = mock_storage
-
-    # Request with URL-encoded path and custom download name
-    response = await dashboard.fetch(
-        "/download.bin?configuration=test.yaml&file=zephyr%2Fzephyr.uf2&download=custom_name.bin",
-        method="GET",
-    )
-    assert response.code == 200
-    assert "custom_name.bin" in response.headers["Content-Disposition"]
-
-
-@pytest.mark.asyncio
-@pytest.mark.usefixtures("mock_ext_storage_path")
-@pytest.mark.parametrize(
-    "attack_path",
-    [
-        pytest.param("../../../secrets.yaml", id="basic_traversal"),
-        pytest.param("..%2F..%2F..%2Fsecrets.yaml", id="url_encoded"),
-        pytest.param("zephyr/../../../secrets.yaml", id="traversal_with_prefix"),
-        pytest.param("/etc/passwd", id="absolute_path"),
-        pytest.param("//etc/passwd", id="double_slash_absolute"),
-        pytest.param("....//secrets.yaml", id="multiple_dots"),
-    ],
-)
-async def test_download_binary_handler_path_traversal_protection(
-    dashboard: DashboardTestHelper,
-    tmp_path: Path,
-    mock_storage_json: MagicMock,
-    attack_path: str,
-) -> None:
-    """Test that DownloadBinaryRequestHandler prevents path traversal attacks.
-
-    Verifies that attempts to use '..' in file paths are sanitized to prevent
-    accessing files outside the build directory. Tests multiple attack vectors.
-    """
-    # Create build structure
-    build_dir = get_build_path(tmp_path, "test")
-    build_dir.mkdir(parents=True)
-    firmware_file = build_dir / "firmware.bin"
-    firmware_file.write_bytes(b"firmware content")
-
-    # Create a sensitive file outside the build directory that should NOT be accessible
-    sensitive_file = tmp_path / "secrets.yaml"
-    sensitive_file.write_bytes(b"secret: my_secret_password")
-
-    # Mock storage JSON
-    mock_storage = Mock()
-    mock_storage.name = "test_device"
-    mock_storage.firmware_bin_path = firmware_file
-    mock_storage_json.load.return_value = mock_storage
-
-    # Attempt path traversal attack - should be blocked
-    with pytest.raises(HTTPClientError) as exc_info:
-        await dashboard.fetch(
-            f"/download.bin?configuration=test.yaml&file={attack_path}",
-            method="GET",
-        )
-    # Should get 404 (file not found after sanitization) or 500 (idedata fails)
-    assert exc_info.value.code in (404, 500)
-
-
-@pytest.mark.asyncio
-@pytest.mark.usefixtures("mock_ext_storage_path")
-async def test_download_binary_handler_multiple_subdirectory_levels(
-    dashboard: DashboardTestHelper,
-    tmp_path: Path,
-    mock_storage_json: MagicMock,
-) -> None:
-    """Test downloading files from multiple subdirectory levels.
-
-    Verifies that joinpath correctly handles multi-level paths like 'build/output/firmware.bin'.
-    """
-    # Create nested directory structure
-    build_dir = get_build_path(tmp_path, "test")
-    nested_dir = build_dir / "build" / "output"
-    nested_dir.mkdir(parents=True)
-
-    firmware_file = build_dir / "firmware.bin"
-    firmware_file.write_bytes(b"main")
-
-    nested_file = nested_dir / "firmware.bin"
-    nested_file.write_bytes(b"nested firmware content")
-
-    # Mock storage JSON
-    mock_storage = Mock()
-    mock_storage.name = "test_device"
-    mock_storage.firmware_bin_path = firmware_file
-    mock_storage_json.load.return_value = mock_storage
-
-    response = await dashboard.fetch(
-        "/download.bin?configuration=test.yaml&file=build/output/firmware.bin",
-        method="GET",
-    )
-    assert response.code == 200
-    assert response.body == b"nested firmware content"
-
-
 @pytest.mark.asyncio
 async def test_edit_request_handler_post_invalid_file(
     dashboard: DashboardTestHelper,

tests/integration/fixtures/batch_delay_zero_rapid_transitions.yaml

@@ -34,9 +34,10 @@ binary_sensor:
           ESP_LOGD("test", "Button ON at %u", now);
         }
         return true;
+      } else {
+        // Only log state change
+        if (id(ir_remote_button).state) {
+          ESP_LOGD("test", "Button OFF at %u", now);
+        }
+        return false;
       }
-      // Only log state change
-      if (id(ir_remote_button).state) {
-        ESP_LOGD("test", "Button OFF at %u", now);
-      }
-      return false;

tests/integration/fixtures/script_queued.yaml

@@ -0,0 +1,170 @@
+esphome:
+  name: test-script-queued
+
+host:
+api:
+  actions:
+    # Test 1: Queue depth with default max_runs=5
+    - action: test_queue_depth
+      then:
+        - logger.log: "=== TEST 1: Queue depth (max_runs=5 means 5 total, reject 6-7) ==="
+        - script.execute:
+            id: queue_depth_script
+            value: 1
+        - script.execute:
+            id: queue_depth_script
+            value: 2
+        - script.execute:
+            id: queue_depth_script
+            value: 3
+        - script.execute:
+            id: queue_depth_script
+            value: 4
+        - script.execute:
+            id: queue_depth_script
+            value: 5
+        - script.execute:
+            id: queue_depth_script
+            value: 6
+        - script.execute:
+            id: queue_depth_script
+            value: 7
+
+    # Test 2: Ring buffer wrap test
+    - action: test_ring_buffer
+      then:
+        - logger.log: "=== TEST 2: Ring buffer wrap (should process A, B, C in order) ==="
+        - script.execute:
+            id: wrap_script
+            msg: "A"
+        - script.execute:
+            id: wrap_script
+            msg: "B"
+        - script.execute:
+            id: wrap_script
+            msg: "C"
+
+    # Test 3: Stop clears queue
+    - action: test_stop_clears
+      then:
+        - logger.log: "=== TEST 3: Stop clears queue (should only see 1, then 'STOPPED') ==="
+        - script.execute:
+            id: stop_script
+            num: 1
+        - script.execute:
+            id: stop_script
+            num: 2
+        - script.execute:
+            id: stop_script
+            num: 3
+        - delay: 50ms
+        - logger.log: "STOPPING script now"
+        - script.stop: stop_script
+
+    # Test 4: Verify rejection (max_runs=3)
+    - action: test_rejection
+      then:
+        - logger.log: "=== TEST 4: Verify rejection (max_runs=3 means 3 total, reject 4-8) ==="
+        - script.execute:
+            id: rejection_script
+            val: 1
+        - script.execute:
+            id: rejection_script
+            val: 2
+        - script.execute:
+            id: rejection_script
+            val: 3
+        - script.execute:
+            id: rejection_script
+            val: 4
+        - script.execute:
+            id: rejection_script
+            val: 5
+        - script.execute:
+            id: rejection_script
+            val: 6
+        - script.execute:
+            id: rejection_script
+            val: 7
+        - script.execute:
+            id: rejection_script
+            val: 8
+
+    # Test 5: No parameters test
+    - action: test_no_params
+      then:
+        - logger.log: "=== TEST 5: No params (should process 3 times) ==="
+        - script.execute: no_params_script
+        - script.execute: no_params_script
+        - script.execute: no_params_script
+
+logger:
+  level: DEBUG
+
+script:
+  # Test script 1: Queue depth test (default max_runs=5)
+  - id: queue_depth_script
+    mode: queued
+    parameters:
+      value: int
+    then:
+      - logger.log:
+          format: "Queue test: START item %d"
+          args: ['value']
+      - delay: 100ms
+      - logger.log:
+          format: "Queue test: END item %d"
+          args: ['value']
+
+  # Test script 2: Ring buffer wrap test (max_runs=3)
+  - id: wrap_script
+    mode: queued
+    max_runs: 3
+    parameters:
+      msg: string
+    then:
+      - logger.log:
+          format: "Ring buffer: START '%s'"
+          args: ['msg.c_str()']
+      - delay: 50ms
+      - logger.log:
+          format: "Ring buffer: END '%s'"
+          args: ['msg.c_str()']
+
+  # Test script 3: Stop test
+  - id: stop_script
+    mode: queued
+    max_runs: 5
+    parameters:
+      num: int
+    then:
+      - logger.log:
+          format: "Stop test: START %d"
+          args: ['num']
+      - delay: 100ms
+      - logger.log:
+          format: "Stop test: END %d"
+          args: ['num']
+
+  # Test script 4: Rejection test (max_runs=3)
+  - id: rejection_script
+    mode: queued
+    max_runs: 3
+    parameters:
+      val: int
+    then:
+      - logger.log:
+          format: "Rejection test: START %d"
+          args: ['val']
+      - delay: 200ms
+      - logger.log:
+          format: "Rejection test: END %d"
+          args: ['val']
+
+  # Test script 5: No parameters
+  - id: no_params_script
+    mode: queued
+    then:
+      - logger.log: "No params: START"
+      - delay: 50ms
+      - logger.log: "No params: END"

tests/integration/test_script_queued.py

@@ -0,0 +1,207 @@
+"""Test ESPHome queued script functionality."""
+
+from __future__ import annotations
+
+import asyncio
+import re
+
+import pytest
+
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+
+@pytest.mark.asyncio
+async def test_script_queued(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+) -> None:
+    """Test comprehensive queued script functionality."""
+    loop = asyncio.get_running_loop()
+
+    # Track all test results
+    test_results = {
+        "queue_depth": {"processed": [], "rejections": 0},
+        "ring_buffer": {"start_order": [], "end_order": []},
+        "stop": {"processed": [], "stop_logged": False},
+        "rejection": {"processed": [], "rejections": 0},
+        "no_params": {"executions": 0},
+    }
+
+    # Patterns for Test 1: Queue depth
+    queue_start = re.compile(r"Queue test: START item (\d+)")
+    queue_end = re.compile(r"Queue test: END item (\d+)")
+    queue_reject = re.compile(
+        r"Script 'queue_depth_script' maximum number of queued runs exceeded!"
+    )
+
+    # Patterns for Test 2: Ring buffer
+    ring_start = re.compile(r"Ring buffer: START '([A-Z])'")
+    ring_end = re.compile(r"Ring buffer: END '([A-Z])'")
+
+    # Patterns for Test 3: Stop
+    stop_start = re.compile(r"Stop test: START (\d+)")
+    stop_log = re.compile(r"STOPPING script now")
+
+    # Patterns for Test 4: Rejection
+    reject_start = re.compile(r"Rejection test: START (\d+)")
+    reject_end = re.compile(r"Rejection test: END (\d+)")
+    reject_reject = re.compile(
+        r"Script 'rejection_script' maximum number of queued runs exceeded!"
+    )
+
+    # Patterns for Test 5: No params
+    no_params_end = re.compile(r"No params: END")
+
+    # Test completion futures
+    test1_complete = loop.create_future()
+    test2_complete = loop.create_future()
+    test3_complete = loop.create_future()
+    test4_complete = loop.create_future()
+    test5_complete = loop.create_future()
+
+    def check_output(line: str) -> None:
+        """Check log output for all test messages."""
+        # Test 1: Queue depth
+        if match := queue_start.search(line):
+            item = int(match.group(1))
+            if item not in test_results["queue_depth"]["processed"]:
+                test_results["queue_depth"]["processed"].append(item)
+
+        if match := queue_end.search(line):
+            item = int(match.group(1))
+            if item == 5 and not test1_complete.done():
+                test1_complete.set_result(True)
+
+        if queue_reject.search(line):
+            test_results["queue_depth"]["rejections"] += 1
+
+        # Test 2: Ring buffer
+        if match := ring_start.search(line):
+            msg = match.group(1)
+            test_results["ring_buffer"]["start_order"].append(msg)
+
+        if match := ring_end.search(line):
+            msg = match.group(1)
+            test_results["ring_buffer"]["end_order"].append(msg)
+            if (
+                len(test_results["ring_buffer"]["end_order"]) == 3
+                and not test2_complete.done()
+            ):
+                test2_complete.set_result(True)
+
+        # Test 3: Stop
+        if match := stop_start.search(line):
+            item = int(match.group(1))
+            if item not in test_results["stop"]["processed"]:
+                test_results["stop"]["processed"].append(item)
+
+        if stop_log.search(line):
+            test_results["stop"]["stop_logged"] = True
+            # Give time for any queued items to be cleared
+            if not test3_complete.done():
+                loop.call_later(
+                    0.3,
+                    lambda: test3_complete.set_result(True)
+                    if not test3_complete.done()
+                    else None,
+                )
+
+        # Test 4: Rejection
+        if match := reject_start.search(line):
+            item = int(match.group(1))
+            if item not in test_results["rejection"]["processed"]:
+                test_results["rejection"]["processed"].append(item)
+
+        if match := reject_end.search(line):
+            item = int(match.group(1))
+            if item == 3 and not test4_complete.done():
+                test4_complete.set_result(True)
+
+        if reject_reject.search(line):
+            test_results["rejection"]["rejections"] += 1
+
+        # Test 5: No params
+        if no_params_end.search(line):
+            test_results["no_params"]["executions"] += 1
+            if (
+                test_results["no_params"]["executions"] == 3
+                and not test5_complete.done()
+            ):
+                test5_complete.set_result(True)
+
+    async with (
+        run_compiled(yaml_config, line_callback=check_output),
+        api_client_connected() as client,
+    ):
+        # Get services
+        _, services = await client.list_entities_services()
+
+        # Test 1: Queue depth limit
+        test_service = next((s for s in services if s.name == "test_queue_depth"), None)
+        assert test_service is not None, "test_queue_depth service not found"
+        client.execute_service(test_service, {})
+        await asyncio.wait_for(test1_complete, timeout=2.0)
+        await asyncio.sleep(0.1)  # Give time for rejections
+
+        # Verify Test 1
+        assert sorted(test_results["queue_depth"]["processed"]) == [1, 2, 3, 4, 5], (
+            f"Test 1: Expected to process items 1-5 (max_runs=5 means 5 total), got {sorted(test_results['queue_depth']['processed'])}"
+        )
+        assert test_results["queue_depth"]["rejections"] >= 2, (
+            "Test 1: Expected at least 2 rejection warnings (items 6-7 should be rejected)"
+        )
+
+        # Test 2: Ring buffer order
+        test_service = next((s for s in services if s.name == "test_ring_buffer"), None)
+        assert test_service is not None, "test_ring_buffer service not found"
+        client.execute_service(test_service, {})
+        await asyncio.wait_for(test2_complete, timeout=2.0)
+
+        # Verify Test 2
+        assert test_results["ring_buffer"]["start_order"] == ["A", "B", "C"], (
+            f"Test 2: Expected start order [A, B, C], got {test_results['ring_buffer']['start_order']}"
+        )
+        assert test_results["ring_buffer"]["end_order"] == ["A", "B", "C"], (
+            f"Test 2: Expected end order [A, B, C], got {test_results['ring_buffer']['end_order']}"
+        )
+
+        # Test 3: Stop clears queue
+        test_service = next((s for s in services if s.name == "test_stop_clears"), None)
+        assert test_service is not None, "test_stop_clears service not found"
+        client.execute_service(test_service, {})
+        await asyncio.wait_for(test3_complete, timeout=2.0)
+
+        # Verify Test 3
+        assert test_results["stop"]["stop_logged"], (
+            "Test 3: Stop command was not logged"
+        )
+        assert test_results["stop"]["processed"] == [1], (
+            f"Test 3: Expected only item 1 to process, got {test_results['stop']['processed']}"
+        )
+
+        # Test 4: Rejection enforcement (max_runs=3)
+        test_service = next((s for s in services if s.name == "test_rejection"), None)
+        assert test_service is not None, "test_rejection service not found"
+        client.execute_service(test_service, {})
+        await asyncio.wait_for(test4_complete, timeout=2.0)
+        await asyncio.sleep(0.1)  # Give time for rejections
+
+        # Verify Test 4
+        assert sorted(test_results["rejection"]["processed"]) == [1, 2, 3], (
+            f"Test 4: Expected to process items 1-3 (max_runs=3 means 3 total), got {sorted(test_results['rejection']['processed'])}"
+        )
+        assert test_results["rejection"]["rejections"] == 5, (
+            f"Test 4: Expected 5 rejections (items 4-8), got {test_results['rejection']['rejections']}"
+        )
+
+        # Test 5: No parameters
+        test_service = next((s for s in services if s.name == "test_no_params"), None)
+        assert test_service is not None, "test_no_params service not found"
+        client.execute_service(test_service, {})
+        await asyncio.wait_for(test5_complete, timeout=2.0)
+
+        # Verify Test 5
+        assert test_results["no_params"]["executions"] == 3, (
+            f"Test 5: Expected 3 executions, got {test_results['no_params']['executions']}"
+        )