Merge remote-tracking branch 'origin/object_id_no_ram' into integration_object

esphome/components/logger/logger.h

@@ -118,11 +118,11 @@ static constexpr uint16_t MAX_HEADER_SIZE = 128;
 static constexpr size_t MAX_POINTER_REPRESENTATION = 2 + sizeof(void *) * 2 + 1;
 
 // Platform-specific: does write_msg_ add its own newline?
-// false: Caller must add newline to buffer before calling write_msg_ (ESP32, ESP8266, RP2040, LibreTiny)
+// false: Caller must add newline to buffer before calling write_msg_ (ESP32, ESP8266, RP2040, LibreTiny, Zephyr)
 //        Allows single write call with newline included for efficiency
 // true:  write_msg_ adds newline itself via puts()/println() (other platforms)
 //        Newline should NOT be added to buffer
-#if defined(USE_ESP32) || defined(USE_ESP8266) || defined(USE_RP2040) || defined(USE_LIBRETINY)
+#if defined(USE_ESP32) || defined(USE_ESP8266) || defined(USE_RP2040) || defined(USE_LIBRETINY) || defined(USE_ZEPHYR)
 static constexpr bool WRITE_MSG_ADDS_NEWLINE = false;
 #else
 static constexpr bool WRITE_MSG_ADDS_NEWLINE = true;

esphome/components/logger/logger_zephyr.cpp

@@ -6,6 +6,7 @@
 
 #include <zephyr/device.h>
 #include <zephyr/drivers/uart.h>
+#include <zephyr/sys/printk.h>
 #include <zephyr/usb/usb_device.h>
 
 namespace esphome::logger {
@@ -14,7 +15,7 @@ static const char *const TAG = "logger";
 
 #ifdef USE_LOGGER_USB_CDC
 void Logger::loop() {
-  if (this->uart_ != UART_SELECTION_USB_CDC || nullptr == this->uart_dev_) {
+  if (this->uart_ != UART_SELECTION_USB_CDC || this->uart_dev_ == nullptr) {
     return;
   }
   static bool opened = false;
@@ -62,18 +63,17 @@ void Logger::pre_setup() {
   ESP_LOGI(TAG, "Log initialized");
 }
 
-void HOT Logger::write_msg_(const char *msg, size_t) {
+void HOT Logger::write_msg_(const char *msg, size_t len) {
+  // Single write with newline already in buffer (added by caller)
 #ifdef CONFIG_PRINTK
-  printk("%s\n", msg);
+  k_str_out(const_cast<char *>(msg), len);
 #endif
-  if (nullptr == this->uart_dev_) {
+  if (this->uart_dev_ == nullptr) {
     return;
   }
-  while (*msg) {
-    uart_poll_out(this->uart_dev_, *msg);
-    ++msg;
+  for (size_t i = 0; i < len; ++i) {
+    uart_poll_out(this->uart_dev_, msg[i]);
   }
-  uart_poll_out(this->uart_dev_, '\n');
 }
 
 const LogString *Logger::get_uart_selection_() {

esphome/components/pid/pid_climate.cpp

@@ -1,4 +1,5 @@
 #include "pid_climate.h"
+#include "esphome/core/entity_base.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -162,14 +163,16 @@ void PIDClimate::start_autotune(std::unique_ptr<PIDAutotuner> &&autotune) {
   float min_value = this->supports_cool_() ? -1.0f : 0.0f;
   float max_value = this->supports_heat_() ? 1.0f : 0.0f;
   this->autotuner_->config(min_value, max_value);
-  this->autotuner_->set_autotuner_id(this->get_object_id());
+  char object_id_buf[OBJECT_ID_MAX_LEN];
+  StringRef object_id = this->get_object_id_to(object_id_buf);
+  this->autotuner_->set_autotuner_id(std::string(object_id.c_str()));
 
   ESP_LOGI(TAG,
            "%s: Autotune has started. This can take a long time depending on the "
            "responsiveness of your system. Your system "
            "output will be altered to deliberately oscillate above and below the setpoint multiple times. "
            "Until your sensor provides a reading, the autotuner may display \'nan\'",
-           this->get_object_id().c_str());
+           object_id.c_str());
 
   this->set_interval("autotune-progress", 10000, [this]() {
     if (this->autotuner_ != nullptr && !this->autotuner_->is_finished())
@@ -177,8 +180,7 @@ void PIDClimate::start_autotune(std::unique_ptr<PIDAutotuner> &&autotune) {
   });
 
   if (mode != climate::CLIMATE_MODE_HEAT_COOL) {
-    ESP_LOGW(TAG, "%s: !!! For PID autotuner you need to set AUTO (also called heat/cool) mode!",
-             this->get_object_id().c_str());
+    ESP_LOGW(TAG, "%s: !!! For PID autotuner you need to set AUTO (also called heat/cool) mode!", object_id.c_str());
   }
 }
 

esphome/components/prometheus/prometheus_handler.cpp

@@ -112,7 +112,12 @@ void PrometheusHandler::handleRequest(AsyncWebServerRequest *req) {
 
 std::string PrometheusHandler::relabel_id_(EntityBase *obj) {
   auto item = relabel_map_id_.find(obj);
-  return item == relabel_map_id_.end() ? obj->get_object_id() : item->second;
+  if (item != relabel_map_id_.end()) {
+    return item->second;
+  }
+  char object_id_buf[OBJECT_ID_MAX_LEN];
+  StringRef object_id = obj->get_object_id_to(object_id_buf);
+  return std::string(object_id.c_str());
 }
 
 std::string PrometheusHandler::relabel_name_(EntityBase *obj) {

esphome/core/entity_base.cpp

@@ -9,7 +9,8 @@ static const char *const TAG = "entity_base";
 
 // Entity Name
 const StringRef &EntityBase::get_name() const { return this->name_; }
-void EntityBase::set_name(const char *name) {
+void EntityBase::set_name(const char *name) { this->set_name(name, 0); }
+void EntityBase::set_name(const char *name, uint32_t object_id_hash) {
   this->name_ = StringRef(name);
   if (this->name_.empty()) {
 #ifdef USE_DEVICES
@@ -18,11 +19,21 @@ void EntityBase::set_name(const char *name) {
     } else
 #endif
     {
-      this->name_ = StringRef(App.get_friendly_name());
+      // Use friendly_name if available, otherwise fall back to device name
+      const std::string &friendly = App.get_friendly_name();
+      this->name_ = StringRef(!friendly.empty() ? friendly : App.get_name());
     }
     this->flags_.has_own_name = false;
+    // Dynamic name - must calculate hash at runtime
+    this->calc_object_id_();
   } else {
     this->flags_.has_own_name = true;
+    // Static name - use pre-computed hash if provided
+    if (object_id_hash != 0) {
+      this->object_id_hash_ = object_id_hash;
+    } else {
+      this->calc_object_id_();
+    }
   }
 }
 
@@ -45,69 +56,30 @@ void EntityBase::set_icon(const char *icon) {
 #endif
 }
 
-// Check if the object_id is dynamic (changes with MAC suffix)
-bool EntityBase::is_object_id_dynamic_() const {
-  return !this->flags_.has_own_name && App.is_name_add_mac_suffix_enabled();
-}
-
-// Entity Object ID
+// Entity Object ID - computed on-demand from name
 std::string EntityBase::get_object_id() const {
-  // Check if `App.get_friendly_name()` is constant or dynamic.
-  if (this->is_object_id_dynamic_()) {
-    // `App.get_friendly_name()` is dynamic.
-    return str_sanitize(str_snake_case(App.get_friendly_name()));
-  }
-  // `App.get_friendly_name()` is constant.
-  return this->object_id_c_str_ == nullptr ? "" : this->object_id_c_str_;
-}
-void EntityBase::set_object_id(const char *object_id) {
-  this->object_id_c_str_ = object_id;
-  this->calc_object_id_();
-}
-
-void EntityBase::set_name_and_object_id(const char *name, const char *object_id) {
-  this->set_name(name);
-  this->object_id_c_str_ = object_id;
-  this->calc_object_id_();
-}
-
-// Calculate Object ID Hash from Entity Name
-void EntityBase::calc_object_id_() {
   char buf[OBJECT_ID_MAX_LEN];
-  StringRef object_id = this->get_object_id_to(buf);
-  this->object_id_hash_ = fnv1_hash(object_id.c_str());
+  size_t len = this->write_object_id_to(buf, sizeof(buf));
+  return std::string(buf, len);
 }
 
-// Format dynamic object_id: sanitized snake_case of friendly_name
-static size_t format_dynamic_object_id(char *buf, size_t buf_size) {
-  const std::string &name = App.get_friendly_name();
-  size_t len = std::min(name.size(), buf_size - 1);
-  for (size_t i = 0; i < len; i++) {
-    buf[i] = to_sanitized_char(to_snake_case_char(name[i]));
-  }
-  buf[len] = '\0';
-  return len;
+// Calculate Object ID Hash directly from name using snake_case + sanitize
+void EntityBase::calc_object_id_() {
+  this->object_id_hash_ = fnv1_hash_object_id(this->name_.c_str(), this->name_.size());
 }
 
 size_t EntityBase::write_object_id_to(char *buf, size_t buf_size) const {
-  if (this->is_object_id_dynamic_()) {
-    return format_dynamic_object_id(buf, buf_size);
+  size_t len = std::min(this->name_.size(), buf_size - 1);
+  for (size_t i = 0; i < len; i++) {
+    buf[i] = to_sanitized_char(to_snake_case_char(this->name_[i]));
   }
-  const char *src = this->object_id_c_str_ == nullptr ? "" : this->object_id_c_str_;
-  size_t len = strlen(src);
-  if (len >= buf_size)
-    len = buf_size - 1;
-  memcpy(buf, src, len);
   buf[len] = '\0';
   return len;
 }
 
 StringRef EntityBase::get_object_id_to(std::span<char, OBJECT_ID_MAX_LEN> buf) const {
-  if (this->is_object_id_dynamic_()) {
-    size_t len = format_dynamic_object_id(buf.data(), buf.size());
-    return StringRef(buf.data(), len);
-  }
-  return this->object_id_c_str_ == nullptr ? StringRef() : StringRef(this->object_id_c_str_);
+  size_t len = this->write_object_id_to(buf.data(), buf.size());
+  return StringRef(buf.data(), len);
 }
 
 uint32_t EntityBase::get_object_id_hash() { return this->object_id_hash_; }

esphome/core/entity_base.h

@@ -28,16 +28,24 @@ class EntityBase {
   // Get/set the name of this Entity
   const StringRef &get_name() const;
   void set_name(const char *name);
+  /// Set name with pre-computed object_id hash (avoids runtime hash calculation)
+  /// Use hash=0 for dynamic names that need runtime calculation
+  void set_name(const char *name, uint32_t object_id_hash);
 
   // Get whether this Entity has its own name or it should use the device friendly_name.
   bool has_own_name() const { return this->flags_.has_own_name; }
 
   // Get the sanitized name of this Entity as an ID.
+  // Deprecated: object_id mangles names and all object_id methods are planned for removal.
+  // See https://github.com/esphome/backlog/issues/76
+  // Now is the time to stop using object_id entirely. If you still need it temporarily,
+  // use get_object_id_to() which will remain available longer but will also eventually be removed.
+  ESPDEPRECATED("object_id mangles names and all object_id methods are planned for removal "
+                "(see https://github.com/esphome/backlog/issues/76). "
+                "Now is the time to stop using object_id. If still needed, use get_object_id_to() "
+                "which will remain available longer. get_object_id() will be removed in 2026.7.0",
+                "2025.12.0")
   std::string get_object_id() const;
-  void set_object_id(const char *object_id);
-
-  // Set both name and object_id in one call (reduces generated code size)
-  void set_name_and_object_id(const char *name, const char *object_id);
 
   // Get the unique Object ID of this Entity
   uint32_t get_object_id_hash();
@@ -133,11 +141,7 @@ class EntityBase {
  protected:
   void calc_object_id_();
 
-  /// Check if the object_id is dynamic (changes with MAC suffix)
-  bool is_object_id_dynamic_() const;
-
   StringRef name_;
-  const char *object_id_c_str_{nullptr};
 #ifdef USE_ENTITY_ICON
   const char *icon_c_str_{nullptr};
 #endif

esphome/core/entity_helpers.py

@@ -15,7 +15,7 @@ from esphome.const import (
 from esphome.core import CORE, ID
 from esphome.cpp_generator import MockObj, add, get_variable
 import esphome.final_validate as fv
-from esphome.helpers import sanitize, snake_case
+from esphome.helpers import fnv1_hash_object_id, sanitize, snake_case
 from esphome.types import ConfigType, EntityMetadata
 
 _LOGGER = logging.getLogger(__name__)
@@ -75,34 +75,21 @@ async def setup_entity(var: MockObj, config: ConfigType, platform: str) -> None:
         config: Configuration dictionary containing entity settings
         platform: The platform name (e.g., "sensor", "binary_sensor")
     """
-    # Get device info
-    device_name: str | None = None
+    # Set device if configured
     device_id_obj: ID | None
     if device_id_obj := config.get(CONF_DEVICE_ID):
         device: MockObj = await get_variable(device_id_obj)
         add(var.set_device(device))
-        # Get device name for object ID calculation
-        device_name = device_id_obj.id
 
-    # Calculate base object_id using the same logic as C++
-    # This must match the C++ behavior in esphome/core/entity_base.cpp
-    base_object_id = get_base_entity_object_id(
-        config[CONF_NAME], CORE.friendly_name, device_name
-    )
-
-    if not config[CONF_NAME]:
-        _LOGGER.debug(
-            "Entity has empty name, using '%s' as object_id base", base_object_id
-        )
-
-    # Set both name and object_id in one call to reduce generated code size
-    add(var.set_name_and_object_id(config[CONF_NAME], base_object_id))
-    _LOGGER.debug(
-        "Setting object_id '%s' for entity '%s' on platform '%s'",
-        base_object_id,
-        config[CONF_NAME],
-        platform,
-    )
+    # Set the entity name with pre-computed object_id hash
+    # For entities with a name, we pre-compute the hash to avoid runtime calculation
+    # For empty names (use device friendly_name), pass 0 to compute at runtime
+    entity_name = config[CONF_NAME]
+    if entity_name:
+        object_id_hash = fnv1_hash_object_id(entity_name)
+        add(var.set_name(entity_name, object_id_hash))
+    else:
+        add(var.set_name(entity_name, 0))
     # Only set disabled_by_default if True (default is False)
     if config[CONF_DISABLED_BY_DEFAULT]:
         add(var.set_disabled_by_default(True))

esphome/core/helpers.h

@@ -532,6 +532,20 @@ constexpr char to_sanitized_char(char c) {
 /// Sanitizes the input string by removing all characters but alphanumerics, dashes and underscores.
 std::string str_sanitize(const std::string &str);
 
+/// Calculate FNV-1 hash of a string while applying snake_case + sanitize transformations.
+/// This computes object_id hashes directly from names without creating an intermediate buffer.
+/// IMPORTANT: Must match Python fnv1_hash_object_id() in esphome/helpers.py.
+/// If you modify this function, update the Python version and tests in both places.
+inline uint32_t fnv1_hash_object_id(const char *str, size_t len) {
+  uint32_t hash = FNV1_OFFSET_BASIS;
+  for (size_t i = 0; i < len; i++) {
+    hash *= FNV1_PRIME;
+    // Apply snake_case (space->underscore, uppercase->lowercase) then sanitize
+    hash ^= static_cast<uint8_t>(to_sanitized_char(to_snake_case_char(str[i])));
+  }
+  return hash;
+}
+
 /// snprintf-like function returning std::string of maximum length \p len (excluding null terminator).
 std::string __attribute__((format(printf, 1, 3))) str_snprintf(const char *fmt, size_t len, ...);
 

esphome/helpers.py

@@ -35,6 +35,10 @@ IS_MACOS = platform.system() == "Darwin"
 IS_WINDOWS = platform.system() == "Windows"
 IS_LINUX = platform.system() == "Linux"
 
+# FNV-1 hash constants (must match C++ in esphome/core/helpers.h)
+FNV1_OFFSET_BASIS = 2166136261
+FNV1_PRIME = 16777619
+
 
 def ensure_unique_string(preferred_string, current_strings):
     test_string = preferred_string
@@ -49,8 +53,17 @@ def ensure_unique_string(preferred_string, current_strings):
     return test_string
 
 
+def fnv1_hash(string: str) -> int:
+    """FNV-1 32-bit hash function (multiply then XOR)."""
+    hash_value = FNV1_OFFSET_BASIS
+    for char in string:
+        hash_value = (hash_value * FNV1_PRIME) & 0xFFFFFFFF
+        hash_value ^= ord(char)
+    return hash_value
+
+
 def fnv1a_32bit_hash(string: str) -> int:
-    """FNV-1a 32-bit hash function.
+    """FNV-1a 32-bit hash function (XOR then multiply).
 
     Note: This uses 32-bit hash instead of 64-bit for several reasons:
     1. ESPHome targets 32-bit microcontrollers with limited RAM (often <320KB)
@@ -63,13 +76,22 @@ def fnv1a_32bit_hash(string: str) -> int:
     a handful of area_ids and device_ids (typically <10 areas and <100
     devices), making collisions virtually impossible.
     """
-    hash_value = 2166136261
+    hash_value = FNV1_OFFSET_BASIS
     for char in string:
         hash_value ^= ord(char)
-        hash_value = (hash_value * 16777619) & 0xFFFFFFFF
+        hash_value = (hash_value * FNV1_PRIME) & 0xFFFFFFFF
     return hash_value
 
 
+def fnv1_hash_object_id(name: str) -> int:
+    """Compute FNV-1 hash of name with snake_case + sanitize transformations.
+
+    IMPORTANT: Must produce same result as C++ fnv1_hash_object_id() in helpers.h.
+    Used for pre-computing entity object_id hashes at code generation time.
+    """
+    return fnv1_hash(sanitize(snake_case(name)))
+
+
 def strip_accents(value: str) -> str:
     """Remove accents from a string."""
     import unicodedata

tests/component_tests/binary_sensor/test_binary_sensor.py

@@ -29,7 +29,7 @@ def test_binary_sensor_sets_mandatory_fields(generate_main):
     )
 
     # Then
-    assert 'bs_1->set_name_and_object_id("test bs1", "test_bs1");' in main_cpp
+    assert 'bs_1->set_name("test bs1",' in main_cpp
     assert "bs_1->set_pin(" in main_cpp
 
 

tests/component_tests/button/test_button.py

@@ -26,7 +26,7 @@ def test_button_sets_mandatory_fields(generate_main):
     main_cpp = generate_main("tests/component_tests/button/test_button.yaml")
 
     # Then
-    assert 'wol_1->set_name_and_object_id("wol_test_1", "wol_test_1");' in main_cpp
+    assert 'wol_1->set_name("wol_test_1",' in main_cpp
     assert "wol_2->set_macaddr(18, 52, 86, 120, 144, 171);" in main_cpp
 
 

tests/component_tests/text/test_text.py

@@ -25,7 +25,7 @@ def test_text_sets_mandatory_fields(generate_main):
     main_cpp = generate_main("tests/component_tests/text/test_text.yaml")
 
     # Then
-    assert 'it_1->set_name_and_object_id("test 1 text", "test_1_text");' in main_cpp
+    assert 'it_1->set_name("test 1 text",' in main_cpp
 
 
 def test_text_config_value_internal_set(generate_main):

tests/component_tests/text_sensor/test_text_sensor.py

@@ -25,18 +25,9 @@ def test_text_sensor_sets_mandatory_fields(generate_main):
     main_cpp = generate_main("tests/component_tests/text_sensor/test_text_sensor.yaml")
 
     # Then
-    assert (
-        'ts_1->set_name_and_object_id("Template Text Sensor 1", "template_text_sensor_1");'
-        in main_cpp
-    )
-    assert (
-        'ts_2->set_name_and_object_id("Template Text Sensor 2", "template_text_sensor_2");'
-        in main_cpp
-    )
-    assert (
-        'ts_3->set_name_and_object_id("Template Text Sensor 3", "template_text_sensor_3");'
-        in main_cpp
-    )
+    assert 'ts_1->set_name("Template Text Sensor 1",' in main_cpp
+    assert 'ts_2->set_name("Template Text Sensor 2",' in main_cpp
+    assert 'ts_3->set_name("Template Text Sensor 3",' in main_cpp
 
 
 def test_text_sensor_config_value_internal_set(generate_main):

tests/integration/fixtures/fnv1_hash_object_id.yaml

@@ -0,0 +1,76 @@
+esphome:
+  name: fnv1-hash-object-id-test
+  platformio_options:
+    build_flags:
+      - "-DDEBUG"
+  on_boot:
+    - lambda: |-
+        using esphome::fnv1_hash_object_id;
+
+        // Test basic lowercase (hash matches Python fnv1_hash_object_id("foo"))
+        uint32_t hash_foo = fnv1_hash_object_id("foo", 3);
+        if (hash_foo == 0x408f5e13) {
+          ESP_LOGI("FNV1_OID", "foo PASSED");
+        } else {
+          ESP_LOGE("FNV1_OID", "foo FAILED: 0x%08x != 0x408f5e13", hash_foo);
+        }
+
+        // Test uppercase conversion (should match lowercase)
+        uint32_t hash_Foo = fnv1_hash_object_id("Foo", 3);
+        if (hash_Foo == 0x408f5e13) {
+          ESP_LOGI("FNV1_OID", "upper PASSED");
+        } else {
+          ESP_LOGE("FNV1_OID", "upper FAILED: 0x%08x != 0x408f5e13", hash_Foo);
+        }
+
+        // Test space to underscore conversion ("foo bar" -> "foo_bar")
+        uint32_t hash_space = fnv1_hash_object_id("foo bar", 7);
+        if (hash_space == 0x3ae35aa1) {
+          ESP_LOGI("FNV1_OID", "space PASSED");
+        } else {
+          ESP_LOGE("FNV1_OID", "space FAILED: 0x%08x != 0x3ae35aa1", hash_space);
+        }
+
+        // Test underscore preserved ("foo_bar")
+        uint32_t hash_underscore = fnv1_hash_object_id("foo_bar", 7);
+        if (hash_underscore == 0x3ae35aa1) {
+          ESP_LOGI("FNV1_OID", "underscore PASSED");
+        } else {
+          ESP_LOGE("FNV1_OID", "underscore FAILED: 0x%08x != 0x3ae35aa1", hash_underscore);
+        }
+
+        // Test hyphen preserved ("foo-bar")
+        uint32_t hash_hyphen = fnv1_hash_object_id("foo-bar", 7);
+        if (hash_hyphen == 0x438b12e3) {
+          ESP_LOGI("FNV1_OID", "hyphen PASSED");
+        } else {
+          ESP_LOGE("FNV1_OID", "hyphen FAILED: 0x%08x != 0x438b12e3", hash_hyphen);
+        }
+
+        // Test special chars become underscore ("foo!bar" -> "foo_bar")
+        uint32_t hash_special = fnv1_hash_object_id("foo!bar", 7);
+        if (hash_special == 0x3ae35aa1) {
+          ESP_LOGI("FNV1_OID", "special PASSED");
+        } else {
+          ESP_LOGE("FNV1_OID", "special FAILED: 0x%08x != 0x3ae35aa1", hash_special);
+        }
+
+        // Test complex name ("My Sensor Name" -> "my_sensor_name")
+        uint32_t hash_complex = fnv1_hash_object_id("My Sensor Name", 14);
+        if (hash_complex == 0x2760962a) {
+          ESP_LOGI("FNV1_OID", "complex PASSED");
+        } else {
+          ESP_LOGE("FNV1_OID", "complex FAILED: 0x%08x != 0x2760962a", hash_complex);
+        }
+
+        // Test empty string returns FNV1_OFFSET_BASIS
+        uint32_t hash_empty = fnv1_hash_object_id("", 0);
+        if (hash_empty == 0x811c9dc5) {
+          ESP_LOGI("FNV1_OID", "empty PASSED");
+        } else {
+          ESP_LOGE("FNV1_OID", "empty FAILED: 0x%08x != 0x811c9dc5", hash_empty);
+        }
+
+host:
+api:
+logger:

tests/integration/fixtures/object_id_api_verification.yaml

@@ -0,0 +1,125 @@
+esphome:
+  name: object-id-test
+  friendly_name: Test Device
+  # Enable MAC suffix - host MAC is 98:35:69:ab:f6:79, suffix is "abf679"
+  # friendly_name becomes "Test Device abf679"
+  name_add_mac_suffix: true
+  # Sub-devices for testing empty-name entities on devices
+  devices:
+    - id: sub_device_1
+      name: Sub Device One
+    - id: sub_device_2
+      name: Sub Device Two
+
+host:
+
+api:
+
+logger:
+
+sensor:
+  # Test 1: Basic name -> object_id = "temperature_sensor"
+  - platform: template
+    name: "Temperature Sensor"
+    id: sensor_basic
+    lambda: return 42.0;
+    update_interval: 60s
+
+  # Test 2: Uppercase name -> object_id = "uppercase_name"
+  - platform: template
+    name: "UPPERCASE NAME"
+    id: sensor_uppercase
+    lambda: return 43.0;
+    update_interval: 60s
+
+  # Test 3: Special characters -> object_id = "special__chars_"
+  - platform: template
+    name: "Special!@Chars#"
+    id: sensor_special
+    lambda: return 44.0;
+    update_interval: 60s
+
+  # Test 4: Hyphen preserved -> object_id = "temp-sensor"
+  - platform: template
+    name: "Temp-Sensor"
+    id: sensor_hyphen
+    lambda: return 45.0;
+    update_interval: 60s
+
+  # Test 5: Underscore preserved -> object_id = "temp_sensor"
+  - platform: template
+    name: "Temp_Sensor"
+    id: sensor_underscore
+    lambda: return 46.0;
+    update_interval: 60s
+
+  # Test 6: Mixed case with spaces -> object_id = "living_room_temperature"
+  - platform: template
+    name: "Living Room Temperature"
+    id: sensor_mixed
+    lambda: return 47.0;
+    update_interval: 60s
+
+  # Test 7: Empty name - uses friendly_name with MAC suffix
+  # friendly_name = "Test Device abf679" -> object_id = "test_device_abf679"
+  - platform: template
+    name: ""
+    id: sensor_empty_name
+    lambda: return 48.0;
+    update_interval: 60s
+
+binary_sensor:
+  # Test 8: Different platform same conversion rules
+  - platform: template
+    name: "Door Open"
+    id: binary_door
+    lambda: return true;
+
+  # Test 9: Numbers in name -> object_id = "sensor_123"
+  - platform: template
+    name: "Sensor 123"
+    id: binary_numbers
+    lambda: return false;
+
+switch:
+  # Test 10: Long name with multiple spaces
+  - platform: template
+    name: "My Very Long Switch Name Here"
+    id: switch_long
+    lambda: return false;
+    turn_on_action:
+      - logger.log: "on"
+    turn_off_action:
+      - logger.log: "off"
+
+text_sensor:
+  # Test 11: Name starting with number (should work fine)
+  - platform: template
+    name: "123 Start"
+    id: text_num_start
+    lambda: return {"test"};
+    update_interval: 60s
+
+button:
+  # Test 12: Named entity on sub-device -> object_id from entity name
+  - platform: template
+    name: "Device Button"
+    id: button_on_device
+    device_id: sub_device_1
+    on_press: []
+
+  # Test 13: Empty name on sub-device -> object_id from device name
+  # Device name "Sub Device One" -> object_id = "sub_device_one"
+  - platform: template
+    name: ""
+    id: button_empty_on_device1
+    device_id: sub_device_1
+    on_press: []
+
+  # Test 14: Empty name on different sub-device
+  # Device name "Sub Device Two" -> object_id = "sub_device_two"
+  - platform: template
+    name: ""
+    id: button_empty_on_device2
+    device_id: sub_device_2
+    on_press: []

tests/integration/test_fnv1_hash_object_id.py

@@ -0,0 +1,75 @@
+"""Integration test for fnv1_hash_object_id function.
+
+This test verifies that the C++ fnv1_hash_object_id() function in
+esphome/core/helpers.h produces the same hash values as the Python
+fnv1_hash_object_id() function in esphome/helpers.py.
+
+If this test fails, one of the implementations has diverged and needs
+to be updated to match the other.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import re
+
+import pytest
+
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+
+@pytest.mark.asyncio
+async def test_fnv1_hash_object_id(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+) -> None:
+    """Test that C++ fnv1_hash_object_id matches Python implementation."""
+
+    test_results: dict[str, str] = {}
+    all_tests_complete = asyncio.Event()
+    expected_tests = {
+        "foo",
+        "upper",
+        "space",
+        "underscore",
+        "hyphen",
+        "special",
+        "complex",
+        "empty",
+    }
+
+    def on_log_line(line: str) -> None:
+        """Capture log lines with test results."""
+        # Strip ANSI escape codes
+        clean_line = re.sub(r"\x1b\[[0-9;]*m", "", line)
+        # Look for our test result messages
+        # Format: "[timestamp][level][FNV1_OID:line]: test_name PASSED"
+        match = re.search(r"\[FNV1_OID:\d+\]:\s+(\w+)\s+(PASSED|FAILED)", clean_line)
+        if match:
+            test_name = match.group(1)
+            result = match.group(2)
+            test_results[test_name] = result
+            if set(test_results.keys()) >= expected_tests:
+                all_tests_complete.set()
+
+    async with (
+        run_compiled(yaml_config, line_callback=on_log_line),
+        api_client_connected() as client,
+    ):
+        device_info = await client.device_info()
+        assert device_info is not None
+        assert device_info.name == "fnv1-hash-object-id-test"
+
+        # Wait for all tests to complete or timeout
+        try:
+            await asyncio.wait_for(all_tests_complete.wait(), timeout=2.0)
+        except TimeoutError:
+            pytest.fail(f"Tests timed out. Got results for: {set(test_results.keys())}")
+
+        # Verify all tests passed
+        for test_name in expected_tests:
+            assert test_name in test_results, f"{test_name} test not found"
+            assert test_results[test_name] == "PASSED", (
+                f"{test_name} test failed - C++ and Python hash mismatch"
+            )

tests/integration/test_object_id_api_verification.py

@@ -0,0 +1,206 @@
+"""Integration test to verify object_id from API matches Python computation.
+
+This test verifies a three-way match between:
+1. C++ object_id generation (get_object_id_to using to_sanitized_char/to_snake_case_char)
+2. C++ hash generation (fnv1_hash_object_id in helpers.h)
+3. Python computation (sanitize/snake_case in helpers.py, fnv1_hash_object_id)
+
+The API response contains C++ computed values, so verifying API == Python
+implicitly verifies C++ == Python == API for both object_id and hash.
+
+This is important for the planned migration to remove object_id from the API
+protocol and have clients (like aioesphomeapi) compute it from the name.
+See: https://github.com/esphome/backlog/issues/76
+
+Test cases covered:
+- Named entities with various characters (uppercase, special chars, hyphens, etc.)
+- Empty-name entities on main device (uses device's friendly_name with MAC suffix)
+- Empty-name entities on sub-devices (uses sub-device's name)
+- Named entities on sub-devices (uses entity name, not device name)
+- MAC suffix handling (name_add_mac_suffix modifies friendly_name at runtime)
+- Both object_id string and hash (key) verification
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from esphome.helpers import fnv1_hash_object_id, sanitize, snake_case
+
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+# Host platform default MAC: 98:35:69:ab:f6:79 -> suffix "abf679"
+MAC_SUFFIX = "abf679"
+
+
+# Expected entities with their own names and expected object_ids
+# Format: (entity_name, expected_object_id)
+NAMED_ENTITIES = [
+    # sensor platform
+    ("Temperature Sensor", "temperature_sensor"),
+    ("UPPERCASE NAME", "uppercase_name"),
+    ("Special!@Chars#", "special__chars_"),
+    ("Temp-Sensor", "temp-sensor"),
+    ("Temp_Sensor", "temp_sensor"),
+    ("Living Room Temperature", "living_room_temperature"),
+    # binary_sensor platform
+    ("Door Open", "door_open"),
+    ("Sensor 123", "sensor_123"),
+    # switch platform
+    ("My Very Long Switch Name Here", "my_very_long_switch_name_here"),
+    # text_sensor platform
+    ("123 Start", "123_start"),
+    # button platform - named entity on sub-device (uses entity name, not device name)
+    ("Device Button", "device_button"),
+]
+
+# Sub-device names and their expected object_ids for empty-name entities
+# Format: (device_name, expected_object_id)
+SUB_DEVICE_EMPTY_NAME_ENTITIES = [
+    ("Sub Device One", "sub_device_one"),
+    ("Sub Device Two", "sub_device_two"),
+]
+
+
+def compute_expected_object_id(name: str) -> str:
+    """Compute expected object_id from name using Python helpers."""
+    return sanitize(snake_case(name))
+
+
+@pytest.mark.asyncio
+async def test_object_id_api_verification(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+) -> None:
+    """Test that object_id from API matches Python computation.
+
+    Tests:
+    1. Named entities - object_id computed from entity name
+    2. Empty-name entities - object_id computed from friendly_name (with MAC suffix)
+    3. Hash verification - key can be computed from name
+    4. Generic verification - all entities can have object_id computed from API data
+    """
+    async with run_compiled(yaml_config), api_client_connected() as client:
+        # Get device info
+        device_info = await client.device_info()
+        assert device_info is not None
+
+        # Device name should include MAC suffix (hyphen separator)
+        assert device_info.name == f"object-id-test-{MAC_SUFFIX}", (
+            f"Device name mismatch: got '{device_info.name}'"
+        )
+        # Friendly name should include MAC suffix (space separator)
+        expected_friendly_name = f"Test Device {MAC_SUFFIX}"
+        assert device_info.friendly_name == expected_friendly_name, (
+            f"Friendly name mismatch: got '{device_info.friendly_name}'"
+        )
+
+        # Get all entities
+        entities, _ = await client.list_entities_services()
+
+        # Create a map of entity names to entity info
+        entity_map = {}
+        for entity in entities:
+            entity_map[entity.name] = entity
+
+        # === Test 1: Verify each named entity ===
+        for entity_name, expected_object_id in NAMED_ENTITIES:
+            assert entity_name in entity_map, (
+                f"Entity '{entity_name}' not found in API response. "
+                f"Available: {list(entity_map.keys())}"
+            )
+
+            entity = entity_map[entity_name]
+
+            # Verify object_id matches expected
+            assert entity.object_id == expected_object_id, (
+                f"Entity '{entity_name}': object_id mismatch. "
+                f"API returned '{entity.object_id}', expected '{expected_object_id}'"
+            )
+
+            # Verify Python computation matches
+            computed = compute_expected_object_id(entity_name)
+            assert computed == expected_object_id, (
+                f"Entity '{entity_name}': Python computation mismatch. "
+                f"Computed '{computed}', expected '{expected_object_id}'"
+            )
+
+            # Verify hash can be computed from the name
+            hash_from_name = fnv1_hash_object_id(entity_name)
+            assert hash_from_name == entity.key, (
+                f"Entity '{entity_name}': hash mismatch. "
+                f"Python hash {hash_from_name:#x}, API key {entity.key:#x}"
+            )
+
+        # === Test 2: Verify empty-name entities ===
+        # Empty-name entities have name="" in API, object_id comes from:
+        # - Main device: friendly_name (with MAC suffix)
+        # - Sub-device: device name
+
+        # Get all empty-name entities
+        empty_name_entities = [e for e in entities if e.name == ""]
+        # We expect 3: 1 on main device, 2 on sub-devices
+        assert len(empty_name_entities) == 3, (
+            f"Expected 3 empty-name entities, got {len(empty_name_entities)}"
+        )
+
+        # Build device_id -> device_name map from device_info
+        device_id_to_name = {d.device_id: d.name for d in device_info.devices}
+
+        # Verify each empty-name entity
+        for entity in empty_name_entities:
+            if entity.device_id == 0:
+                # Main device - uses friendly_name with MAC suffix
+                expected_name = expected_friendly_name
+            else:
+                # Sub-device - uses device name
+                assert entity.device_id in device_id_to_name, (
+                    f"Entity device_id {entity.device_id} not found in devices"
+                )
+                expected_name = device_id_to_name[entity.device_id]
+
+            expected_object_id = compute_expected_object_id(expected_name)
+            assert entity.object_id == expected_object_id, (
+                f"Empty-name entity (device_id={entity.device_id}): object_id mismatch. "
+                f"API: '{entity.object_id}', expected: '{expected_object_id}' "
+                f"(from name '{expected_name}')"
+            )
+
+            # Verify hash matches
+            expected_hash = fnv1_hash_object_id(expected_name)
+            assert entity.key == expected_hash, (
+                f"Empty-name entity (device_id={entity.device_id}): hash mismatch. "
+                f"API key: {entity.key:#x}, expected: {expected_hash:#x}"
+            )
+
+        # === Test 3: Verify ALL entities can have object_id computed from API data ===
+        # This is the key property for removing object_id from the API protocol
+        for entity in entities:
+            if entity.name:
+                # Named entity - use entity name
+                name_for_object_id = entity.name
+            elif entity.device_id == 0:
+                # Empty name on main device - use friendly_name
+                name_for_object_id = device_info.friendly_name
+            else:
+                # Empty name on sub-device - use device name
+                name_for_object_id = device_id_to_name[entity.device_id]
+
+            # Compute object_id from the appropriate name
+            computed_object_id = compute_expected_object_id(name_for_object_id)
+
+            # Verify it matches what the API returned
+            assert entity.object_id == computed_object_id, (
+                f"Entity (name='{entity.name}', device_id={entity.device_id}): "
+                f"object_id cannot be computed. "
+                f"API: '{entity.object_id}', Computed from '{name_for_object_id}': '{computed_object_id}'"
+            )
+
+            # Verify hash can also be computed
+            computed_hash = fnv1_hash_object_id(name_for_object_id)
+            assert entity.key == computed_hash, (
+                f"Entity (name='{entity.name}', device_id={entity.device_id}): "
+                f"hash cannot be computed. "
+                f"API key: {entity.key:#x}, Computed: {computed_hash:#x}"
+            )

tests/unit_tests/core/test_entity_helpers.py

@@ -27,13 +27,9 @@ from esphome.helpers import sanitize, snake_case
 
 from .common import load_config_from_fixture
 
-# Pre-compiled regex patterns for extracting object IDs from expressions
-# Matches both old format: .set_object_id("obj_id")
-# and new format: .set_name_and_object_id("name", "obj_id")
-OBJECT_ID_PATTERN = re.compile(r'\.set_object_id\(["\'](.*?)["\']\)')
-COMBINED_PATTERN = re.compile(
-    r'\.set_name_and_object_id\(["\'].*?["\']\s*,\s*["\'](.*?)["\']\)'
-)
+# Pre-compiled regex pattern for extracting names from set_name calls
+# Matches: .set_name("name", hash) or .set_name("name")
+SET_NAME_PATTERN = re.compile(r'\.set_name\(["\']([^"\']*)["\']')
 
 FIXTURES_DIR = Path(__file__).parent.parent / "fixtures" / "core" / "entity_helpers"
 
@@ -276,14 +272,21 @@ def setup_test_environment() -> Generator[list[str], None, None]:
 
 
 def extract_object_id_from_expressions(expressions: list[str]) -> str | None:
-    """Extract the object ID that was set from the generated expressions."""
+    """Extract the object ID that would be computed from set_name calls.
+
+    Since object_id is now computed from the name (via snake_case + sanitize),
+    we extract the name from set_name() calls and compute the expected object_id.
+    For empty names, we fall back to CORE.friendly_name or CORE.name.
+    """
     for expr in expressions:
-        # First try new combined format: .set_name_and_object_id("name", "obj_id")
-        if match := COMBINED_PATTERN.search(expr):
-            return match.group(1)
-        # Fall back to old format: .set_object_id("obj_id")
-        if match := OBJECT_ID_PATTERN.search(expr):
-            return match.group(1)
+        if match := SET_NAME_PATTERN.search(expr):
+            name = match.group(1)
+            if name:
+                return sanitize(snake_case(name))
+            # Empty name - fall back to friendly_name or device name
+            if CORE.friendly_name:
+                return sanitize(snake_case(CORE.friendly_name))
+            return sanitize(snake_case(CORE.name)) if CORE.name else None
     return None
 
 

tests/unit_tests/test_helpers.py

@@ -279,6 +279,77 @@ def test_sanitize(text, expected):
     assert actual == expected
 
 
+@pytest.mark.parametrize(
+    ("name", "expected_hash"),
+    (
+        # Basic strings - hash of sanitize(snake_case(name))
+        ("foo", 0x408F5E13),
+        ("Foo", 0x408F5E13),  # Same as "foo" (lowercase)
+        ("FOO", 0x408F5E13),  # Same as "foo" (lowercase)
+        # Spaces become underscores
+        ("foo bar", 0x3AE35AA1),  # Transforms to "foo_bar"
+        ("Foo Bar", 0x3AE35AA1),  # Same (lowercase + underscore)
+        # Already snake_case
+        ("foo_bar", 0x3AE35AA1),
+        # Special chars become underscores
+        ("foo!bar", 0x3AE35AA1),  # Transforms to "foo_bar"
+        ("foo@bar", 0x3AE35AA1),  # Transforms to "foo_bar"
+        # Hyphens are preserved
+        ("foo-bar", 0x438B12E3),
+        # Numbers are preserved
+        ("foo123", 0xF3B0067D),
+        # Empty string
+        ("", 0x811C9DC5),  # FNV1_OFFSET_BASIS (no chars processed)
+        # Single char
+        ("a", 0x050C5D7E),
+        # Mixed case and spaces
+        ("My Sensor Name", 0x2760962A),  # Transforms to "my_sensor_name"
+    ),
+)
+def test_fnv1_hash_object_id(name, expected_hash):
+    """Test fnv1_hash_object_id produces expected hashes.
+
+    These expected values were computed to match the C++ implementation
+    in esphome/core/helpers.h. If this test fails after modifying either
+    implementation, ensure both Python and C++ versions stay in sync.
+    """
+    actual = helpers.fnv1_hash_object_id(name)
+
+    assert actual == expected_hash
+
+
+def _fnv1_hash_py(s: str) -> int:
+    """Python implementation of FNV-1 hash for verification."""
+    hash_val = 2166136261  # FNV1_OFFSET_BASIS
+    for c in s:
+        hash_val = (hash_val * 16777619) & 0xFFFFFFFF  # FNV1_PRIME
+        hash_val ^= ord(c)
+    return hash_val
+
+
+@pytest.mark.parametrize(
+    "name",
+    (
+        "Simple",
+        "With Space",
+        "MixedCase",
+        "special!@#chars",
+        "already_snake_case",
+        "123numbers",
+    ),
+)
+def test_fnv1_hash_object_id_matches_manual_calculation(name):
+    """Verify fnv1_hash_object_id matches snake_case + sanitize + standard FNV-1."""
+    # Manual calculation: snake_case -> sanitize -> fnv1_hash
+    transformed = helpers.sanitize(helpers.snake_case(name))
+    expected = _fnv1_hash_py(transformed)
+
+    # Direct calculation via fnv1_hash_object_id
+    actual = helpers.fnv1_hash_object_id(name)
+
+    assert actual == expected
+
+
 @pytest.mark.parametrize(
     "text, expected",
     ((["127.0.0.1", "fe80::1", "2001::2"], ["2001::2", "127.0.0.1", "fe80::1"]),),