From ddf6e0a7b61ac09db7bfdafc17362cf4804b189f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Mon, 13 Oct 2025 14:04:15 -1000
Subject: [PATCH] revert

---
 esphome/components/api/api.proto         |  4 ++--
 esphome/components/api/api_options.proto |  6 ------
 esphome/components/api/api_pb2.h         |  4 ++--
 esphome/components/api/proto.h           | 26 +++++-------------------
 4 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 9b714d00f1..87f477799d 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -1519,7 +1519,7 @@ message BluetoothGATTCharacteristic {
   repeated uint64 uuid = 1 [(fixed_array_size) = 2, (fixed_array_skip_zero) = true];
   uint32 handle = 2;
   uint32 properties = 3;
-  repeated BluetoothGATTDescriptor descriptors = 4 [(fixed_vector) = true];
+  repeated BluetoothGATTDescriptor descriptors = 4;
 
   // New field for efficient UUID (v1.12+)
   // Only one of uuid or short_uuid will be set.
@@ -1531,7 +1531,7 @@ message BluetoothGATTCharacteristic {
 message BluetoothGATTService {
   repeated uint64 uuid = 1 [(fixed_array_size) = 2, (fixed_array_skip_zero) = true];
   uint32 handle = 2;
-  repeated BluetoothGATTCharacteristic characteristics = 3 [(fixed_vector) = true];
+  repeated BluetoothGATTCharacteristic characteristics = 3;
 
   // New field for efficient UUID (v1.12+)
   // Only one of uuid or short_uuid will be set.
diff --git a/esphome/components/api/api_options.proto b/esphome/components/api/api_options.proto
index ead8ac0bbc..633f39b552 100644
--- a/esphome/components/api/api_options.proto
+++ b/esphome/components/api/api_options.proto
@@ -64,10 +64,4 @@ extend google.protobuf.FieldOptions {
     // This is typically done through methods returning const T& or special accessor
     // methods like get_options() or supported_modes_for_api_().
     optional string container_pointer = 50001;
-
-    // fixed_vector: Use FixedVector instead of std::vector for repeated fields
-    // When set, the repeated field will use FixedVector<T> which requires calling
-    // init(size) before adding elements. This eliminates std::vector template overhead
-    // and is ideal when the exact size is known before populating the array.
-    optional bool fixed_vector = 50013 [default=false];
 }
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 1798458393..d9e68ece9b 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1923,7 +1923,7 @@ class BluetoothGATTCharacteristic final : public ProtoMessage {
   std::array<uint64_t, 2> uuid{};
   uint32_t handle{0};
   uint32_t properties{0};
-  FixedVector<BluetoothGATTDescriptor> descriptors{};
+  std::vector<BluetoothGATTDescriptor> descriptors{};
   uint32_t short_uuid{0};
   void encode(ProtoWriteBuffer buffer) const override;
   void calculate_size(ProtoSize &size) const override;
@@ -1937,7 +1937,7 @@ class BluetoothGATTService final : public ProtoMessage {
  public:
   std::array<uint64_t, 2> uuid{};
   uint32_t handle{0};
-  FixedVector<BluetoothGATTCharacteristic> characteristics{};
+  std::vector<BluetoothGATTCharacteristic> characteristics{};
   uint32_t short_uuid{0};
   void encode(ProtoWriteBuffer buffer) const override;
   void calculate_size(ProtoSize &size) const override;
diff --git a/esphome/components/api/proto.h b/esphome/components/api/proto.h
index a6a09bf7c5..9d780692ec 100644
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -749,29 +749,13 @@ class ProtoSize {
   template<typename MessageType>
   inline void add_repeated_message(uint32_t field_id_size, const std::vector<MessageType> &messages) {
     // Skip if the vector is empty
-    if (!messages.empty()) {
-      // Use the force version for all messages in the repeated field
-      for (const auto &message : messages) {
-        add_message_object_force(field_id_size, message);
-      }
+    if (messages.empty()) {
+      return;
     }
-  }
 
-  /**
-   * @brief Calculates and adds the sizes of all messages in a repeated field to the total message size (FixedVector
-   * version)
-   *
-   * @tparam MessageType The type of the nested messages in the FixedVector
-   * @param messages FixedVector of message objects
-   */
-  template<typename MessageType>
-  inline void add_repeated_message(uint32_t field_id_size, const FixedVector<MessageType> &messages) {
-    // Skip if the fixed vector is empty
-    if (!messages.empty()) {
-      // Use the force version for all messages in the repeated field
-      for (const auto &message : messages) {
-        add_message_object_force(field_id_size, message);
-      }
+    // Use the force version for all messages in the repeated field
+    for (const auto &message : messages) {
+      add_message_object_force(field_id_size, message);
     }
   }
 };