From ce350642e467f7b45db8e1d2e5bf294996e4f900 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 10 Jul 2025 21:18:04 -1000
Subject: [PATCH] cleanup

---
 esphome/components/api/api_pb2.cpp  | 4 ++--
 esphome/components/api/proto.h      | 4 ++--
 script/api_protobuf/api_protobuf.py | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 03000900c9..ad8eb5c693 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -975,7 +975,7 @@ const MessageHandler MESSAGE_HANDLERS[2] = {
     {nullptr, nullptr, nullptr},
 #endif
 };
-const size_t MESSAGE_HANDLER_COUNT = 2;
+const uint8_t MESSAGE_HANDLER_COUNT = 2;
 
 const RepeatedMessageHandler REPEATED_MESSAGE_HANDLERS[13] = {
     {&encode_repeated_message_field<DeviceInfo>, &size_repeated_message_field<DeviceInfo>,
@@ -1041,7 +1041,7 @@ const RepeatedMessageHandler REPEATED_MESSAGE_HANDLERS[13] = {
     {nullptr, nullptr, nullptr},
 #endif
 };
-const size_t REPEATED_MESSAGE_HANDLER_COUNT = 13;
+const uint8_t REPEATED_MESSAGE_HANDLER_COUNT = 13;
 
 }  // namespace api
 }  // namespace esphome
diff --git a/esphome/components/api/proto.h b/esphome/components/api/proto.h
index b1297f1c2f..af5aefadb8 100644
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -250,9 +250,9 @@ struct RepeatedMessageHandler {
 
 // Global message handler registries (defined in api_pb2.cpp)
 extern const MessageHandler MESSAGE_HANDLERS[];
-extern const size_t MESSAGE_HANDLER_COUNT;
+extern const uint8_t MESSAGE_HANDLER_COUNT;
 extern const RepeatedMessageHandler REPEATED_MESSAGE_HANDLERS[];
-extern const size_t REPEATED_MESSAGE_HANDLER_COUNT;
+extern const uint8_t REPEATED_MESSAGE_HANDLER_COUNT;
 
 // Optimized metadata structure (4 bytes - no padding on 32-bit architectures)
 struct FieldMeta {
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 227da67982..f5d676ac79 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -1973,9 +1973,7 @@ namespace api {
     if cpp.endswith(",\n"):
         cpp = cpp[:-2] + "\n"
     cpp += "};\n"
-    cpp += (
-        f"const size_t MESSAGE_HANDLER_COUNT = {len(type_registry.message_registry)};\n"
-    )
+    cpp += f"const uint8_t MESSAGE_HANDLER_COUNT = {len(type_registry.message_registry)};\n"
 
     # Generate REPEATED_MESSAGE_HANDLERS array with same approach
     repeated_handler_count = (
@@ -2013,7 +2011,7 @@ namespace api {
     if cpp.endswith(",\n"):
         cpp = cpp[:-2] + "\n"
     cpp += "};\n"
-    cpp += f"const size_t REPEATED_MESSAGE_HANDLER_COUNT = {len(type_registry.repeated_registry)};\n"
+    cpp += f"const uint8_t REPEATED_MESSAGE_HANDLER_COUNT = {len(type_registry.repeated_registry)};\n"
 
     cpp += """\