Bump noise-c to 0.1.30 and libsodium to 1.10021.11

libsodium 1.10021.10 takes the SHA256 padding block, the SHA256 initial
state and the AEAD zero pad out of DRAM on the ESP8266; noise-c 0.1.29
pins it.

.github/workflows/stale.yml

@@ -33,7 +33,7 @@ jobs:
         and will be closed if no further activity occurs within 7 days.
 
         If you are the author of this PR, please leave a comment if you want
-        to keep it open. Also, please merge the latest dev branch into your
+        to keep it open. Also, please rebase your PR onto the latest dev
         branch to ensure that it's up to date with the latest changes.
 
         Thank you for your contribution!

docker/Dockerfile

@@ -22,7 +22,7 @@ RUN \
     -r /requirements.txt
 
 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.14.6
+RUN uv pip install --no-cache-dir esphome-device-builder==1.14.5
 
 RUN \
     platformio settings set enable_telemetry No \

esphome/components/api/api.proto

@@ -77,7 +77,6 @@ service APIConnection {
   rpc serial_proxy_set_modem_pins(SerialProxySetModemPinsRequest) returns (void) {}
   rpc serial_proxy_get_modem_pins(SerialProxyGetModemPinsRequest) returns (void) {}
   rpc serial_proxy_request(SerialProxyRequest) returns (void) {}
-  rpc serial_proxy_set_mode(SerialProxySetModeRequest) returns (void) {}
 }
 
 
@@ -2727,8 +2726,7 @@ enum SerialProxyParity {
   SERIAL_PROXY_PARITY_ODD = 2;
 }
 
-// Configure UART parameters for a serial proxy instance. Only the subscribed client may
-// configure the port; others are refused with PORT_IN_USE (since API 1.17).
+// Configure UART parameters for a serial proxy instance
 message SerialProxyConfigureRequest {
   option (id) = 138;
   option (source) = SOURCE_CLIENT;
@@ -2754,8 +2752,7 @@ message SerialProxyDataReceived {
   bytes data = 2;               // Raw data received from the serial device
 }
 
-// Write data to a serial device. Only the subscribed client may write; writes from
-// others are ignored (since API 1.17).
+// Write data to a serial device
 message SerialProxyWriteRequest {
   option (id) = 140;
   option (source) = SOURCE_CLIENT;
@@ -2766,8 +2763,7 @@ message SerialProxyWriteRequest {
   bytes data = 2;               // Raw data to write to the serial device
 }
 
-// Set modem control pin states (RTS and DTR). Only the subscribed client may set them;
-// others are refused with PORT_IN_USE (since API 1.17).
+// Set modem control pin states (RTS and DTR)
 message SerialProxySetModemPinsRequest {
   option (id) = 141;
   option (source) = SOURCE_CLIENT;
@@ -2806,7 +2802,6 @@ enum SerialProxyRequestType {
   // error the device answers with INVALID_ARGUMENT.
   SERIAL_PROXY_REQUEST_TYPE_CONFIGURE = 3;      // Acknowledges a SerialProxyConfigureRequest
   SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS = 4; // Acknowledges a SerialProxySetModemPinsRequest
-  SERIAL_PROXY_REQUEST_TYPE_SET_MODE = 5;       // Acknowledges a SerialProxySetModeRequest (since API 1.17)
 }
 
 enum SerialProxyStatus {
@@ -2819,8 +2814,7 @@ enum SerialProxyStatus {
   SERIAL_PROXY_STATUS_INVALID_ARGUMENT = 6; // Invalid instance index or parameter value
 }
 
-// Generic request message for simple serial proxy operations. FLUSH requires an active
-// subscription; it is refused with PORT_IN_USE otherwise (since API 1.17).
+// Generic request message for simple serial proxy operations
 message SerialProxyRequest {
   option (id) = 144;
   option (source) = SOURCE_CLIENT;
@@ -2844,29 +2838,6 @@ message SerialProxyRequestResponse {
   string error_message = 4;            // Additional detail on failure (optional)
 }
 
-// How a port treats the bytes passing through it. RAW is a plain byte pipe; PROTOCOL
-// activates the port's protocol-aware tap (if one is configured), letting it observe
-// traffic and inject protocol bytes such as acknowledgements. Which protocol the tap
-// speaks is a property of the device configuration, discoverable from the tap
-// component's own API surface. A client that is about to flash firmware selects RAW
-// first, which definitively disables that injection.
-enum SerialProxyMode {
-  SERIAL_PROXY_MODE_RAW = 0;
-  SERIAL_PROXY_MODE_PROTOCOL = 1;
-}
-
-// Only the subscribed client may change the mode; any other caller -- including one that
-// never subscribed -- is refused with PORT_IN_USE. PROTOCOL is refused with NOT_SUPPORTED
-// when the port has no protocol-aware tap configured.
-message SerialProxySetModeRequest {
-  option (id) = 152;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_SERIAL_PROXY";
-
-  uint32 instance = 1;
-  SerialProxyMode mode = 2;
-}
-
 // ==================== BLUETOOTH CONNECTION PARAMS ====================
 message BluetoothSetConnectionParamsRequest {
   option (id) = 145;

esphome/components/api/api_connection.cpp

@@ -1661,7 +1661,6 @@ void APIConnection::on_serial_proxy_request(const SerialProxyRequest &msg) {
       break;
     case enums::SERIAL_PROXY_REQUEST_TYPE_CONFIGURE:
     case enums::SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS:
-    case enums::SERIAL_PROXY_REQUEST_TYPE_SET_MODE:
       // Response-only discriminators; never valid in a request
       ESP_LOGW(TAG, "Response-only serial proxy request type: %" PRIu32, static_cast<uint32_t>(msg.type));
       status = enums::SERIAL_PROXY_STATUS_INVALID_ARGUMENT;
@@ -1674,19 +1673,6 @@ void APIConnection::on_serial_proxy_request(const SerialProxyRequest &msg) {
   send_serial_proxy_ack(this, msg.instance, msg.type, status);
 }
 
-void APIConnection::on_serial_proxy_set_mode_request(const SerialProxySetModeRequest &msg) {
-  auto &proxies = App.get_serial_proxies();
-  if (msg.instance >= proxies.size()) {
-    ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
-    send_serial_proxy_ack(this, msg.instance, enums::SERIAL_PROXY_REQUEST_TYPE_SET_MODE,
-                          enums::SERIAL_PROXY_STATUS_INVALID_ARGUMENT);
-    return;
-  }
-  serial_proxy::SerialProxyResult result = proxies[msg.instance]->set_mode_from_client(this, msg.mode);
-  send_serial_proxy_ack(this, msg.instance, enums::SERIAL_PROXY_REQUEST_TYPE_SET_MODE,
-                        serial_proxy_result_to_status(result));
-}
-
 void APIConnection::send_serial_proxy_data(const SerialProxyDataReceived &msg) {
   if (!this->send_message(msg)) {
     ESP_LOGV(TAG, "Serial proxy data dropped, TCP buffer full");
@@ -1813,7 +1799,7 @@ bool APIConnection::send_hello_response_(const HelloRequest &msg) {
 
   HelloResponse resp;
   resp.api_version_major = 1;
-  resp.api_version_minor = 17;
+  resp.api_version_minor = 16;
   // Send only the version string - the client only logs this for debugging and doesn't use it otherwise
   resp.server_info = ESPHOME_VERSION_REF;
   resp.name = StringRef(App.get_name());

esphome/components/api/api_connection.h

@@ -244,7 +244,6 @@ class APIConnection final : public APIServerConnectionBase {
   void on_serial_proxy_set_modem_pins_request(const SerialProxySetModemPinsRequest &msg);
   void on_serial_proxy_get_modem_pins_request(const SerialProxyGetModemPinsRequest &msg);
   void on_serial_proxy_request(const SerialProxyRequest &msg);
-  void on_serial_proxy_set_mode_request(const SerialProxySetModeRequest &msg);
   void send_serial_proxy_data(const SerialProxyDataReceived &msg);
 #endif
 

esphome/components/api/api_pb2.cpp

@@ -4253,19 +4253,6 @@ uint32_t SerialProxyRequestResponse::calculate_size() const {
   size += ProtoSize::calc_length(1, this->error_message.size());
   return size;
 }
-bool SerialProxySetModeRequest::decode_varint(uint32_t field_id, proto_varint_value_t value) {
-  switch (field_id) {
-    case 1:
-      this->instance = value;
-      break;
-    case 2:
-      this->mode = static_cast<enums::SerialProxyMode>(value);
-      break;
-    default:
-      return false;
-  }
-  return true;
-}
 #endif
 #ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
 bool BluetoothSetConnectionParamsRequest::decode_varint(uint32_t field_id, proto_varint_value_t value) {

esphome/components/api/api_pb2.h

@@ -356,7 +356,6 @@ enum SerialProxyRequestType : uint32_t {
   SERIAL_PROXY_REQUEST_TYPE_FLUSH = 2,
   SERIAL_PROXY_REQUEST_TYPE_CONFIGURE = 3,
   SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS = 4,
-  SERIAL_PROXY_REQUEST_TYPE_SET_MODE = 5,
 };
 enum SerialProxyStatus : uint32_t {
   SERIAL_PROXY_STATUS_OK = 0,
@@ -367,10 +366,6 @@ enum SerialProxyStatus : uint32_t {
   SERIAL_PROXY_STATUS_PORT_IN_USE = 5,
   SERIAL_PROXY_STATUS_INVALID_ARGUMENT = 6,
 };
-enum SerialProxyMode : uint32_t {
-  SERIAL_PROXY_MODE_RAW = 0,
-  SERIAL_PROXY_MODE_PROTOCOL = 1,
-};
 #endif
 
 }  // namespace enums
@@ -3408,22 +3403,6 @@ class SerialProxyRequestResponse final : public ProtoMessage {
 
  protected:
 };
-class SerialProxySetModeRequest final : public ProtoDecodableMessage {
- public:
-  static constexpr uint16_t MESSAGE_TYPE = 152;
-  static constexpr uint8_t ESTIMATED_SIZE = 6;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  const LogString *message_name() const override { return LOG_STR("serial_proxy_set_mode_request"); }
-#endif
-  uint32_t instance{0};
-  enums::SerialProxyMode mode{};
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  const char *dump_to(DumpBuffer &out) const override;
-#endif
-
- protected:
-  bool decode_varint(uint32_t field_id, proto_varint_value_t value) override;
-};
 #endif
 #ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
 class BluetoothSetConnectionParamsRequest final : public ProtoDecodableMessage {

esphome/components/api/api_pb2_dump.cpp

@@ -854,8 +854,6 @@ template<> const char *proto_enum_to_string<enums::SerialProxyRequestType>(enums
       return ESPHOME_PSTR("SERIAL_PROXY_REQUEST_TYPE_CONFIGURE");
     case enums::SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS:
       return ESPHOME_PSTR("SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS");
-    case enums::SERIAL_PROXY_REQUEST_TYPE_SET_MODE:
-      return ESPHOME_PSTR("SERIAL_PROXY_REQUEST_TYPE_SET_MODE");
     default:
       return ESPHOME_PSTR("UNKNOWN");
   }
@@ -880,16 +878,6 @@ template<> const char *proto_enum_to_string<enums::SerialProxyStatus>(enums::Ser
       return ESPHOME_PSTR("UNKNOWN");
   }
 }
-template<> const char *proto_enum_to_string<enums::SerialProxyMode>(enums::SerialProxyMode value) {
-  switch (value) {
-    case enums::SERIAL_PROXY_MODE_RAW:
-      return ESPHOME_PSTR("SERIAL_PROXY_MODE_RAW");
-    case enums::SERIAL_PROXY_MODE_PROTOCOL:
-      return ESPHOME_PSTR("SERIAL_PROXY_MODE_PROTOCOL");
-    default:
-      return ESPHOME_PSTR("UNKNOWN");
-  }
-}
 #endif
 
 const char *HelloRequest::dump_to(DumpBuffer &out) const {
@@ -2817,12 +2805,6 @@ const char *SerialProxyRequestResponse::dump_to(DumpBuffer &out) const {
   dump_field(out, ESPHOME_PSTR("error_message"), this->error_message);
   return out.c_str();
 }
-const char *SerialProxySetModeRequest::dump_to(DumpBuffer &out) const {
-  MessageDumpHelper helper(out, ESPHOME_PSTR("SerialProxySetModeRequest"));
-  dump_field(out, ESPHOME_PSTR("instance"), this->instance);
-  dump_field(out, ESPHOME_PSTR("mode"), static_cast<enums::SerialProxyMode>(this->mode));
-  return out.c_str();
-}
 #endif
 #ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
 const char *BluetoothSetConnectionParamsRequest::dump_to(DumpBuffer &out) const {

esphome/components/api/api_pb2_service.cpp

@@ -712,17 +712,6 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
       this->on_device_capabilities_request();
       break;
     }
-#ifdef USE_SERIAL_PROXY
-    case SerialProxySetModeRequest::MESSAGE_TYPE: {
-      SerialProxySetModeRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_serial_proxy_set_mode_request"), msg);
-#endif
-      this->on_serial_proxy_set_mode_request(msg);
-      break;
-    }
-#endif
     default:
       break;
   }

esphome/components/api/api_pb2_service.h

@@ -235,9 +235,6 @@ class APIServerConnectionBase {
   void on_serial_proxy_request(const SerialProxyRequest &value){};
 #endif
 
-#ifdef USE_SERIAL_PROXY
-  void on_serial_proxy_set_mode_request(const SerialProxySetModeRequest &value){};
-#endif
 #ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
   void on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &value){};
 #endif

esphome/components/deep_sleep/deep_sleep_bk72xx.cpp

@@ -44,7 +44,7 @@ bool DeepSleepComponent::prepare_to_sleep_() {
           this->status_set_warning();
           ESP_LOGV(TAG, "Waiting for pin to switch state to enter deep sleep...");
         }
-        this->defer_sleep_();
+        this->next_enter_deep_sleep_ = true;
         return false;
       }
     }

esphome/components/deep_sleep/deep_sleep_component.cpp

@@ -17,7 +17,6 @@ void DeepSleepComponent::setup() {
 
 void DeepSleepComponent::schedule_sleep_() {
   this->next_enter_deep_sleep_ = false;
-  this->disable_loop();
   const optional<uint32_t> run_duration = get_run_duration_();
   if (run_duration.has_value()) {
     ESP_LOGI(TAG, "Scheduling in %" PRIu32 " ms", *run_duration);
@@ -46,7 +45,7 @@ void DeepSleepComponent::loop() {
 
 void DeepSleepComponent::begin_sleep(bool manual) {
   if (this->prevent_ && !manual) {
-    this->defer_sleep_();
+    this->next_enter_deep_sleep_ = true;
     return;
   }
 

esphome/components/deep_sleep/deep_sleep_component.h

@@ -190,11 +190,6 @@ class DeepSleepComponent final : public Component {
   void schedule_sleep_();
   bool should_teardown_();
 
-  void defer_sleep_() {
-    this->next_enter_deep_sleep_ = true;
-    this->enable_loop();
-  }
-
 #ifdef USE_BK72XX
   bool pin_prevents_sleep_(WakeUpPinItem &pin_item) const;
   bool get_real_pin_state_(InternalGPIOPin &pin) const { return (pin.digital_read() ^ pin.is_inverted()); }

esphome/components/deep_sleep/deep_sleep_esp32.cpp

@@ -100,7 +100,7 @@ bool DeepSleepComponent::prepare_to_sleep_() {
       this->status_set_warning();
       ESP_LOGW(TAG, "Waiting for wakeup pin state change");
     }
-    this->defer_sleep_();
+    this->next_enter_deep_sleep_ = true;
     return false;
   }
   return true;

esphome/components/es7210/es7210.cpp

@@ -153,14 +153,13 @@ bool ES7210::configure_mic_gain_() {
   ES7210_ERROR_CHECK(this->es7210_update_reg_bit_(ES7210_MIC2_GAIN_REG44, 0x0f, regv));
 
   // Configure mic 3
-  // MIC3 uses the ADC3/4 and MIC3/4 clock domains (bits 2 and 4), not the MIC1/2 domains.
-  ES7210_ERROR_CHECK(this->es7210_update_reg_bit_(ES7210_CLOCK_OFF_REG01, 0x15, 0x00));
+  ES7210_ERROR_CHECK(this->es7210_update_reg_bit_(ES7210_CLOCK_OFF_REG01, 0x0b, 0x00));
   ES7210_ERROR_CHECK(this->write_byte(ES7210_MIC34_POWER_REG4C, 0x00));
   ES7210_ERROR_CHECK(this->es7210_update_reg_bit_(ES7210_MIC3_GAIN_REG45, 0x10, 0x10));
   ES7210_ERROR_CHECK(this->es7210_update_reg_bit_(ES7210_MIC3_GAIN_REG45, 0x0f, regv));
 
   // Configure mic 4
-  ES7210_ERROR_CHECK(this->es7210_update_reg_bit_(ES7210_CLOCK_OFF_REG01, 0x15, 0x00));
+  ES7210_ERROR_CHECK(this->es7210_update_reg_bit_(ES7210_CLOCK_OFF_REG01, 0x0b, 0x00));
   ES7210_ERROR_CHECK(this->write_byte(ES7210_MIC34_POWER_REG4C, 0x00));
   ES7210_ERROR_CHECK(this->es7210_update_reg_bit_(ES7210_MIC4_GAIN_REG46, 0x10, 0x10));
   ES7210_ERROR_CHECK(this->es7210_update_reg_bit_(ES7210_MIC4_GAIN_REG46, 0x0f, regv));

esphome/components/logger/logger_esp32.cpp

@@ -3,7 +3,6 @@
 
 #include "esphome/components/esp32/crash_handler.h"
 #include <esp_log.h>
-#include <esp_idf_version.h>
 
 #include <driver/uart.h>
 #include <soc/soc_caps.h>
@@ -17,10 +16,8 @@
 #include <driver/usb_serial_jtag_vfs.h>
 #endif
 #endif
-#if defined(CONFIG_PM_ENABLE) && defined(CONFIG_FREERTOS_USE_TICKLESS_IDLE) && \
-    (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6, 0, 0))
-#include "esp_sleep.h"
-#endif
+
+#include "esp_idf_version.h"
 #include "freertos/FreeRTOS.h"
 
 #include <fcntl.h>
@@ -90,12 +87,6 @@ void init_uart(uart_port_t uart_num, uint32_t baud_rate, int tx_buffer_size) {
   // ESP-IDF requires rx_buffer_size > UART_HW_FIFO_LEN (128 bytes).
   const int min_rx_buffer_size = UART_HW_FIFO_LEN(uart_num) + 1;
   uart_driver_install(uart_num, min_rx_buffer_size, tx_buffer_size, 0, nullptr, 0);
-#if defined(CONFIG_PM_ENABLE) && defined(CONFIG_FREERTOS_USE_TICKLESS_IDLE) && \
-    (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6, 0, 0))
-  // Always flush before going to light sleep. Could be disabled for devices
-  // without TOP_PD or if source_clk = UART_SCLK_RTC
-  esp_sleep_set_console_uart_handling_mode(ESP_SLEEP_ALWAYS_FLUSH_UART);
-#endif
 }
 
 void Logger::pre_setup() {

esphome/components/mlx90614/mlx90614.cpp

@@ -26,129 +26,44 @@ static const uint8_t MLX90614_ID4 = 0x3F;
 
 static const char *const TAG = "mlx90614";
 
-// The EEPROM cell has a limited number of write cycles, so stop retrying after a few failures
-static constexpr uint8_t EMISSIVITY_WRITE_ATTEMPTS = 3;
-
-// SMBus packet error code: CRC-8 with polynomial 0x07, MSB first
-static uint8_t crc8_pec(const uint8_t *data, uint8_t len) { return crc8(data, len, 0x00, 0x07, true); }
-
 void MLX90614Component::setup() {
-  if (std::isnan(this->emissivity_)) {
+  if (!this->write_emissivity_()) {
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
+    this->mark_failed();
     return;
   }
-  this->emissivity_write_attempts_ = EMISSIVITY_WRITE_ATTEMPTS;
-  this->try_write_emissivity_();
-  if (this->emissivity_write_attempts_ != 0) {
-    this->status_set_warning(LOG_STR("Failed to write emissivity, will retry"));
-  }
-}
-
-void MLX90614Component::try_write_emissivity_() {
-  if (this->emissivity_write_attempts_ == 0) {
-    return;
-  }
-  if (this->write_emissivity_()) {
-    this->emissivity_write_attempts_ = 0;
-    return;
-  }
-  if (--this->emissivity_write_attempts_ == 0) {
-    ESP_LOGE(TAG, "Giving up on writing emissivity after %u attempts", EMISSIVITY_WRITE_ATTEMPTS);
-    this->emissivity_write_failed_ = true;
-  }
 }
 
 bool MLX90614Component::write_emissivity_() {
-  // Skip the write when the EEPROM already holds the desired value to save write cycles
-  uint16_t current_emissivity;
-  if (this->read_register_(MLX90614_EMISSIVITY, current_emissivity) != i2c::ERROR_OK) {
-    return false;
-  }
-
-  const auto desired_emissivity = static_cast<uint16_t>(this->emissivity_ * 0xFFFF);
-  if (current_emissivity == desired_emissivity) {
+  if (std::isnan(this->emissivity_))
     return true;
-  }
-
-  return this->write_register_(MLX90614_EMISSIVITY, desired_emissivity);
-}
-
-bool MLX90614Component::write_register_(uint8_t reg, uint16_t data) {
-  // The PEC covers the whole write transaction: SLA+W, command, data low, data high
-  uint8_t buf[5];
-  buf[0] = this->address_ << 1;
-  buf[1] = reg;
-
-  // See datasheet 8.3.3.1 EEPROM write sequence
-  // 1. Write 0x0000 into the cell of interest (erases the cell)
-  buf[2] = buf[3] = 0;
-  buf[4] = crc8_pec(buf, 4);
-  auto ec = this->write_register(reg, buf + 2, 3);
-  if (ec != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Can't erase register 0x%02X, error %d", reg, ec);
+  uint16_t value = (uint16_t) (this->emissivity_ * 65535);
+  if (!this->write_bytes_(MLX90614_EMISSIVITY, 0)) {
     return false;
   }
-
-  // 2. Wait at least 5ms
   delay(10);
-
-  // 3. Write the new value
-  if (data != 0) {
-    buf[2] = data & 0xFF;
-    buf[3] = data >> 8;
-    buf[4] = crc8_pec(buf, 4);
-    ec = this->write_register(reg, buf + 2, 3);
-    if (ec != i2c::ERROR_OK) {
-      ESP_LOGW(TAG, "Can't write register 0x%02X, error %d", reg, ec);
-      return false;
-    }
-    // 4. Wait at least 5ms
-    delay(10);
-  }
-
-  // 5. Read back to confirm the value was stored
-  uint16_t read_back;
-  ec = this->read_register_(reg, read_back);
-  if (ec != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Can't check register 0x%02X value, error %d", reg, ec);
+  if (!this->write_bytes_(MLX90614_EMISSIVITY, value)) {
     return false;
   }
-
-  if (read_back != data) {
-    ESP_LOGW(TAG, "Read back mismatch on register 0x%02X. Expected 0x%04X, got 0x%04X", reg, data, read_back);
-    return false;
-  }
-
+  delay(10);
   return true;
 }
 
-i2c::ErrorCode MLX90614Component::read_register_(uint8_t reg, uint16_t &data) {
-  // The PEC covers the whole read transaction: SLA+W, command, SLA+R, data low, data high
-  uint8_t buf[6];
+bool MLX90614Component::write_bytes_(uint8_t reg, uint16_t data) {
+  uint8_t buf[5];
   buf[0] = this->address_ << 1;
   buf[1] = reg;
-  buf[2] = (this->address_ << 1) | 0x01;
-
-  const auto ec = this->read_register(reg, buf + 3, 3);
-  if (ec != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "i2c read error %d", ec);
-    return ec;
-  }
-
-  const auto expected_pec = crc8_pec(buf, 5);
-  if (buf[5] != expected_pec) {
-    ESP_LOGW(TAG, "i2c CRC error. Expected 0x%02X, got 0x%02X", expected_pec, buf[5]);
-    return i2c::ERROR_CRC;
-  }
-
-  data = encode_uint16(buf[4], buf[3]);
-  return i2c::ERROR_OK;
+  buf[2] = data & 0xFF;
+  buf[3] = data >> 8;
+  buf[4] = crc8(buf, 4, 0x00, 0x07, true);
+  return this->write_bytes(reg, buf + 2, 3);
 }
 
 void MLX90614Component::dump_config() {
   ESP_LOGCONFIG(TAG, "MLX90614:");
   LOG_I2C_DEVICE(this);
-  if (this->emissivity_write_attempts_ != 0) {
-    ESP_LOGW(TAG, "  Emissivity not written yet, will retry");
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
   }
   LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "Ambient", this->ambient_sensor_);
@@ -156,41 +71,33 @@ void MLX90614Component::dump_config() {
 }
 
 void MLX90614Component::update() {
-  // Temperature reads run regardless of the emissivity state so a failure still shows up as NAN
-  this->try_write_emissivity_();
-
-  // Publishes NAN on a bus or CRC failure so a stuck reading is visible instead of silently stale
-  auto publish_sensor = [this](sensor::Sensor *sensor, uint8_t reg) {
-    if (sensor == nullptr) {
-      return i2c::ERROR_OK;
-    }
-
-    uint16_t raw;
-    const auto ec = this->read_register_(reg, raw);
-    if (ec != i2c::ERROR_OK) {
-      sensor->publish_state(NAN);
-      return ec;
-    }
-
-    // Bit 15 set means the device flagged the reading as invalid
-    const float temperature = (raw & 0x8000) ? NAN : raw * 0.02f - 273.15f;
-    ESP_LOGD(TAG, "'%s': Got temperature=%.1f°C", sensor->get_name().c_str(), temperature);
-    sensor->publish_state(temperature);
-    return ec;
-  };
-
-  const auto object_ec = publish_sensor(this->object_sensor_, MLX90614_TEMPERATURE_OBJECT_1);
-  const auto ambient_ec = publish_sensor(this->ambient_sensor_, MLX90614_TEMPERATURE_AMBIENT);
-
-  if (object_ec != i2c::ERROR_OK || ambient_ec != i2c::ERROR_OK) {
-    this->status_set_warning(LOG_STR("Failed to read some sensors"));
-  } else if (this->emissivity_write_failed_) {
-    this->status_set_warning(LOG_STR("Failed to write emissivity"));
-  } else if (this->emissivity_write_attempts_ != 0) {
-    this->status_set_warning(LOG_STR("Failed to write emissivity, will retry"));
-  } else {
-    this->status_clear_warning();
+  uint8_t emissivity[3];
+  if (this->read_register(MLX90614_EMISSIVITY, emissivity, 3) != i2c::ERROR_OK) {
+    this->status_set_warning();
+    return;
   }
+  uint8_t raw_object[3];
+  if (this->read_register(MLX90614_TEMPERATURE_OBJECT_1, raw_object, 3) != i2c::ERROR_OK) {
+    this->status_set_warning();
+    return;
+  }
+
+  uint8_t raw_ambient[3];
+  if (this->read_register(MLX90614_TEMPERATURE_AMBIENT, raw_ambient, 3) != i2c::ERROR_OK) {
+    this->status_set_warning();
+    return;
+  }
+
+  float ambient = raw_ambient[1] & 0x80 ? NAN : encode_uint16(raw_ambient[1], raw_ambient[0]) * 0.02f - 273.15f;
+  float object = raw_object[1] & 0x80 ? NAN : encode_uint16(raw_object[1], raw_object[0]) * 0.02f - 273.15f;
+
+  ESP_LOGD(TAG, "Got Temperature=%.1f°C Ambient=%.1f°C", object, ambient);
+
+  if (this->ambient_sensor_ != nullptr && !std::isnan(ambient))
+    this->ambient_sensor_->publish_state(ambient);
+  if (this->object_sensor_ != nullptr && !std::isnan(object))
+    this->object_sensor_->publish_state(object);
+  this->status_clear_warning();
 }
 
 }  // namespace esphome::mlx90614

esphome/components/mlx90614/mlx90614.h

@@ -18,18 +18,13 @@ class MLX90614Component final : public PollingComponent, public i2c::I2CDevice {
   void set_emissivity(float emissivity) { emissivity_ = emissivity; }
 
  protected:
-  void try_write_emissivity_();
   bool write_emissivity_();
 
-  bool write_register_(uint8_t reg, uint16_t data);
-  i2c::ErrorCode read_register_(uint8_t reg, uint16_t &data);
+  bool write_bytes_(uint8_t reg, uint16_t data);
 
   sensor::Sensor *ambient_sensor_{nullptr};
   sensor::Sensor *object_sensor_{nullptr};
 
   float emissivity_{NAN};
-  // Remaining attempts to program the emissivity EEPROM cell, bounded to limit cell wear
-  uint8_t emissivity_write_attempts_{0};
-  bool emissivity_write_failed_{false};
 };
 }  // namespace esphome::mlx90614

esphome/components/network/util.h

@@ -26,34 +26,30 @@ namespace esphome::network {
 
 /// Return whether the node is connected to the network (through wifi, eth, ...)
 ESPHOME_ALWAYS_INLINE inline bool is_connected() {
-  // With a single interface enabled the checks below collapse to `if (x) return true; return false;`, which
-  // clang-tidy wants folded into one return. Keep the per-interface form so every enabled interface is checked.
-  // NOLINTBEGIN(readability-simplify-boolean-expr)
 #ifdef USE_ETHERNET
   if (ethernet::global_eth_component != nullptr && ethernet::global_eth_component->is_connected())
     return true;
 #endif
 
 #ifdef USE_MODEM
-  if (modem::global_modem_component != nullptr && modem::global_modem_component->is_connected())
-    return true;
+  if (modem::global_modem_component != nullptr)
+    return modem::global_modem_component->is_connected();
 #endif
 
 #ifdef USE_WIFI
-  if (wifi::global_wifi_component != nullptr && wifi::global_wifi_component->is_connected())
-    return true;
+  if (wifi::global_wifi_component != nullptr)
+    return wifi::global_wifi_component->is_connected();
 #endif
 
 #ifdef USE_OPENTHREAD
-  if (openthread::global_openthread_component != nullptr && openthread::global_openthread_component->is_connected())
-    return true;
+  if (openthread::global_openthread_component != nullptr)
+    return openthread::global_openthread_component->is_connected();
 #endif
 
 #ifdef USE_HOST
   return true;  // Assume it's connected
 #endif
   return false;
-  // NOLINTEND(readability-simplify-boolean-expr)
 }
 
 /// Return whether the network is disabled: every configured interface with a

esphome/components/noise/__init__.py

@@ -88,12 +88,12 @@ def encryption_schema(config: ConfigType | None) -> ConfigType:
 
 async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_NOISE")
-    cg.add_library("esphome/noise-c", "0.1.26")
+    cg.add_library("esphome/noise-c", "0.1.30")
     # noise-c depends on libsodium, but declaring it here too lets the
     # library manager see the full set up front instead of discovering
     # libsodium only after noise-c has downloaded, so the two can download
     # in parallel. The version must match noise-c's library.json.
-    cg.add_library("esphome/libsodium", "1.10021.8")
+    cg.add_library("esphome/libsodium", "1.10021.11")
     # Enable optimized memzero/memcmp in libsodium instead of volatile byte loops
     cg.add_build_flag("-DHAVE_WEAK_SYMBOLS=1")
     cg.add_build_flag("-DHAVE_INLINE_ASM=1")

esphome/components/sendspin/__init__.py

@@ -6,17 +6,12 @@ from esphome.components import esp32, network, psram, socket, wifi
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_BUFFER_SIZE,
-    CONF_ESPHOME,
     CONF_FORMAT,
     CONF_HEIGHT,
     CONF_ID,
-    CONF_MODEL,
-    CONF_NAME,
-    CONF_PROJECT,
     CONF_SAMPLE_RATE,
     CONF_SOURCE,
     CONF_TASK_STACK_IN_PSRAM,
-    CONF_VERSION,
     CONF_WIDTH,
 )
 from esphome.core import CORE, ID
@@ -32,14 +27,6 @@ DOMAIN = "sendspin"
 CONF_DISPLAY_OFFSET = "display_offset"
 CONF_SENDSPIN_ID = "sendspin_id"
 
-CONF_FIRMWARE_VERSION = "firmware_version"
-CONF_MANUFACTURER = "manufacturer"
-
-# An empty device information string would be sent to the server as an empty value rather than
-# falling back, so reject it instead of silently substituting the fallback. The 127 byte cap keeps
-# the length prefix of a protobuf string field to a single byte, matching `esphome: project:`.
-DEVICE_INFO_STRING = cv.All(cv.string_strict, cv.Length(min=1), cv.ByteLength(max=127))
-
 CONF_INITIAL_STATIC_DELAY = "initial_static_delay"
 CONF_FIXED_DELAY = "fixed_delay"
 CONF_DECODE_MEMORY = "decode_memory"
@@ -211,9 +198,6 @@ CONFIG_SCHEMA = cv.All(
         {
             cv.GenerateID(): cv.declare_id(SendspinHub),
             cv.Optional(CONF_TASK_STACK_IN_PSRAM): psram.validate_task_stack_in_psram,
-            cv.Optional(CONF_MANUFACTURER): DEVICE_INFO_STRING,
-            cv.Optional(CONF_MODEL): DEVICE_INFO_STRING,
-            cv.Optional(CONF_FIRMWARE_VERSION): DEVICE_INFO_STRING,
         }
     ),
     cv.only_on_esp32,
@@ -264,22 +248,6 @@ async def to_code(config: ConfigType) -> None:
         cg.add(var.set_task_stack_in_psram(True))
         psram.request_external_task_stack()
 
-    # Device information for the server's client/hello message. Falls back to the project
-    # information, which is written as `manufacturer.model`. Anything still unset keeps the
-    # default the hub itself applies: the ESPHome name and version.
-    project = CORE.config[CONF_ESPHOME].get(CONF_PROJECT, {})
-    project_manufacturer, _, project_model = project.get(CONF_NAME, "").partition(".")
-    for value, setter in (
-        (config.get(CONF_MANUFACTURER) or project_manufacturer, var.set_manufacturer),
-        (config.get(CONF_MODEL) or project_model, var.set_model),
-        (
-            config.get(CONF_FIRMWARE_VERSION) or project.get(CONF_VERSION),
-            var.set_firmware_version,
-        ),
-    ):
-        if value:
-            cg.add(setter(value))
-
     # sendspin-cpp library
     esp32.add_idf_component(name="sendspin/sendspin-cpp", ref="0.7.2")
 

esphome/components/sendspin/sendspin_hub.cpp

@@ -76,12 +76,8 @@ void SendspinHub::dump_config() {
   ESP_LOGCONFIG(TAG,
                 "Sendspin Hub:\n"
                 "  Client ID: %s\n"
-                "  Manufacturer: %s\n"
-                "  Model: %s\n"
-                "  Firmware version: %s\n"
                 "  Task stack in PSRAM: %s",
-                get_client_id_into_buffer(mac_buf), this->manufacturer_, this->get_product_name_(),
-                this->firmware_version_, YESNO(this->task_stack_in_psram_));
+                get_client_id_into_buffer(mac_buf), YESNO(this->task_stack_in_psram_));
 
 #ifdef USE_SENDSPIN_ARTWORK
   // Slot indices come from the order the image platform entries were declared, so the log is the
@@ -131,19 +127,15 @@ const char *SendspinHub::get_client_id_into_buffer(std::span<char, MAC_ADDRESS_P
   return get_mac_address_pretty_into_buffer(buf);
 }
 
-const char *SendspinHub::get_product_name_() const {
-  return this->model_ != nullptr ? this->model_ : App.get_name().c_str();
-}
-
 sendspin::SendspinClientConfig SendspinHub::build_client_config_() {
   sendspin::SendspinClientConfig config;
 
   char mac_buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
   config.client_id = SendspinHub::get_client_id_into_buffer(mac_buf);
   config.name = App.get_friendly_name();
-  config.product_name = this->get_product_name_();
-  config.manufacturer = this->manufacturer_;
-  config.software_version = this->firmware_version_;
+  config.product_name = App.get_name();
+  config.manufacturer = "ESPHome";
+  config.software_version = ESPHOME_VERSION;
   config.httpd_psram_stack = this->task_stack_in_psram_;
 
   return config;

esphome/components/sendspin/sendspin_hub.h

@@ -8,7 +8,6 @@
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/preferences.h"
-#include "esphome/core/version.h"
 
 #include <sendspin/client.h>
 #include <sendspin/config.h>
@@ -126,15 +125,6 @@ class SendspinHub final : public Component,
 
   void set_task_stack_in_psram(bool task_stack_in_psram) { this->task_stack_in_psram_ = task_stack_in_psram; }
 
-  /// @brief Sets the device information reported to the server in the `client/hello` message.
-  ///
-  /// Each takes a pointer to a string literal emitted by codegen, so it must stay valid for the
-  /// lifetime of the hub. Only called for values the configuration overrides; anything left alone
-  /// keeps the default described on the member below.
-  void set_manufacturer(const char *manufacturer) { this->manufacturer_ = manufacturer; }
-  void set_model(const char *model) { this->model_ = model; }
-  void set_firmware_version(const char *firmware_version) { this->firmware_version_ = firmware_version; }
-
   // --- Sendspin role specific methods ---
 
 #ifdef USE_SENDSPIN_ARTWORK
@@ -197,9 +187,6 @@ class SendspinHub final : public Component,
   /// @brief Builds the SendspinClientConfig from ESPHome configuration and platform info.
   sendspin::SendspinClientConfig build_client_config_();
 
-  /// @brief Returns the product name reported to the server: the configured model, or the device name.
-  const char *get_product_name_() const;
-
   /// @brief Writes the active network interface's MAC into @p buf and returns its data pointer.
   /// Uses the ethernet MAC if ethernet is configured, otherwise the base MAC (used by wifi).
   static const char *get_client_id_into_buffer(std::span<char, MAC_ADDRESS_PRETTY_BUFFER_SIZE> buf);
@@ -281,12 +268,6 @@ class SendspinHub final : public Component,
   CallbackManager<void(const sendspin::GroupUpdateObject &)> group_update_callbacks_{};
 
   bool task_stack_in_psram_{false};
-
-  // Device information sent in the `client/hello` message. Defaults apply when neither the
-  // sendspin configuration nor the project information supplies a value.
-  const char *manufacturer_{"ESPHome"};
-  const char *model_{nullptr};  // nullptr reports the device name instead
-  const char *firmware_version_{ESPHOME_VERSION};
 };
 
 /// @brief Base class for all sendspin subcomponents.

esphome/components/serial_proxy/__init__.py

@@ -30,7 +30,6 @@ MULTI_CONF = True
 
 serial_proxy_ns = cg.esphome_ns.namespace("serial_proxy")
 SerialProxy = serial_proxy_ns.class_("SerialProxy", cg.Component, uart.UARTDevice)
-SerialProxyTap = serial_proxy_ns.class_("SerialProxyTap")
 
 api_enums_ns = cg.esphome_ns.namespace("api").namespace("enums")
 SerialProxyPortType = api_enums_ns.enum("SerialProxyPortType")

esphome/components/serial_proxy/serial_proxy.cpp

@@ -29,57 +29,26 @@ void SerialProxy::setup() {
 #ifdef USE_API
   // instance_index_ is fixed at registration time; pre-set it so loop() only needs to update data
   this->outgoing_msg_.instance = this->instance_index_;
-#endif
-#ifdef USE_SERIAL_PROXY_TAP
-  // A tap sets itself up before this runs (its setup priority is higher), so it may
-  // already be waiting on the port -- a boot-time handshake with the device, say. Leaving
-  // the loop enabled is what lets that finish; without it the tap would stall until a
-  // client happened to subscribe.
-  if (this->tap_ != nullptr && this->tap_->tap_needs_port()) {
-    return;
-  }
 #endif
   // No subscriber at startup; disable loop until a client subscribes
   this->disable_loop();
 }
 
-#ifdef USE_SERIAL_PROXY_TAP
-void SerialProxy::reset_mode_() {
-  // The mode belongs to a session, not to the port. Carrying a departed client's choice
-  // over to the next one would inject protocol bytes into a stream that never asked for
-  // them -- a firmware upload, or any client built before this request existed and so
-  // unable to turn it off. Guessing RAW is the safe direction: a client that wanted
-  // protocol handling and did not ask for it merely sends its own acknowledgements.
-  if (this->mode_ == api::enums::SERIAL_PROXY_MODE_RAW) {
-    return;
-  }
-  ESP_LOGD(TAG, "Session ended, returning serial proxy [%" PRIu32 "] to RAW mode", this->instance_index_);
-  this->mode_ = api::enums::SERIAL_PROXY_MODE_RAW;
-}
-#endif
-
 void SerialProxy::loop() {
 #ifdef USE_API
-  // Detect subscriber disconnect
-  if (this->api_connection_ != nullptr && (this->api_connection_->is_marked_for_removal() ||
-                                           !this->api_connection_->is_connection_setup() || !api_is_connected())) {
-    ESP_LOGW(TAG, "Subscriber disconnected");
-    this->api_connection_ = nullptr;
-    this->reset_mode_();
-  }
-
-  // With no subscriber there is normally nothing to do, but a tap may still need the port
-  // read -- it does its protocol work precisely while nobody else is listening.
+  // Safety check — loop should only run when subscribed, but guard against races
   if (this->api_connection_ == nullptr) [[unlikely]] {
-#ifdef USE_SERIAL_PROXY_TAP
-    if (this->tap_ == nullptr || !this->tap_->tap_needs_port()) {
-      this->disable_loop();
-      return;
-    }
-#else
     this->disable_loop();
     return;
-#endif
+  }
+
+  // Detect subscriber disconnect
+  if (this->api_connection_->is_marked_for_removal() || !this->api_connection_->is_connection_setup() ||
+      !api_is_connected()) {
+    ESP_LOGW(TAG, "Subscriber disconnected");
+    this->api_connection_ = nullptr;
+    this->disable_loop();
+    return;
   }
 
   // Read available data from UART and forward to subscribed client
@@ -100,54 +69,11 @@ void __attribute__((noinline)) SerialProxy::read_and_send_(size_t available) {
   if (!this->read_array(buffer, to_read))
     return;
 
-#ifdef USE_SERIAL_PROXY_TAP
-  // Before forwarding, so a tap that answers the device (an acknowledgement, say) is not
-  // waiting on the network round trip to a subscriber that may not even exist.
-  if (this->tap_observing_()) {
-    this->tap_->on_device_rx(buffer, to_read);
-  }
-#endif
-
-  if (this->api_connection_ == nullptr) {
-    return;
-  }
   this->outgoing_msg_.set_data(buffer, to_read);
   this->api_connection_->send_serial_proxy_data(this->outgoing_msg_);
 }
 #endif
 
-#ifdef USE_SERIAL_PROXY_TAP
-
-bool SerialProxy::tap_observing_() const {
-  if (this->tap_ == nullptr) {
-    return false;
-  }
-  // With no subscriber, a tap doing its own protocol work (the boot-time handshake with
-  // the device, say) is served regardless of mode -- nobody has chosen one yet. Once a
-  // subscriber holds the port, the mode alone decides, so RAW stays inert.
-  if (this->api_connection_ == nullptr && this->tap_->tap_needs_port()) {
-    return true;
-  }
-  // Otherwise the mode decides. RAW must be inert: a client that flips to RAW before
-  // flashing firmware is entitled to a byte pipe with nothing injecting protocol bytes
-  // into it, and "the tap turned out not to recognise the stream" is not good enough.
-  return this->mode_ == api::enums::SERIAL_PROXY_MODE_PROTOCOL;
-}
-
-void SerialProxy::tap_pump() {
-#ifdef USE_API
-  // Nothing would consume the bytes; leave them in the FIFO
-  if (!this->tap_observing_() && this->api_connection_ == nullptr) {
-    return;
-  }
-  const size_t available = this->available();
-  if (available > 0) {
-    this->read_and_send_(available);
-  }
-#endif
-}
-#endif
-
 void SerialProxy::dump_config() {
   ESP_LOGCONFIG(TAG,
                 "Serial Proxy [%" PRIu32 "]:\n"
@@ -166,9 +92,8 @@ void SerialProxy::dump_config() {
 SerialProxyResult SerialProxy::configure(api::APIConnection *api_connection, uint32_t baudrate, bool flow_control,
                                          uint8_t parity, uint8_t stop_bits, uint8_t data_size) {
 #ifdef USE_API
-  if (!this->is_subscriber_(api_connection)) {
-    ESP_LOGW(TAG, "Ignoring configure request from client without port subscription [%" PRIu32 "]",
-             this->instance_index_);
+  if (this->port_claimed_by_other_(api_connection)) {
+    ESP_LOGW(TAG, "Ignoring configure request from client without port access [%" PRIu32 "]", this->instance_index_);
     return SerialProxyResult::SERIAL_PROXY_RESULT_PORT_IN_USE;
   }
 #endif
@@ -234,80 +159,24 @@ SerialProxyResult SerialProxy::configure(api::APIConnection *api_connection, uin
   return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
 }
 
-SerialProxyResult SerialProxy::set_mode_from_client(api::APIConnection *api_connection,
-                                                    api::enums::SerialProxyMode mode) {
-#ifdef USE_API
-  // Only the live subscriber may change the mode, so the mode cannot outlive a session
-  if (!this->is_subscriber_(api_connection)) {
-    ESP_LOGW(TAG, "Ignoring mode request from client without port subscription [%" PRIu32 "]", this->instance_index_);
-    return SerialProxyResult::SERIAL_PROXY_RESULT_PORT_IN_USE;
-  }
-#endif
-  // Values come from a remote client
-  if (mode != api::enums::SERIAL_PROXY_MODE_RAW && mode != api::enums::SERIAL_PROXY_MODE_PROTOCOL) {
-    ESP_LOGW(TAG, "Invalid mode: %" PRIu32, static_cast<uint32_t>(mode));
-    return SerialProxyResult::SERIAL_PROXY_RESULT_INVALID_ARGUMENT;
-  }
-  // PROTOCOL on a port with no tap would be a silent no-op; refuse so the client knows
-#ifdef USE_SERIAL_PROXY_TAP
-  const bool has_tap = this->tap_ != nullptr;
-#else
-  const bool has_tap = false;
-#endif
-  if (mode == api::enums::SERIAL_PROXY_MODE_PROTOCOL && !has_tap) {
-    ESP_LOGW(TAG, "No tap on serial proxy [%" PRIu32 "]; PROTOCOL mode unavailable", this->instance_index_);
-    return SerialProxyResult::SERIAL_PROXY_RESULT_NOT_SUPPORTED;
-  }
-  ESP_LOGD(TAG, "Serial proxy [%" PRIu32 "] mode set to %s", this->instance_index_,
-           mode == api::enums::SERIAL_PROXY_MODE_PROTOCOL ? LOG_STR_LITERAL("PROTOCOL") : LOG_STR_LITERAL("RAW"));
-#ifdef USE_SERIAL_PROXY_TAP
-  const bool leaving_protocol_mode =
-      this->mode_ != api::enums::SERIAL_PROXY_MODE_RAW && mode == api::enums::SERIAL_PROXY_MODE_RAW;
-  this->mode_ = mode;
-
-  // Only for an explicit client request, not for reset_mode_() at the end of a session:
-  // an ordinary disconnect says nothing about the device, whereas a client deliberately
-  // asking for raw bytes usually precedes changing what the device is.
-  if (leaving_protocol_mode && this->tap_ != nullptr) {
-    this->tap_->on_protocol_disabled();
-  }
-#endif
-  return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
-}
-
 void SerialProxy::write_from_client(api::APIConnection *api_connection, const uint8_t *data, size_t len) {
 #ifdef USE_API
-  // Bytes from anyone but the live subscriber would interleave with the subscriber's
-  // traffic -- or with an active tap's -- on the wire
-  if (!this->is_subscriber_(api_connection)) {
-    if (this->api_connection_ != nullptr) {
-      ESP_LOGW(TAG, "Ignoring write from client that does not hold serial proxy [%" PRIu32 "]", this->instance_index_);
-    } else {
-      // A legacy client streaming writes without subscribing would flood WARN, one per
-      // request; writes are the only high-rate, unacknowledged operation, so keep this
-      // visible without drowning the log
-      ESP_LOGV(TAG, "Ignoring write from client without port subscription [%" PRIu32 "]", this->instance_index_);
-    }
+  // Bytes from a client other than the live subscriber would interleave with the
+  // subscriber's traffic on the wire
+  if (this->port_claimed_by_other_(api_connection)) {
+    ESP_LOGW(TAG, "Ignoring write from client without port access [%" PRIu32 "]", this->instance_index_);
     return;
   }
 #endif
   if (data == nullptr || len == 0)
     return;
   this->write_array(data, len);
-
-#ifdef USE_SERIAL_PROXY_TAP
-  // After the write, so the tap observes the same ordering the device does
-  if (this->tap_observing_()) {
-    this->tap_->on_client_tx(data, len);
-  }
-#endif
 }
 
 SerialProxyResult SerialProxy::set_modem_pins(api::APIConnection *api_connection, uint32_t line_states) {
 #ifdef USE_API
-  if (!this->is_subscriber_(api_connection)) {
-    ESP_LOGW(TAG, "Ignoring modem pin request from client without port subscription [%" PRIu32 "]",
-             this->instance_index_);
+  if (this->port_claimed_by_other_(api_connection)) {
+    ESP_LOGW(TAG, "Ignoring modem pin request from client without port access [%" PRIu32 "]", this->instance_index_);
     return SerialProxyResult::SERIAL_PROXY_RESULT_PORT_IN_USE;
   }
 #endif
@@ -341,8 +210,8 @@ uint32_t SerialProxy::get_modem_pins() const {
 SerialProxyResult SerialProxy::flush_port(api::APIConnection *api_connection) {
 #ifdef USE_API
   // Flushing stalls the port, so it gets the same ownership check as writes
-  if (!this->is_subscriber_(api_connection)) {
-    ESP_LOGW(TAG, "Ignoring flush from client without port subscription [%" PRIu32 "]", this->instance_index_);
+  if (this->port_claimed_by_other_(api_connection)) {
+    ESP_LOGW(TAG, "Ignoring flush from client without port access [%" PRIu32 "]", this->instance_index_);
     return SerialProxyResult::SERIAL_PROXY_RESULT_PORT_IN_USE;
   }
 #endif
@@ -361,6 +230,11 @@ SerialProxyResult SerialProxy::flush_port(api::APIConnection *api_connection) {
 }
 
 #ifdef USE_API
+bool SerialProxy::port_claimed_by_other_(api::APIConnection *api_connection) const {
+  return this->api_connection_ != nullptr && this->api_connection_ != api_connection &&
+         this->api_connection_->is_connection_setup();
+}
+
 SerialProxyResult SerialProxy::serial_proxy_request(api::APIConnection *api_connection,
                                                     api::enums::SerialProxyRequestType type) {
   switch (type) {
@@ -378,10 +252,6 @@ SerialProxyResult SerialProxy::serial_proxy_request(api::APIConnection *api_conn
           return SerialProxyResult::SERIAL_PROXY_RESULT_PORT_IN_USE;
         }
         ESP_LOGW(TAG, "Previous subscriber disconnected; taking over subscription");
-        // End the dead client's session before starting the new one, so its mode
-        // cannot leak into a session that never asked for it
-        this->api_connection_ = nullptr;
-        this->reset_mode_();
       }
       this->api_connection_ = api_connection;
       this->enable_loop();
@@ -394,15 +264,7 @@ SerialProxyResult SerialProxy::serial_proxy_request(api::APIConnection *api_conn
         return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
       }
       this->api_connection_ = nullptr;
-      this->reset_mode_();
-#ifdef USE_SERIAL_PROXY_TAP
-      // Keep the loop alive for a tap that still needs the port (mirrors loop())
-      if (this->tap_ == nullptr || !this->tap_->tap_needs_port()) {
-        this->disable_loop();
-      }
-#else
       this->disable_loop();
-#endif
       ESP_LOGV(TAG, "API connection unsubscribed from serial proxy [%" PRIu32 "]", this->instance_index_);
       return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
     default:

esphome/components/serial_proxy/serial_proxy.h

@@ -26,7 +26,6 @@ class APIConnection;
 namespace enums {
 enum SerialProxyPortType : uint32_t;
 enum SerialProxyRequestType : uint32_t;
-enum SerialProxyMode : uint32_t;
 }  // namespace enums
 }  // namespace esphome::api
 
@@ -53,36 +52,6 @@ enum class SerialProxyResult : uint8_t {
 /// Maximum bytes to read from UART in a single loop iteration
 inline constexpr size_t SERIAL_PROXY_MAX_READ_SIZE = 256;
 
-#ifdef USE_SERIAL_PROXY_TAP
-/// Observes a port's traffic without owning it, and may inject bytes of its own.
-///
-/// This exists so protocol-aware behaviour can be layered onto a plain byte pipe without
-/// the pipe knowing anything about the protocol: the tap is compiled in only when some
-/// component asks for one, so a proxy carrying an RS485 meter pays nothing for it.
-///
-/// A tap is an observer, never a gatekeeper -- it cannot suppress or alter the bytes
-/// flowing in either direction, so a misbehaving tap cannot corrupt the stream.
-class SerialProxyTap {
- public:
-  /// Bytes read from the device, before they are forwarded to any subscriber.
-  virtual void on_device_rx(const uint8_t *data, size_t len) = 0;
-
-  /// Bytes a subscriber sent towards the device, after they have been written.
-  virtual void on_client_tx(const uint8_t *data, size_t len) = 0;
-
-  /// True when the port must keep reading even with no subscriber attached, so a tap can
-  /// do its own protocol work while nobody is listening. Honoured only while no
-  /// subscriber holds the port; with one attached, the port mode alone decides.
-  virtual bool tap_needs_port() const = 0;
-
-  /// A client explicitly turned protocol handling off for this port. Distinct from the
-  /// automatic reset when a session ends: this one means a client intends to do something
-  /// else with the device -- reflash it, most likely -- so anything the tap believes about
-  /// it should be treated as suspect.
-  virtual void on_protocol_disabled() = 0;
-};
-#endif
-
 class SerialProxy final : public uart::UARTDevice, public Component {
  public:
   void setup() override;
@@ -108,9 +77,6 @@ class SerialProxy final : public uart::UARTDevice, public Component {
   /// Get the port type
   api::enums::SerialProxyPortType get_port_type() const { return this->port_type_; }
 
-  /// Handle a mode change requested by an API client
-  SerialProxyResult set_mode_from_client(api::APIConnection *api_connection, api::enums::SerialProxyMode mode);
-
   /// Configure UART parameters and apply them
   /// @param api_connection The API connection requesting the change
   /// @param baudrate Baud rate in bits per second
@@ -155,67 +121,13 @@ class SerialProxy final : public uart::UARTDevice, public Component {
   /// Set the DTR GPIO pin (from YAML configuration)
   void set_dtr_pin(GPIOPin *pin) { this->dtr_pin_ = pin; }
 
-#ifdef USE_SERIAL_PROXY_TAP
-  /// Attach a traffic observer. At most one, set once at setup time.
-  void set_tap(SerialProxyTap *tap) { this->tap_ = tap; }
-
-  /// Write bytes originating from the tap rather than from a client. Bypasses the
-  /// subscriber ownership check, but only while the tap is being served bytes -- so a
-  /// port in RAW mode with a subscriber attached stays inert. Returns false when the
-  /// bytes were dropped for that reason.
-  bool write_from_tap(const uint8_t *data, size_t len) {
-    if (!this->tap_observing_()) {
-      return false;
-    }
-    this->write_array(data, len);
-    return true;
-  }
-
-  /// Whether the tap is currently being served bytes. Can flip false with no callback
-  /// (a subscriber attaching in RAW mode, say), so a tap should check before starting
-  /// protocol work and when a reply seems overdue.
-  bool tap_is_observed() const { return this->tap_observing_(); }
-
-  /// Resume reading after a tap's needs change. loop() disables itself when there is
-  /// neither a subscriber nor a tap that wants the port, so a tap starting fresh work
-  /// must ask for it back. Must be called from the main loop.
-  void tap_request_port() { this->enable_loop(); }
-
-  /// Whether the underlying device is present. On a USB UART this tracks enumeration, so
-  /// a tap can notice the device being unplugged and plugged back in.
-  bool is_device_connected() const { return this->parent_->is_connected(); }
-
-  /// Run one read-and-dispatch cycle immediately. Lets a tap make progress before the
-  /// main loop is running -- during setup, for instance, while a component is still
-  /// blocking on can_proceed(). Must not be called from on_device_rx() or
-  /// on_client_tx(): each nested cycle costs a 256-byte stack frame.
-  void tap_pump();
-#endif
-
  protected:
 #ifdef USE_API
-  /// Read from UART, hand the bytes to any tap, and forward them to a subscriber
-  /// (slow path with a 256-byte stack buffer)
+  /// Read from UART and send to API client (slow path with 256-byte stack buffer)
   void read_and_send_(size_t available);
 
-  /// True when the given connection is the live subscriber. Every port operation
-  /// (write, configure, modem pins, flush, mode) requires this, so an unsubscribed
-  /// client can never share the wire with the subscriber or an active tap.
-  bool is_subscriber_(api::APIConnection *api_connection) const { return this->api_connection_ == api_connection; }
-#endif
-
-#ifdef USE_SERIAL_PROXY_TAP
-  /// Return the port to RAW when a subscriber goes away, so the mode never outlives it
-  void reset_mode_();
-#else
-  /// Without a tap, PROTOCOL is refused, so the mode is fixed at RAW and there is
-  /// nothing to reset
-  void reset_mode_() {}
-#endif
-
-#ifdef USE_SERIAL_PROXY_TAP
-  /// True when the tap should be shown the traffic passing through this port
-  bool tap_observing_() const;
+  /// True when a live subscriber other than the given connection holds the port
+  bool port_claimed_by_other_(api::APIConnection *api_connection) const;
 #endif
 
   /// Instance index for identifying this proxy in API messages
@@ -235,11 +147,6 @@ class SerialProxy final : public uart::UARTDevice, public Component {
   /// Port type
   api::enums::SerialProxyPortType port_type_{};
 
-#ifdef USE_SERIAL_PROXY_TAP
-  /// How the bytes passing through are treated; zero is SERIAL_PROXY_MODE_RAW
-  api::enums::SerialProxyMode mode_{};
-#endif
-
   /// Optional GPIO pins for modem control
   GPIOPin *rts_pin_{nullptr};
   GPIOPin *dtr_pin_{nullptr};
@@ -247,10 +154,6 @@ class SerialProxy final : public uart::UARTDevice, public Component {
   /// Current modem pin states
   bool rts_state_{false};
   bool dtr_state_{false};
-
-#ifdef USE_SERIAL_PROXY_TAP
-  SerialProxyTap *tap_{nullptr};
-#endif
 };
 
 }  // namespace esphome::serial_proxy

esphome/components/template/binary_sensor/__init__.py

@@ -2,13 +2,7 @@ from esphome import automation
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
-from esphome.const import (
-    CONF_CONDITION,
-    CONF_DEVICE_CLASS,
-    CONF_ID,
-    CONF_LAMBDA,
-    CONF_STATE,
-)
+from esphome.const import CONF_CONDITION, CONF_ID, CONF_LAMBDA, CONF_STATE
 from esphome.cpp_generator import LambdaExpression
 
 from .. import template_ns
@@ -18,11 +12,7 @@ TemplateBinarySensor = template_ns.class_(
 )
 
 CONFIG_SCHEMA = (
-    cv.with_visibility(
-        binary_sensor.binary_sensor_schema(TemplateBinarySensor),
-        cv.Visibility.UI,
-        CONF_DEVICE_CLASS,
-    )
+    binary_sensor.binary_sensor_schema(TemplateBinarySensor)
     .extend(
         {
             cv.Exclusive(CONF_LAMBDA, CONF_CONDITION): cv.returning_lambda,

esphome/components/template/button/__init__.py

@@ -1,14 +1,10 @@
 from esphome.components import button
-import esphome.config_validation as cv
-from esphome.const import CONF_DEVICE_CLASS
 
 from .. import template_ns
 
 TemplateButton = template_ns.class_("TemplateButton", button.Button)
 
-CONFIG_SCHEMA = cv.with_visibility(
-    button.button_schema(TemplateButton), cv.Visibility.UI, CONF_DEVICE_CLASS
-)
+CONFIG_SCHEMA = button.button_schema(TemplateButton)
 
 
 async def to_code(config):

esphome/components/template/cover/__init__.py

@@ -6,7 +6,6 @@ from esphome.const import (
     CONF_ASSUMED_STATE,
     CONF_CLOSE_ACTION,
     CONF_CURRENT_OPERATION,
-    CONF_DEVICE_CLASS,
     CONF_ID,
     CONF_LAMBDA,
     CONF_OPEN_ACTION,
@@ -39,11 +38,7 @@ CONF_HAS_POSITION = "has_position"
 CONF_TOGGLE_ACTION = "toggle_action"
 
 CONFIG_SCHEMA = (
-    cv.with_visibility(
-        cover.cover_schema(TemplateCover),
-        cv.Visibility.UI,
-        CONF_DEVICE_CLASS,
-    )
+    cover.cover_schema(TemplateCover)
     .extend(
         {
             cv.Optional(CONF_LAMBDA): cv.returning_lambda,

esphome/components/template/event/__init__.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import event
 import esphome.config_validation as cv
-from esphome.const import CONF_DEVICE_CLASS, CONF_EVENT_TYPES
+from esphome.const import CONF_EVENT_TYPES
 
 from .. import template_ns
 
@@ -9,9 +9,7 @@ CODEOWNERS = ["@nohat"]
 
 TemplateEvent = template_ns.class_("TemplateEvent", event.Event, cg.Component)
 
-CONFIG_SCHEMA = cv.with_visibility(
-    event.event_schema(TemplateEvent), cv.Visibility.UI, CONF_DEVICE_CLASS
-).extend(
+CONFIG_SCHEMA = event.event_schema(TemplateEvent).extend(
     {
         cv.Required(CONF_EVENT_TYPES): cv.ensure_list(cv.string_strict),
     }

esphome/components/template/number/__init__.py

@@ -3,7 +3,6 @@ import esphome.codegen as cg
 from esphome.components import number
 import esphome.config_validation as cv
 from esphome.const import (
-    CONF_DEVICE_CLASS,
     CONF_ID,
     CONF_INITIAL_VALUE,
     CONF_LAMBDA,
@@ -13,7 +12,6 @@ from esphome.const import (
     CONF_RESTORE_VALUE,
     CONF_SET_ACTION,
     CONF_STEP,
-    CONF_UNIT_OF_MEASUREMENT,
 )
 
 from .. import template_ns
@@ -48,12 +46,7 @@ def validate(config):
 
 
 CONFIG_SCHEMA = cv.All(
-    cv.with_visibility(
-        number.number_schema(TemplateNumber),
-        cv.Visibility.UI,
-        CONF_DEVICE_CLASS,
-        CONF_UNIT_OF_MEASUREMENT,
-    )
+    number.number_schema(TemplateNumber)
     .extend(
         {
             cv.Required(CONF_MAX_VALUE): cv.float_,

esphome/components/template/sensor/__init__.py

@@ -2,16 +2,7 @@ from esphome import automation
 import esphome.codegen as cg
 from esphome.components import sensor
 import esphome.config_validation as cv
-from esphome.const import (
-    CONF_ACCURACY_DECIMALS,
-    CONF_DEVICE_CLASS,
-    CONF_FORCE_UPDATE,
-    CONF_ID,
-    CONF_LAMBDA,
-    CONF_STATE,
-    CONF_STATE_CLASS,
-    CONF_UNIT_OF_MEASUREMENT,
-)
+from esphome.const import CONF_ID, CONF_LAMBDA, CONF_STATE
 
 from .. import template_ns
 
@@ -20,14 +11,9 @@ TemplateSensor = template_ns.class_(
 )
 
 CONFIG_SCHEMA = (
-    cv.with_visibility(
-        sensor.sensor_schema(TemplateSensor, accuracy_decimals=1),
-        cv.Visibility.UI,
-        CONF_UNIT_OF_MEASUREMENT,
-        CONF_ACCURACY_DECIMALS,
-        CONF_DEVICE_CLASS,
-        CONF_STATE_CLASS,
-        CONF_FORCE_UPDATE,
+    sensor.sensor_schema(
+        TemplateSensor,
+        accuracy_decimals=1,
     )
     .extend(
         {

esphome/components/template/switch/__init__.py

@@ -4,7 +4,6 @@ from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ASSUMED_STATE,
-    CONF_DEVICE_CLASS,
     CONF_ID,
     CONF_LAMBDA,
     CONF_OPTIMISTIC,
@@ -32,11 +31,7 @@ def validate(config):
 
 
 CONFIG_SCHEMA = cv.All(
-    cv.with_visibility(
-        switch.switch_schema(TemplateSwitch),
-        cv.Visibility.UI,
-        CONF_DEVICE_CLASS,
-    )
+    switch.switch_schema(TemplateSwitch)
     .extend(
         {
             cv.Optional(CONF_LAMBDA): cv.returning_lambda,

esphome/components/template/text_sensor/__init__.py

@@ -3,7 +3,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 from esphome.components.text_sensor import TextSensorPublishAction
 import esphome.config_validation as cv
-from esphome.const import CONF_DEVICE_CLASS, CONF_ID, CONF_LAMBDA, CONF_STATE
+from esphome.const import CONF_ID, CONF_LAMBDA, CONF_STATE
 
 from .. import template_ns
 
@@ -12,11 +12,7 @@ TemplateTextSensor = template_ns.class_(
 )
 
 CONFIG_SCHEMA = (
-    cv.with_visibility(
-        text_sensor.text_sensor_schema(),
-        cv.Visibility.UI,
-        CONF_DEVICE_CLASS,
-    )
+    text_sensor.text_sensor_schema()
     .extend(
         {
             cv.GenerateID(): cv.declare_id(TemplateTextSensor),

esphome/components/template/valve/__init__.py

@@ -6,7 +6,6 @@ from esphome.const import (
     CONF_ASSUMED_STATE,
     CONF_CLOSE_ACTION,
     CONF_CURRENT_OPERATION,
-    CONF_DEVICE_CLASS,
     CONF_ID,
     CONF_LAMBDA,
     CONF_OPEN_ACTION,
@@ -37,11 +36,7 @@ CONF_HAS_POSITION = "has_position"
 CONF_TOGGLE_ACTION = "toggle_action"
 
 CONFIG_SCHEMA = (
-    cv.with_visibility(
-        valve.valve_schema(TemplateValve),
-        cv.Visibility.UI,
-        CONF_DEVICE_CLASS,
-    )
+    valve.valve_schema(TemplateValve)
     .extend(
         {
             cv.Optional(CONF_LAMBDA): cv.returning_lambda,

esphome/components/zigbee/time/zigbee_time_zephyr.cpp

@@ -1,7 +1,6 @@
 #include "zigbee_time_zephyr.h"
 #if defined(USE_ZIGBEE) && defined(USE_NRF52) && defined(USE_TIME)
 #include "esphome/core/log.h"
-#include "esphome/core/application.h"
 
 namespace esphome::zigbee {
 
@@ -48,7 +47,6 @@ void ZigbeeTime::set_epoch_time(uint32_t epoch) {
     this->synchronize_epoch_(epoch);
     this->has_time_ = true;
   });
-  App.wake_loop_threadsafe();
 }
 
 void ZigbeeTime::zcl_device_cb_(zb_bufid_t bufid) {

esphome/components/zigbee/zigbee_esp32.cpp

@@ -49,8 +49,7 @@ void ZigbeeComponent::factory_reset() {
 
 void ZigbeeComponent::esp_zigbee_alarm_bdb_commissioning(ezb_bdb_comm_mode_mask_t mode) {
   if (!esp_zigbee_lock_acquire(10 / portTICK_PERIOD_MS)) {
-    global_zigbee->set_timeout("zb_init", 100, [mode]() { ZigbeeComponent::esp_zigbee_alarm_bdb_commissioning(mode); });
-    App.wake_loop_threadsafe();
+    global_zigbee->set_timeout("zb_init", 10, [mode]() { ZigbeeComponent::esp_zigbee_alarm_bdb_commissioning(mode); });
     return;
   }
   if (ezb_bdb_start_top_level_commissioning(mode) != EZB_ERR_NONE) {
@@ -89,7 +88,6 @@ bool ZigbeeComponent::app_signal_handler(const ezb_app_signal_t *app_signal) {
         global_zigbee->set_timeout("zb_init", 1000, []() {
           ZigbeeComponent::esp_zigbee_alarm_bdb_commissioning(EZB_BDB_MODE_INITIALIZATION);
         });
-        App.wake_loop_threadsafe();
       }
     } break;
     case EZB_BDB_SIGNAL_STEERING: {
@@ -115,7 +113,6 @@ bool ZigbeeComponent::app_signal_handler(const ezb_app_signal_t *app_signal) {
             ZigbeeComponent::esp_zigbee_alarm_bdb_commissioning(EZB_BDB_MODE_NETWORK_STEERING);
           });
         }
-        App.wake_loop_threadsafe();
       }
     } break;
     case EZB_ZDO_SIGNAL_LEAVE: {

esphome/components/zigbee/zigbee_zephyr.cpp

@@ -1,10 +1,10 @@
 #include "zigbee_zephyr.h"
 #if defined(USE_ZIGBEE) && defined(USE_NRF52)
 #include "esphome/core/log.h"
-#include "esphome/core/application.h"
 #include <zephyr/settings/settings.h>
 #include <zephyr/storage/flash_map.h>
 #include "esphome/core/hal.h"
+#include "esphome/core/wake.h"
 
 extern "C" {
 #include <zboss_api.h>
@@ -120,7 +120,7 @@ void ZigbeeComponent::zcl_device_cb(zb_bufid_t bufid) {
   /* Set default response value. */
   p_device_cb_param->status = RET_OK;
 
-  App.wake_loop_threadsafe();
+  esphome::wake_loop_threadsafe();
 
   // endpoints are enumerated from 1
   if (global_zigbee->callbacks_.size() >= endpoint) {
@@ -138,7 +138,6 @@ void ZigbeeComponent::on_join_(bool factory_new) {
     ESP_LOGD(TAG, "Joined the network");
     this->join_cb_.call(factory_new);
   });
-  App.wake_loop_threadsafe();
 }
 
 void ZigbeeComponent::on_start_() {
@@ -146,7 +145,6 @@ void ZigbeeComponent::on_start_() {
     ESP_LOGD(TAG, "Started zigbee stack");
     this->start_cb_.call();
   });
-  App.wake_loop_threadsafe();
 }
 
 #ifdef USE_ZIGBEE_WIPE_ON_BOOT

esphome/config_validation.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from contextlib import contextmanager, suppress
-import copy
 from datetime import datetime
 from ipaddress import (
     AddressValueError,
@@ -420,37 +419,6 @@ class Required(vol.Required):
         self.visibility: Visibility | None = visibility
 
 
-def with_visibility(schema: Schema, visibility: Visibility, *keys: str) -> Schema:
-    """Return a copy of ``schema`` with the given ``keys`` re-marked at ``visibility``.
-
-    Lets a platform override the editor :class:`Visibility` of fields it
-    inherits from a shared schema builder — without that builder needing a
-    visibility parameter of its own. The canonical use is a ``template``
-    platform promoting the value metadata its user is expected to define
-    (``device_class``, ``unit_of_measurement``, …) onto the main form:
-
-        CONFIG_SCHEMA = cv.with_visibility(
-            sensor.sensor_schema(TemplateSensor),
-            cv.Visibility.UI,
-            CONF_DEVICE_CLASS, CONF_UNIT_OF_MEASUREMENT,
-        )
-
-    The original marker's key, default and validator are preserved; only the
-    visibility changes, and the input ``schema`` is left untouched. Raises if
-    a requested key is not present so typos fail at schema-build time.
-    """
-    wanted = {str(k) for k in keys}
-    overrides = {}
-    for marker, validator in schema.schema.items():
-        if str(marker) in wanted:
-            marker = copy.copy(marker)
-            marker.visibility = visibility
-            overrides[marker] = validator
-    if missing := wanted - {str(m) for m in overrides}:
-        raise ValueError(f"with_visibility: keys not in schema: {sorted(missing)}")
-    return schema.extend(overrides)
-
-
 class FinalExternalInvalid(Invalid):
     """Represents an invalid value in the final validation phase where the path should not be prepended."""
 

esphome/core/defines.h

@@ -181,7 +181,6 @@
 #define USE_SENSOR
 #define USE_SENSOR_FILTER
 #define USE_SERIAL_PROXY
-#define USE_SERIAL_PROXY_TAP
 #define USE_SETUP_PRIORITY_OVERRIDE
 #define USE_STATUS_LED
 #define USE_STATUS_SENSOR

platformio.ini

@@ -45,7 +45,7 @@ lib_deps_base =
 lib_deps =
     ${common.lib_deps_base}
     https://github.com/dudanov/MideaUART.git#eeea6c3e9b4474f067054592b435be1c4e466815 ; midea
-    esphome/noise-c@0.1.26                 ; noise (api, ota)
+    esphome/noise-c@0.1.30                 ; noise (api, ota)
     improv/Improv@1.2.7                    ; improv_serial / esp32_improv
     kikuchan98/pngle@1.1.0                 ; online_image
     ; Using the repository directly, otherwise ESP-IDF can't use the library
@@ -244,7 +244,7 @@ lib_deps =
     ${common:idf-component-libs.lib_deps}
     ESP32Async/ESPAsyncWebServer@3.9.6    ; web_server_base
     droscy/esp_wireguard@0.4.5            ; wireguard
-    esphome/noise-c@0.1.26                ; noise (api, ota)
+    esphome/noise-c@0.1.30                ; noise (api, ota)
     ESP32Async/AsyncTCP@3.4.5             ; async_tcp
     DNSServer                             ; captive_portal
     heman/AsyncMqttClient-esphome@2.0.0   ; mqtt
@@ -641,7 +641,7 @@ build_unflags =
 extends = common
 platform = platformio/native
 lib_deps =
-    esphome/noise-c@0.1.26  ; used by noise (api, ota)
+    esphome/noise-c@0.1.30  ; used by noise (api, ota)
     lvgl/lvgl@9.5.0         ; lvgl
 build_flags =
     ${common.build_flags}

requirements.txt

@@ -12,7 +12,7 @@ pyserial==3.5
 platformio==6.1.19
 esptool==5.4.0
 click==8.3.3
-aioesphomeapi==46.4.0
+aioesphomeapi==46.3.0
 aiohappyeyeballs==2.7.1  # Happy Eyeballs for requests downloads; already pulled in by aioesphomeapi
 zeroconf==0.151.3
 puremagic==2.2.0

script/git-hooks/post-checkout

@@ -1,49 +1,27 @@
 #!/bin/sh
 # Prepare the dev environment for a new checkout or worktree.
 #
-# Installed into the git hooks directory by script/setup.py. Deliberately tiny
-# and self-contained: it stays valid on branches where the setup script does not
-# exist, and simply does nothing there.
+# Installed into the git hooks directory by script/setup. Deliberately tiny and
+# self-contained: it stays valid on branches where script/setup does not exist,
+# and simply does nothing there.
 
 # $3 is 1 for a branch checkout, 0 for a file checkout.
 [ "$3" = "1" ] || exit 0
 
 top=$(git rev-parse --show-toplevel 2>/dev/null) || exit 0
 
-# This also runs on ordinary branch switches, where there is nothing to do. Both
-# layouts are checked because git for Windows runs hooks under its own bundled
-# shell, where the environment lives in venv/Scripts rather than venv/bin.
+# This also runs on ordinary branch switches, where there is nothing to do.
 [ -x "$top/venv/bin/python" ] && exit 0
-[ -f "$top/venv/Scripts/python.exe" ] && exit 0
-
-# Branches from before the setup script moved to Python carry only the shell
-# entry point, so whichever one the checked out branch has is used.
-py=
-if [ -f "$top/script/setup.py" ]; then
-  # The interpreter goes by different names across platforms, and on Windows
-  # "python3" is often a stub that opens the app store instead of running
-  # anything, so each candidate is tried before it is used. Doing nothing is the
-  # right outcome when none of them work.
-  for candidate in "python3" "python" "py -3"; do
-    # Unquoted on purpose: the launcher candidate is a command plus a flag.
-    if $candidate -c "" >/dev/null 2>&1; then
-      py=$candidate
-      break
-    fi
-  done
-  [ -n "$py" ] || exit 0
-elif ! [ -x "$top/script/setup" ]; then
-  exit 0
-fi
+[ -x "$top/script/setup" ] || exit 0
 
 # Every worktree shares the hooks directory of the checkout it was created
-# from, and the setup script run below is the one from whichever branch was just
+# from, and the script/setup run below is the one from whichever branch was just
 # checked out. Older branches install their own pre-commit hook without checking
 # for a worktree: that moves the shared hook aside as pre-commit.legacy and
 # replaces it with one tied to this worktree's virtual environment, so commits
 # break in every checkout. To rule that out, the hooks directory is copied
-# before the setup script runs and put back exactly as it was afterwards,
-# including removing any file the setup script added.
+# before script/setup runs and put back exactly as it was afterwards, including
+# removing any file script/setup added.
 hooks=$(git rev-parse --path-format=absolute --git-path hooks 2>/dev/null) || exit 0
 snap=$(mktemp -d "$hooks/.post-checkout.XXXXXX") || exit 0
 cp -p "$hooks"/* "$snap"/ 2>/dev/null
@@ -51,13 +29,7 @@ cp -p "$hooks"/* "$snap"/ 2>/dev/null
 # Clear VIRTUAL_ENV so a checkout made from a shell with an environment already
 # activated still gets its own, rather than having the active one repointed at
 # this working tree.
-unset VIRTUAL_ENV
-if [ -n "$py" ]; then
-  # Unquoted on purpose, as above.
-  $py "$top/script/setup.py"
-else
-  "$top/script/setup"
-fi
+env -u VIRTUAL_ENV "$top/script/setup"
 status=$?
 
 for f in "$hooks"/*; do

script/setup

@@ -1,7 +1,71 @@
 #!/usr/bin/env bash
-# Set up ESPHome dev environment.
-#
-# The work is done by setup.py, which script/setup.bat also runs, so the Unix
-# and Windows entry points share one implementation.
+# Set up ESPHome dev environment
 
-exec python3 "$(dirname "$0")/setup.py" "$@"
+set -e
+
+cd "$(dirname "$0")/.."
+if [ -n "$VIRTUAL_ENV" ]; then
+  # A virtual environment is already active (e.g. the devcontainer's pre-provisioned
+  # esphome-venv). Install into it rather than creating a ./venv in the workspace.
+  venv_state=active
+elif [ -x venv/bin/python ]; then
+  # Reuse the environment from an earlier run, so this script can be run again
+  # at any time to pick up dependency changes.
+  venv_state=reused
+  source venv/bin/activate
+else
+  venv_state=created
+  # --clear replaces a partial environment left behind by an interrupted run.
+  if [ -x "$(command -v uv)" ]; then
+    uv venv --clear --seed venv
+  else
+    python3 -m venv --clear venv
+  fi
+  source venv/bin/activate
+fi
+
+if ! [ -x "$(command -v uv)" ]; then
+  python3 -m pip install uv
+fi
+
+uv pip install setuptools wheel
+uv pip install -e ".[dev,test]" --config-settings editable_mode=compat
+
+# A worktree shares one git hooks directory with the main checkout it was
+# created from, so hooks are installed from the main checkout only. Installing
+# from a worktree would point the shared hook at that worktree's virtual
+# environment, breaking it for everyone once the worktree is removed.
+git_dir="$(git rev-parse --absolute-git-dir 2>/dev/null || true)"
+common_dir="$(git rev-parse --path-format=absolute --git-common-dir 2>/dev/null || true)"
+if [ -n "$common_dir" ] && [ "$git_dir" = "$common_dir" ]; then
+  # --overwrite replaces any hook already in place. Without it, prek finds a
+  # previously installed pre-commit hook, moves it aside to
+  # .git/hooks/pre-commit.legacy and keeps calling it, so every commit would
+  # run both tools.
+  prek install --overwrite
+
+  # Prepares the virtual environment for new checkouts and worktrees. Installed
+  # once here, it covers every worktree created from this checkout.
+  if [ -d "$common_dir/hooks" ]; then
+    cp script/git-hooks/post-checkout "$common_dir/hooks/post-checkout"
+    chmod +x "$common_dir/hooks/post-checkout"
+  fi
+fi
+
+mkdir -p .temp
+
+echo
+echo
+case "$venv_state" in
+  created)
+    echo "Virtual environment created at ./venv. Run 'source venv/bin/activate' to use it."
+    ;;
+  reused)
+    echo "Dependencies updated in the existing ./venv. Run 'source venv/bin/activate' to use it."
+    ;;
+  active)
+    echo "Dependencies installed into the active virtual environment:"
+    echo "  $VIRTUAL_ENV"
+    echo "It is already active in this shell, so no 'source venv/bin/activate' is needed."
+    ;;
+esac

script/setup.bat

@@ -1 +1,28 @@
-@python "%~dp0setup.py" %*
+@echo off
+
+if defined VIRTUAL_ENV goto :install
+
+echo Starting the Virtual Environment
+python -m venv venv
+call venv/Scripts/activate
+echo Running the Virtual Environment
+
+:install
+
+echo Installing required packages...
+
+python.exe -m pip install --upgrade pip
+
+pip3 install -r requirements.txt -r requirements_test.txt -r requirements_dev.txt
+pip3 install setuptools wheel
+pip3 install -e ".[dev,test]" --config-settings editable_mode=compat
+
+rem --overwrite replaces any hook already in place. Without it, prek finds a
+rem previously installed pre-commit hook, moves it aside to
+rem .git/hooks/pre-commit.legacy and keeps calling it, so every commit would
+rem run both tools.
+prek install --overwrite
+
+echo .
+echo .
+echo Virtual environment created. Run 'venv/Scripts/activate' to use it.

script/setup.py

@@ -1,222 +0,0 @@
-#!/usr/bin/env python3
-"""Set up the ESPHome development environment.
-
-Shared implementation behind script/setup and script/setup.bat, so the Unix and
-Windows entry points cannot drift apart. Uses only the standard library: it runs
-before any dependency has been installed.
-"""
-
-import os
-from pathlib import Path
-import shutil
-import subprocess
-import sys
-import sysconfig
-
-MIN_PYTHON = (3, 12)
-
-ROOT = Path(__file__).resolve().parent.parent
-DEFAULT_VENV = ROOT / "venv"
-POST_CHECKOUT_HOOK = ROOT / "script" / "git-hooks" / "post-checkout"
-
-# State of the environment the dependencies end up in, used for the closing
-# message.
-VENV_ACTIVE = "active"
-VENV_REUSED = "reused"
-VENV_CREATED = "created"
-
-
-def bin_dir(venv: Path) -> Path:
-    """Return the directory holding a virtual environment's executables.
-
-    The "venv" scheme resolves to bin on Unix and Scripts on Windows, so the
-    layout does not have to be hardcoded here.
-    """
-    base = str(venv)
-    return Path(
-        sysconfig.get_path("scripts", "venv", vars={"base": base, "platbase": base})
-    )
-
-
-def venv_python(venv: Path) -> Path:
-    """Return the path to a virtual environment's interpreter."""
-    name = "python.exe" if os.name == "nt" else "python"
-    return bin_dir(venv) / name
-
-
-def run(command: list[str], env: dict[str, str] | None = None) -> None:
-    """Run a command, aborting the whole script if it fails."""
-    print(f"+ {' '.join(command)}", flush=True)
-    result = subprocess.run(command, cwd=ROOT, env=env, check=False)
-    if result.returncode != 0:
-        # Some tools fail without printing anything, so name the step that broke.
-        print(
-            f"Failed with exit code {result.returncode}: {command[0]}", file=sys.stderr
-        )
-        raise SystemExit(result.returncode)
-
-
-def git_output(*args: str) -> str:
-    """Return the trimmed output of a git command, or "" if it cannot be run."""
-    try:
-        result = subprocess.run(
-            ["git", *args], cwd=ROOT, capture_output=True, text=True, check=False
-        )
-    except OSError:
-        # Git is not required to install the dependencies, only to install hooks.
-        return ""
-    if result.returncode != 0:
-        return ""
-    return result.stdout.strip()
-
-
-def create_venv(venv: Path) -> None:
-    """Create a virtual environment, replacing anything already at the path."""
-    # --clear replaces a partial environment left behind by an interrupted run.
-    if (uv := shutil.which("uv")) is not None:
-        run([uv, "venv", "--clear", "--seed", str(venv)])
-    else:
-        run([sys.executable, "-m", "venv", "--clear", str(venv)])
-
-
-def venv_environment(venv: Path) -> dict[str, str]:
-    """Return the environment child processes need to target a virtual env.
-
-    Equivalent to sourcing the environment's activate script: tools such as uv
-    and prek pick the environment up from VIRTUAL_ENV and PATH.
-    """
-    env = dict(os.environ)
-    env["VIRTUAL_ENV"] = str(venv)
-    env.pop("PYTHONHOME", None)
-    path = str(bin_dir(venv))
-    # An empty entry would be appended if PATH is unset, and on Unix that means
-    # the working directory is searched for executables.
-    if existing := env.get("PATH"):
-        path = os.pathsep.join([path, existing])
-    env["PATH"] = path
-    return env
-
-
-def find_uv(venv: Path, env: dict[str, str]) -> str:
-    """Return the path to uv, installing it into the environment if needed."""
-    if (uv := shutil.which("uv", path=env["PATH"])) is not None:
-        return uv
-    run([str(venv_python(venv)), "-m", "pip", "install", "uv"], env=env)
-    if (uv := shutil.which("uv", path=env["PATH"])) is not None:
-        return uv
-    raise SystemExit("uv could not be installed, aborting.")
-
-
-def install_dependencies(venv: Path, env: dict[str, str]) -> None:
-    """Install ESPHome and its development dependencies into the environment."""
-    uv = find_uv(venv, env)
-    run([uv, "pip", "install", "setuptools", "wheel"], env=env)
-    # The dev and test extras pull in requirements_dev.txt and
-    # requirements_test.txt, and the package itself pulls in requirements.txt,
-    # so this single install covers every requirements file.
-    run(
-        [
-            uv,
-            "pip",
-            "install",
-            "-e",
-            ".[dev,test]",
-            "--config-settings",
-            "editable_mode=compat",
-        ],
-        env=env,
-    )
-
-
-def install_git_hooks(env: dict[str, str]) -> None:
-    """Install the git hooks, but only when run from the main checkout.
-
-    A worktree shares one git hooks directory with the main checkout it was
-    created from. Installing from a worktree would point the shared hook at that
-    worktree's virtual environment, breaking it for everyone once the worktree is
-    removed.
-    """
-    git_dir = git_output("rev-parse", "--absolute-git-dir")
-    common_dir = git_output("rev-parse", "--path-format=absolute", "--git-common-dir")
-    if not git_dir or not common_dir or Path(git_dir) != Path(common_dir):
-        return
-
-    prek = shutil.which("prek", path=env["PATH"])
-    if prek is None:
-        raise SystemExit("prek was not installed, aborting.")
-    # --overwrite replaces any hook already in place. Without it, prek finds a
-    # previously installed pre-commit hook, moves it aside to
-    # .git/hooks/pre-commit.legacy and keeps calling it, so every commit would
-    # run both tools.
-    run([prek, "install", "--overwrite"], env=env)
-
-    # Prepares the virtual environment for new checkouts and worktrees. Installed
-    # once here, it covers every worktree created from this checkout.
-    hooks_dir = Path(common_dir) / "hooks"
-    if hooks_dir.is_dir():
-        installed = hooks_dir / "post-checkout"
-        shutil.copyfile(POST_CHECKOUT_HOOK, installed)
-        installed.chmod(0o755)
-
-
-def activate_hint() -> str:
-    """Return the command that activates the environment this script creates."""
-    activate = bin_dir(DEFAULT_VENV).relative_to(ROOT) / "activate"
-    if os.name == "nt":
-        return str(activate)
-    return f"source {activate.as_posix()}"
-
-
-def report(state: str, venv: Path) -> None:
-    """Print the closing message for the environment that was set up."""
-    location = f"./{DEFAULT_VENV.name}"
-    print()
-    print()
-    if state == VENV_ACTIVE:
-        print("Dependencies installed into the active virtual environment:")
-        print(f"  {venv}")
-        print(
-            f"It is already active in this shell, so no '{activate_hint()}' is needed."
-        )
-    elif state == VENV_REUSED:
-        print(
-            f"Dependencies updated in the existing {location}. "
-            f"Run '{activate_hint()}' to use it."
-        )
-    else:
-        print(
-            f"Virtual environment created at {location}. "
-            f"Run '{activate_hint()}' to use it."
-        )
-
-
-def main() -> None:
-    """Set up the development environment."""
-    if sys.version_info < MIN_PYTHON:
-        raise SystemExit(
-            f"ESPHome needs Python {MIN_PYTHON[0]}.{MIN_PYTHON[1]} or newer, "
-            f"but this is Python {sys.version.split()[0]}."
-        )
-
-    # A virtual environment that is already active (for example the
-    # devcontainer's pre-provisioned esphome-venv) is installed into rather than
-    # creating a ./venv in the workspace.
-    if active := os.environ.get("VIRTUAL_ENV"):
-        state, venv = VENV_ACTIVE, Path(active)
-    elif venv_python(DEFAULT_VENV).is_file():
-        # Reuse the environment from an earlier run, so this script can be run
-        # again at any time to pick up dependency changes.
-        state, venv = VENV_REUSED, DEFAULT_VENV
-    else:
-        state, venv = VENV_CREATED, DEFAULT_VENV
-        create_venv(venv)
-
-    env = venv_environment(venv)
-    install_dependencies(venv, env)
-    install_git_hooks(env)
-    (ROOT / ".temp").mkdir(exist_ok=True)
-    report(state, venv)
-
-
-if __name__ == "__main__":
-    main()

sdkconfig.defaults

@@ -17,8 +17,6 @@ CONFIG_ESP_TASK_WDT_INIT=y
 CONFIG_ESP_TASK_WDT_PANIC=y
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=n
-CONFIG_FREERTOS_USE_TICKLESS_IDLE=y
-CONFIG_PM_ENABLE=y
 
 # esp32_ble
 CONFIG_BT_ENABLED=y

tests/benchmarks/stubs/esphome/components/serial_proxy/serial_proxy.h

@@ -40,9 +40,6 @@ class SerialProxy {
     return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
   }
   void write_from_client(api::APIConnection *api_connection, const uint8_t *data, size_t len) {}
-  SerialProxyResult set_mode_from_client(api::APIConnection *api_connection, api::enums::SerialProxyMode mode) {
-    return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
-  }
   SerialProxyResult set_modem_pins(api::APIConnection *api_connection, uint32_t line_states) {
     return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
   }

tests/component_tests/sendspin/config/device_info_default.yaml

@@ -1,12 +0,0 @@
-esphome:
-  name: test
-
-esp32:
-  board: esp32dev
-  framework:
-    type: esp-idf
-
-wifi:
-  ap:
-
-sendspin:

tests/component_tests/sendspin/config/device_info_explicit.yaml

@@ -1,18 +0,0 @@
-esphome:
-  name: test
-  project:
-    name: project_manufacturer.project_model
-    version: 9.9.9
-
-esp32:
-  board: esp32dev
-  framework:
-    type: esp-idf
-
-wifi:
-  ap:
-
-sendspin:
-  manufacturer: Explicit Manufacturer
-  model: Explicit Model
-  firmware_version: 1.2.3

tests/component_tests/sendspin/config/device_info_project.yaml

@@ -1,15 +0,0 @@
-esphome:
-  name: test
-  project:
-    name: project_manufacturer.project_model
-    version: 9.9.9
-
-esp32:
-  board: esp32dev
-  framework:
-    type: esp-idf
-
-wifi:
-  ap:
-
-sendspin:

tests/component_tests/sendspin/test_device_info.py

@@ -1,83 +0,0 @@
-"""Tests for the device information the sendspin hub reports to the server."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from pathlib import Path
-
-import pytest
-
-from esphome import config_validation as cv
-from esphome.components.sendspin import (
-    CONF_FIRMWARE_VERSION,
-    CONF_MANUFACTURER,
-    CONFIG_SCHEMA,
-)
-from esphome.const import CONF_MODEL, PlatformFramework
-from tests.component_tests.types import SetCoreConfigCallable
-
-
-def test_explicit_device_info_wins_over_project(
-    generate_main: Callable[[str | Path], str],
-    component_config_path: Callable[[str], Path],
-) -> None:
-    """Configured values take precedence over the project information."""
-    main_cpp = generate_main(component_config_path("device_info_explicit.yaml"))
-
-    assert 'set_manufacturer("Explicit Manufacturer")' in main_cpp
-    assert 'set_model("Explicit Model")' in main_cpp
-    assert 'set_firmware_version("1.2.3")' in main_cpp
-
-
-def test_project_supplies_device_info(
-    generate_main: Callable[[str | Path], str],
-    component_config_path: Callable[[str], Path],
-) -> None:
-    """Without configured values, the project name splits into manufacturer and model."""
-    main_cpp = generate_main(component_config_path("device_info_project.yaml"))
-
-    assert 'set_manufacturer("project_manufacturer")' in main_cpp
-    assert 'set_model("project_model")' in main_cpp
-    assert 'set_firmware_version("9.9.9")' in main_cpp
-
-
-def test_no_device_info_leaves_hub_defaults(
-    generate_main: Callable[[str | Path], str],
-    component_config_path: Callable[[str], Path],
-) -> None:
-    """With neither source, nothing is emitted and the hub keeps its own defaults."""
-    main_cpp = generate_main(component_config_path("device_info_default.yaml"))
-
-    assert "set_manufacturer(" not in main_cpp
-    assert "set_model(" not in main_cpp
-    assert "set_firmware_version(" not in main_cpp
-
-
-@pytest.mark.parametrize(
-    "conf_key", [CONF_MANUFACTURER, CONF_MODEL, CONF_FIRMWARE_VERSION]
-)
-def test_empty_device_info_rejected(
-    set_core_config: SetCoreConfigCallable, conf_key: str
-) -> None:
-    """An empty string would be sent to the server as an empty value, so it is not accepted."""
-    set_core_config(PlatformFramework.ESP32_IDF)
-
-    with pytest.raises(cv.Invalid):
-        CONFIG_SCHEMA({conf_key: ""})
-
-
-@pytest.mark.parametrize(
-    "conf_key", [CONF_MANUFACTURER, CONF_MODEL, CONF_FIRMWARE_VERSION]
-)
-def test_device_info_capped_at_127_bytes(
-    set_core_config: SetCoreConfigCallable, conf_key: str
-) -> None:
-    """The cap is in bytes so the protobuf length prefix stays a single byte."""
-    set_core_config(PlatformFramework.ESP32_IDF)
-
-    CONFIG_SCHEMA({conf_key: "a" * 127})
-    with pytest.raises(cv.Invalid):
-        CONFIG_SCHEMA({conf_key: "a" * 128})
-    # 64 two-byte characters is 128 bytes.
-    with pytest.raises(cv.Invalid):
-        CONFIG_SCHEMA({conf_key: "é" * 64})

tests/component_tests/template/test_template_visibility.py

@@ -1,76 +0,0 @@
-"""The template platforms surface value-describing metadata on the main form.
-
-Hardware platforms get sensible defaults for unit/device_class/etc., so those
-fields fall through to the editor's advanced disclosure. A ``template`` entity
-has no such defaults -- the user is expected to define them -- so the template
-platforms pass ``visibility=cv.Visibility.UI`` to promote them onto the form.
-"""
-
-from __future__ import annotations
-
-import importlib
-
-import pytest
-
-import esphome.config_validation as cv
-
-
-def _markers(schema: cv.Schema) -> dict[str, object]:
-    s = schema
-    if hasattr(s, "validators"):
-        # cv.All -> the schema is the first validator.
-        s = s.validators[0]
-    return {str(k): k for k in s.schema}
-
-
-@pytest.mark.parametrize(
-    ("platform", "fields"),
-    [
-        (
-            "sensor",
-            [
-                "unit_of_measurement",
-                "accuracy_decimals",
-                "device_class",
-                "state_class",
-                "force_update",
-            ],
-        ),
-        ("binary_sensor", ["device_class"]),
-        ("switch", ["device_class"]),
-        ("cover", ["device_class"]),
-        ("button", ["device_class"]),
-        ("valve", ["device_class"]),
-        ("event", ["device_class"]),
-        ("text_sensor", ["device_class"]),
-        ("number", ["device_class", "unit_of_measurement"]),
-    ],
-)
-def test_template_metadata_is_ui(platform: str, fields: list[str]) -> None:
-    mod = importlib.import_module(f"esphome.components.template.{platform}")
-    markers = _markers(mod.CONFIG_SCHEMA)
-    for field in fields:
-        assert markers[field].visibility is cv.Visibility.UI, f"{platform}.{field}"
-
-
-def test_template_sensor_promotion_preserves_defaults() -> None:
-    """Promoting to UI must not drop the fields' defaults."""
-    from esphome.components.template.sensor import CONFIG_SCHEMA
-
-    markers = _markers(CONFIG_SCHEMA)
-    assert markers["accuracy_decimals"].default() == 1
-    assert markers["force_update"].default() is False
-
-
-def test_hardware_platform_metadata_not_promoted() -> None:
-    """Without ``visibility=`` the builders leave metadata unset.
-
-    Unset markers fall through to the consumer's ``Optional`` default of
-    advanced, so hardware platforms are unaffected by the template promotion.
-    """
-    from esphome.components import binary_sensor, sensor
-
-    hw_sensor = _markers(sensor.sensor_schema(device_class="temperature"))
-    assert hw_sensor["device_class"].visibility is None
-    hw_bs = _markers(binary_sensor.binary_sensor_schema(device_class="motion"))
-    assert hw_bs["device_class"].visibility is None

tests/components/sendspin/common-hub.yaml

@@ -4,6 +4,3 @@ psram:
 sendspin:
   id: sendspin_hub_id
   task_stack_in_psram: true
-  manufacturer: Test Manufacturer
-  model: Test Model
-  firmware_version: 1.2.3

tests/components/serial_proxy/test-tap.esp32-idf.yaml

@@ -1,14 +0,0 @@
-substitutions:
-  tx_pin: GPIO4
-  rx_pin: GPIO5
-
-# Compile the tap code paths; no tap is attached, so this exercises the
-# null-tap branches that a normal build never defines.
-esphome:
-  platformio_options:
-    build_flags:
-      - "-DUSE_SERIAL_PROXY_TAP"
-
-packages:
-  uart: !include ../../test_build_components/common/uart/esp32-idf.yaml
-  serial_proxy: !include common.yaml

tests/script/test_platformio_install_deps.py

@@ -35,8 +35,8 @@ def _load_script():
 def test_spec_key_collapses_destinations() -> None:
     """Two specs delivering one package share a directory and one key."""
     mod = _load_script()
-    assert mod.spec_key("esphome/noise-c @ 0.1.26") == "noise-c"
-    assert mod.spec_key("esphome/noise-c@0.1.26") == "noise-c"
+    assert mod.spec_key("esphome/noise-c @ 1.0") == "noise-c"
+    assert mod.spec_key("esphome/noise-c@1.0") == "noise-c"
     assert mod.spec_key("ESP32Async/AsyncTCP @ ^3.4.10") == mod.spec_key(
         "esp32async/asynctcp @ 3.5.0"
     )
@@ -54,23 +54,23 @@ def test_parse_specs_and_cli_args(tmp_path: Path) -> None:
         "[env:a]\n"
         "platform = fake/platform@1\n"
         "lib_deps =\n"
-        "    esphome/noise-c @ 0.1.26\n"
+        "    esphome/noise-c @ 1.0\n"
         "    ${common.lib_deps}\n"
         "    internal_lib\n"
         "[env:b]\n"
         "lib_deps =\n"
-        "    esphome/noise-c @ 0.1.26\n"
+        "    esphome/noise-c @ 1.0\n"
     )
     mod = _load_script()
     args = Namespace(libraries=True, platforms=True, tools=False)
     libs, platforms, tools = mod.parse_specs(str(ini), args)
     # exact-string duplicates collapse; distinct version pins survive
-    assert libs == ["esphome/noise-c @ 0.1.26"]
+    assert libs == ["esphome/noise-c @ 1.0"]
     assert platforms == ["fake/platform@1"]
     assert tools == []
     assert mod.build_cli_args(libs, platforms, tools) == [
         "-l",
-        "esphome/noise-c @ 0.1.26",
+        "esphome/noise-c @ 1.0",
         "-p",
         "fake/platform@1",
     ]
@@ -162,13 +162,13 @@ def test_parallel_install_behavior(tmp_path: Path) -> None:
     mod.parallel_install(
         cls,
         [
-            "esphome/noise-c @ 0.1.26",
-            "esphome/noise-c @ 0.1.26",
+            "esphome/noise-c @ 1.0",
+            "esphome/noise-c @ 1.0",
             "esphome/already @ 1.0",
             "https://x/framework.tar.xz",
         ],
     )
-    assert cls.calls == ["esphome/noise-c @ 0.1.26"]
+    assert cls.calls == ["esphome/noise-c @ 1.0"]
     assert cls.lock_events == ["lock", "unlock"]
 
 
@@ -205,7 +205,7 @@ def test_parallel_install_runs_dependency_waves(tmp_path: Path) -> None:
     mod = _load_script()
     cls = _reset_fake(str(tmp_path))
     cls.deps = {
-        "esphome/noise-c @ 0.1.26": [
+        "esphome/noise-c @ 1.0": [
             {"owner": "esphome", "name": "libsodium", "version": "^1.0"},
             {"name": "SPI"},
         ],
@@ -213,12 +213,12 @@ def test_parallel_install_runs_dependency_waves(tmp_path: Path) -> None:
             {"owner": "esphome", "name": "libsodium", "version": "^1.0"},
         ],
     }
-    mod.parallel_install(cls, ["esphome/noise-c @ 0.1.26", "esphome/wg @ 1.0"])
+    mod.parallel_install(cls, ["esphome/noise-c @ 1.0", "esphome/wg @ 1.0"])
     assert len(cls.calls) == 3  # the shared dep installs exactly once
     assert {mod.spec_key(c) for c in cls.calls} == {"noise-c", "wg", "libsodium"}
     # Wave-1 strings carry no compatibility; the dependency wave does
     compats = dict(cls.compat_calls)
-    assert compats["esphome/noise-c @ 0.1.26"] is None
+    assert compats["esphome/noise-c @ 1.0"] is None
     dep_compat = next(v for k, v in cls.compat_calls if "libsodium" in k)
     assert dep_compat is not None  # mirrors pio's install_dependency
 
@@ -229,11 +229,11 @@ def test_dependency_wave_excludes_url_specs(tmp_path: Path) -> None:
     mod = _load_script()
     cls = _reset_fake(str(tmp_path))
     cls.deps = {
-        "esphome/noise-c @ 0.1.26": [
+        "esphome/noise-c @ 1.0": [
             {"name": "vendored", "version": "https://github.com/x/y.git"},
         ],
     }
-    mod.parallel_install(cls, ["esphome/noise-c @ 0.1.26"])
+    mod.parallel_install(cls, ["esphome/noise-c @ 1.0"])
     assert {mod.spec_key(c) for c in cls.calls} == {"noise-c"}
 
 
@@ -348,13 +348,13 @@ def test_warm_store_still_walks_dependencies(tmp_path: Path) -> None:
     """Already-installed top-level packages still feed the dependency
     wave; a warm store can be missing a transitive dep."""
     mod = _load_script()
-    cls = _reset_fake(str(tmp_path), installed={"esphome/noise-c @ 0.1.26"})
+    cls = _reset_fake(str(tmp_path), installed={"esphome/noise-c @ 1.0"})
     cls.deps = {
-        "esphome/noise-c @ 0.1.26": [
+        "esphome/noise-c @ 1.0": [
             {"owner": "esphome", "name": "libsodium", "version": "^1.0"},
         ],
     }
-    mod.parallel_install(cls, ["esphome/noise-c @ 0.1.26"])
+    mod.parallel_install(cls, ["esphome/noise-c @ 1.0"])
     assert [mod.spec_key(c) for c in cls.calls] == ["libsodium"]
 
 

tests/script/test_setup.py

@@ -1,562 +0,0 @@
-"""Tests for script/setup.py."""
-
-import importlib.util
-import os
-from pathlib import Path, PurePosixPath, PureWindowsPath
-import runpy
-import sys
-from types import ModuleType
-from unittest.mock import Mock, call, patch
-
-import pytest
-
-_SCRIPT = Path(__file__).parents[2] / "script" / "setup.py"
-
-
-def _load_module() -> ModuleType:
-    spec = importlib.util.spec_from_file_location("script_setup", _SCRIPT)
-    module = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(module)
-    return module
-
-
-@pytest.fixture
-def script_setup() -> ModuleType:
-    """Fresh import of script/setup.py, isolated from other tests."""
-    return _load_module()
-
-
-# --- bin_dir / venv_python / activate_hint -----------------------------------
-
-
-def test_bin_dir_matches_host_layout(script_setup: ModuleType, tmp_path: Path) -> None:
-    """The venv scheme resolves to Scripts on Windows and bin everywhere else."""
-    expected = "Scripts" if os.name == "nt" else "bin"
-    assert script_setup.bin_dir(tmp_path) == tmp_path / expected
-
-
-# Both flavours are exercised on every host. Pure paths are used because a real
-# Path refuses to change flavour: PosixPath cannot be built on Windows, and
-# WindowsPath cannot be built on Unix.
-
-
-def test_venv_python_posix(script_setup: ModuleType, tmp_path: Path) -> None:
-    with (
-        patch.object(
-            script_setup, "bin_dir", return_value=PurePosixPath("/x/venv/bin")
-        ),
-        patch.object(script_setup.os, "name", "posix"),
-    ):
-        result = script_setup.venv_python(tmp_path)
-    assert result == PurePosixPath("/x/venv/bin/python")
-
-
-def test_venv_python_nt(script_setup: ModuleType, tmp_path: Path) -> None:
-    with (
-        patch.object(
-            script_setup, "bin_dir", return_value=PureWindowsPath(r"C:\x\venv\Scripts")
-        ),
-        patch.object(script_setup.os, "name", "nt"),
-    ):
-        result = script_setup.venv_python(tmp_path)
-    assert result == PureWindowsPath(r"C:\x\venv\Scripts\python.exe")
-
-
-def test_activate_hint_posix(script_setup: ModuleType) -> None:
-    with (
-        patch.object(script_setup, "ROOT", PurePosixPath("/x")),
-        patch.object(
-            script_setup, "bin_dir", return_value=PurePosixPath("/x/venv/bin")
-        ),
-        patch.object(script_setup.os, "name", "posix"),
-    ):
-        hint = script_setup.activate_hint()
-    assert hint == "source venv/bin/activate"
-
-
-def test_activate_hint_nt(script_setup: ModuleType) -> None:
-    with (
-        patch.object(script_setup, "ROOT", PureWindowsPath(r"C:\x")),
-        patch.object(
-            script_setup, "bin_dir", return_value=PureWindowsPath(r"C:\x\venv\Scripts")
-        ),
-        patch.object(script_setup.os, "name", "nt"),
-    ):
-        hint = script_setup.activate_hint()
-    # The nt branch returns str(activate) as-is, skipping the "source " prefix.
-    assert hint == r"venv\Scripts\activate"
-
-
-# --- run -----------------------------------------------------------------
-
-
-def test_run_success(script_setup: ModuleType) -> None:
-    with patch.object(
-        script_setup.subprocess, "run", return_value=Mock(returncode=0)
-    ) as mock_run:
-        script_setup.run(["echo", "hi"])
-    mock_run.assert_called_once_with(
-        ["echo", "hi"], cwd=script_setup.ROOT, env=None, check=False
-    )
-
-
-def test_run_failure_raises_system_exit_with_code(
-    script_setup: ModuleType, capsys: pytest.CaptureFixture[str]
-) -> None:
-    with (
-        patch.object(script_setup.subprocess, "run", return_value=Mock(returncode=7)),
-        pytest.raises(SystemExit) as excinfo,
-    ):
-        script_setup.run(["false"])
-    assert excinfo.value.code == 7
-    assert "Failed with exit code 7: false" in capsys.readouterr().err
-
-
-# --- git_output ------------------------------------------------------------
-
-
-def test_git_output_success_strips_stdout(script_setup: ModuleType) -> None:
-    with patch.object(
-        script_setup.subprocess,
-        "run",
-        return_value=Mock(returncode=0, stdout="  /repo/.git \n"),
-    ) as mock_run:
-        result = script_setup.git_output("rev-parse", "--absolute-git-dir")
-    assert result == "/repo/.git"
-    mock_run.assert_called_once_with(
-        ["git", "rev-parse", "--absolute-git-dir"],
-        cwd=script_setup.ROOT,
-        capture_output=True,
-        text=True,
-        check=False,
-    )
-
-
-def test_git_output_nonzero_returncode_is_empty(script_setup: ModuleType) -> None:
-    with patch.object(
-        script_setup.subprocess,
-        "run",
-        return_value=Mock(returncode=1, stdout="whatever"),
-    ):
-        assert script_setup.git_output("status") == ""
-
-
-def test_git_output_oserror_is_empty(script_setup: ModuleType) -> None:
-    with patch.object(script_setup.subprocess, "run", side_effect=OSError("no git")):
-        assert script_setup.git_output("status") == ""
-
-
-# --- create_venv -----------------------------------------------------------
-
-
-def test_create_venv_uses_uv_when_present(
-    script_setup: ModuleType, tmp_path: Path
-) -> None:
-    venv = tmp_path / "venv"
-    with (
-        patch.object(script_setup.shutil, "which", return_value="/usr/bin/uv"),
-        patch.object(
-            script_setup.subprocess, "run", return_value=Mock(returncode=0)
-        ) as mock_run,
-    ):
-        script_setup.create_venv(venv)
-    mock_run.assert_called_once_with(
-        ["/usr/bin/uv", "venv", "--clear", "--seed", str(venv)],
-        cwd=script_setup.ROOT,
-        env=None,
-        check=False,
-    )
-
-
-def test_create_venv_falls_back_to_venv_module(
-    script_setup: ModuleType, tmp_path: Path
-) -> None:
-    venv = tmp_path / "venv"
-    with (
-        patch.object(script_setup.shutil, "which", return_value=None),
-        patch.object(
-            script_setup.subprocess, "run", return_value=Mock(returncode=0)
-        ) as mock_run,
-    ):
-        script_setup.create_venv(venv)
-    mock_run.assert_called_once_with(
-        [sys.executable, "-m", "venv", "--clear", str(venv)],
-        cwd=script_setup.ROOT,
-        env=None,
-        check=False,
-    )
-
-
-# --- venv_environment --------------------------------------------------------
-
-
-def test_venv_environment_sets_virtual_env_and_prepends_path(
-    script_setup: ModuleType, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    venv = tmp_path / "venv"
-    monkeypatch.setenv("PYTHONHOME", "/somewhere")
-    monkeypatch.setenv("PATH", "/usr/bin:/bin")
-    env = script_setup.venv_environment(venv)
-    assert env["VIRTUAL_ENV"] == str(venv)
-    assert "PYTHONHOME" not in env
-    expected_prefix = str(script_setup.bin_dir(venv)) + os.pathsep
-    assert env["PATH"] == expected_prefix + "/usr/bin:/bin"
-
-
-def test_venv_environment_path_fallback_when_unset(
-    script_setup: ModuleType, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    venv = tmp_path / "venv"
-    monkeypatch.delenv("PATH", raising=False)
-    env = script_setup.venv_environment(venv)
-    # No trailing separator: an empty PATH entry means "search the cwd".
-    assert env["PATH"] == str(script_setup.bin_dir(venv))
-
-
-# --- find_uv -----------------------------------------------------------------
-
-
-def test_find_uv_found_immediately(script_setup: ModuleType, tmp_path: Path) -> None:
-    venv = tmp_path / "venv"
-    env = {"PATH": "/usr/bin"}
-    with (
-        patch.object(script_setup.shutil, "which", return_value="/usr/bin/uv"),
-        patch.object(script_setup.subprocess, "run") as mock_run,
-    ):
-        result = script_setup.find_uv(venv, env)
-    assert result == "/usr/bin/uv"
-    mock_run.assert_not_called()
-
-
-def test_find_uv_installed_then_found(script_setup: ModuleType, tmp_path: Path) -> None:
-    venv = tmp_path / "venv"
-    env = {"PATH": "/usr/bin"}
-    with (
-        patch.object(script_setup.shutil, "which", side_effect=[None, "/usr/bin/uv"]),
-        patch.object(
-            script_setup.subprocess, "run", return_value=Mock(returncode=0)
-        ) as mock_run,
-    ):
-        result = script_setup.find_uv(venv, env)
-    assert result == "/usr/bin/uv"
-    mock_run.assert_called_once_with(
-        [str(script_setup.venv_python(venv)), "-m", "pip", "install", "uv"],
-        cwd=script_setup.ROOT,
-        env=env,
-        check=False,
-    )
-
-
-def test_find_uv_still_missing_raises_system_exit(
-    script_setup: ModuleType, tmp_path: Path
-) -> None:
-    venv = tmp_path / "venv"
-    env = {"PATH": "/usr/bin"}
-    with (
-        patch.object(script_setup.shutil, "which", side_effect=[None, None]),
-        patch.object(script_setup.subprocess, "run", return_value=Mock(returncode=0)),
-        pytest.raises(SystemExit, match="uv could not be installed"),
-    ):
-        script_setup.find_uv(venv, env)
-
-
-# --- install_dependencies -----------------------------------------------------
-
-
-def test_install_dependencies_installs_setuptools_then_project(
-    script_setup: ModuleType, tmp_path: Path
-) -> None:
-    venv = tmp_path / "venv"
-    env = {"PATH": "/usr/bin"}
-    with (
-        patch.object(script_setup.shutil, "which", return_value="/usr/bin/uv"),
-        patch.object(
-            script_setup.subprocess, "run", return_value=Mock(returncode=0)
-        ) as mock_run,
-    ):
-        script_setup.install_dependencies(venv, env)
-    assert mock_run.call_args_list == [
-        call(
-            ["/usr/bin/uv", "pip", "install", "setuptools", "wheel"],
-            cwd=script_setup.ROOT,
-            env=env,
-            check=False,
-        ),
-        call(
-            [
-                "/usr/bin/uv",
-                "pip",
-                "install",
-                "-e",
-                ".[dev,test]",
-                "--config-settings",
-                "editable_mode=compat",
-            ],
-            cwd=script_setup.ROOT,
-            env=env,
-            check=False,
-        ),
-    ]
-
-
-# --- install_git_hooks ---------------------------------------------------------
-
-
-def _fake_git_output(git_dir: str, common_dir: str):
-    def _run(*args: str) -> str:
-        if "--absolute-git-dir" in args:
-            return git_dir
-        return common_dir
-
-    return _run
-
-
-def test_install_git_hooks_returns_early_when_git_dir_empty(
-    script_setup: ModuleType,
-) -> None:
-    env = {"PATH": "/usr/bin"}
-    with (
-        patch.object(
-            script_setup, "git_output", side_effect=_fake_git_output("", "/repo/.git")
-        ),
-        patch.object(script_setup.subprocess, "run") as mock_run,
-    ):
-        script_setup.install_git_hooks(env)
-    mock_run.assert_not_called()
-
-
-def test_install_git_hooks_returns_early_when_common_dir_empty(
-    script_setup: ModuleType,
-) -> None:
-    env = {"PATH": "/usr/bin"}
-    with (
-        patch.object(
-            script_setup, "git_output", side_effect=_fake_git_output("/repo/.git", "")
-        ),
-        patch.object(script_setup.subprocess, "run") as mock_run,
-    ):
-        script_setup.install_git_hooks(env)
-    mock_run.assert_not_called()
-
-
-def test_install_git_hooks_returns_early_for_worktree(
-    script_setup: ModuleType,
-) -> None:
-    """A worktree's git-dir differs from the shared common-dir."""
-    env = {"PATH": "/usr/bin"}
-    with (
-        patch.object(
-            script_setup,
-            "git_output",
-            side_effect=_fake_git_output("/repo/.git/worktrees/wt", "/repo/.git"),
-        ),
-        patch.object(script_setup.subprocess, "run") as mock_run,
-    ):
-        script_setup.install_git_hooks(env)
-    mock_run.assert_not_called()
-
-
-def test_install_git_hooks_missing_prek_raises_system_exit(
-    script_setup: ModuleType,
-) -> None:
-    env = {"PATH": "/usr/bin"}
-    with (
-        patch.object(
-            script_setup,
-            "git_output",
-            side_effect=_fake_git_output("/repo/.git", "/repo/.git"),
-        ),
-        patch.object(script_setup.shutil, "which", return_value=None),
-        patch.object(script_setup.subprocess, "run") as mock_run,
-        pytest.raises(SystemExit, match="prek was not installed"),
-    ):
-        script_setup.install_git_hooks(env)
-    mock_run.assert_not_called()
-
-
-def test_install_git_hooks_happy_path_installs_hook(
-    script_setup: ModuleType, tmp_path: Path
-) -> None:
-    env = {"PATH": "/usr/bin"}
-    common_dir = tmp_path / "repo" / ".git"
-    hooks_dir = common_dir / "hooks"
-    hooks_dir.mkdir(parents=True)
-    source_hook = tmp_path / "post-checkout"
-    source_hook.write_text("#!/bin/sh\necho post-checkout\n")
-
-    with (
-        patch.object(script_setup, "POST_CHECKOUT_HOOK", source_hook),
-        patch.object(
-            script_setup,
-            "git_output",
-            side_effect=_fake_git_output(str(common_dir), str(common_dir)),
-        ),
-        patch.object(script_setup.shutil, "which", return_value="/usr/bin/prek"),
-        patch.object(
-            script_setup.subprocess, "run", return_value=Mock(returncode=0)
-        ) as mock_run,
-    ):
-        script_setup.install_git_hooks(env)
-
-    mock_run.assert_called_once_with(
-        ["/usr/bin/prek", "install", "--overwrite"],
-        cwd=script_setup.ROOT,
-        env=env,
-        check=False,
-    )
-    installed = hooks_dir / "post-checkout"
-    assert installed.read_text() == source_hook.read_text()
-    if os.name != "nt":
-        # Windows has no POSIX permission bits for chmod to set.
-        assert (installed.stat().st_mode & 0o777) == 0o755
-
-
-def test_install_git_hooks_skips_copy_when_hooks_dir_missing(
-    script_setup: ModuleType, tmp_path: Path
-) -> None:
-    """The prek install still runs when the hooks directory does not exist."""
-    env = {"PATH": "/usr/bin"}
-    common_dir = tmp_path / "repo" / ".git"
-    common_dir.mkdir(parents=True)  # no "hooks" subdirectory created
-
-    with (
-        patch.object(
-            script_setup,
-            "git_output",
-            side_effect=_fake_git_output(str(common_dir), str(common_dir)),
-        ),
-        patch.object(script_setup.shutil, "which", return_value="/usr/bin/prek"),
-        patch.object(
-            script_setup.subprocess, "run", return_value=Mock(returncode=0)
-        ) as mock_run,
-    ):
-        script_setup.install_git_hooks(env)
-
-    mock_run.assert_called_once()
-    assert not (common_dir / "hooks").exists()
-
-
-# --- report ------------------------------------------------------------------
-
-
-def test_report_active_state(
-    script_setup: ModuleType, capsys: pytest.CaptureFixture
-) -> None:
-    venv = Path("/opt/esphome-venv")
-    script_setup.report(script_setup.VENV_ACTIVE, venv)
-    out = capsys.readouterr().out
-    assert "Dependencies installed into the active virtual environment:" in out
-    assert str(venv) in out
-    assert "is already active in this shell" in out
-
-
-def test_report_reused_state(
-    script_setup: ModuleType, capsys: pytest.CaptureFixture
-) -> None:
-    script_setup.report(script_setup.VENV_REUSED, script_setup.DEFAULT_VENV)
-    out = capsys.readouterr().out
-    assert "Dependencies updated in the existing ./venv" in out
-
-
-def test_report_created_state(
-    script_setup: ModuleType, capsys: pytest.CaptureFixture
-) -> None:
-    script_setup.report(script_setup.VENV_CREATED, script_setup.DEFAULT_VENV)
-    out = capsys.readouterr().out
-    assert "Virtual environment created at ./venv" in out
-
-
-# --- main --------------------------------------------------------------------
-
-
-def test_main_raises_system_exit_when_python_too_old(
-    script_setup: ModuleType,
-) -> None:
-    with (
-        patch.object(script_setup.sys, "version_info", (3, 11, 5)),
-        pytest.raises(SystemExit, match="ESPHome needs Python 3.12"),
-    ):
-        script_setup.main()
-
-
-def test_main_uses_active_virtual_env(
-    script_setup: ModuleType, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    active_venv = tmp_path / "active-venv"
-    monkeypatch.setenv("VIRTUAL_ENV", str(active_venv))
-    with (
-        patch.object(script_setup, "ROOT", tmp_path),
-        patch.object(script_setup, "create_venv") as mock_create_venv,
-        patch.object(script_setup, "install_dependencies") as mock_install_deps,
-        patch.object(script_setup, "install_git_hooks") as mock_install_hooks,
-        patch.object(script_setup, "report") as mock_report,
-    ):
-        script_setup.main()
-    mock_create_venv.assert_not_called()
-    mock_install_deps.assert_called_once()
-    mock_install_hooks.assert_called_once()
-    mock_report.assert_called_once_with(script_setup.VENV_ACTIVE, active_venv)
-    assert (tmp_path / ".temp").is_dir()
-
-
-def test_main_reuses_existing_venv(
-    script_setup: ModuleType, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    monkeypatch.delenv("VIRTUAL_ENV", raising=False)
-    default_venv = tmp_path / "venv"
-    python_path = script_setup.venv_python(default_venv)
-    python_path.parent.mkdir(parents=True)
-    python_path.touch()
-
-    with (
-        patch.object(script_setup, "ROOT", tmp_path),
-        patch.object(script_setup, "DEFAULT_VENV", default_venv),
-        patch.object(script_setup, "create_venv") as mock_create_venv,
-        patch.object(script_setup, "install_dependencies") as mock_install_deps,
-        patch.object(script_setup, "install_git_hooks") as mock_install_hooks,
-        patch.object(script_setup, "report") as mock_report,
-    ):
-        script_setup.main()
-    mock_create_venv.assert_not_called()
-    mock_install_deps.assert_called_once()
-    mock_install_hooks.assert_called_once()
-    mock_report.assert_called_once_with(script_setup.VENV_REUSED, default_venv)
-    assert (tmp_path / ".temp").is_dir()
-
-
-def test_main_creates_new_venv(
-    script_setup: ModuleType, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    monkeypatch.delenv("VIRTUAL_ENV", raising=False)
-    default_venv = tmp_path / "venv"  # does not exist yet
-
-    with (
-        patch.object(script_setup, "ROOT", tmp_path),
-        patch.object(script_setup, "DEFAULT_VENV", default_venv),
-        patch.object(script_setup, "create_venv") as mock_create_venv,
-        patch.object(script_setup, "install_dependencies") as mock_install_deps,
-        patch.object(script_setup, "install_git_hooks") as mock_install_hooks,
-        patch.object(script_setup, "report") as mock_report,
-    ):
-        script_setup.main()
-    mock_create_venv.assert_called_once_with(default_venv)
-    mock_install_deps.assert_called_once()
-    mock_install_hooks.assert_called_once()
-    mock_report.assert_called_once_with(script_setup.VENV_CREATED, default_venv)
-    assert (tmp_path / ".temp").is_dir()
-
-
-def test_run_as_script_calls_main(tmp_path: Path) -> None:
-    """The __main__ guard runs the whole flow, with every side effect stubbed."""
-    completed = Mock(returncode=0, stdout="")
-    with (
-        patch("subprocess.run", return_value=completed) as mock_run,
-        patch("shutil.which", return_value="/usr/bin/uv"),
-        patch("pathlib.Path.mkdir") as mock_mkdir,
-        patch.dict(os.environ, {"VIRTUAL_ENV": str(tmp_path / "env")}),
-    ):
-        runpy.run_path(str(_SCRIPT), run_name="__main__")
-
-    # The dependency install ran, and git reported no hooks directory to touch.
-    assert mock_run.called
-    mock_mkdir.assert_called_once_with(exist_ok=True)

tests/unit_tests/test_config_validation.py

@@ -1394,35 +1394,6 @@ def test_entity_metadata_visibility_hints() -> None:
     assert web["web_server"].visibility is advanced
 
 
-def test_with_visibility_remarks_keys() -> None:
-    """``with_visibility`` re-marks the named keys, preserving each field's
-    default and validator, without touching the other keys or the input schema.
-    """
-    base = cv.Schema(
-        {
-            cv.Optional("a", default=7): cv.int_,
-            cv.Optional("b", visibility=cv.Visibility.ADVANCED): cv.string,
-        }
-    )
-    promoted = cv.with_visibility(base, cv.Visibility.UI, "a")
-
-    pm = {str(k): k for k in promoted.schema}
-    assert pm["a"].visibility is cv.Visibility.UI  # re-marked
-    assert pm["a"].default() == 7  # default preserved
-    assert pm["b"].visibility is cv.Visibility.ADVANCED  # sibling untouched
-    assert promoted({}) == {"a": 7}  # validator/default still applied
-
-    # The input schema is left untouched (no shared-marker mutation).
-    assert {str(k): k for k in base.schema}["a"].visibility is None
-
-
-def test_with_visibility_unknown_key_raises() -> None:
-    """A key not present in the schema is a typo — fail at build time."""
-    base = cv.Schema({cv.Optional("a"): cv.int_})
-    with pytest.raises(ValueError, match="not in schema"):
-        cv.with_visibility(base, cv.Visibility.UI, "nope")
-
-
 def _wrap_str(value: str) -> ESPHomeDataBase:
     """Wrap a raw string as an ESPHomeDataBase, mimicking a YAML-loaded value."""
     return make_data_base(value)

tests/unit_tests/test_platformio_prefetch.py

@@ -1663,7 +1663,7 @@ def test_preinstall_runs_dependency_waves(tmp_path: Path) -> None:
         {"name": "SPI"},
     ]
     m.dependency_to_spec.side_effect = lambda dep: _FakeSpec(name=dep["name"])
-    pf._preinstall(m, [("noise-c@0.1.26", _FakeSpec(name="noise-c"))])
+    pf._preinstall(m, [("noise-c@1.0", _FakeSpec(name="noise-c"))])
     assert installed == ["noise-c", "libsodium"]  # dep deduped, SPI left out
     # The dep wave carries its compatibility so _install searches qualified
     dep_call = m._install.call_args_list[-1]
@@ -1683,7 +1683,7 @@ def test_preinstall_dependency_wave_skips_seen_names(tmp_path: Path) -> None:
     m._install.side_effect = lambda spec, skip_dependencies, compatibility=None: (
         installed.append(getattr(spec, "name", str(spec)))
     )
-    pf._preinstall(m, [("noise-c@0.1.26", _FakeSpec(name="noise-c"))])
+    pf._preinstall(m, [("noise-c@1.0", _FakeSpec(name="noise-c"))])
     assert installed == ["noise-c"]