Merge branch 'dev' into drop_unique_id

Bump version to 2025.7.0-dev
Remove legacy unique_id field from entities
2025-06-11 08:26:41 -05:00 · 2025-06-11 23:16:56 +12:00 · 2025-06-07 22:17:07 -05:00
124 changed files with 883 additions and 3308 deletions
--- a/2
+++ b/2
@@ -490,7 +490,7 @@ esphome/components/vbus/* @ssieb
 esphome/components/veml3235/* @kbx81
 esphome/components/veml7700/* @latonita
 esphome/components/version/* @esphome/core
-esphome/components/voice_assistant/* @jesserockz @kahrendt
+esphome/components/voice_assistant/* @jesserockz
 esphome/components/wake_on_lan/* @clydebarrow @willwill2will54
 esphome/components/watchdog/* @oarcher
 esphome/components/waveshare_epaper/* @clydebarrow
--- a/2
+++ b/2
@@ -48,7 +48,7 @@ PROJECT_NAME           = ESPHome
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 2025.6.2
+PROJECT_NUMBER         = 2025.7.0-dev

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/esphome/components/adc/adc_sensor.h
+++ b/esphome/components/adc/adc_sensor.h
@@ -72,10 +72,6 @@ class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage
  void set_sampling_mode(SamplingMode sampling_mode);
  float sample() override;

-#ifdef USE_ESP8266
-  std::string unique_id() override;
-#endif  // USE_ESP8266
-
 #ifdef USE_RP2040
  void set_is_temperature() { this->is_temperature_ = true; }
 #endif  // USE_RP2040
--- a/esphome/components/adc/adc_sensor_esp8266.cpp
+++ b/esphome/components/adc/adc_sensor_esp8266.cpp
@@ -56,8 +56,6 @@ float ADCSensor::sample() {
  return aggr.aggregate() / 1024.0f;
 }

-std::string ADCSensor::unique_id() { return get_mac_address() + "-adc"; }
-
 }  // namespace adc
 }  // namespace esphome

--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -266,14 +266,12 @@ enum EntityCategory {
 // ==================== BINARY SENSOR ====================
 message ListEntitiesBinarySensorResponse {
  option (id) = 12;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_BINARY_SENSOR";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string device_class = 5;
  bool is_status_binary_sensor = 6;
@@ -283,7 +281,6 @@ message ListEntitiesBinarySensorResponse {
 }
 message BinarySensorStateResponse {
  option (id) = 21;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_BINARY_SENSOR";
  option (no_delay) = true;
@@ -298,14 +295,12 @@ message BinarySensorStateResponse {
 // ==================== COVER ====================
 message ListEntitiesCoverResponse {
  option (id) = 13;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_COVER";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  bool assumed_state = 5;
  bool supports_position = 6;
@@ -328,7 +323,6 @@ enum CoverOperation {
 }
 message CoverStateResponse {
  option (id) = 22;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_COVER";
  option (no_delay) = true;
@@ -371,14 +365,12 @@ message CoverCommandRequest {
 // ==================== FAN ====================
 message ListEntitiesFanResponse {
  option (id) = 14;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_FAN";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  bool supports_oscillation = 5;
  bool supports_speed = 6;
@@ -400,7 +392,6 @@ enum FanDirection {
 }
 message FanStateResponse {
  option (id) = 23;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_FAN";
  option (no_delay) = true;
@@ -450,14 +441,12 @@ enum ColorMode {
 }
 message ListEntitiesLightResponse {
  option (id) = 15;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_LIGHT";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  repeated ColorMode supported_color_modes = 12;
  // next four supports_* are for legacy clients, newer clients should use color modes
@@ -474,7 +463,6 @@ message ListEntitiesLightResponse {
 }
 message LightStateResponse {
  option (id) = 24;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_LIGHT";
  option (no_delay) = true;
@@ -544,14 +532,12 @@ enum SensorLastResetType {

 message ListEntitiesSensorResponse {
  option (id) = 16;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SENSOR";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  string unit_of_measurement = 6;
@@ -566,7 +552,6 @@ message ListEntitiesSensorResponse {
 }
 message SensorStateResponse {
  option (id) = 25;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SENSOR";
  option (no_delay) = true;
@@ -581,14 +566,12 @@ message SensorStateResponse {
 // ==================== SWITCH ====================
 message ListEntitiesSwitchResponse {
  option (id) = 17;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SWITCH";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool assumed_state = 6;
@@ -598,7 +581,6 @@ message ListEntitiesSwitchResponse {
 }
 message SwitchStateResponse {
  option (id) = 26;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SWITCH";
  option (no_delay) = true;
@@ -619,14 +601,12 @@ message SwitchCommandRequest {
 // ==================== TEXT SENSOR ====================
 message ListEntitiesTextSensorResponse {
  option (id) = 18;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_TEXT_SENSOR";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -635,7 +615,6 @@ message ListEntitiesTextSensorResponse {
 }
 message TextSensorStateResponse {
  option (id) = 27;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_TEXT_SENSOR";
  option (no_delay) = true;
@@ -803,14 +782,12 @@ message ExecuteServiceRequest {
 // ==================== CAMERA ====================
 message ListEntitiesCameraResponse {
  option (id) = 43;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_ESP32_CAMERA";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;
  bool disabled_by_default = 5;
  string icon = 6;
  EntityCategory entity_category = 7;
@@ -884,14 +861,12 @@ enum ClimatePreset {
 }
 message ListEntitiesClimateResponse {
  option (id) = 46;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_CLIMATE";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  bool supports_current_temperature = 5;
  bool supports_two_point_target_temperature = 6;
@@ -919,7 +894,6 @@ message ListEntitiesClimateResponse {
 }
 message ClimateStateResponse {
  option (id) = 47;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_CLIMATE";
  option (no_delay) = true;
@@ -981,14 +955,12 @@ enum NumberMode {
 }
 message ListEntitiesNumberResponse {
  option (id) = 49;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_NUMBER";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  float min_value = 6;
@@ -1002,7 +974,6 @@ message ListEntitiesNumberResponse {
 }
 message NumberStateResponse {
  option (id) = 50;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_NUMBER";
  option (no_delay) = true;
@@ -1026,14 +997,12 @@ message NumberCommandRequest {
 // ==================== SELECT ====================
 message ListEntitiesSelectResponse {
  option (id) = 52;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SELECT";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  repeated string options = 6;
@@ -1042,7 +1011,6 @@ message ListEntitiesSelectResponse {
 }
 message SelectStateResponse {
  option (id) = 53;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SELECT";
  option (no_delay) = true;
@@ -1066,14 +1034,12 @@ message SelectCommandRequest {
 // ==================== SIREN ====================
 message ListEntitiesSirenResponse {
  option (id) = 55;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SIREN";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -1084,7 +1050,6 @@ message ListEntitiesSirenResponse {
 }
 message SirenStateResponse {
  option (id) = 56;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SIREN";
  option (no_delay) = true;
@@ -1125,14 +1090,12 @@ enum LockCommand  {
 }
 message ListEntitiesLockResponse {
  option (id) = 58;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_LOCK";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -1147,7 +1110,6 @@ message ListEntitiesLockResponse {
 }
 message LockStateResponse {
  option (id) = 59;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_LOCK";
  option (no_delay) = true;
@@ -1170,14 +1132,12 @@ message LockCommandRequest {
 // ==================== BUTTON ====================
 message ListEntitiesButtonResponse {
  option (id) = 61;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_BUTTON";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -1222,14 +1182,12 @@ message MediaPlayerSupportedFormat {
 }
 message ListEntitiesMediaPlayerResponse {
  option (id) = 63;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_MEDIA_PLAYER";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -1241,7 +1199,6 @@ message ListEntitiesMediaPlayerResponse {
 }
 message MediaPlayerStateResponse {
  option (id) = 64;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_MEDIA_PLAYER";
  option (no_delay) = true;
@@ -1643,7 +1600,6 @@ enum VoiceAssistantEvent {
  VOICE_ASSISTANT_STT_VAD_END = 12;
  VOICE_ASSISTANT_TTS_STREAM_START = 98;
  VOICE_ASSISTANT_TTS_STREAM_END = 99;
-  VOICE_ASSISTANT_INTENT_PROGRESS = 100;
 }

 message VoiceAssistantEventData {
@@ -1764,14 +1720,12 @@ enum AlarmControlPanelStateCommand {

 message ListEntitiesAlarmControlPanelResponse {
  option (id) = 94;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_ALARM_CONTROL_PANEL";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;
  string icon = 5;
  bool disabled_by_default = 6;
  EntityCategory entity_category = 7;
@@ -1782,7 +1736,6 @@ message ListEntitiesAlarmControlPanelResponse {

 message AlarmControlPanelStateResponse {
  option (id) = 95;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_ALARM_CONTROL_PANEL";
  option (no_delay) = true;
@@ -1807,14 +1760,12 @@ enum TextMode {
 }
 message ListEntitiesTextResponse {
  option (id) = 97;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_TEXT";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;
  string icon = 5;
  bool disabled_by_default = 6;
  EntityCategory entity_category = 7;
@@ -1826,7 +1777,6 @@ message ListEntitiesTextResponse {
 }
 message TextStateResponse {
  option (id) = 98;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_TEXT";
  option (no_delay) = true;
@@ -1851,14 +1801,12 @@ message TextCommandRequest {
 // ==================== DATETIME DATE ====================
 message ListEntitiesDateResponse {
  option (id) = 100;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_DATE";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -1866,7 +1814,6 @@ message ListEntitiesDateResponse {
 }
 message DateStateResponse {
  option (id) = 101;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_DATE";
  option (no_delay) = true;
@@ -1894,14 +1841,12 @@ message DateCommandRequest {
 // ==================== DATETIME TIME ====================
 message ListEntitiesTimeResponse {
  option (id) = 103;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_TIME";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -1909,7 +1854,6 @@ message ListEntitiesTimeResponse {
 }
 message TimeStateResponse {
  option (id) = 104;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_TIME";
  option (no_delay) = true;
@@ -1937,14 +1881,12 @@ message TimeCommandRequest {
 // ==================== EVENT ====================
 message ListEntitiesEventResponse {
  option (id) = 107;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_EVENT";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -1955,7 +1897,6 @@ message ListEntitiesEventResponse {
 }
 message EventResponse {
  option (id) = 108;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_EVENT";

@@ -1966,14 +1907,12 @@ message EventResponse {
 // ==================== VALVE ====================
 message ListEntitiesValveResponse {
  option (id) = 109;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_VALVE";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -1992,7 +1931,6 @@ enum ValveOperation {
 }
 message ValveStateResponse {
  option (id) = 110;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_VALVE";
  option (no_delay) = true;
@@ -2017,14 +1955,12 @@ message ValveCommandRequest {
 // ==================== DATETIME DATETIME ====================
 message ListEntitiesDateTimeResponse {
  option (id) = 112;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_DATETIME";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -2032,7 +1968,6 @@ message ListEntitiesDateTimeResponse {
 }
 message DateTimeStateResponse {
  option (id) = 113;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_DATETIME";
  option (no_delay) = true;
@@ -2056,14 +1991,12 @@ message DateTimeCommandRequest {
 // ==================== UPDATE ====================
 message ListEntitiesUpdateResponse {
  option (id) = 116;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_UPDATE";

  string object_id = 1;
  fixed32 key = 2;
  string name = 3;
-  string unique_id = 4;

  string icon = 5;
  bool disabled_by_default = 6;
@@ -2072,7 +2005,6 @@ message ListEntitiesUpdateResponse {
 }
 message UpdateStateResponse {
  option (id) = 117;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_UPDATE";
  option (no_delay) = true;
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -225,10 +225,6 @@ void APIConnection::loop() {
  }
 }

-std::string get_default_unique_id(const std::string &component_type, EntityBase *entity) {
-  return App.get_name() + component_type + entity->get_object_id();
-}
-
 DisconnectResponse APIConnection::disconnect(const DisconnectRequest &msg) {
  // remote initiated disconnect_client
  // don't close yet, we still need to send the disconnect response
@@ -248,41 +244,25 @@ void APIConnection::on_disconnect_response(const DisconnectResponse &value) {
 uint16_t APIConnection::encode_message_to_buffer(ProtoMessage &msg, uint16_t message_type, APIConnection *conn,
                                                 uint32_t remaining_size, bool is_single) {
  // Calculate size
-  uint32_t calculated_size = 0;
-  msg.calculate_size(calculated_size);
-
-  // Cache frame sizes to avoid repeated virtual calls
-  const uint8_t header_padding = conn->helper_->frame_header_padding();
-  const uint8_t footer_size = conn->helper_->frame_footer_size();
+  uint32_t size = 0;
+  msg.calculate_size(size);

  // Calculate total size with padding for buffer allocation
-  size_t total_calculated_size = calculated_size + header_padding + footer_size;
+  uint16_t total_size =
+      static_cast<uint16_t>(size) + conn->helper_->frame_header_padding() + conn->helper_->frame_footer_size();

  // Check if it fits
-  if (total_calculated_size > remaining_size) {
+  if (total_size > remaining_size) {
    return 0;  // Doesn't fit
  }

-  // Allocate buffer space - pass payload size, allocation functions add header/footer space
-  ProtoWriteBuffer buffer = is_single ? conn->allocate_single_message_buffer(calculated_size)
-                                      : conn->allocate_batch_message_buffer(calculated_size);
-
-  // Get buffer size after allocation (which includes header padding)
-  std::vector<uint8_t> &shared_buf = conn->parent_->get_shared_buffer_ref();
-  size_t size_before_encode = shared_buf.size();
+  // Allocate exact buffer space needed (just the payload, not the overhead)
+  ProtoWriteBuffer buffer =
+      is_single ? conn->allocate_single_message_buffer(size) : conn->allocate_batch_message_buffer(size);

  // Encode directly into buffer
  msg.encode(buffer);
-
-  // Calculate actual encoded size (not including header that was already added)
-  size_t actual_payload_size = shared_buf.size() - size_before_encode;
-
-  // Return actual total size (header + actual payload + footer)
-  size_t actual_total_size = header_padding + actual_payload_size + footer_size;
-
-  // Verify that calculate_size() returned the correct value
-  assert(calculated_size == actual_payload_size);
-  return static_cast<uint16_t>(actual_total_size);
+  return total_size;
 }

 #ifdef USE_BINARY_SENSOR
@@ -301,7 +281,7 @@ uint16_t APIConnection::try_send_binary_sensor_state(EntityBase *entity, APIConn
  BinarySensorStateResponse resp;
  resp.state = binary_sensor->state;
  resp.missing_state = !binary_sensor->has_state();
-  fill_entity_state_base(binary_sensor, resp);
+  resp.key = binary_sensor->get_object_id_hash();
  return encode_message_to_buffer(resp, BinarySensorStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -311,7 +291,6 @@ uint16_t APIConnection::try_send_binary_sensor_info(EntityBase *entity, APIConne
  ListEntitiesBinarySensorResponse msg;
  msg.device_class = binary_sensor->get_device_class();
  msg.is_status_binary_sensor = binary_sensor->is_status_binary_sensor();
-  msg.unique_id = get_default_unique_id("binary_sensor", binary_sensor);
  fill_entity_info_base(binary_sensor, msg);
  return encode_message_to_buffer(msg, ListEntitiesBinarySensorResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -335,7 +314,7 @@ uint16_t APIConnection::try_send_cover_state(EntityBase *entity, APIConnection *
  if (traits.get_supports_tilt())
    msg.tilt = cover->tilt;
  msg.current_operation = static_cast<enums::CoverOperation>(cover->current_operation);
-  fill_entity_state_base(cover, msg);
+  msg.key = cover->get_object_id_hash();
  return encode_message_to_buffer(msg, CoverStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 uint16_t APIConnection::try_send_cover_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -348,7 +327,6 @@ uint16_t APIConnection::try_send_cover_info(EntityBase *entity, APIConnection *c
  msg.supports_tilt = traits.get_supports_tilt();
  msg.supports_stop = traits.get_supports_stop();
  msg.device_class = cover->get_device_class();
-  msg.unique_id = get_default_unique_id("cover", cover);
  fill_entity_info_base(cover, msg);
  return encode_message_to_buffer(msg, ListEntitiesCoverResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -403,7 +381,7 @@ uint16_t APIConnection::try_send_fan_state(EntityBase *entity, APIConnection *co
    msg.direction = static_cast<enums::FanDirection>(fan->direction);
  if (traits.supports_preset_modes())
    msg.preset_mode = fan->preset_mode;
-  fill_entity_state_base(fan, msg);
+  msg.key = fan->get_object_id_hash();
  return encode_message_to_buffer(msg, FanStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 uint16_t APIConnection::try_send_fan_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -417,7 +395,6 @@ uint16_t APIConnection::try_send_fan_info(EntityBase *entity, APIConnection *con
  msg.supported_speed_count = traits.supported_speed_count();
  for (auto const &preset : traits.supported_preset_modes())
    msg.supported_preset_modes.push_back(preset);
-  msg.unique_id = get_default_unique_id("fan", fan);
  fill_entity_info_base(fan, msg);
  return encode_message_to_buffer(msg, ListEntitiesFanResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -470,7 +447,7 @@ uint16_t APIConnection::try_send_light_state(EntityBase *entity, APIConnection *
  resp.warm_white = values.get_warm_white();
  if (light->supports_effects())
    resp.effect = light->get_effect_name();
-  fill_entity_state_base(light, resp);
+  resp.key = light->get_object_id_hash();
  return encode_message_to_buffer(resp, LightStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 uint16_t APIConnection::try_send_light_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -497,7 +474,6 @@ uint16_t APIConnection::try_send_light_info(EntityBase *entity, APIConnection *c
      msg.effects.push_back(effect->get_name());
    }
  }
-  msg.unique_id = get_default_unique_id("light", light);
  fill_entity_info_base(light, msg);
  return encode_message_to_buffer(msg, ListEntitiesLightResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -552,7 +528,7 @@ uint16_t APIConnection::try_send_sensor_state(EntityBase *entity, APIConnection
  SensorStateResponse resp;
  resp.state = sensor->state;
  resp.missing_state = !sensor->has_state();
-  fill_entity_state_base(sensor, resp);
+  resp.key = sensor->get_object_id_hash();
  return encode_message_to_buffer(resp, SensorStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -565,9 +541,6 @@ uint16_t APIConnection::try_send_sensor_info(EntityBase *entity, APIConnection *
  msg.force_update = sensor->get_force_update();
  msg.device_class = sensor->get_device_class();
  msg.state_class = static_cast<enums::SensorStateClass>(sensor->get_state_class());
-  msg.unique_id = sensor->unique_id();
-  if (msg.unique_id.empty())
-    msg.unique_id = get_default_unique_id("sensor", sensor);
  fill_entity_info_base(sensor, msg);
  return encode_message_to_buffer(msg, ListEntitiesSensorResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -586,7 +559,7 @@ uint16_t APIConnection::try_send_switch_state(EntityBase *entity, APIConnection
  auto *a_switch = static_cast<switch_::Switch *>(entity);
  SwitchStateResponse resp;
  resp.state = a_switch->state;
-  fill_entity_state_base(a_switch, resp);
+  resp.key = a_switch->get_object_id_hash();
  return encode_message_to_buffer(resp, SwitchStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -596,7 +569,6 @@ uint16_t APIConnection::try_send_switch_info(EntityBase *entity, APIConnection *
  ListEntitiesSwitchResponse msg;
  msg.assumed_state = a_switch->assumed_state();
  msg.device_class = a_switch->get_device_class();
-  msg.unique_id = get_default_unique_id("switch", a_switch);
  fill_entity_info_base(a_switch, msg);
  return encode_message_to_buffer(msg, ListEntitiesSwitchResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -629,7 +601,7 @@ uint16_t APIConnection::try_send_text_sensor_state(EntityBase *entity, APIConnec
  TextSensorStateResponse resp;
  resp.state = text_sensor->state;
  resp.missing_state = !text_sensor->has_state();
-  fill_entity_state_base(text_sensor, resp);
+  resp.key = text_sensor->get_object_id_hash();
  return encode_message_to_buffer(resp, TextSensorStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 uint16_t APIConnection::try_send_text_sensor_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -637,9 +609,6 @@ uint16_t APIConnection::try_send_text_sensor_info(EntityBase *entity, APIConnect
  auto *text_sensor = static_cast<text_sensor::TextSensor *>(entity);
  ListEntitiesTextSensorResponse msg;
  msg.device_class = text_sensor->get_device_class();
-  msg.unique_id = text_sensor->unique_id();
-  if (msg.unique_id.empty())
-    msg.unique_id = get_default_unique_id("text_sensor", text_sensor);
  fill_entity_info_base(text_sensor, msg);
  return encode_message_to_buffer(msg, ListEntitiesTextSensorResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -653,7 +622,7 @@ uint16_t APIConnection::try_send_climate_state(EntityBase *entity, APIConnection
                                               bool is_single) {
  auto *climate = static_cast<climate::Climate *>(entity);
  ClimateStateResponse resp;
-  fill_entity_state_base(climate, resp);
+  resp.key = climate->get_object_id_hash();
  auto traits = climate->get_traits();
  resp.mode = static_cast<enums::ClimateMode>(climate->mode);
  resp.action = static_cast<enums::ClimateAction>(climate->action);
@@ -714,7 +683,6 @@ uint16_t APIConnection::try_send_climate_info(EntityBase *entity, APIConnection
    msg.supported_custom_presets.push_back(custom_preset);
  for (auto swing_mode : traits.get_supported_swing_modes())
    msg.supported_swing_modes.push_back(static_cast<enums::ClimateSwingMode>(swing_mode));
-  msg.unique_id = get_default_unique_id("climate", climate);
  fill_entity_info_base(climate, msg);
  return encode_message_to_buffer(msg, ListEntitiesClimateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -762,7 +730,7 @@ uint16_t APIConnection::try_send_number_state(EntityBase *entity, APIConnection
  NumberStateResponse resp;
  resp.state = number->state;
  resp.missing_state = !number->has_state();
-  fill_entity_state_base(number, resp);
+  resp.key = number->get_object_id_hash();
  return encode_message_to_buffer(resp, NumberStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -776,7 +744,6 @@ uint16_t APIConnection::try_send_number_info(EntityBase *entity, APIConnection *
  msg.min_value = number->traits.get_min_value();
  msg.max_value = number->traits.get_max_value();
  msg.step = number->traits.get_step();
-  msg.unique_id = get_default_unique_id("number", number);
  fill_entity_info_base(number, msg);
  return encode_message_to_buffer(msg, ListEntitiesNumberResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -803,7 +770,7 @@ uint16_t APIConnection::try_send_date_state(EntityBase *entity, APIConnection *c
  resp.year = date->year;
  resp.month = date->month;
  resp.day = date->day;
-  fill_entity_state_base(date, resp);
+  resp.key = date->get_object_id_hash();
  return encode_message_to_buffer(resp, DateStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 void APIConnection::send_date_info(datetime::DateEntity *date) {
@@ -813,7 +780,6 @@ uint16_t APIConnection::try_send_date_info(EntityBase *entity, APIConnection *co
                                           bool is_single) {
  auto *date = static_cast<datetime::DateEntity *>(entity);
  ListEntitiesDateResponse msg;
-  msg.unique_id = get_default_unique_id("date", date);
  fill_entity_info_base(date, msg);
  return encode_message_to_buffer(msg, ListEntitiesDateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -840,7 +806,7 @@ uint16_t APIConnection::try_send_time_state(EntityBase *entity, APIConnection *c
  resp.hour = time->hour;
  resp.minute = time->minute;
  resp.second = time->second;
-  fill_entity_state_base(time, resp);
+  resp.key = time->get_object_id_hash();
  return encode_message_to_buffer(resp, TimeStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 void APIConnection::send_time_info(datetime::TimeEntity *time) {
@@ -850,7 +816,6 @@ uint16_t APIConnection::try_send_time_info(EntityBase *entity, APIConnection *co
                                           bool is_single) {
  auto *time = static_cast<datetime::TimeEntity *>(entity);
  ListEntitiesTimeResponse msg;
-  msg.unique_id = get_default_unique_id("time", time);
  fill_entity_info_base(time, msg);
  return encode_message_to_buffer(msg, ListEntitiesTimeResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -879,7 +844,7 @@ uint16_t APIConnection::try_send_datetime_state(EntityBase *entity, APIConnectio
    ESPTime state = datetime->state_as_esptime();
    resp.epoch_seconds = state.timestamp;
  }
-  fill_entity_state_base(datetime, resp);
+  resp.key = datetime->get_object_id_hash();
  return encode_message_to_buffer(resp, DateTimeStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 void APIConnection::send_datetime_info(datetime::DateTimeEntity *datetime) {
@@ -889,7 +854,6 @@ uint16_t APIConnection::try_send_datetime_info(EntityBase *entity, APIConnection
                                               bool is_single) {
  auto *datetime = static_cast<datetime::DateTimeEntity *>(entity);
  ListEntitiesDateTimeResponse msg;
-  msg.unique_id = get_default_unique_id("datetime", datetime);
  fill_entity_info_base(datetime, msg);
  return encode_message_to_buffer(msg, ListEntitiesDateTimeResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -918,7 +882,7 @@ uint16_t APIConnection::try_send_text_state(EntityBase *entity, APIConnection *c
  TextStateResponse resp;
  resp.state = text->state;
  resp.missing_state = !text->has_state();
-  fill_entity_state_base(text, resp);
+  resp.key = text->get_object_id_hash();
  return encode_message_to_buffer(resp, TextStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -930,7 +894,6 @@ uint16_t APIConnection::try_send_text_info(EntityBase *entity, APIConnection *co
  msg.min_length = text->traits.get_min_length();
  msg.max_length = text->traits.get_max_length();
  msg.pattern = text->traits.get_pattern();
-  msg.unique_id = get_default_unique_id("text", text);
  fill_entity_info_base(text, msg);
  return encode_message_to_buffer(msg, ListEntitiesTextResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -959,7 +922,7 @@ uint16_t APIConnection::try_send_select_state(EntityBase *entity, APIConnection
  SelectStateResponse resp;
  resp.state = select->state;
  resp.missing_state = !select->has_state();
-  fill_entity_state_base(select, resp);
+  resp.key = select->get_object_id_hash();
  return encode_message_to_buffer(resp, SelectStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -969,7 +932,6 @@ uint16_t APIConnection::try_send_select_info(EntityBase *entity, APIConnection *
  ListEntitiesSelectResponse msg;
  for (const auto &option : select->traits.get_options())
    msg.options.push_back(option);
-  msg.unique_id = get_default_unique_id("select", select);
  fill_entity_info_base(select, msg);
  return encode_message_to_buffer(msg, ListEntitiesSelectResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -993,7 +955,6 @@ uint16_t APIConnection::try_send_button_info(EntityBase *entity, APIConnection *
  auto *button = static_cast<button::Button *>(entity);
  ListEntitiesButtonResponse msg;
  msg.device_class = button->get_device_class();
-  msg.unique_id = get_default_unique_id("button", button);
  fill_entity_info_base(button, msg);
  return encode_message_to_buffer(msg, ListEntitiesButtonResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -1019,7 +980,7 @@ uint16_t APIConnection::try_send_lock_state(EntityBase *entity, APIConnection *c
  auto *a_lock = static_cast<lock::Lock *>(entity);
  LockStateResponse resp;
  resp.state = static_cast<enums::LockState>(a_lock->state);
-  fill_entity_state_base(a_lock, resp);
+  resp.key = a_lock->get_object_id_hash();
  return encode_message_to_buffer(resp, LockStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -1030,7 +991,6 @@ uint16_t APIConnection::try_send_lock_info(EntityBase *entity, APIConnection *co
  msg.assumed_state = a_lock->traits.get_assumed_state();
  msg.supports_open = a_lock->traits.get_supports_open();
  msg.requires_code = a_lock->traits.get_requires_code();
-  msg.unique_id = get_default_unique_id("lock", a_lock);
  fill_entity_info_base(a_lock, msg);
  return encode_message_to_buffer(msg, ListEntitiesLockResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -1063,7 +1023,7 @@ uint16_t APIConnection::try_send_valve_state(EntityBase *entity, APIConnection *
  ValveStateResponse resp;
  resp.position = valve->position;
  resp.current_operation = static_cast<enums::ValveOperation>(valve->current_operation);
-  fill_entity_state_base(valve, resp);
+  resp.key = valve->get_object_id_hash();
  return encode_message_to_buffer(resp, ValveStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 void APIConnection::send_valve_info(valve::Valve *valve) {
@@ -1078,7 +1038,6 @@ uint16_t APIConnection::try_send_valve_info(EntityBase *entity, APIConnection *c
  msg.assumed_state = traits.get_is_assumed_state();
  msg.supports_position = traits.get_supports_position();
  msg.supports_stop = traits.get_supports_stop();
-  msg.unique_id = get_default_unique_id("valve", valve);
  fill_entity_info_base(valve, msg);
  return encode_message_to_buffer(msg, ListEntitiesValveResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -1111,7 +1070,7 @@ uint16_t APIConnection::try_send_media_player_state(EntityBase *entity, APIConne
  resp.state = static_cast<enums::MediaPlayerState>(report_state);
  resp.volume = media_player->volume;
  resp.muted = media_player->is_muted();
-  fill_entity_state_base(media_player, resp);
+  resp.key = media_player->get_object_id_hash();
  return encode_message_to_buffer(resp, MediaPlayerStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 void APIConnection::send_media_player_info(media_player::MediaPlayer *media_player) {
@@ -1133,7 +1092,6 @@ uint16_t APIConnection::try_send_media_player_info(EntityBase *entity, APIConnec
    media_format.sample_bytes = supported_format.sample_bytes;
    msg.supported_formats.push_back(media_format);
  }
-  msg.unique_id = get_default_unique_id("media_player", media_player);
  fill_entity_info_base(media_player, msg);
  return encode_message_to_buffer(msg, ListEntitiesMediaPlayerResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -1176,7 +1134,6 @@ uint16_t APIConnection::try_send_camera_info(EntityBase *entity, APIConnection *
                                             bool is_single) {
  auto *camera = static_cast<esp32_camera::ESP32Camera *>(entity);
  ListEntitiesCameraResponse msg;
-  msg.unique_id = get_default_unique_id("camera", camera);
  fill_entity_info_base(camera, msg);
  return encode_message_to_buffer(msg, ListEntitiesCameraResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -1375,7 +1332,7 @@ uint16_t APIConnection::try_send_alarm_control_panel_state(EntityBase *entity, A
  auto *a_alarm_control_panel = static_cast<alarm_control_panel::AlarmControlPanel *>(entity);
  AlarmControlPanelStateResponse resp;
  resp.state = static_cast<enums::AlarmControlPanelState>(a_alarm_control_panel->get_state());
-  fill_entity_state_base(a_alarm_control_panel, resp);
+  resp.key = a_alarm_control_panel->get_object_id_hash();
  return encode_message_to_buffer(resp, AlarmControlPanelStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 void APIConnection::send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
@@ -1389,7 +1346,6 @@ uint16_t APIConnection::try_send_alarm_control_panel_info(EntityBase *entity, AP
  msg.supported_features = a_alarm_control_panel->get_supported_features();
  msg.requires_code = a_alarm_control_panel->get_requires_code();
  msg.requires_code_to_arm = a_alarm_control_panel->get_requires_code_to_arm();
-  msg.unique_id = get_default_unique_id("alarm_control_panel", a_alarm_control_panel);
  fill_entity_info_base(a_alarm_control_panel, msg);
  return encode_message_to_buffer(msg, ListEntitiesAlarmControlPanelResponse::MESSAGE_TYPE, conn, remaining_size,
                                  is_single);
@@ -1439,7 +1395,7 @@ uint16_t APIConnection::try_send_event_response(event::Event *event, const std::
                                                uint32_t remaining_size, bool is_single) {
  EventResponse resp;
  resp.event_type = event_type;
-  fill_entity_state_base(event, resp);
+  resp.key = event->get_object_id_hash();
  return encode_message_to_buffer(resp, EventResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -1450,7 +1406,6 @@ uint16_t APIConnection::try_send_event_info(EntityBase *entity, APIConnection *c
  msg.device_class = event->get_device_class();
  for (const auto &event_type : event->get_event_types())
    msg.event_types.push_back(event_type);
-  msg.unique_id = get_default_unique_id("event", event);
  fill_entity_info_base(event, msg);
  return encode_message_to_buffer(msg, ListEntitiesEventResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -1477,7 +1432,7 @@ uint16_t APIConnection::try_send_update_state(EntityBase *entity, APIConnection
    resp.release_summary = update->update_info.summary;
    resp.release_url = update->update_info.release_url;
  }
-  fill_entity_state_base(update, resp);
+  resp.key = update->get_object_id_hash();
  return encode_message_to_buffer(resp, UpdateStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 void APIConnection::send_update_info(update::UpdateEntity *update) {
@@ -1488,7 +1443,6 @@ uint16_t APIConnection::try_send_update_info(EntityBase *entity, APIConnection *
  auto *update = static_cast<update::UpdateEntity *>(entity);
  ListEntitiesUpdateResponse msg;
  msg.device_class = update->get_device_class();
-  msg.unique_id = get_default_unique_id("update", update);
  fill_entity_info_base(update, msg);
  return encode_message_to_buffer(msg, ListEntitiesUpdateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -1538,7 +1492,7 @@ bool APIConnection::try_send_log_message(int level, const char *tag, const char
  buffer.encode_string(3, line, line_length);             // string message = 3

  // SubscribeLogsResponse - 29
-  return this->send_buffer(buffer, SubscribeLogsResponse::MESSAGE_TYPE);
+  return this->send_buffer(buffer, 29);
 }

 HelloResponse APIConnection::hello(const HelloRequest &msg) {
@@ -1685,7 +1639,7 @@ bool APIConnection::try_to_clear_buffer(bool log_out_of_space) {
  return false;
 }
 bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint16_t message_type) {
-  if (!this->try_to_clear_buffer(message_type != SubscribeLogsResponse::MESSAGE_TYPE)) {  // SubscribeLogsResponse
+  if (!this->try_to_clear_buffer(message_type != 29)) {  // SubscribeLogsResponse
    return false;
  }

@@ -1807,7 +1761,7 @@ void APIConnection::process_batch_() {
  this->batch_first_message_ = true;

  size_t items_processed = 0;
-  uint16_t remaining_size = std::numeric_limits<uint16_t>::max();
+  uint32_t remaining_size = MAX_PACKET_SIZE;

  // Track where each message's header padding begins in the buffer
  // For plaintext: this is where the 6-byte header padding starts
@@ -1832,15 +1786,11 @@ void APIConnection::process_batch_() {
    packet_info.emplace_back(item.message_type, current_offset, proto_payload_size);

    // Update tracking variables
-    items_processed++;
-    // After first message, set remaining size to MAX_PACKET_SIZE to avoid fragmentation
-    if (items_processed == 1) {
-      remaining_size = MAX_PACKET_SIZE;
-    }
    remaining_size -= payload_size;
    // Calculate where the next message's header padding will start
    // Current buffer size + footer space (that prepare_message_buffer will add for this message)
    current_offset = this->parent_->get_shared_buffer_ref().size() + footer_size;
+    items_processed++;
  }

  if (items_processed == 0) {
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -240,8 +240,8 @@ class APIConnection : public APIServerConnection {
    // - Header padding: space for protocol headers (7 bytes for Noise, 6 for Plaintext)
    // - Footer: space for MAC (16 bytes for Noise, 0 for Plaintext)
    shared_buf.reserve(reserve_size + header_padding + this->helper_->frame_footer_size());
-    // Resize to add header padding so message encoding starts at the correct position
-    shared_buf.resize(header_padding);
+    // Insert header padding bytes so message encoding starts at the correct position
+    shared_buf.insert(shared_buf.begin(), header_padding, 0);
    return {&shared_buf};
  }

@@ -249,25 +249,31 @@ class APIConnection : public APIServerConnection {
  ProtoWriteBuffer prepare_message_buffer(uint16_t message_size, bool is_first_message) {
    // Get reference to shared buffer (it maintains state between batch messages)
    std::vector<uint8_t> &shared_buf = this->parent_->get_shared_buffer_ref();
-
-    if (is_first_message) {
-      shared_buf.clear();
-    }
-
    size_t current_size = shared_buf.size();

-    // Calculate padding to add:
-    // - First message: just header padding
-    // - Subsequent messages: footer for previous message + header padding for this message
-    size_t padding_to_add = is_first_message
-                                ? this->helper_->frame_header_padding()
-                                : this->helper_->frame_header_padding() + this->helper_->frame_footer_size();
+    if (is_first_message) {
+      // For first message, initialize buffer with header padding
+      uint8_t header_padding = this->helper_->frame_header_padding();
+      shared_buf.clear();
+      shared_buf.reserve(message_size + header_padding);
+      shared_buf.resize(header_padding);
+      // Fill header padding with zeros
+      std::fill(shared_buf.begin(), shared_buf.end(), 0);
+    } else {
+      // For subsequent messages, add footer space for previous message and header for this message
+      uint8_t footer_size = this->helper_->frame_footer_size();
+      uint8_t header_padding = this->helper_->frame_header_padding();

-    // Reserve space for padding + message
-    shared_buf.reserve(current_size + padding_to_add + message_size);
+      // Reserve additional space for everything
+      shared_buf.reserve(current_size + footer_size + header_padding + message_size);

-    // Resize to add the padding bytes
-    shared_buf.resize(current_size + padding_to_add);
+      // Single resize to add both footer and header padding
+      size_t new_size = current_size + footer_size + header_padding;
+      shared_buf.resize(new_size);
+
+      // Fill the newly added bytes with zeros (footer + header padding)
+      std::fill(shared_buf.begin() + current_size, shared_buf.end(), 0);
+    }

    return {&shared_buf};
  }
@@ -282,8 +288,8 @@ class APIConnection : public APIServerConnection {
  ProtoWriteBuffer allocate_batch_message_buffer(uint16_t size);

 protected:
-  // Helper function to fill common entity info fields
-  static void fill_entity_info_base(esphome::EntityBase *entity, InfoResponseProtoMessage &response) {
+  // Helper function to fill common entity fields
+  template<typename ResponseT> static void fill_entity_info_base(esphome::EntityBase *entity, ResponseT &response) {
    // Set common fields that are shared by all entity types
    response.key = entity->get_object_id_hash();
    response.object_id = entity->get_object_id();
@@ -297,11 +303,6 @@ class APIConnection : public APIServerConnection {
    response.entity_category = static_cast<enums::EntityCategory>(entity->get_entity_category());
  }

-  // Helper function to fill common entity state fields
-  static void fill_entity_state_base(esphome::EntityBase *entity, StateResponseProtoMessage &response) {
-    response.key = entity->get_object_id_hash();
-  }
-
  // Non-template helper to encode any ProtoMessage
  static uint16_t encode_message_to_buffer(ProtoMessage &msg, uint16_t message_type, APIConnection *conn,
                                           uint32_t remaining_size, bool is_single);
--- a/esphome/components/api/api_options.proto
+++ b/esphome/components/api/api_options.proto
@@ -21,5 +21,4 @@ extend google.protobuf.MessageOptions {
    optional string ifdef = 1038;
    optional bool log = 1039 [default=true];
    optional bool no_delay = 1040 [default=false];
-    optional string base_class = 1041;
 }
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -516,8 +516,6 @@ template<> const char *proto_enum_to_string<enums::VoiceAssistantEvent>(enums::V
      return "VOICE_ASSISTANT_TTS_STREAM_START";
    case enums::VOICE_ASSISTANT_TTS_STREAM_END:
      return "VOICE_ASSISTANT_TTS_STREAM_END";
-    case enums::VOICE_ASSISTANT_INTENT_PROGRESS:
-      return "VOICE_ASSISTANT_INTENT_PROGRESS";
    default:
      return "UNKNOWN";
  }
@@ -630,7 +628,6 @@ template<> const char *proto_enum_to_string<enums::UpdateCommand>(enums::UpdateC
  }
 }
 #endif
-
 bool HelloRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
  switch (field_id) {
    case 2: {
@@ -1082,10 +1079,6 @@ bool ListEntitiesBinarySensorResponse::decode_length(uint32_t field_id, ProtoLen
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->device_class = value.as_string();
      return true;
@@ -1112,7 +1105,6 @@ void ListEntitiesBinarySensorResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->device_class);
  buffer.encode_bool(6, this->is_status_binary_sensor);
  buffer.encode_bool(7, this->disabled_by_default);
@@ -1123,7 +1115,6 @@ void ListEntitiesBinarySensorResponse::calculate_size(uint32_t &total_size) cons
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->device_class, false);
  ProtoSize::add_bool_field(total_size, 1, this->is_status_binary_sensor, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
@@ -1147,10 +1138,6 @@ void ListEntitiesBinarySensorResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  device_class: ");
  out.append("'").append(this->device_class).append("'");
  out.append("\n");
@@ -1266,10 +1253,6 @@ bool ListEntitiesCoverResponse::decode_length(uint32_t field_id, ProtoLengthDeli
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 8: {
      this->device_class = value.as_string();
      return true;
@@ -1296,7 +1279,6 @@ void ListEntitiesCoverResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_bool(5, this->assumed_state);
  buffer.encode_bool(6, this->supports_position);
  buffer.encode_bool(7, this->supports_tilt);
@@ -1310,7 +1292,6 @@ void ListEntitiesCoverResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_bool_field(total_size, 1, this->assumed_state, false);
  ProtoSize::add_bool_field(total_size, 1, this->supports_position, false);
  ProtoSize::add_bool_field(total_size, 1, this->supports_tilt, false);
@@ -1337,10 +1318,6 @@ void ListEntitiesCoverResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  assumed_state: ");
  out.append(YESNO(this->assumed_state));
  out.append("\n");
@@ -1595,10 +1572,6 @@ bool ListEntitiesFanResponse::decode_length(uint32_t field_id, ProtoLengthDelimi
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 10: {
      this->icon = value.as_string();
      return true;
@@ -1625,7 +1598,6 @@ void ListEntitiesFanResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_bool(5, this->supports_oscillation);
  buffer.encode_bool(6, this->supports_speed);
  buffer.encode_bool(7, this->supports_direction);
@@ -1641,7 +1613,6 @@ void ListEntitiesFanResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_bool_field(total_size, 1, this->supports_oscillation, false);
  ProtoSize::add_bool_field(total_size, 1, this->supports_speed, false);
  ProtoSize::add_bool_field(total_size, 1, this->supports_direction, false);
@@ -1672,10 +1643,6 @@ void ListEntitiesFanResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  supports_oscillation: ");
  out.append(YESNO(this->supports_oscillation));
  out.append("\n");
@@ -2017,10 +1984,6 @@ bool ListEntitiesLightResponse::decode_length(uint32_t field_id, ProtoLengthDeli
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 11: {
      this->effects.push_back(value.as_string());
      return true;
@@ -2055,7 +2018,6 @@ void ListEntitiesLightResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  for (auto &it : this->supported_color_modes) {
    buffer.encode_enum<enums::ColorMode>(12, it, true);
  }
@@ -2076,7 +2038,6 @@ void ListEntitiesLightResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  if (!this->supported_color_modes.empty()) {
    for (const auto &it : this->supported_color_modes) {
      ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(it), true);
@@ -2114,10 +2075,6 @@ void ListEntitiesLightResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  for (const auto &it : this->supported_color_modes) {
    out.append("  supported_color_modes: ");
    out.append(proto_enum_to_string<enums::ColorMode>(it));
@@ -2688,10 +2645,6 @@ bool ListEntitiesSensorResponse::decode_length(uint32_t field_id, ProtoLengthDel
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -2722,7 +2675,6 @@ void ListEntitiesSensorResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_string(6, this->unit_of_measurement);
  buffer.encode_int32(7, this->accuracy_decimals);
@@ -2737,7 +2689,6 @@ void ListEntitiesSensorResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_string_field(total_size, 1, this->unit_of_measurement, false);
  ProtoSize::add_int32_field(total_size, 1, this->accuracy_decimals, false);
@@ -2765,10 +2716,6 @@ void ListEntitiesSensorResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -2890,10 +2837,6 @@ bool ListEntitiesSwitchResponse::decode_length(uint32_t field_id, ProtoLengthDel
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -2920,7 +2863,6 @@ void ListEntitiesSwitchResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->assumed_state);
  buffer.encode_bool(7, this->disabled_by_default);
@@ -2931,7 +2873,6 @@ void ListEntitiesSwitchResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->assumed_state, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
@@ -2955,10 +2896,6 @@ void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -3091,10 +3028,6 @@ bool ListEntitiesTextSensorResponse::decode_length(uint32_t field_id, ProtoLengt
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -3121,7 +3054,6 @@ void ListEntitiesTextSensorResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -3131,7 +3063,6 @@ void ListEntitiesTextSensorResponse::calculate_size(uint32_t &total_size) const
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -3154,10 +3085,6 @@ void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -3958,10 +3885,6 @@ bool ListEntitiesCameraResponse::decode_length(uint32_t field_id, ProtoLengthDel
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 6: {
      this->icon = value.as_string();
      return true;
@@ -3984,7 +3907,6 @@ void ListEntitiesCameraResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_bool(5, this->disabled_by_default);
  buffer.encode_string(6, this->icon);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -3993,7 +3915,6 @@ void ListEntitiesCameraResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -4015,10 +3936,6 @@ void ListEntitiesCameraResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  disabled_by_default: ");
  out.append(YESNO(this->disabled_by_default));
  out.append("\n");
@@ -4192,10 +4109,6 @@ bool ListEntitiesClimateResponse::decode_length(uint32_t field_id, ProtoLengthDe
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 15: {
      this->supported_custom_fan_modes.push_back(value.as_string());
      return true;
@@ -4250,7 +4163,6 @@ void ListEntitiesClimateResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_bool(5, this->supports_current_temperature);
  buffer.encode_bool(6, this->supports_two_point_target_temperature);
  for (auto &it : this->supported_modes) {
@@ -4289,7 +4201,6 @@ void ListEntitiesClimateResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_bool_field(total_size, 1, this->supports_current_temperature, false);
  ProtoSize::add_bool_field(total_size, 1, this->supports_two_point_target_temperature, false);
  if (!this->supported_modes.empty()) {
@@ -4353,10 +4264,6 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  supports_current_temperature: ");
  out.append(YESNO(this->supports_current_temperature));
  out.append("\n");
@@ -4937,10 +4844,6 @@ bool ListEntitiesNumberResponse::decode_length(uint32_t field_id, ProtoLengthDel
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -4983,7 +4886,6 @@ void ListEntitiesNumberResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_float(6, this->min_value);
  buffer.encode_float(7, this->max_value);
@@ -4998,7 +4900,6 @@ void ListEntitiesNumberResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->min_value != 0.0f, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->max_value != 0.0f, false);
@@ -5026,10 +4927,6 @@ void ListEntitiesNumberResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -5187,10 +5084,6 @@ bool ListEntitiesSelectResponse::decode_length(uint32_t field_id, ProtoLengthDel
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -5217,7 +5110,6 @@ void ListEntitiesSelectResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  for (auto &it : this->options) {
    buffer.encode_string(6, it, true);
@@ -5229,7 +5121,6 @@ void ListEntitiesSelectResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  if (!this->options.empty()) {
    for (const auto &it : this->options) {
@@ -5256,10 +5147,6 @@ void ListEntitiesSelectResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -5414,10 +5301,6 @@ bool ListEntitiesSirenResponse::decode_length(uint32_t field_id, ProtoLengthDeli
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -5444,7 +5327,6 @@ void ListEntitiesSirenResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  for (auto &it : this->tones) {
@@ -5458,7 +5340,6 @@ void ListEntitiesSirenResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  if (!this->tones.empty()) {
@@ -5487,10 +5368,6 @@ void ListEntitiesSirenResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -5719,10 +5596,6 @@ bool ListEntitiesLockResponse::decode_length(uint32_t field_id, ProtoLengthDelim
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -5749,7 +5622,6 @@ void ListEntitiesLockResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -5762,7 +5634,6 @@ void ListEntitiesLockResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -5788,10 +5659,6 @@ void ListEntitiesLockResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -5958,10 +5825,6 @@ bool ListEntitiesButtonResponse::decode_length(uint32_t field_id, ProtoLengthDel
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -5988,7 +5851,6 @@ void ListEntitiesButtonResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -5998,7 +5860,6 @@ void ListEntitiesButtonResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -6021,10 +5882,6 @@ void ListEntitiesButtonResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -6171,10 +6028,6 @@ bool ListEntitiesMediaPlayerResponse::decode_length(uint32_t field_id, ProtoLeng
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -6201,7 +6054,6 @@ void ListEntitiesMediaPlayerResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -6214,7 +6066,6 @@ void ListEntitiesMediaPlayerResponse::calculate_size(uint32_t &total_size) const
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -6238,10 +6089,6 @@ void ListEntitiesMediaPlayerResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -8593,10 +8440,6 @@ bool ListEntitiesAlarmControlPanelResponse::decode_length(uint32_t field_id, Pro
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -8619,7 +8462,6 @@ void ListEntitiesAlarmControlPanelResponse::encode(ProtoWriteBuffer buffer) cons
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -8631,7 +8473,6 @@ void ListEntitiesAlarmControlPanelResponse::calculate_size(uint32_t &total_size)
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -8656,10 +8497,6 @@ void ListEntitiesAlarmControlPanelResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -8825,10 +8662,6 @@ bool ListEntitiesTextResponse::decode_length(uint32_t field_id, ProtoLengthDelim
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -8855,7 +8688,6 @@ void ListEntitiesTextResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -8868,7 +8700,6 @@ void ListEntitiesTextResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -8894,10 +8725,6 @@ void ListEntitiesTextResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -9056,10 +8883,6 @@ bool ListEntitiesDateResponse::decode_length(uint32_t field_id, ProtoLengthDelim
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -9082,7 +8905,6 @@ void ListEntitiesDateResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -9091,7 +8913,6 @@ void ListEntitiesDateResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -9113,10 +8934,6 @@ void ListEntitiesDateResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -9297,10 +9114,6 @@ bool ListEntitiesTimeResponse::decode_length(uint32_t field_id, ProtoLengthDelim
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -9323,7 +9136,6 @@ void ListEntitiesTimeResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -9332,7 +9144,6 @@ void ListEntitiesTimeResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -9354,10 +9165,6 @@ void ListEntitiesTimeResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -9538,10 +9345,6 @@ bool ListEntitiesEventResponse::decode_length(uint32_t field_id, ProtoLengthDeli
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -9572,7 +9375,6 @@ void ListEntitiesEventResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -9585,7 +9387,6 @@ void ListEntitiesEventResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -9613,10 +9414,6 @@ void ListEntitiesEventResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -9720,10 +9517,6 @@ bool ListEntitiesValveResponse::decode_length(uint32_t field_id, ProtoLengthDeli
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -9750,7 +9543,6 @@ void ListEntitiesValveResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -9763,7 +9555,6 @@ void ListEntitiesValveResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -9789,10 +9580,6 @@ void ListEntitiesValveResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -9965,10 +9752,6 @@ bool ListEntitiesDateTimeResponse::decode_length(uint32_t field_id, ProtoLengthD
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -9991,7 +9774,6 @@ void ListEntitiesDateTimeResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -10000,7 +9782,6 @@ void ListEntitiesDateTimeResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -10022,10 +9803,6 @@ void ListEntitiesDateTimeResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
@@ -10156,10 +9933,6 @@ bool ListEntitiesUpdateResponse::decode_length(uint32_t field_id, ProtoLengthDel
      this->name = value.as_string();
      return true;
    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
    case 5: {
      this->icon = value.as_string();
      return true;
@@ -10186,7 +9959,6 @@ void ListEntitiesUpdateResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->object_id);
  buffer.encode_fixed32(2, this->key);
  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
  buffer.encode_string(5, this->icon);
  buffer.encode_bool(6, this->disabled_by_default);
  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
@@ -10196,7 +9968,6 @@ void ListEntitiesUpdateResponse::calculate_size(uint32_t &total_size) const {
  ProtoSize::add_string_field(total_size, 1, this->object_id, false);
  ProtoSize::add_fixed_field<4>(total_size, 1, this->key != 0, false);
  ProtoSize::add_string_field(total_size, 1, this->name, false);
-  ProtoSize::add_string_field(total_size, 1, this->unique_id, false);
  ProtoSize::add_string_field(total_size, 1, this->icon, false);
  ProtoSize::add_bool_field(total_size, 1, this->disabled_by_default, false);
  ProtoSize::add_enum_field(total_size, 1, static_cast<uint32_t>(this->entity_category), false);
@@ -10219,10 +9990,6 @@ void ListEntitiesUpdateResponse::dump_to(std::string &out) const {
  out.append("'").append(this->name).append("'");
  out.append("\n");

-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
  out.append("  icon: ");
  out.append("'").append(this->icon).append("'");
  out.append("\n");
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -208,7 +208,6 @@ enum VoiceAssistantEvent : uint32_t {
  VOICE_ASSISTANT_STT_VAD_END = 12,
  VOICE_ASSISTANT_TTS_STREAM_START = 98,
  VOICE_ASSISTANT_TTS_STREAM_END = 99,
-  VOICE_ASSISTANT_INTENT_PROGRESS = 100,
 };
 enum VoiceAssistantTimerEvent : uint32_t {
  VOICE_ASSISTANT_TIMER_STARTED = 0,
@@ -254,27 +253,6 @@ enum UpdateCommand : uint32_t {

 }  // namespace enums

-class InfoResponseProtoMessage : public ProtoMessage {
- public:
-  ~InfoResponseProtoMessage() override = default;
-  std::string object_id{};
-  uint32_t key{0};
-  std::string name{};
-  std::string unique_id{};
-  bool disabled_by_default{false};
-  std::string icon{};
-  enums::EntityCategory entity_category{};
-
- protected:
-};
-
-class StateResponseProtoMessage : public ProtoMessage {
- public:
-  ~StateResponseProtoMessage() override = default;
-  uint32_t key{0};
-
- protected:
-};
 class HelloRequest : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 1;
@@ -506,15 +484,21 @@ class SubscribeStatesRequest : public ProtoMessage {

 protected:
 };
-class ListEntitiesBinarySensorResponse : public InfoResponseProtoMessage {
+class ListEntitiesBinarySensorResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 12;
  static constexpr uint16_t ESTIMATED_SIZE = 56;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_binary_sensor_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
  std::string device_class{};
  bool is_status_binary_sensor{false};
+  bool disabled_by_default{false};
+  std::string icon{};
+  enums::EntityCategory entity_category{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -526,13 +510,14 @@ class ListEntitiesBinarySensorResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class BinarySensorStateResponse : public StateResponseProtoMessage {
+class BinarySensorStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 21;
  static constexpr uint16_t ESTIMATED_SIZE = 9;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "binary_sensor_state_response"; }
 #endif
+  uint32_t key{0};
  bool state{false};
  bool missing_state{false};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -545,17 +530,23 @@ class BinarySensorStateResponse : public StateResponseProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesCoverResponse : public InfoResponseProtoMessage {
+class ListEntitiesCoverResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 13;
  static constexpr uint16_t ESTIMATED_SIZE = 62;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_cover_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
  bool assumed_state{false};
  bool supports_position{false};
  bool supports_tilt{false};
  std::string device_class{};
+  bool disabled_by_default{false};
+  std::string icon{};
+  enums::EntityCategory entity_category{};
  bool supports_stop{false};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -568,13 +559,14 @@ class ListEntitiesCoverResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class CoverStateResponse : public StateResponseProtoMessage {
+class CoverStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 22;
  static constexpr uint16_t ESTIMATED_SIZE = 19;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "cover_state_response"; }
 #endif
+  uint32_t key{0};
  enums::LegacyCoverState legacy_state{};
  float position{0.0f};
  float tilt{0.0f};
@@ -614,17 +606,23 @@ class CoverCommandRequest : public ProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesFanResponse : public InfoResponseProtoMessage {
+class ListEntitiesFanResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 14;
  static constexpr uint16_t ESTIMATED_SIZE = 73;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_fan_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
  bool supports_oscillation{false};
  bool supports_speed{false};
  bool supports_direction{false};
  int32_t supported_speed_count{0};
+  bool disabled_by_default{false};
+  std::string icon{};
+  enums::EntityCategory entity_category{};
  std::vector<std::string> supported_preset_modes{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -637,13 +635,14 @@ class ListEntitiesFanResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class FanStateResponse : public StateResponseProtoMessage {
+class FanStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 23;
  static constexpr uint16_t ESTIMATED_SIZE = 26;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "fan_state_response"; }
 #endif
+  uint32_t key{0};
  bool state{false};
  bool oscillating{false};
  enums::FanSpeed speed{};
@@ -692,13 +691,16 @@ class FanCommandRequest : public ProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesLightResponse : public InfoResponseProtoMessage {
+class ListEntitiesLightResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 15;
  static constexpr uint16_t ESTIMATED_SIZE = 85;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_light_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
  std::vector<enums::ColorMode> supported_color_modes{};
  bool legacy_supports_brightness{false};
  bool legacy_supports_rgb{false};
@@ -707,6 +709,9 @@ class ListEntitiesLightResponse : public InfoResponseProtoMessage {
  float min_mireds{0.0f};
  float max_mireds{0.0f};
  std::vector<std::string> effects{};
+  bool disabled_by_default{false};
+  std::string icon{};
+  enums::EntityCategory entity_category{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -718,13 +723,14 @@ class ListEntitiesLightResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class LightStateResponse : public StateResponseProtoMessage {
+class LightStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 24;
  static constexpr uint16_t ESTIMATED_SIZE = 63;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "light_state_response"; }
 #endif
+  uint32_t key{0};
  bool state{false};
  float brightness{0.0f};
  enums::ColorMode color_mode{};
@@ -793,19 +799,25 @@ class LightCommandRequest : public ProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesSensorResponse : public InfoResponseProtoMessage {
+class ListEntitiesSensorResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 16;
  static constexpr uint16_t ESTIMATED_SIZE = 73;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_sensor_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
  std::string unit_of_measurement{};
  int32_t accuracy_decimals{0};
  bool force_update{false};
  std::string device_class{};
  enums::SensorStateClass state_class{};
  enums::SensorLastResetType legacy_last_reset_type{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -817,13 +829,14 @@ class ListEntitiesSensorResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class SensorStateResponse : public StateResponseProtoMessage {
+class SensorStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 25;
  static constexpr uint16_t ESTIMATED_SIZE = 12;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "sensor_state_response"; }
 #endif
+  uint32_t key{0};
  float state{0.0f};
  bool missing_state{false};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -836,14 +849,20 @@ class SensorStateResponse : public StateResponseProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesSwitchResponse : public InfoResponseProtoMessage {
+class ListEntitiesSwitchResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 17;
  static constexpr uint16_t ESTIMATED_SIZE = 56;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_switch_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
  bool assumed_state{false};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  std::string device_class{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -856,13 +875,14 @@ class ListEntitiesSwitchResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class SwitchStateResponse : public StateResponseProtoMessage {
+class SwitchStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 26;
  static constexpr uint16_t ESTIMATED_SIZE = 7;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "switch_state_response"; }
 #endif
+  uint32_t key{0};
  bool state{false};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -893,13 +913,19 @@ class SwitchCommandRequest : public ProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesTextSensorResponse : public InfoResponseProtoMessage {
+class ListEntitiesTextSensorResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 18;
  static constexpr uint16_t ESTIMATED_SIZE = 54;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_text_sensor_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  std::string device_class{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -912,13 +938,14 @@ class ListEntitiesTextSensorResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class TextSensorStateResponse : public StateResponseProtoMessage {
+class TextSensorStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 27;
  static constexpr uint16_t ESTIMATED_SIZE = 16;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "text_sensor_state_response"; }
 #endif
+  uint32_t key{0};
  std::string state{};
  bool missing_state{false};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -1215,13 +1242,19 @@ class ExecuteServiceRequest : public ProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
-class ListEntitiesCameraResponse : public InfoResponseProtoMessage {
+class ListEntitiesCameraResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 43;
  static constexpr uint16_t ESTIMATED_SIZE = 45;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_camera_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  bool disabled_by_default{false};
+  std::string icon{};
+  enums::EntityCategory entity_category{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -1272,13 +1305,16 @@ class CameraImageRequest : public ProtoMessage {
 protected:
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesClimateResponse : public InfoResponseProtoMessage {
+class ListEntitiesClimateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 46;
  static constexpr uint16_t ESTIMATED_SIZE = 151;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_climate_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
  bool supports_current_temperature{false};
  bool supports_two_point_target_temperature{false};
  std::vector<enums::ClimateMode> supported_modes{};
@@ -1292,6 +1328,9 @@ class ListEntitiesClimateResponse : public InfoResponseProtoMessage {
  std::vector<std::string> supported_custom_fan_modes{};
  std::vector<enums::ClimatePreset> supported_presets{};
  std::vector<std::string> supported_custom_presets{};
+  bool disabled_by_default{false};
+  std::string icon{};
+  enums::EntityCategory entity_category{};
  float visual_current_temperature_step{0.0f};
  bool supports_current_humidity{false};
  bool supports_target_humidity{false};
@@ -1308,13 +1347,14 @@ class ListEntitiesClimateResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ClimateStateResponse : public StateResponseProtoMessage {
+class ClimateStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 47;
  static constexpr uint16_t ESTIMATED_SIZE = 65;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "climate_state_response"; }
 #endif
+  uint32_t key{0};
  enums::ClimateMode mode{};
  float current_temperature{0.0f};
  float target_temperature{0.0f};
@@ -1381,16 +1421,22 @@ class ClimateCommandRequest : public ProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesNumberResponse : public InfoResponseProtoMessage {
+class ListEntitiesNumberResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 49;
  static constexpr uint16_t ESTIMATED_SIZE = 80;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_number_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
  float min_value{0.0f};
  float max_value{0.0f};
  float step{0.0f};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  std::string unit_of_measurement{};
  enums::NumberMode mode{};
  std::string device_class{};
@@ -1405,13 +1451,14 @@ class ListEntitiesNumberResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class NumberStateResponse : public StateResponseProtoMessage {
+class NumberStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 50;
  static constexpr uint16_t ESTIMATED_SIZE = 12;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "number_state_response"; }
 #endif
+  uint32_t key{0};
  float state{0.0f};
  bool missing_state{false};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -1442,14 +1489,20 @@ class NumberCommandRequest : public ProtoMessage {
 protected:
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
 };
-class ListEntitiesSelectResponse : public InfoResponseProtoMessage {
+class ListEntitiesSelectResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 52;
  static constexpr uint16_t ESTIMATED_SIZE = 63;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_select_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
  std::vector<std::string> options{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -1461,13 +1514,14 @@ class ListEntitiesSelectResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class SelectStateResponse : public StateResponseProtoMessage {
+class SelectStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 53;
  static constexpr uint16_t ESTIMATED_SIZE = 16;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "select_state_response"; }
 #endif
+  uint32_t key{0};
  std::string state{};
  bool missing_state{false};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -1500,16 +1554,22 @@ class SelectCommandRequest : public ProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
-class ListEntitiesSirenResponse : public InfoResponseProtoMessage {
+class ListEntitiesSirenResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 55;
  static constexpr uint16_t ESTIMATED_SIZE = 67;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_siren_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
  std::vector<std::string> tones{};
  bool supports_duration{false};
  bool supports_volume{false};
+  enums::EntityCategory entity_category{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -1521,13 +1581,14 @@ class ListEntitiesSirenResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class SirenStateResponse : public StateResponseProtoMessage {
+class SirenStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 56;
  static constexpr uint16_t ESTIMATED_SIZE = 7;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "siren_state_response"; }
 #endif
+  uint32_t key{0};
  bool state{false};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -1566,13 +1627,19 @@ class SirenCommandRequest : public ProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesLockResponse : public InfoResponseProtoMessage {
+class ListEntitiesLockResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 58;
  static constexpr uint16_t ESTIMATED_SIZE = 60;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_lock_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  bool assumed_state{false};
  bool supports_open{false};
  bool requires_code{false};
@@ -1588,13 +1655,14 @@ class ListEntitiesLockResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class LockStateResponse : public StateResponseProtoMessage {
+class LockStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 59;
  static constexpr uint16_t ESTIMATED_SIZE = 7;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "lock_state_response"; }
 #endif
+  uint32_t key{0};
  enums::LockState state{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -1628,13 +1696,19 @@ class LockCommandRequest : public ProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesButtonResponse : public InfoResponseProtoMessage {
+class ListEntitiesButtonResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 61;
  static constexpr uint16_t ESTIMATED_SIZE = 54;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_button_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  std::string device_class{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -1681,13 +1755,19 @@ class MediaPlayerSupportedFormat : public ProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesMediaPlayerResponse : public InfoResponseProtoMessage {
+class ListEntitiesMediaPlayerResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 63;
  static constexpr uint16_t ESTIMATED_SIZE = 81;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_media_player_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  bool supports_pause{false};
  std::vector<MediaPlayerSupportedFormat> supported_formats{};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -1701,13 +1781,14 @@ class ListEntitiesMediaPlayerResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class MediaPlayerStateResponse : public StateResponseProtoMessage {
+class MediaPlayerStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 64;
  static constexpr uint16_t ESTIMATED_SIZE = 14;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "media_player_state_response"; }
 #endif
+  uint32_t key{0};
  enums::MediaPlayerState state{};
  float volume{0.0f};
  bool muted{false};
@@ -2557,13 +2638,19 @@ class VoiceAssistantSetConfiguration : public ProtoMessage {
 protected:
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
-class ListEntitiesAlarmControlPanelResponse : public InfoResponseProtoMessage {
+class ListEntitiesAlarmControlPanelResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 94;
  static constexpr uint16_t ESTIMATED_SIZE = 53;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_alarm_control_panel_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  uint32_t supported_features{0};
  bool requires_code{false};
  bool requires_code_to_arm{false};
@@ -2578,13 +2665,14 @@ class ListEntitiesAlarmControlPanelResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class AlarmControlPanelStateResponse : public StateResponseProtoMessage {
+class AlarmControlPanelStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 95;
  static constexpr uint16_t ESTIMATED_SIZE = 7;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "alarm_control_panel_state_response"; }
 #endif
+  uint32_t key{0};
  enums::AlarmControlPanelState state{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -2617,13 +2705,19 @@ class AlarmControlPanelCommandRequest : public ProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesTextResponse : public InfoResponseProtoMessage {
+class ListEntitiesTextResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 97;
  static constexpr uint16_t ESTIMATED_SIZE = 64;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_text_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  uint32_t min_length{0};
  uint32_t max_length{0};
  std::string pattern{};
@@ -2639,13 +2733,14 @@ class ListEntitiesTextResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class TextStateResponse : public StateResponseProtoMessage {
+class TextStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 98;
  static constexpr uint16_t ESTIMATED_SIZE = 16;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "text_state_response"; }
 #endif
+  uint32_t key{0};
  std::string state{};
  bool missing_state{false};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -2678,13 +2773,19 @@ class TextCommandRequest : public ProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
-class ListEntitiesDateResponse : public InfoResponseProtoMessage {
+class ListEntitiesDateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 100;
  static constexpr uint16_t ESTIMATED_SIZE = 45;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_date_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -2696,13 +2797,14 @@ class ListEntitiesDateResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class DateStateResponse : public StateResponseProtoMessage {
+class DateStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 101;
  static constexpr uint16_t ESTIMATED_SIZE = 19;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "date_state_response"; }
 #endif
+  uint32_t key{0};
  bool missing_state{false};
  uint32_t year{0};
  uint32_t month{0};
@@ -2738,13 +2840,19 @@ class DateCommandRequest : public ProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesTimeResponse : public InfoResponseProtoMessage {
+class ListEntitiesTimeResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 103;
  static constexpr uint16_t ESTIMATED_SIZE = 45;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_time_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -2756,13 +2864,14 @@ class ListEntitiesTimeResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class TimeStateResponse : public StateResponseProtoMessage {
+class TimeStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 104;
  static constexpr uint16_t ESTIMATED_SIZE = 19;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "time_state_response"; }
 #endif
+  uint32_t key{0};
  bool missing_state{false};
  uint32_t hour{0};
  uint32_t minute{0};
@@ -2798,13 +2907,19 @@ class TimeCommandRequest : public ProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesEventResponse : public InfoResponseProtoMessage {
+class ListEntitiesEventResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 107;
  static constexpr uint16_t ESTIMATED_SIZE = 72;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_event_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  std::string device_class{};
  std::vector<std::string> event_types{};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -2818,13 +2933,14 @@ class ListEntitiesEventResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class EventResponse : public StateResponseProtoMessage {
+class EventResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 108;
  static constexpr uint16_t ESTIMATED_SIZE = 14;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "event_response"; }
 #endif
+  uint32_t key{0};
  std::string event_type{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -2836,13 +2952,19 @@ class EventResponse : public StateResponseProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
-class ListEntitiesValveResponse : public InfoResponseProtoMessage {
+class ListEntitiesValveResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 109;
  static constexpr uint16_t ESTIMATED_SIZE = 60;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_valve_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  std::string device_class{};
  bool assumed_state{false};
  bool supports_position{false};
@@ -2858,13 +2980,14 @@ class ListEntitiesValveResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ValveStateResponse : public StateResponseProtoMessage {
+class ValveStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 110;
  static constexpr uint16_t ESTIMATED_SIZE = 12;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "valve_state_response"; }
 #endif
+  uint32_t key{0};
  float position{0.0f};
  enums::ValveOperation current_operation{};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -2898,13 +3021,19 @@ class ValveCommandRequest : public ProtoMessage {
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class ListEntitiesDateTimeResponse : public InfoResponseProtoMessage {
+class ListEntitiesDateTimeResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 112;
  static constexpr uint16_t ESTIMATED_SIZE = 45;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_date_time_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -2916,13 +3045,14 @@ class ListEntitiesDateTimeResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class DateTimeStateResponse : public StateResponseProtoMessage {
+class DateTimeStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 113;
  static constexpr uint16_t ESTIMATED_SIZE = 12;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "date_time_state_response"; }
 #endif
+  uint32_t key{0};
  bool missing_state{false};
  uint32_t epoch_seconds{0};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -2953,13 +3083,19 @@ class DateTimeCommandRequest : public ProtoMessage {
 protected:
  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
 };
-class ListEntitiesUpdateResponse : public InfoResponseProtoMessage {
+class ListEntitiesUpdateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 116;
  static constexpr uint16_t ESTIMATED_SIZE = 54;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "list_entities_update_response"; }
 #endif
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
  std::string device_class{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(uint32_t &total_size) const override;
@@ -2972,13 +3108,14 @@ class ListEntitiesUpdateResponse : public InfoResponseProtoMessage {
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
-class UpdateStateResponse : public StateResponseProtoMessage {
+class UpdateStateResponse : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 117;
  static constexpr uint16_t ESTIMATED_SIZE = 61;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  static constexpr const char *message_name() { return "update_state_response"; }
 #endif
+  uint32_t key{0};
  bool missing_state{false};
  bool in_progress{false};
  bool has_progress{false};
--- a/esphome/components/api/client.py
+++ b/esphome/components/api/client.py
@@ -46,10 +46,12 @@ async def async_run_logs(config: dict[str, Any], address: str) -> None:
        time_ = datetime.now()
        message: bytes = msg.message
        text = message.decode("utf8", "backslashreplace")
+        if dashboard:
+            text = text.replace("\033", "\\033")
        for parsed_msg in parse_log_message(
            text, f"[{time_.hour:02}:{time_.minute:02}:{time_.second:02}]"
        ):
-            print(parsed_msg.replace("\033", "\\033") if dashboard else parsed_msg)
+            print(parsed_msg)

    stop = await async_run(cli, on_log, name=name)
    try:
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -216,7 +216,7 @@ class ProtoWriteBuffer {
    this->buffer_->insert(this->buffer_->end(), data, data + len);
  }
  void encode_string(uint32_t field_id, const std::string &value, bool force = false) {
-    this->encode_string(field_id, value.data(), value.size(), force);
+    this->encode_string(field_id, value.data(), value.size());
  }
  void encode_bytes(uint32_t field_id, const uint8_t *data, size_t len, bool force = false) {
    this->encode_string(field_id, reinterpret_cast<const char *>(data), len, force);
--- a/esphome/components/audio/audio_reader.cpp
+++ b/esphome/components/audio/audio_reader.cpp
@@ -5,7 +5,6 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
-#include "esphome/core/log.h"

 #if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
 #include "esp_crt_bundle.h"
@@ -17,13 +16,13 @@ namespace audio {
 static const uint32_t READ_WRITE_TIMEOUT_MS = 20;

 static const uint32_t CONNECTION_TIMEOUT_MS = 5000;
-static const uint8_t MAX_FETCHING_HEADER_ATTEMPTS = 6;
+
+// The number of times the http read times out with no data before throwing an error
+static const uint32_t ERROR_COUNT_NO_DATA_READ_TIMEOUT = 100;

 static const size_t HTTP_STREAM_BUFFER_SIZE = 2048;

-static const uint8_t MAX_REDIRECTIONS = 5;
-
-static const char *const TAG = "audio_reader";
+static const uint8_t MAX_REDIRECTION = 5;

 // Some common HTTP status codes - borrowed from http_request component accessed 20241224
 enum HttpStatus {
@@ -95,7 +94,7 @@ esp_err_t AudioReader::start(const std::string &uri, AudioFileType &file_type) {
  client_config.url = uri.c_str();
  client_config.cert_pem = nullptr;
  client_config.disable_auto_redirect = false;
-  client_config.max_redirection_count = MAX_REDIRECTIONS;
+  client_config.max_redirection_count = 10;
  client_config.event_handler = http_event_handler;
  client_config.user_data = this;
  client_config.buffer_size = HTTP_STREAM_BUFFER_SIZE;
@@ -117,29 +116,12 @@ esp_err_t AudioReader::start(const std::string &uri, AudioFileType &file_type) {
  esp_err_t err = esp_http_client_open(this->client_, 0);

  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Failed to open URL");
    this->cleanup_connection_();
    return err;
  }

  int64_t header_length = esp_http_client_fetch_headers(this->client_);
-  uint8_t reattempt_count = 0;
-  while ((header_length < 0) && (reattempt_count < MAX_FETCHING_HEADER_ATTEMPTS)) {
-    this->cleanup_connection_();
-    if (header_length != -ESP_ERR_HTTP_EAGAIN) {
-      // Serious error, no recovery
-      return ESP_FAIL;
-    } else {
-      // Reconnect from a fresh state to avoid a bug where it never reads the headers even if made available
-      this->client_ = esp_http_client_init(&client_config);
-      esp_http_client_open(this->client_, 0);
-      header_length = esp_http_client_fetch_headers(this->client_);
-      ++reattempt_count;
-    }
-  }
-
  if (header_length < 0) {
-    ESP_LOGE(TAG, "Failed to fetch headers");
    this->cleanup_connection_();
    return ESP_FAIL;
  }
@@ -153,7 +135,7 @@ esp_err_t AudioReader::start(const std::string &uri, AudioFileType &file_type) {

  ssize_t redirect_count = 0;

-  while ((esp_http_client_set_redirection(this->client_) == ESP_OK) && (redirect_count < MAX_REDIRECTIONS)) {
+  while ((esp_http_client_set_redirection(this->client_) == ESP_OK) && (redirect_count < MAX_REDIRECTION)) {
    err = esp_http_client_open(this->client_, 0);
    if (err != ESP_OK) {
      this->cleanup_connection_();
@@ -285,29 +267,27 @@ AudioReaderState AudioReader::http_read_() {
      return AudioReaderState::FINISHED;
    }
  } else if (this->output_transfer_buffer_->free() > 0) {
-    int received_len = esp_http_client_read(this->client_, (char *) this->output_transfer_buffer_->get_buffer_end(),
-                                            this->output_transfer_buffer_->free());
+    size_t bytes_to_read = this->output_transfer_buffer_->free();
+    int received_len =
+        esp_http_client_read(this->client_, (char *) this->output_transfer_buffer_->get_buffer_end(), bytes_to_read);

    if (received_len > 0) {
      this->output_transfer_buffer_->increase_buffer_length(received_len);
      this->last_data_read_ms_ = millis();
-      return AudioReaderState::READING;
-    } else if (received_len <= 0) {
+    } else if (received_len < 0) {
      // HTTP read error
-      if (received_len == -1) {
-        // A true connection error occured, no chance at recovery
-        this->cleanup_connection_();
-        return AudioReaderState::FAILED;
-      }
+      this->cleanup_connection_();
+      return AudioReaderState::FAILED;
+    } else {
+      if (bytes_to_read > 0) {
+        // Read timed out
+        if ((millis() - this->last_data_read_ms_) > CONNECTION_TIMEOUT_MS) {
+          this->cleanup_connection_();
+          return AudioReaderState::FAILED;
+        }

-      // Read timed out, manually verify if it has been too long since the last successful read
-      if ((millis() - this->last_data_read_ms_) > MAX_FETCHING_HEADER_ATTEMPTS * CONNECTION_TIMEOUT_MS) {
-        ESP_LOGE(TAG, "Timed out");
-        this->cleanup_connection_();
-        return AudioReaderState::FAILED;
+        delay(READ_WRITE_TIMEOUT_MS);
      }
-
-      delay(READ_WRITE_TIMEOUT_MS);
    }
  }

--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -58,7 +58,7 @@ static std::vector<api::BluetoothLERawAdvertisement> &get_batch_buffer() {
  return batch_buffer;
 }

-bool BluetoothProxy::parse_devices(const esp32_ble::BLEScanResult *scan_results, size_t count) {
+bool BluetoothProxy::parse_devices(esp_ble_gap_cb_param_t::ble_scan_result_evt_param *advertisements, size_t count) {
  if (!api::global_api_server->is_connected() || this->api_connection_ == nullptr || !this->raw_advertisements_)
    return false;

@@ -73,7 +73,7 @@ bool BluetoothProxy::parse_devices(const esp32_ble::BLEScanResult *scan_results,

  // Add new advertisements to the batch buffer
  for (size_t i = 0; i < count; i++) {
-    auto &result = scan_results[i];
+    auto &result = advertisements[i];
    uint8_t length = result.adv_data_len + result.scan_rsp_len;

    batch_buffer.emplace_back();
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -52,7 +52,7 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
 public:
  BluetoothProxy();
  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
-  bool parse_devices(const esp32_ble::BLEScanResult *scan_results, size_t count) override;
+  bool parse_devices(esp_ble_gap_cb_param_t::ble_scan_result_evt_param *advertisements, size_t count) override;
  void dump_config() override;
  void setup() override;
  void loop() override;
--- a/esphome/components/bme280_base/bme280_base.cpp
+++ b/esphome/components/bme280_base/bme280_base.cpp
@@ -93,8 +93,9 @@ void BME280Component::setup() {

  // Mark as not failed before initializing. Some devices will turn off sensors to save on batteries
  // and when they come back on, the COMPONENT_STATE_FAILED bit must be unset on the component.
-  if (this->is_failed()) {
-    this->reset_to_construction_state();
+  if ((this->component_state_ & COMPONENT_STATE_MASK) == COMPONENT_STATE_FAILED) {
+    this->component_state_ &= ~COMPONENT_STATE_MASK;
+    this->component_state_ |= COMPONENT_STATE_CONSTRUCTION;
  }

  if (!this->read_byte(BME280_REGISTER_CHIPID, &chip_id)) {
--- a/esphome/components/datetime/date_entity.cpp
+++ b/esphome/components/datetime/date_entity.cpp
@@ -11,25 +11,25 @@ static const char *const TAG = "datetime.date_entity";

 void DateEntity::publish_state() {
  if (this->year_ == 0 || this->month_ == 0 || this->day_ == 0) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    return;
  }
  if (this->year_ < 1970 || this->year_ > 3000) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Year must be between 1970 and 3000");
    return;
  }
  if (this->month_ < 1 || this->month_ > 12) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Month must be between 1 and 12");
    return;
  }
  if (this->day_ > days_in_month(this->month_, this->year_)) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Day must be between 1 and %d for month %d", days_in_month(this->month_, this->year_), this->month_);
    return;
  }
-  this->set_has_state(true);
+  this->has_state_ = true;
  ESP_LOGD(TAG, "'%s': Sending date %d-%d-%d", this->get_name().c_str(), this->year_, this->month_, this->day_);
  this->state_callback_.call();
 }
--- a/esphome/components/datetime/datetime_base.h
+++ b/esphome/components/datetime/datetime_base.h
@@ -13,6 +13,9 @@ namespace datetime {

 class DateTimeBase : public EntityBase {
 public:
+  /// Return whether this Datetime has gotten a full state yet.
+  bool has_state() const { return this->has_state_; }
+
  virtual ESPTime state_as_esptime() const = 0;

  void add_on_state_callback(std::function<void()> &&callback) { this->state_callback_.add(std::move(callback)); }
@@ -28,6 +31,8 @@ class DateTimeBase : public EntityBase {
 #ifdef USE_TIME
  time::RealTimeClock *rtc_;
 #endif
+
+  bool has_state_{false};
 };

 #ifdef USE_TIME
--- a/esphome/components/datetime/datetime_entity.cpp
+++ b/esphome/components/datetime/datetime_entity.cpp
@@ -11,40 +11,40 @@ static const char *const TAG = "datetime.datetime_entity";

 void DateTimeEntity::publish_state() {
  if (this->year_ == 0 || this->month_ == 0 || this->day_ == 0) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    return;
  }
  if (this->year_ < 1970 || this->year_ > 3000) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Year must be between 1970 and 3000");
    return;
  }
  if (this->month_ < 1 || this->month_ > 12) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Month must be between 1 and 12");
    return;
  }
  if (this->day_ > days_in_month(this->month_, this->year_)) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Day must be between 1 and %d for month %d", days_in_month(this->month_, this->year_), this->month_);
    return;
  }
  if (this->hour_ > 23) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Hour must be between 0 and 23");
    return;
  }
  if (this->minute_ > 59) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Minute must be between 0 and 59");
    return;
  }
  if (this->second_ > 59) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Second must be between 0 and 59");
    return;
  }
-  this->set_has_state(true);
+  this->has_state_ = true;
  ESP_LOGD(TAG, "'%s': Sending datetime %04u-%02u-%02u %02d:%02d:%02d", this->get_name().c_str(), this->year_,
           this->month_, this->day_, this->hour_, this->minute_, this->second_);
  this->state_callback_.call();
--- a/esphome/components/datetime/time_entity.cpp
+++ b/esphome/components/datetime/time_entity.cpp
@@ -11,21 +11,21 @@ static const char *const TAG = "datetime.time_entity";

 void TimeEntity::publish_state() {
  if (this->hour_ > 23) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Hour must be between 0 and 23");
    return;
  }
  if (this->minute_ > 59) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Minute must be between 0 and 59");
    return;
  }
  if (this->second_ > 59) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Second must be between 0 and 59");
    return;
  }
-  this->set_has_state(true);
+  this->has_state_ = true;
  ESP_LOGD(TAG, "'%s': Sending time %02d:%02d:%02d", this->get_name().c_str(), this->hour_, this->minute_,
           this->second_);
  this->state_callback_.call();
--- a/esphome/components/esp32/init.py
+++ b/esphome/components/esp32/init.py
@@ -94,13 +94,6 @@ COMPILER_OPTIMIZATIONS = {
    "SIZE": "CONFIG_COMPILER_OPTIMIZATION_SIZE",
 }

-ARDUINO_ALLOWED_VARIANTS = [
-    VARIANT_ESP32,
-    VARIANT_ESP32C3,
-    VARIANT_ESP32S2,
-    VARIANT_ESP32S3,
-]
-

 def get_cpu_frequencies(*frequencies):
    return [str(x) + "MHZ" for x in frequencies]
@@ -150,17 +143,12 @@ def set_core_data(config):
        CORE.data[KEY_ESP32][KEY_COMPONENTS] = {}
    elif conf[CONF_TYPE] == FRAMEWORK_ARDUINO:
        CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK] = "arduino"
-        if variant not in ARDUINO_ALLOWED_VARIANTS:
-            raise cv.Invalid(
-                f"ESPHome does not support using the Arduino framework for the {variant}. Please use the ESP-IDF framework instead.",
-                path=[CONF_FRAMEWORK, CONF_TYPE],
-            )
    CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] = cv.Version.parse(
        config[CONF_FRAMEWORK][CONF_VERSION]
    )

    CORE.data[KEY_ESP32][KEY_BOARD] = config[CONF_BOARD]
-    CORE.data[KEY_ESP32][KEY_VARIANT] = variant
+    CORE.data[KEY_ESP32][KEY_VARIANT] = config[CONF_VARIANT]
    CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES] = {}

    return config
@@ -605,7 +593,7 @@ ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
                        CONF_ENABLE_LWIP_DHCP_SERVER, "wifi", default=False
                    ): cv.boolean,
                    cv.Optional(
-                        CONF_ENABLE_LWIP_MDNS_QUERIES, default=True
+                        CONF_ENABLE_LWIP_MDNS_QUERIES, default=False
                    ): cv.boolean,
                    cv.Optional(
                        CONF_ENABLE_LWIP_BRIDGE_INTERFACE, default=False
@@ -630,21 +618,6 @@ ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
 )


-def _set_default_framework(config):
-    if CONF_FRAMEWORK not in config:
-        config = config.copy()
-
-        variant = config[CONF_VARIANT]
-        if variant in ARDUINO_ALLOWED_VARIANTS:
-            config[CONF_FRAMEWORK] = ARDUINO_FRAMEWORK_SCHEMA({})
-            config[CONF_FRAMEWORK][CONF_TYPE] = FRAMEWORK_ARDUINO
-        else:
-            config[CONF_FRAMEWORK] = ESP_IDF_FRAMEWORK_SCHEMA({})
-            config[CONF_FRAMEWORK][CONF_TYPE] = FRAMEWORK_ESP_IDF
-
-    return config
-
-
 FRAMEWORK_ESP_IDF = "esp-idf"
 FRAMEWORK_ARDUINO = "arduino"
 FRAMEWORK_SCHEMA = cv.typed_schema(
@@ -654,6 +627,7 @@ FRAMEWORK_SCHEMA = cv.typed_schema(
    },
    lower=True,
    space="-",
+    default_type=FRAMEWORK_ARDUINO,
 )


@@ -680,11 +654,10 @@ CONFIG_SCHEMA = cv.All(
            ),
            cv.Optional(CONF_PARTITIONS): cv.file_,
            cv.Optional(CONF_VARIANT): cv.one_of(*VARIANTS, upper=True),
-            cv.Optional(CONF_FRAMEWORK): FRAMEWORK_SCHEMA,
+            cv.Optional(CONF_FRAMEWORK, default={}): FRAMEWORK_SCHEMA,
        }
    ),
    _detect_variant,
-    _set_default_framework,
    set_core_data,
 )

@@ -760,7 +733,7 @@ async def to_code(config):
            and not advanced[CONF_ENABLE_LWIP_DHCP_SERVER]
        ):
            add_idf_sdkconfig_option("CONFIG_LWIP_DHCPS", False)
-        if not advanced.get(CONF_ENABLE_LWIP_MDNS_QUERIES, True):
+        if not advanced.get(CONF_ENABLE_LWIP_MDNS_QUERIES, False):
            add_idf_sdkconfig_option("CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES", False)
        if not advanced.get(CONF_ENABLE_LWIP_BRIDGE_INTERFACE, False):
            add_idf_sdkconfig_option("CONFIG_LWIP_BRIDGEIF_MAX_PORTS", 0)
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -1,7 +1,6 @@
 #ifdef USE_ESP32

 #include "ble.h"
-#include "ble_event_pool.h"

 #include "esphome/core/application.h"
 #include "esphome/core/log.h"
@@ -24,6 +23,9 @@ namespace esp32_ble {

 static const char *const TAG = "esp32_ble";

+static RAMAllocator<BLEEvent> EVENT_ALLOCATOR(  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+    RAMAllocator<BLEEvent>::ALLOW_FAILURE | RAMAllocator<BLEEvent>::ALLOC_INTERNAL);
+
 void ESP32BLE::setup() {
  global_ble = this;
  ESP_LOGCONFIG(TAG, "Running setup");
@@ -302,191 +304,82 @@ void ESP32BLE::loop() {
  BLEEvent *ble_event = this->ble_events_.pop();
  while (ble_event != nullptr) {
    switch (ble_event->type_) {
-      case BLEEvent::GATTS: {
-        esp_gatts_cb_event_t event = ble_event->event_.gatts.gatts_event;
-        esp_gatt_if_t gatts_if = ble_event->event_.gatts.gatts_if;
-        esp_ble_gatts_cb_param_t *param = ble_event->event_.gatts.gatts_param;
-        ESP_LOGV(TAG, "gatts_event [esp_gatt_if: %d] - %d", gatts_if, event);
-        for (auto *gatts_handler : this->gatts_event_handlers_) {
-          gatts_handler->gatts_event_handler(event, gatts_if, param);
-        }
+      case BLEEvent::GATTS:
+        this->real_gatts_event_handler_(ble_event->event_.gatts.gatts_event, ble_event->event_.gatts.gatts_if,
+                                        &ble_event->event_.gatts.gatts_param);
        break;
-      }
-      case BLEEvent::GATTC: {
-        esp_gattc_cb_event_t event = ble_event->event_.gattc.gattc_event;
-        esp_gatt_if_t gattc_if = ble_event->event_.gattc.gattc_if;
-        esp_ble_gattc_cb_param_t *param = ble_event->event_.gattc.gattc_param;
-        ESP_LOGV(TAG, "gattc_event [esp_gatt_if: %d] - %d", gattc_if, event);
-        for (auto *gattc_handler : this->gattc_event_handlers_) {
-          gattc_handler->gattc_event_handler(event, gattc_if, param);
-        }
+      case BLEEvent::GATTC:
+        this->real_gattc_event_handler_(ble_event->event_.gattc.gattc_event, ble_event->event_.gattc.gattc_if,
+                                        &ble_event->event_.gattc.gattc_param);
        break;
-      }
-      case BLEEvent::GAP: {
-        esp_gap_ble_cb_event_t gap_event = ble_event->event_.gap.gap_event;
-        switch (gap_event) {
-          case ESP_GAP_BLE_SCAN_RESULT_EVT:
-            // Use the new scan event handler - no memcpy!
-            for (auto *scan_handler : this->gap_scan_event_handlers_) {
-              scan_handler->gap_scan_event_handler(ble_event->scan_result());
-            }
-            break;
-
-          // Scan complete events
-          case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT:
-          case ESP_GAP_BLE_SCAN_START_COMPLETE_EVT:
-          case ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT:
-            // All three scan complete events have the same structure with just status
-            // The scan_complete struct matches ESP-IDF's layout exactly, so this reinterpret_cast is safe
-            // This is verified at compile-time by static_assert checks in ble_event.h
-            // The struct already contains our copy of the status (copied in BLEEvent constructor)
-            ESP_LOGV(TAG, "gap_event_handler - %d", gap_event);
-            for (auto *gap_handler : this->gap_event_handlers_) {
-              gap_handler->gap_event_handler(
-                  gap_event, reinterpret_cast<esp_ble_gap_cb_param_t *>(&ble_event->event_.gap.scan_complete));
-            }
-            break;
-
-          // Advertising complete events
-          case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT:
-          case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT:
-          case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT:
-          case ESP_GAP_BLE_ADV_START_COMPLETE_EVT:
-          case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT:
-            // All advertising complete events have the same structure with just status
-            ESP_LOGV(TAG, "gap_event_handler - %d", gap_event);
-            for (auto *gap_handler : this->gap_event_handlers_) {
-              gap_handler->gap_event_handler(
-                  gap_event, reinterpret_cast<esp_ble_gap_cb_param_t *>(&ble_event->event_.gap.adv_complete));
-            }
-            break;
-
-          // RSSI complete event
-          case ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT:
-            ESP_LOGV(TAG, "gap_event_handler - %d", gap_event);
-            for (auto *gap_handler : this->gap_event_handlers_) {
-              gap_handler->gap_event_handler(
-                  gap_event, reinterpret_cast<esp_ble_gap_cb_param_t *>(&ble_event->event_.gap.read_rssi_complete));
-            }
-            break;
-
-          // Security events
-          case ESP_GAP_BLE_AUTH_CMPL_EVT:
-          case ESP_GAP_BLE_SEC_REQ_EVT:
-          case ESP_GAP_BLE_PASSKEY_NOTIF_EVT:
-          case ESP_GAP_BLE_PASSKEY_REQ_EVT:
-          case ESP_GAP_BLE_NC_REQ_EVT:
-            ESP_LOGV(TAG, "gap_event_handler - %d", gap_event);
-            for (auto *gap_handler : this->gap_event_handlers_) {
-              gap_handler->gap_event_handler(
-                  gap_event, reinterpret_cast<esp_ble_gap_cb_param_t *>(&ble_event->event_.gap.security));
-            }
-            break;
-
-          default:
-            // Unknown/unhandled event
-            ESP_LOGW(TAG, "Unhandled GAP event type in loop: %d", gap_event);
-            break;
-        }
+      case BLEEvent::GAP:
+        this->real_gap_event_handler_(ble_event->event_.gap.gap_event, &ble_event->event_.gap.gap_param);
        break;
-      }
      default:
        break;
    }
-    // Return the event to the pool
-    this->ble_event_pool_.release(ble_event);
+    ble_event->~BLEEvent();
+    EVENT_ALLOCATOR.deallocate(ble_event, 1);
    ble_event = this->ble_events_.pop();
  }
  if (this->advertising_ != nullptr) {
    this->advertising_->loop();
  }
-
-  // Log dropped events periodically
-  uint16_t dropped = this->ble_events_.get_and_reset_dropped_count();
-  if (dropped > 0) {
-    ESP_LOGW(TAG, "Dropped %u BLE events due to buffer overflow", dropped);
-  }
 }

-// Helper function to load new event data based on type
-void load_ble_event(BLEEvent *event, esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
-  event->load_gap_event(e, p);
-}
-
-void load_ble_event(BLEEvent *event, esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
-  event->load_gattc_event(e, i, p);
-}
-
-void load_ble_event(BLEEvent *event, esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
-  event->load_gatts_event(e, i, p);
-}
-
-template<typename... Args> void enqueue_ble_event(Args... args) {
-  // Allocate an event from the pool
-  BLEEvent *event = global_ble->ble_event_pool_.allocate();
-  if (event == nullptr) {
-    // No events available - queue is full or we're out of memory
-    global_ble->ble_events_.increment_dropped_count();
-    return;
-  }
-
-  // Load new event data (replaces previous event)
-  load_ble_event(event, args...);
-
-  // Push the event to the queue
-  global_ble->ble_events_.push(event);
-  // Push always succeeds because we're the only producer and the pool ensures we never exceed queue size
-}
-
-// Explicit template instantiations for the friend function
-template void enqueue_ble_event(esp_gap_ble_cb_event_t, esp_ble_gap_cb_param_t *);
-template void enqueue_ble_event(esp_gatts_cb_event_t, esp_gatt_if_t, esp_ble_gatts_cb_param_t *);
-template void enqueue_ble_event(esp_gattc_cb_event_t, esp_gatt_if_t, esp_ble_gattc_cb_param_t *);
-
 void ESP32BLE::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
-  switch (event) {
-    // Queue GAP events that components need to handle
-    // Scanning events - used by esp32_ble_tracker
-    case ESP_GAP_BLE_SCAN_RESULT_EVT:
-    case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT:
-    case ESP_GAP_BLE_SCAN_START_COMPLETE_EVT:
-    case ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT:
-    // Advertising events - used by esp32_ble_beacon and esp32_ble server
-    case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT:
-    case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT:
-    case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT:
-    case ESP_GAP_BLE_ADV_START_COMPLETE_EVT:
-    case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT:
-    // Connection events - used by ble_client
-    case ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT:
-    // Security events - used by ble_client and bluetooth_proxy
-    case ESP_GAP_BLE_AUTH_CMPL_EVT:
-    case ESP_GAP_BLE_SEC_REQ_EVT:
-    case ESP_GAP_BLE_PASSKEY_NOTIF_EVT:
-    case ESP_GAP_BLE_PASSKEY_REQ_EVT:
-    case ESP_GAP_BLE_NC_REQ_EVT:
-      enqueue_ble_event(event, param);
-      return;
-
-    // Ignore these GAP events as they are not relevant for our use case
-    case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT:
-    case ESP_GAP_BLE_SET_PKT_LENGTH_COMPLETE_EVT:
-      return;
-
-    default:
-      break;
+  BLEEvent *new_event = EVENT_ALLOCATOR.allocate(1);
+  if (new_event == nullptr) {
+    // Memory too fragmented to allocate new event. Can only drop it until memory comes back
+    return;
+  }
+  new (new_event) BLEEvent(event, param);
+  global_ble->ble_events_.push(new_event);
+}  // NOLINT(clang-analyzer-unix.Malloc)
+
+void ESP32BLE::real_gap_event_handler_(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
+  ESP_LOGV(TAG, "(BLE) gap_event_handler - %d", event);
+  for (auto *gap_handler : this->gap_event_handlers_) {
+    gap_handler->gap_event_handler(event, param);
  }
-  ESP_LOGW(TAG, "Ignoring unexpected GAP event type: %d", event);
 }

 void ESP32BLE::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
                                   esp_ble_gatts_cb_param_t *param) {
-  enqueue_ble_event(event, gatts_if, param);
+  BLEEvent *new_event = EVENT_ALLOCATOR.allocate(1);
+  if (new_event == nullptr) {
+    // Memory too fragmented to allocate new event. Can only drop it until memory comes back
+    return;
+  }
+  new (new_event) BLEEvent(event, gatts_if, param);
+  global_ble->ble_events_.push(new_event);
+}  // NOLINT(clang-analyzer-unix.Malloc)
+
+void ESP32BLE::real_gatts_event_handler_(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
+                                         esp_ble_gatts_cb_param_t *param) {
+  ESP_LOGV(TAG, "(BLE) gatts_event [esp_gatt_if: %d] - %d", gatts_if, event);
+  for (auto *gatts_handler : this->gatts_event_handlers_) {
+    gatts_handler->gatts_event_handler(event, gatts_if, param);
+  }
 }

 void ESP32BLE::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                   esp_ble_gattc_cb_param_t *param) {
-  enqueue_ble_event(event, gattc_if, param);
+  BLEEvent *new_event = EVENT_ALLOCATOR.allocate(1);
+  if (new_event == nullptr) {
+    // Memory too fragmented to allocate new event. Can only drop it until memory comes back
+    return;
+  }
+  new (new_event) BLEEvent(event, gattc_if, param);
+  global_ble->ble_events_.push(new_event);
+}  // NOLINT(clang-analyzer-unix.Malloc)
+
+void ESP32BLE::real_gattc_event_handler_(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                         esp_ble_gattc_cb_param_t *param) {
+  ESP_LOGV(TAG, "(BLE) gattc_event [esp_gatt_if: %d] - %d", gattc_if, event);
+  for (auto *gattc_handler : this->gattc_event_handlers_) {
+    gattc_handler->gattc_event_handler(event, gattc_if, param);
+  }
 }

 float ESP32BLE::get_setup_priority() const { return setup_priority::BLUETOOTH; }
--- a/esphome/components/esp32_ble/ble.h
+++ b/esphome/components/esp32_ble/ble.h
@@ -2,7 +2,6 @@

 #include "ble_advertising.h"
 #include "ble_uuid.h"
-#include "ble_scan_result.h"

 #include <functional>

@@ -12,7 +11,6 @@
 #include "esphome/core/helpers.h"

 #include "ble_event.h"
-#include "ble_event_pool.h"
 #include "queue.h"

 #ifdef USE_ESP32
@@ -24,16 +22,6 @@
 namespace esphome {
 namespace esp32_ble {

-// Maximum number of BLE scan results to buffer
-#ifdef USE_PSRAM
-static constexpr uint8_t SCAN_RESULT_BUFFER_SIZE = 32;
-#else
-static constexpr uint8_t SCAN_RESULT_BUFFER_SIZE = 20;
-#endif
-
-// Maximum size of the BLE event queue - must be power of 2 for lock-free queue
-static constexpr size_t MAX_BLE_QUEUE_SIZE = 64;
-
 uint64_t ble_addr_to_uint64(const esp_bd_addr_t address);

 // NOLINTNEXTLINE(modernize-use-using)
@@ -69,11 +57,6 @@ class GAPEventHandler {
  virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) = 0;
 };

-class GAPScanEventHandler {
- public:
-  virtual void gap_scan_event_handler(const BLEScanResult &scan_result) = 0;
-};
-
 class GATTcEventHandler {
 public:
  virtual void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
@@ -118,9 +101,6 @@ class ESP32BLE : public Component {
  void advertising_register_raw_advertisement_callback(std::function<void(bool)> &&callback);

  void register_gap_event_handler(GAPEventHandler *handler) { this->gap_event_handlers_.push_back(handler); }
-  void register_gap_scan_event_handler(GAPScanEventHandler *handler) {
-    this->gap_scan_event_handlers_.push_back(handler);
-  }
  void register_gattc_event_handler(GATTcEventHandler *handler) { this->gattc_event_handlers_.push_back(handler); }
  void register_gatts_event_handler(GATTsEventHandler *handler) { this->gatts_event_handlers_.push_back(handler); }
  void register_ble_status_event_handler(BLEStatusEventHandler *handler) {
@@ -133,23 +113,22 @@ class ESP32BLE : public Component {
  static void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t *param);
  static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);

+  void real_gatts_event_handler_(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param);
+  void real_gattc_event_handler_(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t *param);
+  void real_gap_event_handler_(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);
+
  bool ble_setup_();
  bool ble_dismantle_();
  bool ble_pre_setup_();
  void advertising_init_();

- private:
-  template<typename... Args> friend void enqueue_ble_event(Args... args);
-
  std::vector<GAPEventHandler *> gap_event_handlers_;
-  std::vector<GAPScanEventHandler *> gap_scan_event_handlers_;
  std::vector<GATTcEventHandler *> gattc_event_handlers_;
  std::vector<GATTsEventHandler *> gatts_event_handlers_;
  std::vector<BLEStatusEventHandler *> ble_status_event_handlers_;
  BLEComponentState state_{BLE_COMPONENT_STATE_OFF};

-  LockFreeQueue<BLEEvent, MAX_BLE_QUEUE_SIZE> ble_events_;
-  BLEEventPool<MAX_BLE_QUEUE_SIZE> ble_event_pool_;
+  Queue<BLEEvent> ble_events_;
  BLEAdvertising *advertising_{};
  esp_ble_io_cap_t io_cap_{ESP_IO_CAP_NONE};
  uint32_t advertising_cycle_time_{};
--- a/esphome/components/esp32_ble/ble_event.h
+++ b/esphome/components/esp32_ble/ble_event.h
@@ -2,399 +2,92 @@

 #ifdef USE_ESP32

-#include <cstddef>  // for offsetof
 #include <vector>

 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
 #include <esp_gatts_api.h>

-#include "ble_scan_result.h"
-
 namespace esphome {
 namespace esp32_ble {
-
-// Compile-time verification that ESP-IDF scan complete events only contain a status field
-// This ensures our reinterpret_cast in ble.cpp is safe
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_scan_param_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF scan_param_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_scan_start_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF scan_start_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_scan_stop_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF scan_stop_cmpl structure has unexpected size");
-
-// Verify the status field is at offset 0 (first member)
-static_assert(offsetof(esp_ble_gap_cb_param_t, scan_param_cmpl.status) == 0,
-              "status must be first member of scan_param_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, scan_start_cmpl.status) == 0,
-              "status must be first member of scan_start_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, scan_stop_cmpl.status) == 0,
-              "status must be first member of scan_stop_cmpl");
-
-// Compile-time verification for advertising complete events
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_adv_data_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF adv_data_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_scan_rsp_data_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF scan_rsp_data_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_adv_data_raw_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF adv_data_raw_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_adv_start_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF adv_start_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_adv_stop_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF adv_stop_cmpl structure has unexpected size");
-
-// Verify the status field is at offset 0 for advertising events
-static_assert(offsetof(esp_ble_gap_cb_param_t, adv_data_cmpl.status) == 0,
-              "status must be first member of adv_data_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, scan_rsp_data_cmpl.status) == 0,
-              "status must be first member of scan_rsp_data_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, adv_data_raw_cmpl.status) == 0,
-              "status must be first member of adv_data_raw_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, adv_start_cmpl.status) == 0,
-              "status must be first member of adv_start_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, adv_stop_cmpl.status) == 0,
-              "status must be first member of adv_stop_cmpl");
-
-// Compile-time verification for RSSI complete event structure
-static_assert(offsetof(esp_ble_gap_cb_param_t, read_rssi_cmpl.status) == 0,
-              "status must be first member of read_rssi_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, read_rssi_cmpl.rssi) == sizeof(esp_bt_status_t),
-              "rssi must immediately follow status in read_rssi_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, read_rssi_cmpl.remote_addr) == sizeof(esp_bt_status_t) + sizeof(int8_t),
-              "remote_addr must follow rssi in read_rssi_cmpl");
-
 // Received GAP, GATTC and GATTS events are only queued, and get processed in the main loop().
-// This class stores each event with minimal memory usage.
-// GAP events (99% of traffic) don't have the vector overhead.
-// GATTC/GATTS events use heap allocation for their param and data.
-//
-// Event flow:
-// 1. ESP-IDF BLE stack calls our static handlers in the BLE task context
-// 2. The handlers create a BLEEvent instance, copying only the data we need
-// 3. The event is pushed to a thread-safe queue
-// 4. In the main loop(), events are popped from the queue and processed
-// 5. The event destructor cleans up any external allocations
-//
-// Thread safety:
-// - GAP events: We copy only the fields we need directly into the union
-// - GATTC/GATTS events: We heap-allocate and copy the entire param struct, ensuring
-//   the data remains valid even after the BLE callback returns. The original
-//   param pointer from ESP-IDF is only valid during the callback.
-//
-// CRITICAL DESIGN NOTE:
-// The heap allocations for GATTC/GATTS events are REQUIRED for memory safety.
-// DO NOT attempt to optimize by removing these allocations or storing pointers
-// to the original ESP-IDF data. The ESP-IDF callback data has a different lifetime
-// than our event processing, and accessing it after the callback returns would
-// result in use-after-free bugs and crashes.
+// This class stores each event in a single type.
 class BLEEvent {
 public:
-  // NOLINTNEXTLINE(readability-identifier-naming)
-  enum ble_event_t : uint8_t {
-    GAP,
-    GATTC,
-    GATTS,
-  };
-
-  // Type definitions for cleaner method signatures
-  struct StatusOnlyData {
-    esp_bt_status_t status;
-  };
-
-  struct RSSICompleteData {
-    esp_bt_status_t status;
-    int8_t rssi;
-    esp_bd_addr_t remote_addr;
-  };
-
-  // Constructor for GAP events - no external allocations needed
  BLEEvent(esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
+    this->event_.gap.gap_event = e;
+    memcpy(&this->event_.gap.gap_param, p, sizeof(esp_ble_gap_cb_param_t));
    this->type_ = GAP;
-    this->init_gap_data_(e, p);
-  }
+  };

-  // Constructor for GATTC events - uses heap allocation
-  // IMPORTANT: The heap allocation is REQUIRED and must not be removed as an optimization.
-  // The param pointer from ESP-IDF is only valid during the callback execution.
-  // Since BLE events are processed asynchronously in the main loop, we must create
-  // our own copy to ensure the data remains valid until the event is processed.
  BLEEvent(esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
+    this->event_.gattc.gattc_event = e;
+    this->event_.gattc.gattc_if = i;
+    memcpy(&this->event_.gattc.gattc_param, p, sizeof(esp_ble_gattc_cb_param_t));
+    // Need to also make a copy of relevant event data.
+    switch (e) {
+      case ESP_GATTC_NOTIFY_EVT:
+        this->data.assign(p->notify.value, p->notify.value + p->notify.value_len);
+        this->event_.gattc.gattc_param.notify.value = this->data.data();
+        break;
+      case ESP_GATTC_READ_CHAR_EVT:
+      case ESP_GATTC_READ_DESCR_EVT:
+        this->data.assign(p->read.value, p->read.value + p->read.value_len);
+        this->event_.gattc.gattc_param.read.value = this->data.data();
+        break;
+      default:
+        break;
+    }
    this->type_ = GATTC;
-    this->init_gattc_data_(e, i, p);
-  }
+  };

-  // Constructor for GATTS events - uses heap allocation
-  // IMPORTANT: The heap allocation is REQUIRED and must not be removed as an optimization.
-  // The param pointer from ESP-IDF is only valid during the callback execution.
-  // Since BLE events are processed asynchronously in the main loop, we must create
-  // our own copy to ensure the data remains valid until the event is processed.
  BLEEvent(esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
+    this->event_.gatts.gatts_event = e;
+    this->event_.gatts.gatts_if = i;
+    memcpy(&this->event_.gatts.gatts_param, p, sizeof(esp_ble_gatts_cb_param_t));
+    // Need to also make a copy of relevant event data.
+    switch (e) {
+      case ESP_GATTS_WRITE_EVT:
+        this->data.assign(p->write.value, p->write.value + p->write.len);
+        this->event_.gatts.gatts_param.write.value = this->data.data();
+        break;
+      default:
+        break;
+    }
    this->type_ = GATTS;
-    this->init_gatts_data_(e, i, p);
-  }
-
-  // Destructor to clean up heap allocations
-  ~BLEEvent() { this->cleanup_heap_data(); }
-
-  // Default constructor for pre-allocation in pool
-  BLEEvent() : type_(GAP) {}
-
-  // Clean up any heap-allocated data
-  void cleanup_heap_data() {
-    if (this->type_ == GAP) {
-      return;
-    }
-    if (this->type_ == GATTC) {
-      delete this->event_.gattc.gattc_param;
-      delete this->event_.gattc.data;
-      this->event_.gattc.gattc_param = nullptr;
-      this->event_.gattc.data = nullptr;
-      return;
-    }
-    if (this->type_ == GATTS) {
-      delete this->event_.gatts.gatts_param;
-      delete this->event_.gatts.data;
-      this->event_.gatts.gatts_param = nullptr;
-      this->event_.gatts.data = nullptr;
-    }
-  }
-
-  // Load new event data for reuse (replaces previous event data)
-  void load_gap_event(esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
-    this->cleanup_heap_data();
-    this->type_ = GAP;
-    this->init_gap_data_(e, p);
-  }
-
-  void load_gattc_event(esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
-    this->cleanup_heap_data();
-    this->type_ = GATTC;
-    this->init_gattc_data_(e, i, p);
-  }
-
-  void load_gatts_event(esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
-    this->cleanup_heap_data();
-    this->type_ = GATTS;
-    this->init_gatts_data_(e, i, p);
-  }
-
-  // Disable copy to prevent double-delete
-  BLEEvent(const BLEEvent &) = delete;
-  BLEEvent &operator=(const BLEEvent &) = delete;
+  };

  union {
    // NOLINTNEXTLINE(readability-identifier-naming)
    struct gap_event {
      esp_gap_ble_cb_event_t gap_event;
-      union {
-        BLEScanResult scan_result;  // 73 bytes - Used by: esp32_ble_tracker
-        // This matches ESP-IDF's scan complete event structures
-        // All three (scan_param_cmpl, scan_start_cmpl, scan_stop_cmpl) have identical layout
-        // Used by: esp32_ble_tracker
-        StatusOnlyData scan_complete;  // 1 byte
-        // Advertising complete events all have same structure
-        // Used by: esp32_ble_beacon, esp32_ble server components
-        // ADV_DATA_SET, SCAN_RSP_DATA_SET, ADV_DATA_RAW_SET, ADV_START, ADV_STOP
-        StatusOnlyData adv_complete;  // 1 byte
-        // RSSI complete event
-        // Used by: ble_client (ble_rssi_sensor component)
-        RSSICompleteData read_rssi_complete;  // 8 bytes
-        // Security events - we store the full security union
-        // Used by: ble_client (automation), bluetooth_proxy, esp32_ble_client
-        esp_ble_sec_t security;  // Variable size, but fits within scan_result size
-      };
-    } gap;  // 80 bytes total
+      esp_ble_gap_cb_param_t gap_param;
+    } gap;

    // NOLINTNEXTLINE(readability-identifier-naming)
    struct gattc_event {
      esp_gattc_cb_event_t gattc_event;
      esp_gatt_if_t gattc_if;
-      esp_ble_gattc_cb_param_t *gattc_param;  // Heap-allocated
-      std::vector<uint8_t> *data;             // Heap-allocated
-    } gattc;                                  // 16 bytes (pointers only)
+      esp_ble_gattc_cb_param_t gattc_param;
+    } gattc;

    // NOLINTNEXTLINE(readability-identifier-naming)
    struct gatts_event {
      esp_gatts_cb_event_t gatts_event;
      esp_gatt_if_t gatts_if;
-      esp_ble_gatts_cb_param_t *gatts_param;  // Heap-allocated
-      std::vector<uint8_t> *data;             // Heap-allocated
-    } gatts;                                  // 16 bytes (pointers only)
-  } event_;                                   // 80 bytes
+      esp_ble_gatts_cb_param_t gatts_param;
+    } gatts;
+  } event_;

-  ble_event_t type_;
-
-  // Helper methods to access event data
-  ble_event_t type() const { return type_; }
-  esp_gap_ble_cb_event_t gap_event_type() const { return event_.gap.gap_event; }
-  const BLEScanResult &scan_result() const { return event_.gap.scan_result; }
-  esp_bt_status_t scan_complete_status() const { return event_.gap.scan_complete.status; }
-  esp_bt_status_t adv_complete_status() const { return event_.gap.adv_complete.status; }
-  const RSSICompleteData &read_rssi_complete() const { return event_.gap.read_rssi_complete; }
-  const esp_ble_sec_t &security() const { return event_.gap.security; }
-
- private:
-  // Initialize GAP event data
-  void init_gap_data_(esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
-    this->event_.gap.gap_event = e;
-
-    if (p == nullptr) {
-      return;  // Invalid event, but we can't log in header file
-    }
-
-    // Copy data based on event type
-    switch (e) {
-      case ESP_GAP_BLE_SCAN_RESULT_EVT:
-        memcpy(this->event_.gap.scan_result.bda, p->scan_rst.bda, sizeof(esp_bd_addr_t));
-        this->event_.gap.scan_result.ble_addr_type = p->scan_rst.ble_addr_type;
-        this->event_.gap.scan_result.rssi = p->scan_rst.rssi;
-        this->event_.gap.scan_result.adv_data_len = p->scan_rst.adv_data_len;
-        this->event_.gap.scan_result.scan_rsp_len = p->scan_rst.scan_rsp_len;
-        this->event_.gap.scan_result.search_evt = p->scan_rst.search_evt;
-        memcpy(this->event_.gap.scan_result.ble_adv, p->scan_rst.ble_adv,
-               ESP_BLE_ADV_DATA_LEN_MAX + ESP_BLE_SCAN_RSP_DATA_LEN_MAX);
-        break;
-
-      case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT:
-        this->event_.gap.scan_complete.status = p->scan_param_cmpl.status;
-        break;
-
-      case ESP_GAP_BLE_SCAN_START_COMPLETE_EVT:
-        this->event_.gap.scan_complete.status = p->scan_start_cmpl.status;
-        break;
-
-      case ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT:
-        this->event_.gap.scan_complete.status = p->scan_stop_cmpl.status;
-        break;
-
-      // Advertising complete events - all have same structure with just status
-      // Used by: esp32_ble_beacon, esp32_ble server components
-      case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT:
-        this->event_.gap.adv_complete.status = p->adv_data_cmpl.status;
-        break;
-      case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT:
-        this->event_.gap.adv_complete.status = p->scan_rsp_data_cmpl.status;
-        break;
-      case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT:  // Used by: esp32_ble_beacon
-        this->event_.gap.adv_complete.status = p->adv_data_raw_cmpl.status;
-        break;
-      case ESP_GAP_BLE_ADV_START_COMPLETE_EVT:  // Used by: esp32_ble_beacon
-        this->event_.gap.adv_complete.status = p->adv_start_cmpl.status;
-        break;
-      case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT:  // Used by: esp32_ble_beacon
-        this->event_.gap.adv_complete.status = p->adv_stop_cmpl.status;
-        break;
-
-      // RSSI complete event
-      // Used by: ble_client (ble_rssi_sensor)
-      case ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT:
-        this->event_.gap.read_rssi_complete.status = p->read_rssi_cmpl.status;
-        this->event_.gap.read_rssi_complete.rssi = p->read_rssi_cmpl.rssi;
-        memcpy(this->event_.gap.read_rssi_complete.remote_addr, p->read_rssi_cmpl.remote_addr, sizeof(esp_bd_addr_t));
-        break;
-
-      // Security events - copy the entire security union
-      // Used by: ble_client, bluetooth_proxy, esp32_ble_client
-      case ESP_GAP_BLE_AUTH_CMPL_EVT:      // Used by: bluetooth_proxy, esp32_ble_client
-      case ESP_GAP_BLE_SEC_REQ_EVT:        // Used by: esp32_ble_client
-      case ESP_GAP_BLE_PASSKEY_NOTIF_EVT:  // Used by: ble_client automation
-      case ESP_GAP_BLE_PASSKEY_REQ_EVT:    // Used by: ble_client automation
-      case ESP_GAP_BLE_NC_REQ_EVT:         // Used by: ble_client automation
-        memcpy(&this->event_.gap.security, &p->ble_security, sizeof(esp_ble_sec_t));
-        break;
-
-      default:
-        // We only store data for GAP events that components currently use
-        // Unknown events still get queued and logged in ble.cpp:375 as
-        // "Unhandled GAP event type in loop" - this helps identify new events
-        // that components might need in the future
-        break;
-    }
-  }
-
-  // Initialize GATTC event data
-  void init_gattc_data_(esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
-    this->event_.gattc.gattc_event = e;
-    this->event_.gattc.gattc_if = i;
-
-    if (p == nullptr) {
-      this->event_.gattc.gattc_param = nullptr;
-      this->event_.gattc.data = nullptr;
-      return;  // Invalid event, but we can't log in header file
-    }
-
-    // Heap-allocate param and data
-    // Heap allocation is used because GATTC/GATTS events are rare (<1% of events)
-    // while GAP events (99%) are stored inline to minimize memory usage
-    // IMPORTANT: This heap allocation provides clear ownership semantics:
-    // - The BLEEvent owns the allocated memory for its lifetime
-    // - The data remains valid from the BLE callback context until processed in the main loop
-    // - Without this copy, we'd have use-after-free bugs as ESP-IDF reuses the callback memory
-    this->event_.gattc.gattc_param = new esp_ble_gattc_cb_param_t(*p);
-
-    // Copy data for events that need it
-    // The param struct contains pointers (e.g., notify.value) that point to temporary buffers.
-    // We must copy this data to ensure it remains valid when the event is processed later.
-    switch (e) {
-      case ESP_GATTC_NOTIFY_EVT:
-        this->event_.gattc.data = new std::vector<uint8_t>(p->notify.value, p->notify.value + p->notify.value_len);
-        this->event_.gattc.gattc_param->notify.value = this->event_.gattc.data->data();
-        break;
-      case ESP_GATTC_READ_CHAR_EVT:
-      case ESP_GATTC_READ_DESCR_EVT:
-        this->event_.gattc.data = new std::vector<uint8_t>(p->read.value, p->read.value + p->read.value_len);
-        this->event_.gattc.gattc_param->read.value = this->event_.gattc.data->data();
-        break;
-      default:
-        this->event_.gattc.data = nullptr;
-        break;
-    }
-  }
-
-  // Initialize GATTS event data
-  void init_gatts_data_(esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
-    this->event_.gatts.gatts_event = e;
-    this->event_.gatts.gatts_if = i;
-
-    if (p == nullptr) {
-      this->event_.gatts.gatts_param = nullptr;
-      this->event_.gatts.data = nullptr;
-      return;  // Invalid event, but we can't log in header file
-    }
-
-    // Heap-allocate param and data
-    // Heap allocation is used because GATTC/GATTS events are rare (<1% of events)
-    // while GAP events (99%) are stored inline to minimize memory usage
-    // IMPORTANT: This heap allocation provides clear ownership semantics:
-    // - The BLEEvent owns the allocated memory for its lifetime
-    // - The data remains valid from the BLE callback context until processed in the main loop
-    // - Without this copy, we'd have use-after-free bugs as ESP-IDF reuses the callback memory
-    this->event_.gatts.gatts_param = new esp_ble_gatts_cb_param_t(*p);
-
-    // Copy data for events that need it
-    // The param struct contains pointers (e.g., write.value) that point to temporary buffers.
-    // We must copy this data to ensure it remains valid when the event is processed later.
-    switch (e) {
-      case ESP_GATTS_WRITE_EVT:
-        this->event_.gatts.data = new std::vector<uint8_t>(p->write.value, p->write.value + p->write.len);
-        this->event_.gatts.gatts_param->write.value = this->event_.gatts.data->data();
-        break;
-      default:
-        this->event_.gatts.data = nullptr;
-        break;
-    }
-  }
+  std::vector<uint8_t> data{};
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  enum ble_event_t : uint8_t {
+    GAP,
+    GATTC,
+    GATTS,
+  } type_;
 };

-// Verify the gap_event struct hasn't grown beyond expected size
-// The gap member in the union should be 80 bytes (including the gap_event enum)
-static_assert(sizeof(decltype(((BLEEvent *) nullptr)->event_.gap)) <= 80, "gap_event struct has grown beyond 80 bytes");
-
-// Verify esp_ble_sec_t fits within our union
-static_assert(sizeof(esp_ble_sec_t) <= 73, "esp_ble_sec_t is larger than BLEScanResult");
-
-// BLEEvent total size: 84 bytes (80 byte union + 1 byte type + 3 bytes padding)
-
 }  // namespace esp32_ble
 }  // namespace esphome

--- a/esphome/components/esp32_ble/ble_event_pool.h
+++ b/esphome/components/esp32_ble/ble_event_pool.h
@@ -1,72 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP32
-
-#include <atomic>
-#include <cstddef>
-#include "ble_event.h"
-#include "queue.h"
-#include "esphome/core/helpers.h"
-
-namespace esphome {
-namespace esp32_ble {
-
-// BLE Event Pool - On-demand pool of BLEEvent objects to avoid heap fragmentation
-// Events are allocated on first use and reused thereafter, growing to peak usage
-template<uint8_t SIZE> class BLEEventPool {
- public:
-  BLEEventPool() : total_created_(0) {}
-
-  ~BLEEventPool() {
-    // Clean up any remaining events in the free list
-    BLEEvent *event;
-    while ((event = this->free_list_.pop()) != nullptr) {
-      delete event;
-    }
-  }
-
-  // Allocate an event from the pool
-  // Returns nullptr if pool is full
-  BLEEvent *allocate() {
-    // Try to get from free list first
-    BLEEvent *event = this->free_list_.pop();
-    if (event != nullptr)
-      return event;
-
-    // Need to create a new event
-    if (this->total_created_ >= SIZE) {
-      // Pool is at capacity
-      return nullptr;
-    }
-
-    // Use internal RAM for better performance
-    RAMAllocator<BLEEvent> allocator(RAMAllocator<BLEEvent>::ALLOC_INTERNAL);
-    event = allocator.allocate(1);
-
-    if (event == nullptr) {
-      // Memory allocation failed
-      return nullptr;
-    }
-
-    // Placement new to construct the object
-    new (event) BLEEvent();
-    this->total_created_++;
-    return event;
-  }
-
-  // Return an event to the pool for reuse
-  void release(BLEEvent *event) {
-    if (event != nullptr) {
-      this->free_list_.push(event);
-    }
-  }
-
- private:
-  LockFreeQueue<BLEEvent, SIZE> free_list_;  // Free events ready for reuse
-  uint8_t total_created_;                    // Total events created (high water mark)
-};
-
-}  // namespace esp32_ble
-}  // namespace esphome
-
-#endif
--- a/esphome/components/esp32_ble/ble_scan_result.h
+++ b/esphome/components/esp32_ble/ble_scan_result.h
@@ -1,24 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP32
-
-#include <esp_gap_ble_api.h>
-
-namespace esphome {
-namespace esp32_ble {
-
-// Structure for BLE scan results - only fields we actually use
-struct __attribute__((packed)) BLEScanResult {
-  esp_bd_addr_t bda;
-  uint8_t ble_addr_type;
-  int8_t rssi;
-  uint8_t ble_adv[ESP_BLE_ADV_DATA_LEN_MAX + ESP_BLE_SCAN_RSP_DATA_LEN_MAX];
-  uint8_t adv_data_len;
-  uint8_t scan_rsp_len;
-  uint8_t search_evt;
-};  // ~73 bytes vs ~400 bytes for full esp_ble_gap_cb_param_t
-
-}  // namespace esp32_ble
-}  // namespace esphome
-
-#endif
--- a/esphome/components/esp32_ble/queue.h
+++ b/esphome/components/esp32_ble/queue.h
@@ -2,81 +2,52 @@

 #ifdef USE_ESP32

-#include <atomic>
-#include <cstddef>
+#include <mutex>
+#include <queue>
+
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>

 /*
 * BLE events come in from a separate Task (thread) in the ESP32 stack. Rather
- * than using mutex-based locking, this lock-free queue allows the BLE
- * task to enqueue events without blocking. The main loop() then processes
- * these events at a safer time.
- *
- * This is a Single-Producer Single-Consumer (SPSC) lock-free ring buffer.
- * The BLE task is the only producer, and the main loop() is the only consumer.
+ * than trying to deal with various locking strategies, all incoming GAP and GATT
+ * events will simply be placed on a semaphore guarded queue. The next time the
+ * component runs loop(), these events are popped off the queue and handed at
+ * this safer time.
 */

 namespace esphome {
 namespace esp32_ble {

-template<class T, uint8_t SIZE> class LockFreeQueue {
+template<class T> class Queue {
 public:
-  LockFreeQueue() : head_(0), tail_(0), dropped_count_(0) {}
+  Queue() { m_ = xSemaphoreCreateMutex(); }

-  bool push(T *element) {
+  void push(T *element) {
    if (element == nullptr)
-      return false;
-
-    uint8_t current_tail = tail_.load(std::memory_order_relaxed);
-    uint8_t next_tail = (current_tail + 1) % SIZE;
-
-    if (next_tail == head_.load(std::memory_order_acquire)) {
-      // Buffer full
-      dropped_count_.fetch_add(1, std::memory_order_relaxed);
-      return false;
-    }
-
-    buffer_[current_tail] = element;
-    tail_.store(next_tail, std::memory_order_release);
-    return true;
+      return;
+    // It is not called from main loop. Thus it won't block main thread.
+    xSemaphoreTake(m_, portMAX_DELAY);
+    q_.push(element);
+    xSemaphoreGive(m_);
  }

  T *pop() {
-    uint8_t current_head = head_.load(std::memory_order_relaxed);
+    T *element = nullptr;

-    if (current_head == tail_.load(std::memory_order_acquire)) {
-      return nullptr;  // Empty
+    if (xSemaphoreTake(m_, 5L / portTICK_PERIOD_MS)) {
+      if (!q_.empty()) {
+        element = q_.front();
+        q_.pop();
+      }
+      xSemaphoreGive(m_);
    }
-
-    T *element = buffer_[current_head];
-    head_.store((current_head + 1) % SIZE, std::memory_order_release);
    return element;
  }

-  size_t size() const {
-    uint8_t tail = tail_.load(std::memory_order_acquire);
-    uint8_t head = head_.load(std::memory_order_acquire);
-    return (tail - head + SIZE) % SIZE;
-  }
-
-  uint16_t get_and_reset_dropped_count() { return dropped_count_.exchange(0, std::memory_order_relaxed); }
-
-  void increment_dropped_count() { dropped_count_.fetch_add(1, std::memory_order_relaxed); }
-
-  bool empty() const { return head_.load(std::memory_order_acquire) == tail_.load(std::memory_order_acquire); }
-
-  bool full() const {
-    uint8_t next_tail = (tail_.load(std::memory_order_relaxed) + 1) % SIZE;
-    return next_tail == head_.load(std::memory_order_acquire);
-  }
-
 protected:
-  T *buffer_[SIZE];
-  // Atomic: written by producer (push/increment), read+reset by consumer (get_and_reset)
-  std::atomic<uint16_t> dropped_count_;  // 65535 max - more than enough for drop tracking
-  // Atomic: written by consumer (pop), read by producer (push) to check if full
-  std::atomic<uint8_t> head_;
-  // Atomic: written by producer (push), read by consumer (pop) to check if empty
-  std::atomic<uint8_t> tail_;
+  std::queue<T *> q_;
+  SemaphoreHandle_t m_;
 };

 }  // namespace esp32_ble
--- a/esphome/components/esp32_ble_tracker/init.py
+++ b/esphome/components/esp32_ble_tracker/init.py
@@ -268,7 +268,6 @@ async def to_code(config):

    parent = await cg.get_variable(config[esp32_ble.CONF_BLE_ID])
    cg.add(parent.register_gap_event_handler(var))
-    cg.add(parent.register_gap_scan_event_handler(var))
    cg.add(parent.register_gattc_event_handler(var))
    cg.add(parent.register_ble_status_event_handler(var))
    cg.add(var.set_parent(parent))
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -50,15 +50,17 @@ void ESP32BLETracker::setup() {
    ESP_LOGE(TAG, "BLE Tracker was marked failed by ESP32BLE");
    return;
  }
-  RAMAllocator<BLEScanResult> allocator;
-  this->scan_ring_buffer_ = allocator.allocate(SCAN_RESULT_BUFFER_SIZE);
+  ExternalRAMAllocator<esp_ble_gap_cb_param_t::ble_scan_result_evt_param> allocator(
+      ExternalRAMAllocator<esp_ble_gap_cb_param_t::ble_scan_result_evt_param>::ALLOW_FAILURE);
+  this->scan_result_buffer_ = allocator.allocate(ESP32BLETracker::SCAN_RESULT_BUFFER_SIZE);

-  if (this->scan_ring_buffer_ == nullptr) {
-    ESP_LOGE(TAG, "Could not allocate ring buffer for BLE Tracker!");
+  if (this->scan_result_buffer_ == nullptr) {
+    ESP_LOGE(TAG, "Could not allocate buffer for BLE Tracker!");
    this->mark_failed();
  }

  global_esp32_ble_tracker = this;
+  this->scan_result_lock_ = xSemaphoreCreateMutex();

 #ifdef USE_OTA
  ota::get_global_ota_callback()->add_on_state_callback(
@@ -118,31 +120,27 @@ void ESP32BLETracker::loop() {
  }
  bool promote_to_connecting = discovered && !searching && !connecting;

-  // Process scan results from lock-free SPSC ring buffer
-  // Consumer side: This runs in the main loop thread
-  if (this->scanner_state_ == ScannerState::RUNNING) {
-    // Load our own index with relaxed ordering (we're the only writer)
-    size_t read_idx = this->ring_read_index_.load(std::memory_order_relaxed);
+  if (this->scanner_state_ == ScannerState::RUNNING &&
+      this->scan_result_index_ &&  // if it looks like we have a scan result we will take the lock
+      xSemaphoreTake(this->scan_result_lock_, 0)) {
+    uint32_t index = this->scan_result_index_;
+    if (index >= ESP32BLETracker::SCAN_RESULT_BUFFER_SIZE) {
+      ESP_LOGW(TAG, "Too many BLE events to process. Some devices may not show up.");
+    }

-    // Load producer's index with acquire to see their latest writes
-    size_t write_idx = this->ring_write_index_.load(std::memory_order_acquire);
-
-    while (read_idx != write_idx) {
-      // Process one result at a time directly from ring buffer
-      BLEScanResult &scan_result = this->scan_ring_buffer_[read_idx];
-
-      if (this->raw_advertisements_) {
-        for (auto *listener : this->listeners_) {
-          listener->parse_devices(&scan_result, 1);
-        }
-        for (auto *client : this->clients_) {
-          client->parse_devices(&scan_result, 1);
-        }
+    if (this->raw_advertisements_) {
+      for (auto *listener : this->listeners_) {
+        listener->parse_devices(this->scan_result_buffer_, this->scan_result_index_);
      }
+      for (auto *client : this->clients_) {
+        client->parse_devices(this->scan_result_buffer_, this->scan_result_index_);
+      }
+    }

-      if (this->parse_advertisements_) {
+    if (this->parse_advertisements_) {
+      for (size_t i = 0; i < index; i++) {
        ESPBTDevice device;
-        device.parse_scan_rst(scan_result);
+        device.parse_scan_rst(this->scan_result_buffer_[i]);

        bool found = false;
        for (auto *listener : this->listeners_) {
@@ -163,19 +161,9 @@ void ESP32BLETracker::loop() {
          this->print_bt_device_info(device);
        }
      }
-
-      // Move to next entry in ring buffer
-      read_idx = (read_idx + 1) % SCAN_RESULT_BUFFER_SIZE;
-
-      // Store with release to ensure reads complete before index update
-      this->ring_read_index_.store(read_idx, std::memory_order_release);
-    }
-
-    // Log dropped results periodically
-    size_t dropped = this->scan_results_dropped_.exchange(0, std::memory_order_relaxed);
-    if (dropped > 0) {
-      ESP_LOGW(TAG, "Dropped %zu BLE scan results due to buffer overflow", dropped);
    }
+    this->scan_result_index_ = 0;
+    xSemaphoreGive(this->scan_result_lock_);
  }
  if (this->scanner_state_ == ScannerState::STOPPED) {
    this->end_of_scan_();  // Change state to IDLE
@@ -382,6 +370,9 @@ void ESP32BLETracker::recalculate_advertisement_parser_types() {

 void ESP32BLETracker::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
  switch (event) {
+    case ESP_GAP_BLE_SCAN_RESULT_EVT:
+      this->gap_scan_result_(param->scan_rst);
+      break;
    case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT:
      this->gap_scan_set_param_complete_(param->scan_param_cmpl);
      break;
@@ -394,57 +385,11 @@ void ESP32BLETracker::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_ga
    default:
      break;
  }
-  // Forward all events to clients (scan results are handled separately via gap_scan_event_handler)
  for (auto *client : this->clients_) {
    client->gap_event_handler(event, param);
  }
 }

-void ESP32BLETracker::gap_scan_event_handler(const BLEScanResult &scan_result) {
-  ESP_LOGV(TAG, "gap_scan_result - event %d", scan_result.search_evt);
-
-  if (scan_result.search_evt == ESP_GAP_SEARCH_INQ_RES_EVT) {
-    // Lock-free SPSC ring buffer write (Producer side)
-    // This runs in the ESP-IDF Bluetooth stack callback thread
-    // IMPORTANT: Only this thread writes to ring_write_index_
-
-    // Load our own index with relaxed ordering (we're the only writer)
-    size_t write_idx = this->ring_write_index_.load(std::memory_order_relaxed);
-    size_t next_write_idx = (write_idx + 1) % SCAN_RESULT_BUFFER_SIZE;
-
-    // Load consumer's index with acquire to see their latest updates
-    size_t read_idx = this->ring_read_index_.load(std::memory_order_acquire);
-
-    // Check if buffer is full
-    if (next_write_idx != read_idx) {
-      // Write to ring buffer
-      this->scan_ring_buffer_[write_idx] = scan_result;
-
-      // Store with release to ensure the write is visible before index update
-      this->ring_write_index_.store(next_write_idx, std::memory_order_release);
-    } else {
-      // Buffer full, track dropped results
-      this->scan_results_dropped_.fetch_add(1, std::memory_order_relaxed);
-    }
-  } else if (scan_result.search_evt == ESP_GAP_SEARCH_INQ_CMPL_EVT) {
-    // Scan finished on its own
-    if (this->scanner_state_ != ScannerState::RUNNING) {
-      if (this->scanner_state_ == ScannerState::STOPPING) {
-        ESP_LOGE(TAG, "Scan was not running when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::STARTING) {
-        ESP_LOGE(TAG, "Scan was not started when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::FAILED) {
-        ESP_LOGE(TAG, "Scan was in failed state when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::IDLE) {
-        ESP_LOGE(TAG, "Scan was idle when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::STOPPED) {
-        ESP_LOGE(TAG, "Scan was stopped when scan completed.");
-      }
-    }
-    this->set_scanner_state_(ScannerState::STOPPED);
-  }
-}
-
 void ESP32BLETracker::gap_scan_set_param_complete_(const esp_ble_gap_cb_param_t::ble_scan_param_cmpl_evt_param &param) {
  ESP_LOGV(TAG, "gap_scan_set_param_complete - status %d", param.status);
  if (param.status == ESP_BT_STATUS_DONE) {
@@ -499,6 +444,34 @@ void ESP32BLETracker::gap_scan_stop_complete_(const esp_ble_gap_cb_param_t::ble_
  this->set_scanner_state_(ScannerState::STOPPED);
 }

+void ESP32BLETracker::gap_scan_result_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
+  ESP_LOGV(TAG, "gap_scan_result - event %d", param.search_evt);
+  if (param.search_evt == ESP_GAP_SEARCH_INQ_RES_EVT) {
+    if (xSemaphoreTake(this->scan_result_lock_, 0)) {
+      if (this->scan_result_index_ < ESP32BLETracker::SCAN_RESULT_BUFFER_SIZE) {
+        this->scan_result_buffer_[this->scan_result_index_++] = param;
+      }
+      xSemaphoreGive(this->scan_result_lock_);
+    }
+  } else if (param.search_evt == ESP_GAP_SEARCH_INQ_CMPL_EVT) {
+    // Scan finished on its own
+    if (this->scanner_state_ != ScannerState::RUNNING) {
+      if (this->scanner_state_ == ScannerState::STOPPING) {
+        ESP_LOGE(TAG, "Scan was not running when scan completed.");
+      } else if (this->scanner_state_ == ScannerState::STARTING) {
+        ESP_LOGE(TAG, "Scan was not started when scan completed.");
+      } else if (this->scanner_state_ == ScannerState::FAILED) {
+        ESP_LOGE(TAG, "Scan was in failed state when scan completed.");
+      } else if (this->scanner_state_ == ScannerState::IDLE) {
+        ESP_LOGE(TAG, "Scan was idle when scan completed.");
+      } else if (this->scanner_state_ == ScannerState::STOPPED) {
+        ESP_LOGE(TAG, "Scan was stopped when scan completed.");
+      }
+    }
+    this->set_scanner_state_(ScannerState::STOPPED);
+  }
+}
+
 void ESP32BLETracker::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                          esp_ble_gattc_cb_param_t *param) {
  for (auto *client : this->clients_) {
@@ -521,16 +494,13 @@ optional<ESPBLEiBeacon> ESPBLEiBeacon::from_manufacturer_data(const ServiceData
  return ESPBLEiBeacon(data.data.data());
 }

-void ESPBTDevice::parse_scan_rst(const BLEScanResult &scan_result) {
-  this->scan_result_ = &scan_result;
+void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
+  this->scan_result_ = param;
  for (uint8_t i = 0; i < ESP_BD_ADDR_LEN; i++)
-    this->address_[i] = scan_result.bda[i];
-  this->address_type_ = static_cast<esp_ble_addr_type_t>(scan_result.ble_addr_type);
-  this->rssi_ = scan_result.rssi;
-
-  // Parse advertisement data directly
-  uint8_t total_len = scan_result.adv_data_len + scan_result.scan_rsp_len;
-  this->parse_adv_(scan_result.ble_adv, total_len);
+    this->address_[i] = param.bda[i];
+  this->address_type_ = param.ble_addr_type;
+  this->rssi_ = param.rssi;
+  this->parse_adv_(param);

 #ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
  ESP_LOGVV(TAG, "Parse Result:");
@@ -588,13 +558,13 @@ void ESPBTDevice::parse_scan_rst(const BLEScanResult &scan_result) {
    ESP_LOGVV(TAG, "    Data: %s", format_hex_pretty(data.data).c_str());
  }

-  ESP_LOGVV(TAG, "  Adv data: %s",
-            format_hex_pretty(scan_result.ble_adv, scan_result.adv_data_len + scan_result.scan_rsp_len).c_str());
+  ESP_LOGVV(TAG, "  Adv data: %s", format_hex_pretty(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
 #endif
 }
-
-void ESPBTDevice::parse_adv_(const uint8_t *payload, uint8_t len) {
+void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
  size_t offset = 0;
+  const uint8_t *payload = param.ble_adv;
+  uint8_t len = param.adv_data_len + param.scan_rsp_len;

  while (offset + 2 < len) {
    const uint8_t field_length = payload[offset++];  // First byte is length of adv record
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -6,7 +6,6 @@
 #include "esphome/core/helpers.h"

 #include <array>
-#include <atomic>
 #include <string>
 #include <vector>

@@ -63,7 +62,7 @@ class ESPBLEiBeacon {

 class ESPBTDevice {
 public:
-  void parse_scan_rst(const BLEScanResult &scan_result);
+  void parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param);

  std::string address_str() const;

@@ -85,8 +84,7 @@ class ESPBTDevice {

  const std::vector<ServiceData> &get_service_datas() const { return service_datas_; }

-  // Exposed through a function for use in lambdas
-  const BLEScanResult &get_scan_result() const { return *scan_result_; }
+  const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &get_scan_result() const { return scan_result_; }

  bool resolve_irk(const uint8_t *irk) const;

@@ -100,7 +98,7 @@ class ESPBTDevice {
  }

 protected:
-  void parse_adv_(const uint8_t *payload, uint8_t len);
+  void parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param);

  esp_bd_addr_t address_{
      0,
@@ -114,7 +112,7 @@ class ESPBTDevice {
  std::vector<ESPBTUUID> service_uuids_{};
  std::vector<ServiceData> manufacturer_datas_{};
  std::vector<ServiceData> service_datas_{};
-  const BLEScanResult *scan_result_{nullptr};
+  esp_ble_gap_cb_param_t::ble_scan_result_evt_param scan_result_{};
 };

 class ESP32BLETracker;
@@ -123,7 +121,9 @@ class ESPBTDeviceListener {
 public:
  virtual void on_scan_end() {}
  virtual bool parse_device(const ESPBTDevice &device) = 0;
-  virtual bool parse_devices(const BLEScanResult *scan_results, size_t count) { return false; };
+  virtual bool parse_devices(esp_ble_gap_cb_param_t::ble_scan_result_evt_param *advertisements, size_t count) {
+    return false;
+  };
  virtual AdvertisementParserType get_advertisement_parser_type() {
    return AdvertisementParserType::PARSED_ADVERTISEMENTS;
  };
@@ -210,7 +210,6 @@ class ESPBTClient : public ESPBTDeviceListener {

 class ESP32BLETracker : public Component,
                        public GAPEventHandler,
-                        public GAPScanEventHandler,
                        public GATTcEventHandler,
                        public BLEStatusEventHandler,
                        public Parented<ESP32BLE> {
@@ -241,7 +240,6 @@ class ESP32BLETracker : public Component,
  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                           esp_ble_gattc_cb_param_t *param) override;
  void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
-  void gap_scan_event_handler(const BLEScanResult &scan_result) override;
  void ble_before_disabled_event_handler() override;

  void add_scanner_state_callback(std::function<void(ScannerState)> &&callback) {
@@ -287,16 +285,14 @@ class ESP32BLETracker : public Component,
  bool ble_was_disabled_{true};
  bool raw_advertisements_{false};
  bool parse_advertisements_{false};
-
-  // Lock-free Single-Producer Single-Consumer (SPSC) ring buffer for scan results
-  // Producer: ESP-IDF Bluetooth stack callback (gap_scan_event_handler)
-  // Consumer: ESPHome main loop (loop() method)
-  // This design ensures zero blocking in the BT callback and prevents scan result loss
-  BLEScanResult *scan_ring_buffer_;
-  std::atomic<size_t> ring_write_index_{0};      // Written only by BT callback (producer)
-  std::atomic<size_t> ring_read_index_{0};       // Written only by main loop (consumer)
-  std::atomic<size_t> scan_results_dropped_{0};  // Tracks buffer overflow events
-
+  SemaphoreHandle_t scan_result_lock_;
+  size_t scan_result_index_{0};
+#ifdef USE_PSRAM
+  const static u_int8_t SCAN_RESULT_BUFFER_SIZE = 32;
+#else
+  const static u_int8_t SCAN_RESULT_BUFFER_SIZE = 20;
+#endif  // USE_PSRAM
+  esp_ble_gap_cb_param_t::ble_scan_result_evt_param *scan_result_buffer_;
  esp_bt_status_t scan_start_failed_{ESP_BT_STATUS_SUCCESS};
  esp_bt_status_t scan_set_param_failed_{ESP_BT_STATUS_SUCCESS};
  int connecting_{0};
--- a/esphome/components/esp32_camera/esp32_camera.cpp
+++ b/esphome/components/esp32_camera/esp32_camera.cpp
@@ -57,7 +57,7 @@ void ESP32Camera::dump_config() {
                "  External Clock: Pin:%d Frequency:%u\n"
                "  I2C Pins: SDA:%d SCL:%d\n"
                "  Reset Pin: %d",
-                this->name_.c_str(), YESNO(this->is_internal()), conf.pin_d0, conf.pin_d1, conf.pin_d2, conf.pin_d3,
+                this->name_.c_str(), YESNO(this->internal_), conf.pin_d0, conf.pin_d1, conf.pin_d2, conf.pin_d3,
                conf.pin_d4, conf.pin_d5, conf.pin_d6, conf.pin_d7, conf.pin_vsync, conf.pin_href, conf.pin_pclk,
                conf.pin_xclk, conf.xclk_freq_hz, conf.pin_sccb_sda, conf.pin_sccb_scl, conf.pin_reset);
  switch (this->config_.frame_size) {
--- a/esphome/components/esp32_hall/esp32_hall.cpp
+++ b/esphome/components/esp32_hall/esp32_hall.cpp
@@ -16,7 +16,6 @@ void ESP32HallSensor::update() {
  ESP_LOGD(TAG, "'%s': Got reading %.0f µT", this->name_.c_str(), value);
  this->publish_state(value);
 }
-std::string ESP32HallSensor::unique_id() { return get_mac_address() + "-hall"; }
 void ESP32HallSensor::dump_config() { LOG_SENSOR("", "ESP32 Hall Sensor", this); }

 }  // namespace esp32_hall
--- a/esphome/components/esp32_hall/esp32_hall.h
+++ b/esphome/components/esp32_hall/esp32_hall.h
@@ -13,8 +13,6 @@ class ESP32HallSensor : public sensor::Sensor, public PollingComponent {
  void dump_config() override;

  void update() override;
-
-  std::string unique_id() override;
 };

 }  // namespace esp32_hall
--- a/esphome/components/ethernet_info/ethernet_info_text_sensor.h
+++ b/esphome/components/ethernet_info/ethernet_info_text_sensor.h
@@ -29,7 +29,6 @@ class IPAddressEthernetInfo : public PollingComponent, public text_sensor::TextS
  }

  float get_setup_priority() const override { return setup_priority::ETHERNET; }
-  std::string unique_id() override { return get_mac_address() + "-ethernetinfo"; }
  void dump_config() override;
  void add_ip_sensors(uint8_t index, text_sensor::TextSensor *s) { this->ip_sensors_[index] = s; }

@@ -52,7 +51,6 @@ class DNSAddressEthernetInfo : public PollingComponent, public text_sensor::Text
    }
  }
  float get_setup_priority() const override { return setup_priority::ETHERNET; }
-  std::string unique_id() override { return get_mac_address() + "-ethernetinfo-dns"; }
  void dump_config() override;

 protected:
@@ -63,7 +61,6 @@ class MACAddressEthernetInfo : public Component, public text_sensor::TextSensor
 public:
  void setup() override { this->publish_state(ethernet::global_eth_component->get_eth_mac_address_pretty()); }
  float get_setup_priority() const override { return setup_priority::ETHERNET; }
-  std::string unique_id() override { return get_mac_address() + "-ethernetinfo-mac"; }
  void dump_config() override;
 };

--- a/esphome/components/fan/fan.cpp
+++ b/esphome/components/fan/fan.cpp
@@ -41,48 +41,39 @@ void FanCall::perform() {
 void FanCall::validate_() {
  auto traits = this->parent_.get_traits();

-  if (this->speed_.has_value()) {
+  if (this->speed_.has_value())
    this->speed_ = clamp(*this->speed_, 1, traits.supported_speed_count());

-    // https://developers.home-assistant.io/docs/core/entity/fan/#preset-modes
-    // "Manually setting a speed must disable any set preset mode"
-    this->preset_mode_.clear();
+  if (this->binary_state_.has_value() && *this->binary_state_) {
+    // when turning on, if neither current nor new speed available, set speed to 100%
+    if (traits.supports_speed() && !this->parent_.state && this->parent_.speed == 0 && !this->speed_.has_value()) {
+      this->speed_ = traits.supported_speed_count();
+    }
+  }
+
+  if (this->oscillating_.has_value() && !traits.supports_oscillation()) {
+    ESP_LOGW(TAG, "'%s' - This fan does not support oscillation!", this->parent_.get_name().c_str());
+    this->oscillating_.reset();
+  }
+
+  if (this->speed_.has_value() && !traits.supports_speed()) {
+    ESP_LOGW(TAG, "'%s' - This fan does not support speeds!", this->parent_.get_name().c_str());
+    this->speed_.reset();
+  }
+
+  if (this->direction_.has_value() && !traits.supports_direction()) {
+    ESP_LOGW(TAG, "'%s' - This fan does not support directions!", this->parent_.get_name().c_str());
+    this->direction_.reset();
  }

  if (!this->preset_mode_.empty()) {
    const auto &preset_modes = traits.supported_preset_modes();
    if (preset_modes.find(this->preset_mode_) == preset_modes.end()) {
-      ESP_LOGW(TAG, "%s: Preset mode '%s' not supported", this->parent_.get_name().c_str(), this->preset_mode_.c_str());
+      ESP_LOGW(TAG, "'%s' - This fan does not support preset mode '%s'!", this->parent_.get_name().c_str(),
+               this->preset_mode_.c_str());
      this->preset_mode_.clear();
    }
  }
-
-  // when turning on...
-  if (!this->parent_.state && this->binary_state_.has_value() &&
-      *this->binary_state_
-      // ..,and no preset mode will be active...
-      && this->preset_mode_.empty() &&
-      this->parent_.preset_mode.empty()
-      // ...and neither current nor new speed is available...
-      && traits.supports_speed() && this->parent_.speed == 0 && !this->speed_.has_value()) {
-    // ...set speed to 100%
-    this->speed_ = traits.supported_speed_count();
-  }
-
-  if (this->oscillating_.has_value() && !traits.supports_oscillation()) {
-    ESP_LOGW(TAG, "%s: Oscillation not supported", this->parent_.get_name().c_str());
-    this->oscillating_.reset();
-  }
-
-  if (this->speed_.has_value() && !traits.supports_speed()) {
-    ESP_LOGW(TAG, "%s: Speed control not supported", this->parent_.get_name().c_str());
-    this->speed_.reset();
-  }
-
-  if (this->direction_.has_value() && !traits.supports_direction()) {
-    ESP_LOGW(TAG, "%s: Direction control not supported", this->parent_.get_name().c_str());
-    this->direction_.reset();
-  }
 }

 FanCall FanRestoreState::to_call(Fan &fan) {
--- a/esphome/components/i2c/init.py
+++ b/esphome/components/i2c/init.py
@@ -1,8 +1,5 @@
-import logging
-
 from esphome import pins
 import esphome.codegen as cg
-from esphome.components import esp32
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_ADDRESS,
@@ -15,8 +12,6 @@ from esphome.const import (
    CONF_SCL,
    CONF_SDA,
    CONF_TIMEOUT,
-    KEY_CORE,
-    KEY_FRAMEWORK_VERSION,
    PLATFORM_ESP32,
    PLATFORM_ESP8266,
    PLATFORM_RP2040,
@@ -24,7 +19,6 @@ from esphome.const import (
 from esphome.core import CORE, coroutine_with_priority
 import esphome.final_validate as fv

-LOGGER = logging.getLogger(__name__)
 CODEOWNERS = ["@esphome/core"]
 i2c_ns = cg.esphome_ns.namespace("i2c")
 I2CBus = i2c_ns.class_("I2CBus")
@@ -46,32 +40,6 @@ def _bus_declare_type(value):
    raise NotImplementedError


-def validate_config(config):
-    if (
-        config[CONF_SCAN]
-        and CORE.is_esp32
-        and CORE.using_esp_idf
-        and esp32.get_esp32_variant()
-        in [
-            esp32.const.VARIANT_ESP32C5,
-            esp32.const.VARIANT_ESP32C6,
-            esp32.const.VARIANT_ESP32P4,
-        ]
-    ):
-        version: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
-        if version.major == 5 and (
-            (version.minor == 3 and version.patch <= 3)
-            or (version.minor == 4 and version.patch <= 1)
-        ):
-            LOGGER.warning(
-                "There is a bug in esp-idf version %s that breaks I2C scan, I2C scan "
-                "has been disabled, see https://github.com/esphome/issues/issues/7128",
-                str(version),
-            )
-            config[CONF_SCAN] = False
-    return config
-
-
 pin_with_input_and_output_support = pins.internal_gpio_pin_number(
    {CONF_OUTPUT: True, CONF_INPUT: True}
 )
@@ -97,7 +65,6 @@ CONFIG_SCHEMA = cv.All(
        }
    ).extend(cv.COMPONENT_SCHEMA),
    cv.only_on([PLATFORM_ESP32, PLATFORM_ESP8266, PLATFORM_RP2040]),
-    validate_config,
 )


--- a/esphome/components/i2s_audio/i2s_audio.cpp
+++ b/esphome/components/i2s_audio/i2s_audio.cpp
@@ -18,7 +18,7 @@ void I2SAudioComponent::setup() {

  static i2s_port_t next_port_num = I2S_NUM_0;
  if (next_port_num >= I2S_NUM_MAX) {
-    ESP_LOGE(TAG, "Too many components");
+    ESP_LOGE(TAG, "Too many I2S Audio components");
    this->mark_failed();
    return;
  }
--- a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
+++ b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
@@ -45,7 +45,7 @@ void I2SAudioMicrophone::setup() {
 #if SOC_I2S_SUPPORTS_ADC
  if (this->adc_) {
    if (this->parent_->get_port() != I2S_NUM_0) {
-      ESP_LOGE(TAG, "Internal ADC only works on I2S0");
+      ESP_LOGE(TAG, "Internal ADC only works on I2S0!");
      this->mark_failed();
      return;
    }
@@ -55,7 +55,7 @@ void I2SAudioMicrophone::setup() {
  {
    if (this->pdm_) {
      if (this->parent_->get_port() != I2S_NUM_0) {
-        ESP_LOGE(TAG, "PDM only works on I2S0");
+        ESP_LOGE(TAG, "PDM only works on I2S0!");
        this->mark_failed();
        return;
      }
@@ -64,14 +64,14 @@ void I2SAudioMicrophone::setup() {

  this->active_listeners_semaphore_ = xSemaphoreCreateCounting(MAX_LISTENERS, MAX_LISTENERS);
  if (this->active_listeners_semaphore_ == nullptr) {
-    ESP_LOGE(TAG, "Creating semaphore failed");
+    ESP_LOGE(TAG, "Failed to create semaphore");
    this->mark_failed();
    return;
  }

  this->event_group_ = xEventGroupCreate();
  if (this->event_group_ == nullptr) {
-    ESP_LOGE(TAG, "Creating event group failed");
+    ESP_LOGE(TAG, "Failed to create event group");
    this->mark_failed();
    return;
  }
@@ -79,15 +79,6 @@ void I2SAudioMicrophone::setup() {
  this->configure_stream_settings_();
 }

-void I2SAudioMicrophone::dump_config() {
-  ESP_LOGCONFIG(TAG,
-                "Microphone:\n"
-                "  Pin: %d\n"
-                "  PDM: %s\n"
-                "  DC offset correction: %s",
-                static_cast<int8_t>(this->din_pin_), YESNO(this->pdm_), YESNO(this->correct_dc_offset_));
-}
-
 void I2SAudioMicrophone::configure_stream_settings_() {
  uint8_t channel_count = 1;
 #ifdef USE_I2S_LEGACY
@@ -136,7 +127,6 @@ bool I2SAudioMicrophone::start_driver_() {
  if (!this->parent_->try_lock()) {
    return false;  // Waiting for another i2s to return lock
  }
-  this->locked_driver_ = true;
  esp_err_t err;

 #ifdef USE_I2S_LEGACY
@@ -161,7 +151,7 @@ bool I2SAudioMicrophone::start_driver_() {
    config.mode = (i2s_mode_t) (config.mode | I2S_MODE_ADC_BUILT_IN);
    err = i2s_driver_install(this->parent_->get_port(), &config, 0, nullptr);
    if (err != ESP_OK) {
-      ESP_LOGE(TAG, "Error installing driver: %s", esp_err_to_name(err));
+      ESP_LOGE(TAG, "Error installing I2S driver: %s", esp_err_to_name(err));
      return false;
    }

@@ -184,7 +174,7 @@ bool I2SAudioMicrophone::start_driver_() {

    err = i2s_driver_install(this->parent_->get_port(), &config, 0, nullptr);
    if (err != ESP_OK) {
-      ESP_LOGE(TAG, "Error installing driver: %s", esp_err_to_name(err));
+      ESP_LOGE(TAG, "Error installing I2S driver: %s", esp_err_to_name(err));
      return false;
    }

@@ -193,7 +183,7 @@ bool I2SAudioMicrophone::start_driver_() {

    err = i2s_set_pin(this->parent_->get_port(), &pin_config);
    if (err != ESP_OK) {
-      ESP_LOGE(TAG, "Error setting pin: %s", esp_err_to_name(err));
+      ESP_LOGE(TAG, "Error setting I2S pin: %s", esp_err_to_name(err));
      return false;
    }
  }
@@ -208,7 +198,7 @@ bool I2SAudioMicrophone::start_driver_() {
  /* Allocate a new RX channel and get the handle of this channel */
  err = i2s_new_channel(&chan_cfg, NULL, &this->rx_handle_);
  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Error creating channel: %s", esp_err_to_name(err));
+    ESP_LOGE(TAG, "Error creating new I2S channel: %s", esp_err_to_name(err));
    return false;
  }

@@ -280,14 +270,14 @@ bool I2SAudioMicrophone::start_driver_() {
    err = i2s_channel_init_std_mode(this->rx_handle_, &std_cfg);
  }
  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Error initializing channel: %s", esp_err_to_name(err));
+    ESP_LOGE(TAG, "Error initializing I2S channel: %s", esp_err_to_name(err));
    return false;
  }

  /* Before reading data, start the RX channel first */
  i2s_channel_enable(this->rx_handle_);
  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Enabling failed: %s", esp_err_to_name(err));
+    ESP_LOGE(TAG, "Error enabling I2S Microphone: %s", esp_err_to_name(err));
    return false;
  }
 #endif
@@ -314,37 +304,31 @@ void I2SAudioMicrophone::stop_driver_() {
  if (this->adc_) {
    err = i2s_adc_disable(this->parent_->get_port());
    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "Error disabling ADC: %s", esp_err_to_name(err));
+      ESP_LOGW(TAG, "Error disabling ADC - it may not have started: %s", esp_err_to_name(err));
    }
  }
 #endif
  err = i2s_stop(this->parent_->get_port());
  if (err != ESP_OK) {
-    ESP_LOGW(TAG, "Error stopping: %s", esp_err_to_name(err));
+    ESP_LOGW(TAG, "Error stopping I2S microphone - it may not have started: %s", esp_err_to_name(err));
  }
  err = i2s_driver_uninstall(this->parent_->get_port());
  if (err != ESP_OK) {
-    ESP_LOGW(TAG, "Error uninstalling driver: %s", esp_err_to_name(err));
+    ESP_LOGW(TAG, "Error uninstalling I2S driver - it may not have started: %s", esp_err_to_name(err));
  }
 #else
-  if (this->rx_handle_ != nullptr) {
-    /* Have to stop the channel before deleting it */
-    err = i2s_channel_disable(this->rx_handle_);
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "Error stopping: %s", esp_err_to_name(err));
-    }
-    /* If the handle is not needed any more, delete it to release the channel resources */
-    err = i2s_del_channel(this->rx_handle_);
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "Error deleting channel: %s", esp_err_to_name(err));
-    }
-    this->rx_handle_ = nullptr;
+  /* Have to stop the channel before deleting it */
+  err = i2s_channel_disable(this->rx_handle_);
+  if (err != ESP_OK) {
+    ESP_LOGW(TAG, "Error stopping I2S microphone - it may not have started: %s", esp_err_to_name(err));
+  }
+  /* If the handle is not needed any more, delete it to release the channel resources */
+  err = i2s_del_channel(this->rx_handle_);
+  if (err != ESP_OK) {
+    ESP_LOGW(TAG, "Error deleting I2S channel - it may not have started: %s", esp_err_to_name(err));
  }
 #endif
-  if (this->locked_driver_) {
-    this->parent_->unlock();
-    this->locked_driver_ = false;
-  }
+  this->parent_->unlock();
 }

 void I2SAudioMicrophone::mic_task(void *params) {
@@ -416,7 +400,7 @@ size_t I2SAudioMicrophone::read_(uint8_t *buf, size_t len, TickType_t ticks_to_w
    // Ignore ESP_ERR_TIMEOUT if ticks_to_wait = 0, as it will read the data on the next call
    if (!this->status_has_warning()) {
      // Avoid spamming the logs with the error message if its repeated
-      ESP_LOGW(TAG, "Read error: %s", esp_err_to_name(err));
+      ESP_LOGW(TAG, "Error reading from I2S microphone: %s", esp_err_to_name(err));
    }
    this->status_set_warning();
    return 0;
@@ -444,19 +428,19 @@ void I2SAudioMicrophone::loop() {
  uint32_t event_group_bits = xEventGroupGetBits(this->event_group_);

  if (event_group_bits & MicrophoneEventGroupBits::TASK_STARTING) {
-    ESP_LOGV(TAG, "Task started, attempting to allocate buffer");
+    ESP_LOGD(TAG, "Task started, attempting to allocate buffer");
    xEventGroupClearBits(this->event_group_, MicrophoneEventGroupBits::TASK_STARTING);
  }

  if (event_group_bits & MicrophoneEventGroupBits::TASK_RUNNING) {
-    ESP_LOGV(TAG, "Task is running and reading data");
+    ESP_LOGD(TAG, "Task is running and reading data");

    xEventGroupClearBits(this->event_group_, MicrophoneEventGroupBits::TASK_RUNNING);
    this->state_ = microphone::STATE_RUNNING;
  }

  if ((event_group_bits & MicrophoneEventGroupBits::TASK_STOPPED)) {
-    ESP_LOGV(TAG, "Task finished, freeing resources and uninstalling driver");
+    ESP_LOGD(TAG, "Task finished, freeing resources and uninstalling I2S driver");

    vTaskDelete(this->task_handle_);
    this->task_handle_ = nullptr;
@@ -486,8 +470,7 @@ void I2SAudioMicrophone::loop() {
      }

      if (!this->start_driver_()) {
-        ESP_LOGE(TAG, "Driver failed to start; retrying in 1 second");
-        this->status_momentary_error("driver_fail", 1000);
+        this->status_momentary_error("I2S driver failed to start, unloading it and attempting again in 1 second", 1000);
        this->stop_driver_();  // Stop/frees whatever possibly started
        break;
      }
@@ -497,8 +480,7 @@ void I2SAudioMicrophone::loop() {
                    &this->task_handle_);

        if (this->task_handle_ == nullptr) {
-          ESP_LOGE(TAG, "Task failed to start, retrying in 1 second");
-          this->status_momentary_error("task_fail", 1000);
+          this->status_momentary_error("Task failed to start, attempting again in 1 second", 1000);
          this->stop_driver_();  // Stops the driver to return the lock; will be reloaded in next attempt
        }
      }
--- a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h
+++ b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.h
@@ -18,7 +18,6 @@ namespace i2s_audio {
 class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, public Component {
 public:
  void setup() override;
-  void dump_config() override;
  void start() override;
  void stop() override;

@@ -81,7 +80,6 @@ class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, pub
  bool pdm_{false};

  bool correct_dc_offset_;
-  bool locked_driver_{false};
  int32_t dc_offset_{0};
 };

--- a/esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp
+++ b/esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp
@@ -110,48 +110,29 @@ void I2SAudioSpeaker::setup() {
  }
 }

-void I2SAudioSpeaker::dump_config() {
-  ESP_LOGCONFIG(TAG,
-                "Speaker:\n"
-                "  Pin: %d\n"
-                "  Buffer duration: %" PRIu32,
-                static_cast<int8_t>(this->dout_pin_), this->buffer_duration_ms_);
-  if (this->timeout_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Timeout: %" PRIu32 " ms", this->timeout_.value());
-  }
-#ifdef USE_I2S_LEGACY
-#if SOC_I2S_SUPPORTS_DAC
-  ESP_LOGCONFIG(TAG, "  Internal DAC mode: %d", static_cast<int8_t>(this->internal_dac_mode_));
-#endif
-  ESP_LOGCONFIG(TAG, "  Communication format: %d", static_cast<int8_t>(this->i2s_comm_fmt_));
-#else
-  ESP_LOGCONFIG(TAG, "  Communication format: %s", this->i2s_comm_fmt_.c_str());
-#endif
-}
-
 void I2SAudioSpeaker::loop() {
  uint32_t event_group_bits = xEventGroupGetBits(this->event_group_);

  if (event_group_bits & SpeakerEventGroupBits::STATE_STARTING) {
-    ESP_LOGD(TAG, "Starting");
+    ESP_LOGD(TAG, "Starting Speaker");
    this->state_ = speaker::STATE_STARTING;
    xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::STATE_STARTING);
  }
  if (event_group_bits & SpeakerEventGroupBits::STATE_RUNNING) {
-    ESP_LOGD(TAG, "Started");
+    ESP_LOGD(TAG, "Started Speaker");
    this->state_ = speaker::STATE_RUNNING;
    xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::STATE_RUNNING);
    this->status_clear_warning();
    this->status_clear_error();
  }
  if (event_group_bits & SpeakerEventGroupBits::STATE_STOPPING) {
-    ESP_LOGD(TAG, "Stopping");
+    ESP_LOGD(TAG, "Stopping Speaker");
    this->state_ = speaker::STATE_STOPPING;
    xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::STATE_STOPPING);
  }
  if (event_group_bits & SpeakerEventGroupBits::STATE_STOPPED) {
    if (!this->task_created_) {
-      ESP_LOGD(TAG, "Stopped");
+      ESP_LOGD(TAG, "Stopped Speaker");
      this->state_ = speaker::STATE_STOPPED;
      xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::ALL_BITS);
      this->speaker_task_handle_ = nullptr;
@@ -159,19 +140,20 @@ void I2SAudioSpeaker::loop() {
  }

  if (event_group_bits & SpeakerEventGroupBits::ERR_TASK_FAILED_TO_START) {
-    this->status_set_error("Failed to start task");
+    this->status_set_error("Failed to start speaker task");
    xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::ERR_TASK_FAILED_TO_START);
  }

  if (event_group_bits & SpeakerEventGroupBits::ALL_ERR_ESP_BITS) {
    uint32_t error_bits = event_group_bits & SpeakerEventGroupBits::ALL_ERR_ESP_BITS;
-    ESP_LOGW(TAG, "Writing failed: %s", esp_err_to_name(err_bit_to_esp_err(error_bits)));
+    ESP_LOGW(TAG, "Error writing to I2S: %s", esp_err_to_name(err_bit_to_esp_err(error_bits)));
    this->status_set_warning();
  }

  if (event_group_bits & SpeakerEventGroupBits::ERR_ESP_NOT_SUPPORTED) {
-    this->status_set_error("Failed to adjust bus to match incoming audio");
-    ESP_LOGE(TAG, "Incompatible audio format: sample rate = %" PRIu32 ", channels = %u, bits per sample = %u",
+    this->status_set_error("Failed to adjust I2S bus to match the incoming audio");
+    ESP_LOGE(TAG,
+             "Incompatible audio format: sample rate = %" PRIu32 ", channels = %" PRIu8 ", bits per sample = %" PRIu8,
             this->audio_stream_info_.get_sample_rate(), this->audio_stream_info_.get_channels(),
             this->audio_stream_info_.get_bits_per_sample());
  }
@@ -220,7 +202,7 @@ void I2SAudioSpeaker::set_mute_state(bool mute_state) {

 size_t I2SAudioSpeaker::play(const uint8_t *data, size_t length, TickType_t ticks_to_wait) {
  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Setup failed; cannot play audio");
+    ESP_LOGE(TAG, "Cannot play audio, speaker failed to setup");
    return 0;
  }
  if (this->state_ != speaker::STATE_RUNNING && this->state_ != speaker::STATE_STARTING) {
--- a/esphome/components/i2s_audio/speaker/i2s_audio_speaker.h
+++ b/esphome/components/i2s_audio/speaker/i2s_audio_speaker.h
@@ -24,7 +24,6 @@ class I2SAudioSpeaker : public I2SAudioOut, public speaker::Speaker, public Comp
  float get_setup_priority() const override { return esphome::setup_priority::PROCESSOR; }

  void setup() override;
-  void dump_config() override;
  void loop() override;

  void set_buffer_duration(uint32_t buffer_duration_ms) { this->buffer_duration_ms_ = buffer_duration_ms; }
--- a/esphome/components/kmeteriso/kmeteriso.cpp
+++ b/esphome/components/kmeteriso/kmeteriso.cpp
@@ -19,8 +19,9 @@ void KMeterISOComponent::setup() {

  // Mark as not failed before initializing. Some devices will turn off sensors to save on batteries
  // and when they come back on, the COMPONENT_STATE_FAILED bit must be unset on the component.
-  if (this->is_failed()) {
-    this->reset_to_construction_state();
+  if ((this->component_state_ & COMPONENT_STATE_MASK) == COMPONENT_STATE_FAILED) {
+    this->component_state_ &= ~COMPONENT_STATE_MASK;
+    this->component_state_ |= COMPONENT_STATE_CONSTRUCTION;
  }

  auto err = this->bus_->writev(this->address_, nullptr, 0);
--- a/esphome/components/light/light_state.h
+++ b/esphome/components/light/light_state.h
@@ -17,7 +17,7 @@ namespace light {

 class LightOutput;

-enum LightRestoreMode : uint8_t {
+enum LightRestoreMode {
  LIGHT_RESTORE_DEFAULT_OFF,
  LIGHT_RESTORE_DEFAULT_ON,
  LIGHT_ALWAYS_OFF,
@@ -212,18 +212,12 @@ class LightState : public EntityBase, public Component {

  /// Store the output to allow effects to have more access.
  LightOutput *output_;
-  /// The currently active transformer for this light (transition/flash).
-  std::unique_ptr<LightTransformer> transformer_{nullptr};
-  /// List of effects for this light.
-  std::vector<LightEffect *> effects_;
  /// 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.
-  uint32_t default_transition_length_{};
-  /// Transition length to use for flash transitions.
-  uint32_t flash_transition_length_{};
-  /// Gamma correction factor for the light.
-  float gamma_correct_{};
+  /// The currently active transformer for this light (transition/flash).
+  std::unique_ptr<LightTransformer> transformer_{nullptr};
+  /// Whether the light value should be written in the next cycle.
+  bool next_write_{true};

  /// Object used to store the persisted values of the light.
  ESPPreferenceObject rtc_;
@@ -242,13 +236,19 @@ class LightState : public EntityBase, public Component {
   */
  CallbackManager<void()> target_state_reached_callback_{};

-  /// Initial state of the light.
-  optional<LightStateRTCState> initial_state_{};
-
+  /// Default transition length for all transitions in ms.
+  uint32_t default_transition_length_{};
+  /// Transition length to use for flash transitions.
+  uint32_t flash_transition_length_{};
+  /// Gamma correction factor for the light.
+  float gamma_correct_{};
  /// Restore mode of the light.
  LightRestoreMode restore_mode_;
-  /// Whether the light value should be written in the next cycle.
-  bool next_write_{true};
+  /// Initial state of the light.
+  optional<LightStateRTCState> initial_state_{};
+  /// List of effects for this light.
+  std::vector<LightEffect *> effects_;
+
  // for effects, true if a transformer (transition) is active.
  bool is_transformer_active_ = false;
 };
--- a/esphome/components/logger/logger.cpp
+++ b/esphome/components/logger/logger.cpp
@@ -116,7 +116,7 @@ void Logger::log_vprintf_(int level, const char *tag, int line, const __FlashStr
  if (this->baud_rate_ > 0) {
    this->write_msg_(this->tx_buffer_ + msg_start);
  }
-  this->log_callback_.call(level, tag, this->tx_buffer_ + msg_start);
+  this->call_log_callbacks_(level, tag, this->tx_buffer_ + msg_start);

  global_recursion_guard_ = false;
 }
@@ -129,6 +129,19 @@ inline int Logger::level_for(const char *tag) {
  return this->current_level_;
 }

+void HOT Logger::call_log_callbacks_(int level, const char *tag, const char *msg) {
+#ifdef USE_ESP32
+  // Suppress network-logging if memory constrained
+  // In some configurations (eg BLE enabled) there may be some transient
+  // memory exhaustion, and trying to log when OOM can lead to a crash. Skipping
+  // here usually allows the stack to recover instead.
+  // See issue #1234 for analysis.
+  if (xPortGetFreeHeapSize() < 2048)
+    return;
+#endif
+  this->log_callback_.call(level, tag, msg);
+}
+
 Logger::Logger(uint32_t baud_rate, size_t tx_buffer_size) : baud_rate_(baud_rate), tx_buffer_size_(tx_buffer_size) {
  // add 1 to buffer size for null terminator
  this->tx_buffer_ = new char[this->tx_buffer_size_ + 1];  // NOLINT
@@ -176,7 +189,7 @@ void Logger::loop() {
                                  this->tx_buffer_size_);
      this->write_footer_to_buffer_(this->tx_buffer_, &this->tx_buffer_at_, this->tx_buffer_size_);
      this->tx_buffer_[this->tx_buffer_at_] = '\0';
-      this->log_callback_.call(message->level, message->tag, this->tx_buffer_);
+      this->call_log_callbacks_(message->level, message->tag, this->tx_buffer_);
      // At this point all the data we need from message has been transferred to the tx_buffer
      // so we can release the message to allow other tasks to use it as soon as possible.
      this->log_buffer_->release_message_main_loop(received_token);
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -156,6 +156,7 @@ class Logger : public Component {
 #endif

 protected:
+  void call_log_callbacks_(int level, const char *tag, const char *msg);
  void write_msg_(const char *msg);

  // Format a log message with printf-style arguments and write it to a buffer with header, footer, and null terminator
@@ -190,7 +191,7 @@ class Logger : public Component {
    if (this->baud_rate_ > 0) {
      this->write_msg_(this->tx_buffer_);  // If logging is enabled, write to console
    }
-    this->log_callback_.call(level, tag, this->tx_buffer_);
+    this->call_log_callbacks_(level, tag, this->tx_buffer_);
  }

  // Write the body of the log message to the buffer
--- a/esphome/components/lvgl/widgets/qrcode.py
+++ b/esphome/components/lvgl/widgets/qrcode.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_SIZE, CONF_TEXT
 from esphome.cpp_generator import MockObjClass

-from ..defines import CONF_MAIN
+from ..defines import CONF_MAIN, literal
 from ..lv_validation import color, color_retmapper, lv_text
 from ..lvcode import LocalVariable, lv, lv_expr
 from ..schemas import TEXT_SCHEMA
@@ -34,7 +34,7 @@ class QrCodeType(WidgetType):
        )

    def get_uses(self):
-        return ("canvas", "img", "label")
+        return ("canvas", "img")

    def obj_creator(self, parent: MockObjClass, config: dict):
        dark_color = color_retmapper(config[CONF_DARK_COLOR])
@@ -45,8 +45,10 @@ class QrCodeType(WidgetType):
    async def to_code(self, w: Widget, config):
        if (value := config.get(CONF_TEXT)) is not None:
            value = await lv_text.process(value)
-            with LocalVariable("qr_text", cg.std_string, value, modifier="") as str_obj:
-                lv.qrcode_update(w.obj, str_obj.c_str(), str_obj.size())
+            with LocalVariable(
+                "qr_text", cg.const_char_ptr, value, modifier=""
+            ) as str_obj:
+                lv.qrcode_update(w.obj, str_obj, literal(f"strlen({str_obj})"))


 qr_code_spec = QrCodeType()
--- a/esphome/components/mcp23xxx_base/mcp23xxx_base.cpp
+++ b/esphome/components/mcp23xxx_base/mcp23xxx_base.cpp
@@ -6,11 +6,7 @@ namespace mcp23xxx_base {

 float MCP23XXXBase::get_setup_priority() const { return setup_priority::IO; }

-void MCP23XXXGPIOPin::setup() {
-  pin_mode(flags_);
-  this->parent_->pin_interrupt_mode(this->pin_, this->interrupt_mode_);
-}
-
+void MCP23XXXGPIOPin::setup() { pin_mode(flags_); }
 void MCP23XXXGPIOPin::pin_mode(gpio::Flags flags) { this->parent_->pin_mode(this->pin_, flags); }
 bool MCP23XXXGPIOPin::digital_read() { return this->parent_->digital_read(this->pin_) != this->inverted_; }
 void MCP23XXXGPIOPin::digital_write(bool value) { this->parent_->digital_write(this->pin_, value != this->inverted_); }
--- a/esphome/components/mqtt/mqtt_component.cpp
+++ b/esphome/components/mqtt/mqtt_component.cpp
@@ -128,21 +128,16 @@ bool MQTTComponent::send_discovery_() {
            root[MQTT_PAYLOAD_NOT_AVAILABLE] = this->availability_->payload_not_available;
        }

-        std::string unique_id = this->unique_id();
        const MQTTDiscoveryInfo &discovery_info = global_mqtt_client->get_discovery_info();
-        if (!unique_id.empty()) {
-          root[MQTT_UNIQUE_ID] = unique_id;
+        if (discovery_info.unique_id_generator == MQTT_MAC_ADDRESS_UNIQUE_ID_GENERATOR) {
+          char friendly_name_hash[9];
+          sprintf(friendly_name_hash, "%08" PRIx32, fnv1_hash(this->friendly_name()));
+          friendly_name_hash[8] = 0;  // ensure the hash-string ends with null
+          root[MQTT_UNIQUE_ID] = get_mac_address() + "-" + this->component_type() + "-" + friendly_name_hash;
        } else {
-          if (discovery_info.unique_id_generator == MQTT_MAC_ADDRESS_UNIQUE_ID_GENERATOR) {
-            char friendly_name_hash[9];
-            sprintf(friendly_name_hash, "%08" PRIx32, fnv1_hash(this->friendly_name()));
-            friendly_name_hash[8] = 0;  // ensure the hash-string ends with null
-            root[MQTT_UNIQUE_ID] = get_mac_address() + "-" + this->component_type() + "-" + friendly_name_hash;
-          } else {
-            // default to almost-unique ID. It's a hack but the only way to get that
-            // gorgeous device registry view.
-            root[MQTT_UNIQUE_ID] = "ESP" + this->component_type() + this->get_default_object_id_();
-          }
+          // default to almost-unique ID. It's a hack but the only way to get that
+          // gorgeous device registry view.
+          root[MQTT_UNIQUE_ID] = "ESP" + this->component_type() + this->get_default_object_id_();
        }

        const std::string &node_name = App.get_name();
@@ -153,7 +148,7 @@ bool MQTTComponent::send_discovery_() {
        if (node_friendly_name.empty()) {
          node_friendly_name = node_name;
        }
-        std::string node_area = App.get_area();
+        const std::string &node_area = App.get_area();

        JsonObject device_info = root.createNestedObject(MQTT_DEVICE);
        const auto mac = get_mac_address();
@@ -284,7 +279,6 @@ void MQTTComponent::call_dump_config() {
  this->dump_config();
 }
 void MQTTComponent::schedule_resend_state() { this->resend_state_ = true; }
-std::string MQTTComponent::unique_id() { return ""; }
 bool MQTTComponent::is_connected_() const { return global_mqtt_client->is_connected(); }

 // Pull these properties from EntityBase if not overridden
--- a/esphome/components/mqtt/mqtt_component.h
+++ b/esphome/components/mqtt/mqtt_component.h
@@ -164,13 +164,6 @@ class MQTTComponent : public Component {
   */
  virtual const EntityBase *get_entity() const = 0;

-  /** A unique ID for this MQTT component, empty for no unique id. See unique ID requirements:
-   * https://developers.home-assistant.io/docs/en/entity_registry_index.html#unique-id-requirements
-   *
-   * @return The unique id as a string.
-   */
-  virtual std::string unique_id();
-
  /// Get the friendly name of this MQTT component.
  virtual std::string friendly_name() const;

--- a/esphome/components/mqtt/mqtt_sensor.cpp
+++ b/esphome/components/mqtt/mqtt_sensor.cpp
@@ -74,7 +74,6 @@ bool MQTTSensorComponent::publish_state(float value) {
  int8_t accuracy = this->sensor_->get_accuracy_decimals();
  return this->publish(this->get_state_topic_(), value_accuracy_to_string(value, accuracy));
 }
-std::string MQTTSensorComponent::unique_id() { return this->sensor_->unique_id(); }

 }  // namespace mqtt
 }  // namespace esphome
--- a/esphome/components/mqtt/mqtt_sensor.h
+++ b/esphome/components/mqtt/mqtt_sensor.h
@@ -46,7 +46,6 @@ class MQTTSensorComponent : public mqtt::MQTTComponent {
  /// Override for MQTTComponent, returns "sensor".
  std::string component_type() const override;
  const EntityBase *get_entity() const override;
-  std::string unique_id() override;

  sensor::Sensor *sensor_;
  optional<uint32_t> expire_after_;  // Override the expire after advertised to Home Assistant
--- a/esphome/components/mqtt/mqtt_text_sensor.cpp
+++ b/esphome/components/mqtt/mqtt_text_sensor.cpp
@@ -38,7 +38,6 @@ bool MQTTTextSensor::send_initial_state() {
 }
 std::string MQTTTextSensor::component_type() const { return "sensor"; }
 const EntityBase *MQTTTextSensor::get_entity() const { return this->sensor_; }
-std::string MQTTTextSensor::unique_id() { return this->sensor_->unique_id(); }

 }  // namespace mqtt
 }  // namespace esphome
--- a/esphome/components/mqtt/mqtt_text_sensor.h
+++ b/esphome/components/mqtt/mqtt_text_sensor.h
@@ -28,7 +28,6 @@ class MQTTTextSensor : public mqtt::MQTTComponent {
 protected:
  std::string component_type() const override;
  const EntityBase *get_entity() const override;
-  std::string unique_id() override;

  text_sensor::TextSensor *sensor_;
 };
--- a/esphome/components/nextion/binary_sensor/nextion_binarysensor.cpp
+++ b/esphome/components/nextion/binary_sensor/nextion_binarysensor.cpp
@@ -56,7 +56,7 @@ void NextionBinarySensor::set_state(bool state, bool publish, bool send_to_nexti
    this->publish_state(state);
  } else {
    this->state = state;
-    this->set_has_state(true);
+    this->has_state_ = true;
  }

  this->update_component_settings();
--- a/esphome/components/nextion/nextion.cpp
+++ b/esphome/components/nextion/nextion.cpp
@@ -33,7 +33,6 @@ bool Nextion::send_command_(const std::string &command) {

 #ifdef USE_NEXTION_COMMAND_SPACING
  if (!this->ignore_is_setup_ && !this->command_pacer_.can_send()) {
-    ESP_LOGN(TAG, "Command spacing: delaying command '%s'", command.c_str());
    return false;
  }
 #endif  // USE_NEXTION_COMMAND_SPACING
@@ -44,6 +43,10 @@ bool Nextion::send_command_(const std::string &command) {
  const uint8_t to_send[3] = {0xFF, 0xFF, 0xFF};
  this->write_array(to_send, sizeof(to_send));

+#ifdef USE_NEXTION_COMMAND_SPACING
+  this->command_pacer_.mark_sent();
+#endif  // USE_NEXTION_COMMAND_SPACING
+
  return true;
 }

@@ -374,6 +377,12 @@ void Nextion::process_nextion_commands_() {
  size_t commands_processed = 0;
 #endif  // USE_NEXTION_MAX_COMMANDS_PER_LOOP

+#ifdef USE_NEXTION_COMMAND_SPACING
+  if (!this->command_pacer_.can_send()) {
+    return;  // Will try again in next loop iteration
+  }
+#endif
+
  size_t to_process_length = 0;
  std::string to_process;

@@ -421,7 +430,6 @@ void Nextion::process_nextion_commands_() {
        }
 #ifdef USE_NEXTION_COMMAND_SPACING
        this->command_pacer_.mark_sent();  // Here is where we should mark the command as sent
-        ESP_LOGN(TAG, "Command spacing: marked command sent at %u ms", millis());
 #endif
        break;
      case 0x02:  // invalid Component ID or name was used
--- a/esphome/components/nextion/nextion_upload_arduino.cpp
+++ b/esphome/components/nextion/nextion_upload_arduino.cpp
@@ -337,26 +337,23 @@ bool Nextion::upload_tft(uint32_t baud_rate, bool exit_reparse) {

 bool Nextion::upload_end_(bool successful) {
  ESP_LOGD(TAG, "TFT upload done: %s", YESNO(successful));
+  this->is_updating_ = false;
+  this->ignore_is_setup_ = false;
+
+  uint32_t baud_rate = this->parent_->get_baud_rate();
+  if (baud_rate != this->original_baud_rate_) {
+    ESP_LOGD(TAG, "Baud back: %" PRIu32 "->%" PRIu32, baud_rate, this->original_baud_rate_);
+    this->parent_->set_baud_rate(this->original_baud_rate_);
+    this->parent_->load_settings();
+  }

  if (successful) {
    ESP_LOGD(TAG, "Restart");
    delay(1500);  // NOLINT
    App.safe_reboot();
-    delay(1500);  // NOLINT
  } else {
    ESP_LOGE(TAG, "TFT upload failed");
-
-    this->is_updating_ = false;
-    this->ignore_is_setup_ = false;
-
-    uint32_t baud_rate = this->parent_->get_baud_rate();
-    if (baud_rate != this->original_baud_rate_) {
-      ESP_LOGD(TAG, "Baud back: %" PRIu32 "->%" PRIu32, baud_rate, this->original_baud_rate_);
-      this->parent_->set_baud_rate(this->original_baud_rate_);
-      this->parent_->load_settings();
-    }
  }
-
  return successful;
 }

--- a/esphome/components/nextion/nextion_upload_idf.cpp
+++ b/esphome/components/nextion/nextion_upload_idf.cpp
@@ -337,6 +337,15 @@ bool Nextion::upload_tft(uint32_t baud_rate, bool exit_reparse) {

 bool Nextion::upload_end_(bool successful) {
  ESP_LOGD(TAG, "TFT upload done: %s", YESNO(successful));
+  this->is_updating_ = false;
+  this->ignore_is_setup_ = false;
+
+  uint32_t baud_rate = this->parent_->get_baud_rate();
+  if (baud_rate != this->original_baud_rate_) {
+    ESP_LOGD(TAG, "Baud back: %" PRIu32 "->%" PRIu32, baud_rate, this->original_baud_rate_);
+    this->parent_->set_baud_rate(this->original_baud_rate_);
+    this->parent_->load_settings();
+  }

  if (successful) {
    ESP_LOGD(TAG, "Restart");
@@ -344,18 +353,7 @@ bool Nextion::upload_end_(bool successful) {
    App.safe_reboot();
  } else {
    ESP_LOGE(TAG, "TFT upload failed");
-
-    this->is_updating_ = false;
-    this->ignore_is_setup_ = false;
-
-    uint32_t baud_rate = this->parent_->get_baud_rate();
-    if (baud_rate != this->original_baud_rate_) {
-      ESP_LOGD(TAG, "Baud back: %" PRIu32 "->%" PRIu32, baud_rate, this->original_baud_rate_);
-      this->parent_->set_baud_rate(this->original_baud_rate_);
-      this->parent_->load_settings();
-    }
  }
-
  return successful;
 }

--- a/esphome/components/nextion/sensor/nextion_sensor.cpp
+++ b/esphome/components/nextion/sensor/nextion_sensor.cpp
@@ -88,7 +88,7 @@ void NextionSensor::set_state(float state, bool publish, bool send_to_nextion) {
    } else {
      this->raw_state = state;
      this->state = state;
-      this->set_has_state(true);
+      this->has_state_ = true;
    }
  }
  this->update_component_settings();
--- a/esphome/components/nextion/text_sensor/nextion_textsensor.cpp
+++ b/esphome/components/nextion/text_sensor/nextion_textsensor.cpp
@@ -37,7 +37,7 @@ void NextionTextSensor::set_state(const std::string &state, bool publish, bool s
    this->publish_state(state);
  } else {
    this->state = state;
-    this->set_has_state(true);
+    this->has_state_ = true;
  }

  this->update_component_settings();
--- a/esphome/components/number/number.cpp
+++ b/esphome/components/number/number.cpp
@@ -7,7 +7,7 @@ namespace number {
 static const char *const TAG = "number";

 void Number::publish_state(float state) {
-  this->set_has_state(true);
+  this->has_state_ = true;
  this->state = state;
  ESP_LOGD(TAG, "'%s': Sending state %f", this->get_name().c_str(), state);
  this->state_callback_.call(state);
--- a/esphome/components/number/number.h
+++ b/esphome/components/number/number.h
@@ -48,6 +48,9 @@ class Number : public EntityBase {

  NumberTraits traits;

+  /// Return whether this number has gotten a full state yet.
+  bool has_state() const { return has_state_; }
+
 protected:
  friend class NumberCall;

@@ -60,6 +63,7 @@ class Number : public EntityBase {
  virtual void control(float value) = 0;

  CallbackManager<void(float)> state_callback_;
+  bool has_state_{false};
 };

 }  // namespace number
--- a/esphome/components/one_wire/one_wire.cpp
+++ b/esphome/components/one_wire/one_wire.cpp
@@ -11,8 +11,6 @@ const std::string &OneWireDevice::get_address_name() {
  return this->address_name_;
 }

-std::string OneWireDevice::unique_id() { return "dallas-" + str_lower_case(format_hex(this->address_)); }
-
 bool OneWireDevice::send_command_(uint8_t cmd) {
  if (!this->bus_->select(this->address_))
    return false;
--- a/esphome/components/one_wire/one_wire.h
+++ b/esphome/components/one_wire/one_wire.h
@@ -24,8 +24,6 @@ class OneWireDevice {
  /// Helper to create (and cache) the name for this sensor. For example "0xfe0000031f1eaf29".
  const std::string &get_address_name();

-  std::string unique_id();
-
 protected:
  uint64_t address_{0};
  OneWireBus *bus_{nullptr};  ///< pointer to OneWireBus instance
--- a/esphome/components/openthread/init.py
+++ b/esphome/components/openthread/init.py
@@ -46,7 +46,7 @@ def set_sdkconfig_options(config):
    add_idf_sdkconfig_option("CONFIG_OPENTHREAD_NETWORK_PANID", config[CONF_PAN_ID])
    add_idf_sdkconfig_option("CONFIG_OPENTHREAD_NETWORK_CHANNEL", config[CONF_CHANNEL])
    add_idf_sdkconfig_option(
-        "CONFIG_OPENTHREAD_NETWORK_MASTERKEY", f"{config[CONF_NETWORK_KEY]:X}".lower()
+        "CONFIG_OPENTHREAD_NETWORK_MASTERKEY", f"{config[CONF_NETWORK_KEY]:X}"
    )

    if network_name := config.get(CONF_NETWORK_NAME):
@@ -54,14 +54,14 @@ def set_sdkconfig_options(config):

    if (ext_pan_id := config.get(CONF_EXT_PAN_ID)) is not None:
        add_idf_sdkconfig_option(
-            "CONFIG_OPENTHREAD_NETWORK_EXTPANID", f"{ext_pan_id:X}".lower()
+            "CONFIG_OPENTHREAD_NETWORK_EXTPANID", f"{ext_pan_id:X}"
        )
    if (mesh_local_prefix := config.get(CONF_MESH_LOCAL_PREFIX)) is not None:
        add_idf_sdkconfig_option(
-            "CONFIG_OPENTHREAD_MESH_LOCAL_PREFIX", f"{mesh_local_prefix}".lower()
+            "CONFIG_OPENTHREAD_MESH_LOCAL_PREFIX", f"{mesh_local_prefix:X}"
        )
    if (pskc := config.get(CONF_PSKC)) is not None:
-        add_idf_sdkconfig_option("CONFIG_OPENTHREAD_NETWORK_PSKC", f"{pskc:X}".lower())
+        add_idf_sdkconfig_option("CONFIG_OPENTHREAD_NETWORK_PSKC", f"{pskc:X}")

    if CONF_FORCE_DATASET in config:
        if config[CONF_FORCE_DATASET]:
@@ -98,7 +98,7 @@ _CONNECTION_SCHEMA = cv.Schema(
        cv.Optional(CONF_EXT_PAN_ID): cv.hex_int,
        cv.Optional(CONF_NETWORK_NAME): cv.string_strict,
        cv.Optional(CONF_PSKC): cv.hex_int,
-        cv.Optional(CONF_MESH_LOCAL_PREFIX): cv.ipv6network,
+        cv.Optional(CONF_MESH_LOCAL_PREFIX): cv.hex_int,
    }
 )

--- a/esphome/components/openthread/openthread.cpp
+++ b/esphome/components/openthread/openthread.cpp
@@ -137,7 +137,7 @@ void OpenThreadSrpComponent::setup() {
  // Copy the mdns services to our local instance so that the c_str pointers remain valid for the lifetime of this
  // component
  this->mdns_services_ = this->mdns_->get_services();
-  ESP_LOGD(TAG, "Setting up SRP services. count = %d\n", this->mdns_services_.size());
+  ESP_LOGW(TAG, "Setting up SRP services. count = %d\n", this->mdns_services_.size());
  for (const auto &service : this->mdns_services_) {
    otSrpClientBuffersServiceEntry *entry = otSrpClientBuffersAllocateService(instance);
    if (!entry) {
@@ -185,11 +185,11 @@ void OpenThreadSrpComponent::setup() {
    if (error != OT_ERROR_NONE) {
      ESP_LOGW(TAG, "Failed to add service: %s", otThreadErrorToString(error));
    }
-    ESP_LOGD(TAG, "Added service: %s", full_service.c_str());
+    ESP_LOGW(TAG, "Added service: %s", full_service.c_str());
  }

  otSrpClientEnableAutoStartMode(instance, srp_start_callback, nullptr);
-  ESP_LOGD(TAG, "Finished SRP setup");
+  ESP_LOGW(TAG, "Finished SRP setup");
 }

 void *OpenThreadSrpComponent::pool_alloc_(size_t size) {
--- a/esphome/components/openthread/tlv.py
+++ b/esphome/components/openthread/tlv.py
@@ -1,6 +1,5 @@
 # Sourced from https://gist.github.com/agners/0338576e0003318b63ec1ea75adc90f9
 import binascii
-import ipaddress

 from esphome.const import CONF_CHANNEL

@@ -38,12 +37,6 @@ def parse_tlv(tlv) -> dict:
        if tag in TLV_TYPES:
            if tag == 3:
                output[TLV_TYPES[tag]] = val.decode("utf-8")
-            elif tag == 7:
-                mesh_local_prefix = binascii.hexlify(val).decode("utf-8")
-                mesh_local_prefix_str = f"{mesh_local_prefix}0000000000000000"
-                ipv6_bytes = bytes.fromhex(mesh_local_prefix_str)
-                ipv6_address = ipaddress.IPv6Address(ipv6_bytes)
-                output[TLV_TYPES[tag]] = f"{ipv6_address}/64"
            else:
                output[TLV_TYPES[tag]] = int.from_bytes(val)
    return output
--- a/esphome/components/prometheus/init.py
+++ b/esphome/components/prometheus/init.py
@@ -31,6 +31,7 @@ CONFIG_SCHEMA = cv.Schema(
            }
        ),
    },
+    cv.only_with_arduino,
 ).extend(cv.COMPONENT_SCHEMA)


--- a/esphome/components/select/select.cpp
+++ b/esphome/components/select/select.cpp
@@ -10,7 +10,7 @@ void Select::publish_state(const std::string &state) {
  auto index = this->index_of(state);
  const auto *name = this->get_name().c_str();
  if (index.has_value()) {
-    this->set_has_state(true);
+    this->has_state_ = true;
    this->state = state;
    ESP_LOGD(TAG, "'%s': Sending state %s (index %zu)", name, state.c_str(), index.value());
    this->state_callback_.call(state, index.value());
--- a/esphome/components/select/select.h
+++ b/esphome/components/select/select.h
@@ -35,6 +35,9 @@ class Select : public EntityBase {

  void publish_state(const std::string &state);

+  /// Return whether this select component has gotten a full state yet.
+  bool has_state() const { return has_state_; }
+
  /// Instantiate a SelectCall object to modify this select component's state.
  SelectCall make_call() { return SelectCall(this); }

@@ -70,6 +73,7 @@ class Select : public EntityBase {
  virtual void control(const std::string &value) = 0;

  CallbackManager<void(std::string, size_t)> state_callback_;
+  bool has_state_{false};
 };

 }  // namespace select
--- a/esphome/components/sensor/sensor.cpp
+++ b/esphome/components/sensor/sensor.cpp
@@ -38,9 +38,7 @@ StateClass Sensor::get_state_class() {

 void Sensor::publish_state(float state) {
  this->raw_state = state;
-  if (this->raw_callback_) {
-    this->raw_callback_->call(state);
-  }
+  this->raw_callback_.call(state);

  ESP_LOGV(TAG, "'%s': Received new state %f", this->name_.c_str(), state);

@@ -53,10 +51,7 @@ void Sensor::publish_state(float state) {

 void Sensor::add_on_state_callback(std::function<void(float)> &&callback) { this->callback_.add(std::move(callback)); }
 void Sensor::add_on_raw_state_callback(std::function<void(float)> &&callback) {
-  if (!this->raw_callback_) {
-    this->raw_callback_ = make_unique<CallbackManager<void(float)>>();
-  }
-  this->raw_callback_->add(std::move(callback));
+  this->raw_callback_.add(std::move(callback));
 }

 void Sensor::add_filter(Filter *filter) {
@@ -90,15 +85,15 @@ void Sensor::clear_filters() {
 }
 float Sensor::get_state() const { return this->state; }
 float Sensor::get_raw_state() const { return this->raw_state; }
-std::string Sensor::unique_id() { return ""; }

 void Sensor::internal_send_state_to_frontend(float state) {
-  this->set_has_state(true);
+  this->has_state_ = true;
  this->state = state;
  ESP_LOGD(TAG, "'%s': Sending state %.5f %s with %d decimals of accuracy", this->get_name().c_str(), state,
           this->get_unit_of_measurement().c_str(), this->get_accuracy_decimals());
  this->callback_.call(state);
 }
+bool Sensor::has_state() const { return this->has_state_; }

 }  // namespace sensor
 }  // namespace esphome
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -7,7 +7,6 @@
 #include "esphome/components/sensor/filter.h"

 #include <vector>
-#include <memory>

 namespace esphome {
 namespace sensor {
@@ -28,9 +27,6 @@ namespace sensor {
    if (!(obj)->get_icon().empty()) { \
      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon().c_str()); \
    } \
-    if (!(obj)->unique_id().empty()) { \
-      ESP_LOGV(TAG, "%s  Unique ID: '%s'", prefix, (obj)->unique_id().c_str()); \
-    } \
    if ((obj)->get_force_update()) { \
      ESP_LOGV(TAG, "%s  Force Update: YES", prefix); \
    } \
@@ -141,23 +137,21 @@ class Sensor : public EntityBase, public EntityBase_DeviceClass, public EntityBa
   */
  float raw_state;

-  /** Override this method to set the unique ID of this sensor.
-   *
-   * @deprecated Do not use for new sensors, a suitable unique ID is automatically generated (2023.4).
-   */
-  virtual std::string unique_id();
+  /// Return whether this sensor has gotten a full state (that passed through all filters) yet.
+  bool has_state() const;

  void internal_send_state_to_frontend(float state);

 protected:
-  std::unique_ptr<CallbackManager<void(float)>> raw_callback_;  ///< Storage for raw state callbacks (lazy allocated).
-  CallbackManager<void(float)> callback_;                       ///< Storage for filtered state callbacks.
+  CallbackManager<void(float)> raw_callback_;  ///< Storage for raw state callbacks.
+  CallbackManager<void(float)> callback_;      ///< Storage for filtered state callbacks.

  Filter *filter_list_{nullptr};  ///< Store all active filters.

  optional<int8_t> accuracy_decimals_;                  ///< Accuracy in decimals override
  optional<StateClass> state_class_{STATE_CLASS_NONE};  ///< State class override
  bool force_update_{false};                            ///< Force update mode
+  bool has_state_{false};
 };

 }  // namespace sensor
--- a/esphome/components/speaker/media_player/audio_pipeline.cpp
+++ b/esphome/components/speaker/media_player/audio_pipeline.cpp
@@ -343,12 +343,13 @@ void AudioPipeline::read_task(void *params) {
    xEventGroupSetBits(this_pipeline->event_group_, EventGroupBits::READER_MESSAGE_FINISHED);

    // Wait until the pipeline notifies us the source of the media file
-    EventBits_t event_bits = xEventGroupWaitBits(
-        this_pipeline->event_group_,
-        EventGroupBits::READER_COMMAND_INIT_FILE | EventGroupBits::READER_COMMAND_INIT_HTTP,  // Bit message to read
-        pdFALSE,                                                                              // Clear the bit on exit
-        pdFALSE,                                                                              // Wait for all the bits,
-        portMAX_DELAY);  // Block indefinitely until bit is set
+    EventBits_t event_bits =
+        xEventGroupWaitBits(this_pipeline->event_group_,
+                            EventGroupBits::READER_COMMAND_INIT_FILE | EventGroupBits::READER_COMMAND_INIT_HTTP |
+                                EventGroupBits::PIPELINE_COMMAND_STOP,  // Bit message to read
+                            pdFALSE,                                    // Clear the bit on exit
+                            pdFALSE,                                    // Wait for all the bits,
+                            portMAX_DELAY);                             // Block indefinitely until bit is set

    if (!(event_bits & EventGroupBits::PIPELINE_COMMAND_STOP)) {
      xEventGroupClearBits(this_pipeline->event_group_, EventGroupBits::READER_MESSAGE_FINISHED |
@@ -433,12 +434,12 @@ void AudioPipeline::decode_task(void *params) {
    xEventGroupSetBits(this_pipeline->event_group_, EventGroupBits::DECODER_MESSAGE_FINISHED);

    // Wait until the reader notifies us that the media type is available
-    EventBits_t event_bits =
-        xEventGroupWaitBits(this_pipeline->event_group_,
-                            EventGroupBits::READER_MESSAGE_LOADED_MEDIA_TYPE,  // Bit message to read
-                            pdFALSE,                                           // Clear the bit on exit
-                            pdFALSE,                                           // Wait for all the bits,
-                            portMAX_DELAY);                                    // Block indefinitely until bit is set
+    EventBits_t event_bits = xEventGroupWaitBits(this_pipeline->event_group_,
+                                                 EventGroupBits::READER_MESSAGE_LOADED_MEDIA_TYPE |
+                                                     EventGroupBits::PIPELINE_COMMAND_STOP,  // Bit message to read
+                                                 pdFALSE,                                    // Clear the bit on exit
+                                                 pdFALSE,                                    // Wait for all the bits,
+                                                 portMAX_DELAY);  // Block indefinitely until bit is set

    xEventGroupClearBits(this_pipeline->event_group_,
                         EventGroupBits::DECODER_MESSAGE_FINISHED | EventGroupBits::READER_MESSAGE_LOADED_MEDIA_TYPE);
--- a/esphome/components/spi/spi_arduino.cpp
+++ b/esphome/components/spi/spi_arduino.cpp
@@ -3,6 +3,7 @@

 namespace esphome {
 namespace spi {
+
 #ifdef USE_ARDUINO

 static const char *const TAG = "spi-esp-arduino";
@@ -37,31 +38,17 @@ class SPIDelegateHw : public SPIDelegate {

  void write16(uint16_t data) override { this->channel_->transfer16(data); }

-  void write_array(const uint8_t *ptr, size_t length) override {
-    if (length == 1) {
-      this->channel_->transfer(*ptr);
-      return;
-    }
 #ifdef USE_RP2040
-    // avoid overwriting the supplied buffer. Use vector for automatic deallocation
-    auto rxbuf = std::vector<uint8_t>(length);
-    memcpy(rxbuf.data(), ptr, length);
-    this->channel_->transfer((void *) rxbuf.data(), length);
-#elif defined(USE_ESP8266)
-    // ESP8266 SPI library requires the pointer to be word aligned, but the data may not be
-    // so we need to copy the data to a temporary buffer
-    if (reinterpret_cast<uintptr_t>(ptr) & 0x3) {
-      ESP_LOGVV(TAG, "SPI write buffer not word aligned, copying to temporary buffer");
-      auto txbuf = std::vector<uint8_t>(length);
-      memcpy(txbuf.data(), ptr, length);
-      this->channel_->writeBytes(txbuf.data(), length);
-    } else {
-      this->channel_->writeBytes(ptr, length);
-    }
-#else
-    this->channel_->writeBytes(ptr, length);
-#endif
+  void write_array(const uint8_t *ptr, size_t length) override {
+    // avoid overwriting the supplied buffer
+    uint8_t *rxbuf = new uint8_t[length];  // NOLINT(cppcoreguidelines-owning-memory)
+    memcpy(rxbuf, ptr, length);
+    this->channel_->transfer((void *) rxbuf, length);
+    delete[] rxbuf;  // NOLINT(cppcoreguidelines-owning-memory)
  }
+#else
+  void write_array(const uint8_t *ptr, size_t length) override { this->channel_->writeBytes(ptr, length); }
+#endif

  void read_array(uint8_t *ptr, size_t length) override { this->channel_->transfer(ptr, length); }

--- a/esphome/components/status_led/light/status_led_light.cpp
+++ b/esphome/components/status_led/light/status_led_light.cpp
@@ -9,10 +9,10 @@ namespace status_led {
 static const char *const TAG = "status_led";

 void StatusLEDLightOutput::loop() {
-  uint8_t new_state = App.get_app_state() & STATUS_LED_MASK;
+  uint32_t new_state = App.get_app_state() & STATUS_LED_MASK;

  if (new_state != this->last_app_state_) {
-    ESP_LOGV(TAG, "New app state 0x%02X", new_state);
+    ESP_LOGV(TAG, "New app state 0x%08" PRIX32, new_state);
  }

  if ((new_state & STATUS_LED_ERROR) != 0u) {
--- a/esphome/components/status_led/light/status_led_light.h
+++ b/esphome/components/status_led/light/status_led_light.h
@@ -36,7 +36,7 @@ class StatusLEDLightOutput : public light::LightOutput, public Component {
  GPIOPin *pin_{nullptr};
  output::BinaryOutput *output_{nullptr};
  light::LightState *lightstate_{};
-  uint8_t last_app_state_{0xFF};
+  uint32_t last_app_state_{0xFFFF};
  void output_state_(bool state);
 };

--- a/esphome/components/switch/switch.h
+++ b/esphome/components/switch/switch.h
@@ -21,7 +21,7 @@ const int RESTORE_MODE_PERSISTENT_MASK = 0x02;
 const int RESTORE_MODE_INVERTED_MASK = 0x04;
 const int RESTORE_MODE_DISABLED_MASK = 0x08;

-enum SwitchRestoreMode : uint8_t {
+enum SwitchRestoreMode {
  SWITCH_ALWAYS_OFF = !RESTORE_MODE_ON_MASK,
  SWITCH_ALWAYS_ON = RESTORE_MODE_ON_MASK,
  SWITCH_RESTORE_DEFAULT_OFF = RESTORE_MODE_PERSISTENT_MASK,
@@ -49,12 +49,12 @@ class Switch : public EntityBase, public EntityBase_DeviceClass {
   */
  void publish_state(bool state);

-  /// Indicates whether or not state is to be retrieved from flash and how
-  SwitchRestoreMode restore_mode{SWITCH_RESTORE_DEFAULT_OFF};
-
  /// The current reported state of the binary sensor.
  bool state;

+  /// Indicates whether or not state is to be retrieved from flash and how
+  SwitchRestoreMode restore_mode{SWITCH_RESTORE_DEFAULT_OFF};
+
  /** Turn this switch on. This is called by the front-end.
   *
   * For implementing switches, please override write_state.
@@ -123,16 +123,10 @@ class Switch : public EntityBase, public EntityBase_DeviceClass {
   */
  virtual void write_state(bool state) = 0;

-  // Pointer first (4 bytes)
-  ESPPreferenceObject rtc_;
-
-  // CallbackManager (12 bytes on 32-bit - contains vector)
  CallbackManager<void(bool)> state_callback_{};
-
-  // Small types grouped together
-  Deduplicator<bool> publish_dedup_;  // 2 bytes (bool has_value_ + bool last_value_)
-  bool inverted_{false};              // 1 byte
-  // Total: 3 bytes, 1 byte padding
+  bool inverted_{false};
+  Deduplicator<bool> publish_dedup_;
+  ESPPreferenceObject rtc_;
 };

 #define LOG_SWITCH(prefix, type, obj) log_switch((TAG), (prefix), LOG_STR_LITERAL(type), (obj))
--- a/esphome/components/template/alarm_control_panel/template_alarm_control_panel.cpp
+++ b/esphome/components/template/alarm_control_panel/template_alarm_control_panel.cpp
@@ -110,7 +110,15 @@ void TemplateAlarmControlPanel::loop() {
      delay = this->arming_night_time_;
    }
    if ((millis() - this->last_update_) > delay) {
-      this->bypass_before_arming();
+#ifdef USE_BINARY_SENSOR
+      for (auto sensor_info : this->sensor_map_) {
+        // Check for sensors left on and set to bypass automatically and remove them from monitoring
+        if ((sensor_info.second.flags & BINARY_SENSOR_MODE_BYPASS_AUTO) && (sensor_info.first->state)) {
+          ESP_LOGW(TAG, "%s is left on and will be automatically bypassed", sensor_info.first->get_name().c_str());
+          this->bypassed_sensor_indicies_.push_back(sensor_info.second.store_index);
+        }
+      }
+#endif
      this->publish_state(this->desired_state_);
    }
    return;
@@ -251,23 +259,10 @@ void TemplateAlarmControlPanel::arm_(optional<std::string> code, alarm_control_p
  if (delay > 0) {
    this->publish_state(ACP_STATE_ARMING);
  } else {
-    this->bypass_before_arming();
    this->publish_state(state);
  }
 }

-void TemplateAlarmControlPanel::bypass_before_arming() {
-#ifdef USE_BINARY_SENSOR
-  for (auto sensor_info : this->sensor_map_) {
-    // Check for sensors left on and set to bypass automatically and remove them from monitoring
-    if ((sensor_info.second.flags & BINARY_SENSOR_MODE_BYPASS_AUTO) && (sensor_info.first->state)) {
-      ESP_LOGW(TAG, "'%s' is left on and will be automatically bypassed", sensor_info.first->get_name().c_str());
-      this->bypassed_sensor_indicies_.push_back(sensor_info.second.store_index);
-    }
-  }
-#endif
-}
-
 void TemplateAlarmControlPanel::control(const AlarmControlPanelCall &call) {
  if (call.get_state()) {
    if (call.get_state() == ACP_STATE_ARMED_AWAY) {
--- a/esphome/components/template/alarm_control_panel/template_alarm_control_panel.h
+++ b/esphome/components/template/alarm_control_panel/template_alarm_control_panel.h
@@ -60,7 +60,6 @@ class TemplateAlarmControlPanel : public alarm_control_panel::AlarmControlPanel,
  bool get_requires_code_to_arm() const override { return this->requires_code_to_arm_; }
  bool get_all_sensors_ready() { return this->sensors_ready_; };
  void set_restore_mode(TemplateAlarmControlPanelRestoreMode restore_mode) { this->restore_mode_ = restore_mode; }
-  void bypass_before_arming();

 #ifdef USE_BINARY_SENSOR
  /** Add a binary_sensor to the alarm_panel.
--- a/esphome/components/text/text.cpp
+++ b/esphome/components/text/text.cpp
@@ -7,7 +7,7 @@ namespace text {
 static const char *const TAG = "text";

 void Text::publish_state(const std::string &state) {
-  this->set_has_state(true);
+  this->has_state_ = true;
  this->state = state;
  if (this->traits.get_mode() == TEXT_MODE_PASSWORD) {
    ESP_LOGD(TAG, "'%s': Sending state " LOG_SECRET("'%s'"), this->get_name().c_str(), state.c_str());
--- a/esphome/components/text/text.h
+++ b/esphome/components/text/text.h
@@ -28,6 +28,9 @@ class Text : public EntityBase {

  void publish_state(const std::string &state);

+  /// Return whether this text input has gotten a full state yet.
+  bool has_state() const { return has_state_; }
+
  /// Instantiate a TextCall object to modify this text component's state.
  TextCall make_call() { return TextCall(this); }

@@ -45,6 +48,7 @@ class Text : public EntityBase {
  virtual void control(const std::string &value) = 0;

  CallbackManager<void(std::string)> state_callback_;
+  bool has_state_{false};
 };

 }  // namespace text
--- a/esphome/components/text_sensor/text_sensor.cpp
+++ b/esphome/components/text_sensor/text_sensor.cpp
@@ -8,9 +8,7 @@ static const char *const TAG = "text_sensor";

 void TextSensor::publish_state(const std::string &state) {
  this->raw_state = state;
-  if (this->raw_callback_) {
-    this->raw_callback_->call(state);
-  }
+  this->raw_callback_.call(state);

  ESP_LOGV(TAG, "'%s': Received new state %s", this->name_.c_str(), state.c_str());

@@ -55,22 +53,19 @@ void TextSensor::add_on_state_callback(std::function<void(std::string)> callback
  this->callback_.add(std::move(callback));
 }
 void TextSensor::add_on_raw_state_callback(std::function<void(std::string)> callback) {
-  if (!this->raw_callback_) {
-    this->raw_callback_ = make_unique<CallbackManager<void(std::string)>>();
-  }
-  this->raw_callback_->add(std::move(callback));
+  this->raw_callback_.add(std::move(callback));
 }

 std::string TextSensor::get_state() const { return this->state; }
 std::string TextSensor::get_raw_state() const { return this->raw_state; }
 void TextSensor::internal_send_state_to_frontend(const std::string &state) {
  this->state = state;
-  this->set_has_state(true);
+  this->has_state_ = true;
  ESP_LOGD(TAG, "'%s': Sending state '%s'", this->name_.c_str(), state.c_str());
  this->callback_.call(state);
 }

-std::string TextSensor::unique_id() { return ""; }
+bool TextSensor::has_state() { return this->has_state_; }

 }  // namespace text_sensor
 }  // namespace esphome
--- a/esphome/components/text_sensor/text_sensor.h
+++ b/esphome/components/text_sensor/text_sensor.h
@@ -6,7 +6,6 @@
 #include "esphome/components/text_sensor/filter.h"

 #include <vector>
-#include <memory>

 namespace esphome {
 namespace text_sensor {
@@ -20,9 +19,6 @@ namespace text_sensor {
    if (!(obj)->get_icon().empty()) { \
      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon().c_str()); \
    } \
-    if (!(obj)->unique_id().empty()) { \
-      ESP_LOGV(TAG, "%s  Unique ID: '%s'", prefix, (obj)->unique_id().c_str()); \
-    } \
  }

 #define SUB_TEXT_SENSOR(name) \
@@ -34,8 +30,6 @@ namespace text_sensor {

 class TextSensor : public EntityBase, public EntityBase_DeviceClass {
 public:
-  TextSensor() = default;
-
  /// Getter-syntax for .state.
  std::string get_state() const;
  /// Getter-syntax for .raw_state
@@ -64,20 +58,18 @@ class TextSensor : public EntityBase, public EntityBase_DeviceClass {

  // ========== INTERNAL METHODS ==========
  // (In most use cases you won't need these)
-  /** Override this method to set the unique ID of this sensor.
-   *
-   * @deprecated Do not use for new sensors, a suitable unique ID is automatically generated (2023.4).
-   */
-  virtual std::string unique_id();
+
+  bool has_state();

  void internal_send_state_to_frontend(const std::string &state);

 protected:
-  std::unique_ptr<CallbackManager<void(std::string)>>
-      raw_callback_;                             ///< Storage for raw state callbacks (lazy allocated).
-  CallbackManager<void(std::string)> callback_;  ///< Storage for filtered state callbacks.
+  CallbackManager<void(std::string)> raw_callback_;  ///< Storage for raw state callbacks.
+  CallbackManager<void(std::string)> callback_;      ///< Storage for filtered state callbacks.

  Filter *filter_list_{nullptr};  ///< Store all active filters.
+
+  bool has_state_{false};
 };

 }  // namespace text_sensor
--- a/esphome/components/update/update_entity.cpp
+++ b/esphome/components/update/update_entity.cpp
@@ -30,7 +30,7 @@ void UpdateEntity::publish_state() {
    ESP_LOGD(TAG, "  Progress: %.0f%%", this->update_info_.progress);
  }

-  this->set_has_state(true);
+  this->has_state_ = true;
  this->state_callback_.call();
 }

--- a/esphome/components/update/update_entity.h
+++ b/esphome/components/update/update_entity.h
@@ -28,6 +28,8 @@ enum UpdateState : uint8_t {

 class UpdateEntity : public EntityBase, public EntityBase_DeviceClass {
 public:
+  bool has_state() const { return this->has_state_; }
+
  void publish_state();

  void perform() { this->perform(false); }
@@ -42,6 +44,7 @@ class UpdateEntity : public EntityBase, public EntityBase_DeviceClass {
 protected:
  UpdateState state_{UPDATE_STATE_UNKNOWN};
  UpdateInfo update_info_;
+  bool has_state_{false};

  CallbackManager<void()> state_callback_{};
 };
--- a/esphome/components/uptime/sensor/uptime_seconds_sensor.cpp
+++ b/esphome/components/uptime/sensor/uptime_seconds_sensor.cpp
@@ -27,7 +27,6 @@ void UptimeSecondsSensor::update() {
  const float seconds = float(seconds_int) + (this->uptime_ % 1000ULL) / 1000.0f;
  this->publish_state(seconds);
 }
-std::string UptimeSecondsSensor::unique_id() { return get_mac_address() + "-uptime"; }
 float UptimeSecondsSensor::get_setup_priority() const { return setup_priority::HARDWARE; }
 void UptimeSecondsSensor::dump_config() {
  LOG_SENSOR("", "Uptime Sensor", this);
--- a/esphome/components/uptime/sensor/uptime_seconds_sensor.h
+++ b/esphome/components/uptime/sensor/uptime_seconds_sensor.h
@@ -13,8 +13,6 @@ class UptimeSecondsSensor : public sensor::Sensor, public PollingComponent {

  float get_setup_priority() const override;

-  std::string unique_id() override;
-
 protected:
  uint64_t uptime_{0};
 };
--- a/esphome/components/uptime/sensor/uptime_timestamp_sensor.cpp
+++ b/esphome/components/uptime/sensor/uptime_timestamp_sensor.cpp
@@ -13,7 +13,7 @@ static const char *const TAG = "uptime.sensor";

 void UptimeTimestampSensor::setup() {
  this->time_->add_on_time_sync_callback([this]() {
-    if (this->has_state())
+    if (this->has_state_)
      return;  // No need to update the timestamp if it's already set

    auto now = this->time_->now();
--- a/esphome/components/version/version_text_sensor.cpp
+++ b/esphome/components/version/version_text_sensor.cpp
@@ -17,7 +17,6 @@ void VersionTextSensor::setup() {
 }
 float VersionTextSensor::get_setup_priority() const { return setup_priority::DATA; }
 void VersionTextSensor::set_hide_timestamp(bool hide_timestamp) { this->hide_timestamp_ = hide_timestamp; }
-std::string VersionTextSensor::unique_id() { return get_mac_address() + "-version"; }
 void VersionTextSensor::dump_config() { LOG_TEXT_SENSOR("", "Version Text Sensor", this); }

 }  // namespace version
--- a/esphome/components/version/version_text_sensor.h
+++ b/esphome/components/version/version_text_sensor.h
@@ -12,7 +12,6 @@ class VersionTextSensor : public text_sensor::TextSensor, public Component {
  void setup() override;
  void dump_config() override;
  float get_setup_priority() const override;
-  std::string unique_id() override;

 protected:
  bool hide_timestamp_{false};
--- a/esphome/components/voice_assistant/init.py
+++ b/esphome/components/voice_assistant/init.py
@@ -17,11 +17,10 @@ from esphome.const import (
 AUTO_LOAD = ["socket"]
 DEPENDENCIES = ["api", "microphone"]

-CODEOWNERS = ["@jesserockz", "@kahrendt"]
+CODEOWNERS = ["@jesserockz"]

 CONF_ON_END = "on_end"
 CONF_ON_INTENT_END = "on_intent_end"
-CONF_ON_INTENT_PROGRESS = "on_intent_progress"
 CONF_ON_INTENT_START = "on_intent_start"
 CONF_ON_LISTENING = "on_listening"
 CONF_ON_START = "on_start"
@@ -137,9 +136,6 @@ CONFIG_SCHEMA = cv.All(
            cv.Optional(CONF_ON_INTENT_START): automation.validate_automation(
                single=True
            ),
-            cv.Optional(CONF_ON_INTENT_PROGRESS): automation.validate_automation(
-                single=True
-            ),
            cv.Optional(CONF_ON_INTENT_END): automation.validate_automation(
                single=True
            ),
@@ -286,13 +282,6 @@ async def to_code(config):
            config[CONF_ON_INTENT_START],
        )

-    if CONF_ON_INTENT_PROGRESS in config:
-        await automation.build_automation(
-            var.get_intent_progress_trigger(),
-            [(cg.std_string, "x")],
-            config[CONF_ON_INTENT_PROGRESS],
-        )
-
    if CONF_ON_INTENT_END in config:
        await automation.build_automation(
            var.get_intent_end_trigger(),
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -555,7 +555,7 @@ void VoiceAssistant::request_stop() {
      break;
    case State::AWAITING_RESPONSE:
      this->signal_stop_();
-      // Fallthrough intended to stop a streaming TTS announcement that has potentially started
+      break;
    case State::STREAMING_RESPONSE:
 #ifdef USE_MEDIA_PLAYER
      // Stop any ongoing media player announcement
@@ -599,14 +599,6 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
  switch (msg.event_type) {
    case api::enums::VOICE_ASSISTANT_RUN_START:
      ESP_LOGD(TAG, "Assist Pipeline running");
-#ifdef USE_MEDIA_PLAYER
-      this->started_streaming_tts_ = false;
-      for (auto arg : msg.data) {
-        if (arg.name == "url") {
-          this->tts_response_url_ = std::move(arg.value);
-        }
-      }
-#endif
      this->defer([this]() { this->start_trigger_->trigger(); });
      break;
    case api::enums::VOICE_ASSISTANT_WAKE_WORD_START:
@@ -630,8 +622,6 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
      if (text.empty()) {
        ESP_LOGW(TAG, "No text in STT_END event");
        return;
-      } else if (text.length() > 500) {
-        text = text.substr(0, 497) + "...";
      }
      ESP_LOGD(TAG, "Speech recognised as: \"%s\"", text.c_str());
      this->defer([this, text]() { this->stt_end_trigger_->trigger(text); });
@@ -641,27 +631,6 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
      ESP_LOGD(TAG, "Intent started");
      this->defer([this]() { this->intent_start_trigger_->trigger(); });
      break;
-    case api::enums::VOICE_ASSISTANT_INTENT_PROGRESS: {
-      ESP_LOGD(TAG, "Intent progress");
-      std::string tts_url_for_trigger = "";
-#ifdef USE_MEDIA_PLAYER
-      if (this->media_player_ != nullptr) {
-        for (const auto &arg : msg.data) {
-          if ((arg.name == "tts_start_streaming") && (arg.value == "1") && !this->tts_response_url_.empty()) {
-            this->media_player_->make_call().set_media_url(this->tts_response_url_).set_announcement(true).perform();
-
-            this->media_player_wait_for_announcement_start_ = true;
-            this->media_player_wait_for_announcement_end_ = false;
-            this->started_streaming_tts_ = true;
-            tts_url_for_trigger = this->tts_response_url_;
-            this->tts_response_url_.clear();  // Reset streaming URL
-          }
-        }
-      }
-#endif
-      this->defer([this, tts_url_for_trigger]() { this->intent_progress_trigger_->trigger(tts_url_for_trigger); });
-      break;
-    }
    case api::enums::VOICE_ASSISTANT_INTENT_END: {
      for (auto arg : msg.data) {
        if (arg.name == "conversation_id") {
@@ -684,9 +653,6 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
        ESP_LOGW(TAG, "No text in TTS_START event");
        return;
      }
-      if (text.length() > 500) {
-        text = text.substr(0, 497) + "...";
-      }
      ESP_LOGD(TAG, "Response: \"%s\"", text.c_str());
      this->defer([this, text]() {
        this->tts_start_trigger_->trigger(text);
@@ -712,7 +678,7 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
      ESP_LOGD(TAG, "Response URL: \"%s\"", url.c_str());
      this->defer([this, url]() {
 #ifdef USE_MEDIA_PLAYER
-        if ((this->media_player_ != nullptr) && (!this->started_streaming_tts_)) {
+        if (this->media_player_ != nullptr) {
          this->media_player_->make_call().set_media_url(url).set_announcement(true).perform();

          this->media_player_wait_for_announcement_start_ = true;
--- a/esphome/components/voice_assistant/voice_assistant.h
+++ b/esphome/components/voice_assistant/voice_assistant.h
@@ -177,7 +177,6 @@ class VoiceAssistant : public Component {

  Trigger<> *get_intent_end_trigger() const { return this->intent_end_trigger_; }
  Trigger<> *get_intent_start_trigger() const { return this->intent_start_trigger_; }
-  Trigger<std::string> *get_intent_progress_trigger() const { return this->intent_progress_trigger_; }
  Trigger<> *get_listening_trigger() const { return this->listening_trigger_; }
  Trigger<> *get_end_trigger() const { return this->end_trigger_; }
  Trigger<> *get_start_trigger() const { return this->start_trigger_; }
@@ -234,7 +233,6 @@ class VoiceAssistant : public Component {
  Trigger<> *tts_stream_start_trigger_ = new Trigger<>();
  Trigger<> *tts_stream_end_trigger_ = new Trigger<>();
 #endif
-  Trigger<std::string> *intent_progress_trigger_ = new Trigger<std::string>();
  Trigger<> *wake_word_detected_trigger_ = new Trigger<>();
  Trigger<std::string> *stt_end_trigger_ = new Trigger<std::string>();
  Trigger<std::string> *tts_end_trigger_ = new Trigger<std::string>();
@@ -270,8 +268,6 @@ class VoiceAssistant : public Component {
 #endif
 #ifdef USE_MEDIA_PLAYER
  media_player::MediaPlayer *media_player_{nullptr};
-  std::string tts_response_url_{""};
-  bool started_streaming_tts_{false};
  bool media_player_wait_for_announcement_start_{false};
  bool media_player_wait_for_announcement_end_{false};
 #endif
--- a/esphome/components/web_server_idf/init.py
+++ b/esphome/components/web_server_idf/init.py
@@ -8,6 +8,8 @@ CONFIG_SCHEMA = cv.All(
    cv.only_with_esp_idf,
 )

+AUTO_LOAD = ["web_server"]
+

 async def to_code(config):
    # Increase the maximum supported size of headers section in HTTP request packet to be processed by the server
--- a/esphome/components/web_server_idf/web_server_idf.cpp
+++ b/esphome/components/web_server_idf/web_server_idf.cpp
@@ -9,12 +9,10 @@

 #include "utils.h"

-#include "web_server_idf.h"
-
-#ifdef USE_WEBSERVER
 #include "esphome/components/web_server/web_server.h"
 #include "esphome/components/web_server/list_entities.h"
-#endif  // USE_WEBSERVER
+
+#include "web_server_idf.h"

 namespace esphome {
 namespace web_server_idf {
@@ -275,7 +273,6 @@ void AsyncResponseStream::printf(const char *fmt, ...) {
  this->print(str);
 }

-#ifdef USE_WEBSERVER
 AsyncEventSource::~AsyncEventSource() {
  for (auto *ses : this->sessions_) {
    delete ses;  // NOLINT(cppcoreguidelines-owning-memory)
@@ -514,7 +511,6 @@ void AsyncEventSourceResponse::deferrable_send_state(void *source, const char *e
    }
  }
 }
-#endif

 }  // namespace web_server_idf
 }  // namespace esphome
--- a/esphome/components/web_server_idf/web_server_idf.h
+++ b/esphome/components/web_server_idf/web_server_idf.h
@@ -1,7 +1,6 @@
 #pragma once
 #ifdef USE_ESP_IDF

-#include "esphome/core/defines.h"
 #include <esp_http_server.h>

 #include <functional>
@@ -13,12 +12,10 @@
 #include <vector>

 namespace esphome {
-#ifdef USE_WEBSERVER
 namespace web_server {
 class WebServer;
 class ListEntitiesIterator;
 };  // namespace web_server
-#endif
 namespace web_server_idf {

 #define F(string_literal) (string_literal)
@@ -223,7 +220,6 @@ class AsyncWebHandler {
  virtual bool isRequestHandlerTrivial() { return true; }
 };

-#ifdef USE_WEBSERVER
 class AsyncEventSource;
 class AsyncEventSourceResponse;

@@ -311,13 +307,10 @@ class AsyncEventSource : public AsyncWebHandler {
  connect_handler_t on_connect_{};
  esphome::web_server::WebServer *web_server_;
 };
-#endif  // USE_WEBSERVER

 class DefaultHeaders {
  friend class AsyncWebServerRequest;
-#ifdef USE_WEBSERVER
  friend class AsyncEventSourceResponse;
-#endif

 public:
  // NOLINTNEXTLINE(readability-identifier-naming)
--- a/esphome/components/weikai/weikai.cpp
+++ b/esphome/components/weikai/weikai.cpp
@@ -102,7 +102,7 @@ WeikaiRegister &WeikaiRegister::operator|=(uint8_t value) {
 // The WeikaiComponent methods
 ///////////////////////////////////////////////////////////////////////////////
 void WeikaiComponent::loop() {
-  if (!this->is_in_loop_state())
+  if ((this->component_state_ & COMPONENT_STATE_MASK) != COMPONENT_STATE_LOOP)
    return;

  // If there are some bytes in the receive FIFO we transfers them to the ring buffers
--- a/esphome/components/wifi_info/wifi_info_text_sensor.h
+++ b/esphome/components/wifi_info/wifi_info_text_sensor.h
@@ -28,7 +28,6 @@ class IPAddressWiFiInfo : public PollingComponent, public text_sensor::TextSenso
    }
  }
  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-  std::string unique_id() override { return get_mac_address() + "-wifiinfo-ip"; }
  void dump_config() override;
  void add_ip_sensors(uint8_t index, text_sensor::TextSensor *s) { this->ip_sensors_[index] = s; }

@@ -51,7 +50,6 @@ class DNSAddressWifiInfo : public PollingComponent, public text_sensor::TextSens
    }
  }
  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-  std::string unique_id() override { return get_mac_address() + "-wifiinfo-dns"; }
  void dump_config() override;

 protected:
@@ -80,7 +78,6 @@ class ScanResultsWiFiInfo : public PollingComponent, public text_sensor::TextSen
    }
  }
  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-  std::string unique_id() override { return get_mac_address() + "-wifiinfo-scanresults"; }
  void dump_config() override;

 protected:
@@ -97,7 +94,6 @@ class SSIDWiFiInfo : public PollingComponent, public text_sensor::TextSensor {
    }
  }
  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-  std::string unique_id() override { return get_mac_address() + "-wifiinfo-ssid"; }
  void dump_config() override;

 protected:
@@ -116,7 +112,6 @@ class BSSIDWiFiInfo : public PollingComponent, public text_sensor::TextSensor {
    }
  }
  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-  std::string unique_id() override { return get_mac_address() + "-wifiinfo-bssid"; }
  void dump_config() override;

 protected:
@@ -126,7 +121,6 @@ class BSSIDWiFiInfo : public PollingComponent, public text_sensor::TextSensor {
 class MacAddressWifiInfo : public Component, public text_sensor::TextSensor {
 public:
  void setup() override { this->publish_state(get_mac_address_pretty()); }
-  std::string unique_id() override { return get_mac_address() + "-wifiinfo-macadr"; }
  void dump_config() override;
 };

--- a/esphome/components/wifi_signal/wifi_signal_sensor.h
+++ b/esphome/components/wifi_signal/wifi_signal_sensor.h
@@ -13,7 +13,6 @@ class WiFiSignalSensor : public sensor::Sensor, public PollingComponent {
  void update() override { this->publish_state(wifi::global_wifi_component->wifi_rssi()); }
  void dump_config() override;

-  std::string unique_id() override { return get_mac_address() + "-wifisignal"; }
  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
 };

--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -3,15 +3,7 @@
 from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime
-from ipaddress import (
-    AddressValueError,
-    IPv4Address,
-    IPv4Network,
-    IPv6Address,
-    IPv6Network,
-    ip_address,
-    ip_network,
-)
+from ipaddress import AddressValueError, IPv4Address, ip_address
 import logging
 import os
 import re
@@ -1184,14 +1176,6 @@ def ipv4address(value):
    return address


-def ipv6address(value):
-    try:
-        address = IPv6Address(value)
-    except AddressValueError as exc:
-        raise Invalid(f"{value} is not a valid IPv6 address") from exc
-    return address
-
-
 def ipv4address_multi_broadcast(value):
    address = ipv4address(value)
    if not (address.is_multicast or (address == IPv4Address("255.255.255.255"))):
@@ -1209,33 +1193,6 @@ def ipaddress(value):
    return address


-def ipv4network(value):
-    """Validate that the value is a valid IPv4 network."""
-    try:
-        network = IPv4Network(value, strict=False)
-    except ValueError as exc:
-        raise Invalid(f"{value} is not a valid IPv4 network") from exc
-    return network
-
-
-def ipv6network(value):
-    """Validate that the value is a valid IPv6 network."""
-    try:
-        network = IPv6Network(value, strict=False)
-    except ValueError as exc:
-        raise Invalid(f"{value} is not a valid IPv6 network") from exc
-    return network
-
-
-def ipnetwork(value):
-    """Validate that the value is a valid IP network."""
-    try:
-        network = ip_network(value, strict=False)
-    except ValueError as exc:
-        raise Invalid(f"{value} is not a valid IP network") from exc
-    return network
-
-
 def _valid_topic(value):
    """Validate that this is a valid topic name/filter."""
    if value is None:  # Used to disable publishing and subscribing
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""

-__version__ = "2025.6.2"
+__version__ = "2025.7.0-dev"

 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
J. Nick Koston	60cc4c4ed0	Merge branch 'dev' into drop_unique_id	2025-06-11 08:26:41 -05:00
Jesse Hills	f467c79a20	Bump version to 2025.7.0-dev	2025-06-11 23:16:56 +12:00
J. Nick Koston	34c100e997	Remove legacy unique_id field from entities These are no longer used in Home Assistant. This will be a breaking change for MQTT for the sensors that defined custom unique ids.	2025-06-07 22:17:07 -05:00