From f73076bb8b0407ccb54dd164e91c9d14c4b5c7c6 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Tue, 3 Mar 2026 11:25:18 -1000
Subject: [PATCH] should be in tu

---
 esphome/components/api/api_connection.cpp | 42 +++++++++++++++++++++++
 esphome/components/api/api_connection.h   | 37 ++------------------
 2 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index da2f021e01..5f0cc10755 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -395,6 +395,48 @@ uint16_t APIConnection::encode_message_to_buffer(ProtoMessage &msg, uint8_t mess
   return static_cast<uint16_t>(header_padding + calculated_size + footer_size);
 }
 
+uint16_t APIConnection::fill_and_encode_entity_info(EntityBase *entity, InfoResponseProtoMessage &msg,
+                                                    uint8_t message_type, APIConnection *conn,
+                                                    uint32_t remaining_size) {
+  // Set common fields that are shared by all entity types
+  msg.key = entity->get_object_id_hash();
+
+  // API 1.14+ clients compute object_id client-side from the entity name
+  // For older clients, we must send object_id for backward compatibility
+  // See: https://github.com/esphome/backlog/issues/76
+  // TODO: Remove this backward compat code before 2026.7.0 - all clients should support API 1.14 by then
+  // Buffer must remain in scope until encode_message_to_buffer is called
+  char object_id_buf[OBJECT_ID_MAX_LEN];
+  if (!conn->client_supports_api_version(1, 14)) {
+    msg.object_id = entity->get_object_id_to(object_id_buf);
+  }
+
+  if (entity->has_own_name()) {
+    msg.name = entity->get_name();
+  }
+
+  // Set common EntityBase properties
+#ifdef USE_ENTITY_ICON
+  char icon_buf[MAX_ICON_LENGTH];
+  msg.icon = StringRef(entity->get_icon_to(icon_buf));
+#endif
+  msg.disabled_by_default = entity->is_disabled_by_default();
+  msg.entity_category = static_cast<enums::EntityCategory>(entity->get_entity_category());
+#ifdef USE_DEVICES
+  msg.device_id = entity->get_device_id();
+#endif
+  return encode_message_to_buffer(msg, message_type, conn, remaining_size);
+}
+
+uint16_t APIConnection::fill_and_encode_entity_info_with_device_class(EntityBase *entity, InfoResponseProtoMessage &msg,
+                                                                      StringRef &device_class_field,
+                                                                      uint8_t message_type, APIConnection *conn,
+                                                                      uint32_t remaining_size) {
+  char dc_buf[MAX_DEVICE_CLASS_LENGTH];
+  device_class_field = StringRef(entity->get_device_class_to(dc_buf));
+  return fill_and_encode_entity_info(entity, msg, message_type, conn, remaining_size);
+}
+
 #ifdef USE_BINARY_SENSOR
 bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor) {
   return this->send_message_smart_(binary_sensor, BinarySensorStateResponse::MESSAGE_TYPE,
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index 41b3dfb717..83ec20481d 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -328,45 +328,12 @@ class APIConnection final : public APIServerConnectionBase {
 
   // Helper to fill entity info base and encode message
   static uint16_t fill_and_encode_entity_info(EntityBase *entity, InfoResponseProtoMessage &msg, uint8_t message_type,
-                                              APIConnection *conn, uint32_t remaining_size) {
-    // Set common fields that are shared by all entity types
-    msg.key = entity->get_object_id_hash();
-
-    // API 1.14+ clients compute object_id client-side from the entity name
-    // For older clients, we must send object_id for backward compatibility
-    // See: https://github.com/esphome/backlog/issues/76
-    // TODO: Remove this backward compat code before 2026.7.0 - all clients should support API 1.14 by then
-    // Buffer must remain in scope until encode_message_to_buffer is called
-    char object_id_buf[OBJECT_ID_MAX_LEN];
-    if (!conn->client_supports_api_version(1, 14)) {
-      msg.object_id = entity->get_object_id_to(object_id_buf);
-    }
-
-    if (entity->has_own_name()) {
-      msg.name = entity->get_name();
-    }
-
-    // Set common EntityBase properties
-#ifdef USE_ENTITY_ICON
-    char icon_buf[MAX_ICON_LENGTH];
-    msg.icon = StringRef(entity->get_icon_to(icon_buf));
-#endif
-    msg.disabled_by_default = entity->is_disabled_by_default();
-    msg.entity_category = static_cast<enums::EntityCategory>(entity->get_entity_category());
-#ifdef USE_DEVICES
-    msg.device_id = entity->get_device_id();
-#endif
-    return encode_message_to_buffer(msg, message_type, conn, remaining_size);
-  }
+                                              APIConnection *conn, uint32_t remaining_size);
 
   // Wrapper for entity types that have a device_class field
   static uint16_t fill_and_encode_entity_info_with_device_class(EntityBase *entity, InfoResponseProtoMessage &msg,
                                                                 StringRef &device_class_field, uint8_t message_type,
-                                                                APIConnection *conn, uint32_t remaining_size) {
-    char dc_buf[MAX_DEVICE_CLASS_LENGTH];
-    device_class_field = StringRef(entity->get_device_class_to(dc_buf));
-    return fill_and_encode_entity_info(entity, msg, message_type, conn, remaining_size);
-  }
+                                                                APIConnection *conn, uint32_t remaining_size);
 
 #ifdef USE_VOICE_ASSISTANT
   // Helper to check voice assistant validity and connection ownership