lock

2025-06-12 22:37:26 -05:00 · 2025-06-12 22:34:03 -05:00 · 2025-06-12 22:21:15 -05:00 · 2025-06-12 22:10:40 -05:00 · 2025-06-12 22:09:53 -05:00 · 2025-06-12 22:05:31 -05:00
456 changed files with 5188 additions and 11997 deletions
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -49,7 +49,7 @@ jobs:
        with:
          python-version: "3.10"
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v3.10.0

      - name: Set TAG
        run: |
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -377,7 +377,15 @@ jobs:
        id: list-components
        run: |
          . venv/bin/activate
-          components=$(script/list-components.py --changed --branch ${{ steps.target-branch.outputs.branch }})
+
+          # Check if we should test all components (via label)
+          if [[ "${{ contains(github.event.pull_request.labels.*.name, 'test-all-components') }}" == "true" ]]; then
+            echo "Label 'test-all-components' found - testing ALL components"
+            components=$(script/list-components.py)
+          else
+            components=$(script/list-components.py --changed --branch ${{ steps.target-branch.outputs.branch }})
+          fi
+
          output_components=$(echo "$components" | jq -R -s -c 'split("\n")[:-1] | map(select(length > 0))')
          count=$(echo "$output_components" | jq length)

@@ -415,11 +423,15 @@ jobs:
      - name: test_build_components -e config -c ${{ matrix.file }}
        run: |
          . venv/bin/activate
-          ./script/test_build_components -e config -c ${{ matrix.file }}
+          # Use 4 parallel jobs for config validation
+          ./script/test_build_components -e config -c ${{ matrix.file }} -j 4 -f
      - name: test_build_components -e compile -c ${{ matrix.file }}
        run: |
          . venv/bin/activate
-          ./script/test_build_components -e compile -c ${{ matrix.file }}
+          mkdir -p build_cache
+          export PLATFORMIO_BUILD_CACHE_DIR=$PWD/build_cache
+          # Use 2 parallel jobs for compilation (resource intensive)
+          ./script/test_build_components -e compile -c ${{ matrix.file }} -j 2 -f -b $PWD/build_cache

  test-build-components-splitter:
    name: Split components for testing into 20 groups maximum
@@ -471,17 +483,28 @@ jobs:
      - name: Validate config
        run: |
          . venv/bin/activate
-          for component in ${{ matrix.components }}; do
-            ./script/test_build_components -e config -c $component
+          # Process all components in parallel for config validation
+          components="${{ matrix.components }}"
+          # Convert space-separated list to multiple -c flags
+          component_args=""
+          for component in $components; do
+            component_args="$component_args -c $component"
          done
+          # Use 8 parallel jobs for lightweight config validation
+          ./script/test_build_components -e config $component_args -j 8 -f
      - name: Compile config
        run: |
          . venv/bin/activate
-          mkdir build_cache
+          mkdir -p build_cache
          export PLATFORMIO_BUILD_CACHE_DIR=$PWD/build_cache
-          for component in ${{ matrix.components }}; do
-            ./script/test_build_components -e compile -c $component
+          # Process all components in parallel for compilation
+          components="${{ matrix.components }}"
+          component_args=""
+          for component in $components; do
+            component_args="$component_args -c $component"
          done
+          # Use 4 parallel jobs for resource-intensive compilation
+          ./script/test_build_components -e compile $component_args -j 4 -f -b $PWD/build_cache

  ci-status:
    name: CI Status
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -1,11 +1,28 @@
 ---
-name: Lock closed issues and PRs
+name: Lock

 on:
  schedule:
-    - cron: "30 0 * * *"  # Run daily at 00:30 UTC
+    - cron: "30 0 * * *"
  workflow_dispatch:

+permissions:
+  issues: write
+  pull-requests: write
+
+concurrency:
+  group: lock
+
 jobs:
  lock:
-    uses: esphome/workflows/.github/workflows/lock.yml@main
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v5.0.1
+        with:
+          pr-inactive-days: "1"
+          pr-lock-reason: ""
+          exclude-any-pr-labels: keep-open
+
+          issue-inactive-days: "7"
+          issue-lock-reason: ""
+          exclude-any-issue-labels: keep-open
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -99,7 +99,7 @@ jobs:
          python-version: "3.10"

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v3.10.0

      - name: Log in to docker hub
        uses: docker/login-action@v3.4.0
@@ -178,7 +178,7 @@ jobs:
          merge-multiple: true

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v3.10.0

      - name: Log in to docker hub
        if: matrix.registry == 'dockerhub'
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.12.1
+    rev: v0.11.10
    hooks:
      # Run the linter.
      - id: ruff
@@ -12,7 +12,7 @@ repos:
      # Run the formatter.
      - id: ruff-format
  - repo: https://github.com/PyCQA/flake8
-    rev: 7.3.0
+    rev: 7.2.0
    hooks:
      - id: flake8
        additional_dependencies:
--- a/5
+++ b/5
@@ -146,7 +146,6 @@ esphome/components/esp32_ble_client/* @jesserockz
 esphome/components/esp32_ble_server/* @Rapsssito @clydebarrow @jesserockz
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
-esphome/components/esp32_hosted/* @swoboda1337
 esphome/components/esp32_improv/* @jesserockz
 esphome/components/esp32_rmt/* @jesserockz
 esphome/components/esp32_rmt_led_strip/* @jesserockz
@@ -324,7 +323,6 @@ esphome/components/one_wire/* @ssieb
 esphome/components/online_image/* @clydebarrow @guillempages
 esphome/components/opentherm/* @olegtarasov
 esphome/components/openthread/* @mrene
-esphome/components/opt3001/* @ccutrer
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/packet_transport/* @clydebarrow
@@ -492,7 +490,7 @@ esphome/components/vbus/* @ssieb
 esphome/components/veml3235/* @kbx81
 esphome/components/veml7700/* @latonita
 esphome/components/version/* @esphome/core
-esphome/components/voice_assistant/* @jesserockz @kahrendt
+esphome/components/voice_assistant/* @jesserockz
 esphome/components/wake_on_lan/* @clydebarrow @willwill2will54
 esphome/components/watchdog/* @oarcher
 esphome/components/waveshare_epaper/* @clydebarrow
@@ -522,7 +520,6 @@ esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
 esphome/components/xiaomi_rtcgq02lm/* @jesserockz
-esphome/components/xiaomi_xmwsdj04mmc/* @medusalix
 esphome/components/xl9535/* @mreditor97
 esphome/components/xpt2046/touchscreen/* @nielsnl68 @numo68
 esphome/components/xxtea/* @clydebarrow
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -22,7 +22,6 @@ from esphome.cpp_generator import (  # noqa: F401
    TemplateArguments,
    add,
    add_build_flag,
-    add_build_unflag,
    add_define,
    add_global,
    add_library,
@@ -35,7 +34,6 @@ from esphome.cpp_generator import (  # noqa: F401
    process_lambda,
    progmem_array,
    safe_exp,
-    set_cpp_standard,
    statement,
    static_const_array,
    templatable,
--- a/esphome/components/ac_dimmer/ac_dimmer.cpp
+++ b/esphome/components/ac_dimmer/ac_dimmer.cpp
@@ -4,7 +4,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include <cmath>
-#include <numbers>

 #ifdef USE_ESP8266
 #include <core_esp8266_waveform.h>
@@ -194,17 +193,18 @@ void AcDimmer::setup() {
  setTimer1Callback(&timer_interrupt);
 #endif
 #ifdef USE_ESP32
-  // timer frequency of 1mhz
-  dimmer_timer = timerBegin(1000000);
-  timerAttachInterrupt(dimmer_timer, &AcDimmerDataStore::s_timer_intr);
+  // 80 Divider -> 1 count=1µs
+  dimmer_timer = timerBegin(0, 80, true);
+  timerAttachInterrupt(dimmer_timer, &AcDimmerDataStore::s_timer_intr, true);
  // For ESP32, we can't use dynamic interval calculation because the timerX functions
  // are not callable from ISR (placed in flash storage).
  // Here we just use an interrupt firing every 50 µs.
-  timerAlarm(dimmer_timer, 50, true, 0);
+  timerAlarmWrite(dimmer_timer, 50, true);
+  timerAlarmEnable(dimmer_timer);
 #endif
 }
 void AcDimmer::write_state(float state) {
-  state = std::acos(1 - (2 * state)) / std::numbers::pi;  // RMS power compensation
+  state = std::acos(1 - (2 * state)) / 3.14159;  // RMS power compensation
  auto new_value = static_cast<uint16_t>(roundf(state * 65535));
  if (new_value != 0 && this->store_.value == 0)
    this->store_.init_cycle = this->init_with_half_cycle_;
--- a/esphome/components/alarm_control_panel/init.py
+++ b/esphome/components/alarm_control_panel/init.py
@@ -14,8 +14,8 @@ from esphome.const import (
    CONF_WEB_SERVER,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
+from esphome.cpp_helpers import setup_entity

 CODEOWNERS = ["@grahambrown11", "@hwstar"]
 IS_PLATFORM_COMPONENT = True
@@ -149,9 +149,6 @@ _ALARM_CONTROL_PANEL_SCHEMA = (
 )


-_ALARM_CONTROL_PANEL_SCHEMA.add_extra(entity_duplicate_validator("alarm_control_panel"))
-
-
 def alarm_control_panel_schema(
    class_: MockObjClass,
    *,
@@ -193,7 +190,7 @@ ALARM_CONTROL_PANEL_CONDITION_SCHEMA = maybe_simple_id(


 async def setup_alarm_control_panel_core_(var, config):
-    await setup_entity(var, config, "alarm_control_panel")
+    await setup_entity(var, config)
    for conf in config.get(CONF_ON_STATE, []):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
        await automation.build_automation(trigger, [], conf)
--- a/esphome/components/anova/anova.cpp
+++ b/esphome/components/anova/anova.cpp
@@ -17,11 +17,7 @@ void Anova::setup() {
  this->current_request_ = 0;
 }

-void Anova::loop() {
-  // Parent BLEClientNode has a loop() method, but this component uses
-  // polling via update() and BLE callbacks so loop isn't needed
-  this->disable_loop();
-}
+void Anova::loop() {}

 void Anova::control(const ClimateCall &call) {
  if (call.get_mode().has_value()) {
--- a/esphome/components/api/init.py
+++ b/esphome/components/api/init.py
@@ -177,11 +177,7 @@ async def to_code(config):
            # and plaintext disabled. Only a factory reset can remove it.
            cg.add_define("USE_API_PLAINTEXT")
        cg.add_define("USE_API_NOISE")
-        cg.add_library(
-            None,
-            None,
-            "https://github.com/esphome/noise-c.git#libsodium_update",
-        )
+        cg.add_library("esphome/noise-c", "0.1.6")
    else:
        cg.add_define("USE_API_PLAINTEXT")

--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -188,17 +188,6 @@ message DeviceInfoRequest {
  // Empty
 }

-message AreaInfo {
-  uint32 area_id = 1;
-  string name = 2;
-}
-
-message DeviceInfo {
-  uint32 device_id = 1;
-  string name = 2;
-  uint32 area_id = 3;
-}
-
 message DeviceInfoResponse {
  option (id) = 10;
  option (source) = SOURCE_SERVER;
@@ -247,12 +236,6 @@ message DeviceInfoResponse {

  // Supports receiving and saving api encryption key
  bool api_encryption_supported = 19;
-
-  repeated DeviceInfo devices = 20;
-  repeated AreaInfo areas = 21;
-
-  // Top-level area info to phase out suggested_area
-  AreaInfo area = 22;
 }

 message ListEntitiesRequest {
@@ -283,7 +266,6 @@ enum EntityCategory {
 // ==================== BINARY SENSOR ====================
 message ListEntitiesBinarySensorResponse {
  option (id) = 12;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_BINARY_SENSOR";

@@ -297,11 +279,9 @@ message ListEntitiesBinarySensorResponse {
  bool disabled_by_default = 7;
  string icon = 8;
  EntityCategory entity_category = 9;
-  uint32 device_id = 10;
 }
 message BinarySensorStateResponse {
  option (id) = 21;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_BINARY_SENSOR";
  option (no_delay) = true;
@@ -316,7 +296,6 @@ message BinarySensorStateResponse {
 // ==================== COVER ====================
 message ListEntitiesCoverResponse {
  option (id) = 13;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_COVER";

@@ -333,7 +312,6 @@ message ListEntitiesCoverResponse {
  string icon = 10;
  EntityCategory entity_category = 11;
  bool supports_stop = 12;
-  uint32 device_id = 13;
 }

 enum LegacyCoverState {
@@ -347,7 +325,6 @@ enum CoverOperation {
 }
 message CoverStateResponse {
  option (id) = 22;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_COVER";
  option (no_delay) = true;
@@ -390,7 +367,6 @@ message CoverCommandRequest {
 // ==================== FAN ====================
 message ListEntitiesFanResponse {
  option (id) = 14;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_FAN";

@@ -407,7 +383,6 @@ message ListEntitiesFanResponse {
  string icon = 10;
  EntityCategory entity_category = 11;
  repeated string supported_preset_modes = 12;
-  uint32 device_id = 13;
 }
 enum FanSpeed {
  FAN_SPEED_LOW = 0;
@@ -420,7 +395,6 @@ enum FanDirection {
 }
 message FanStateResponse {
  option (id) = 23;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_FAN";
  option (no_delay) = true;
@@ -470,7 +444,6 @@ enum ColorMode {
 }
 message ListEntitiesLightResponse {
  option (id) = 15;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_LIGHT";

@@ -491,11 +464,9 @@ message ListEntitiesLightResponse {
  bool disabled_by_default = 13;
  string icon = 14;
  EntityCategory entity_category = 15;
-  uint32 device_id = 16;
 }
 message LightStateResponse {
  option (id) = 24;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_LIGHT";
  option (no_delay) = true;
@@ -565,7 +536,6 @@ enum SensorLastResetType {

 message ListEntitiesSensorResponse {
  option (id) = 16;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SENSOR";

@@ -584,11 +554,9 @@ message ListEntitiesSensorResponse {
  SensorLastResetType legacy_last_reset_type = 11;
  bool disabled_by_default = 12;
  EntityCategory entity_category = 13;
-  uint32 device_id = 14;
 }
 message SensorStateResponse {
  option (id) = 25;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SENSOR";
  option (no_delay) = true;
@@ -603,7 +571,6 @@ message SensorStateResponse {
 // ==================== SWITCH ====================
 message ListEntitiesSwitchResponse {
  option (id) = 17;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SWITCH";

@@ -617,11 +584,9 @@ message ListEntitiesSwitchResponse {
  bool disabled_by_default = 7;
  EntityCategory entity_category = 8;
  string device_class = 9;
-  uint32 device_id = 10;
 }
 message SwitchStateResponse {
  option (id) = 26;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SWITCH";
  option (no_delay) = true;
@@ -642,7 +607,6 @@ message SwitchCommandRequest {
 // ==================== TEXT SENSOR ====================
 message ListEntitiesTextSensorResponse {
  option (id) = 18;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_TEXT_SENSOR";

@@ -655,11 +619,9 @@ message ListEntitiesTextSensorResponse {
  bool disabled_by_default = 6;
  EntityCategory entity_category = 7;
  string device_class = 8;
-  uint32 device_id = 9;
 }
 message TextSensorStateResponse {
  option (id) = 27;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_TEXT_SENSOR";
  option (no_delay) = true;
@@ -827,7 +789,6 @@ message ExecuteServiceRequest {
 // ==================== CAMERA ====================
 message ListEntitiesCameraResponse {
  option (id) = 43;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_ESP32_CAMERA";

@@ -838,7 +799,6 @@ message ListEntitiesCameraResponse {
  bool disabled_by_default = 5;
  string icon = 6;
  EntityCategory entity_category = 7;
-  uint32 device_id = 8;
 }

 message CameraImageResponse {
@@ -909,7 +869,6 @@ enum ClimatePreset {
 }
 message ListEntitiesClimateResponse {
  option (id) = 46;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_CLIMATE";

@@ -941,11 +900,9 @@ message ListEntitiesClimateResponse {
  bool supports_target_humidity = 23;
  float visual_min_humidity = 24;
  float visual_max_humidity = 25;
-  uint32 device_id = 26;
 }
 message ClimateStateResponse {
  option (id) = 47;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_CLIMATE";
  option (no_delay) = true;
@@ -1007,7 +964,6 @@ enum NumberMode {
 }
 message ListEntitiesNumberResponse {
  option (id) = 49;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_NUMBER";

@@ -1025,11 +981,9 @@ message ListEntitiesNumberResponse {
  string unit_of_measurement = 11;
  NumberMode mode = 12;
  string device_class = 13;
-  uint32 device_id = 14;
 }
 message NumberStateResponse {
  option (id) = 50;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_NUMBER";
  option (no_delay) = true;
@@ -1053,7 +1007,6 @@ message NumberCommandRequest {
 // ==================== SELECT ====================
 message ListEntitiesSelectResponse {
  option (id) = 52;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SELECT";

@@ -1066,11 +1019,9 @@ message ListEntitiesSelectResponse {
  repeated string options = 6;
  bool disabled_by_default = 7;
  EntityCategory entity_category = 8;
-  uint32 device_id = 9;
 }
 message SelectStateResponse {
  option (id) = 53;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SELECT";
  option (no_delay) = true;
@@ -1094,7 +1045,6 @@ message SelectCommandRequest {
 // ==================== SIREN ====================
 message ListEntitiesSirenResponse {
  option (id) = 55;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SIREN";

@@ -1109,11 +1059,9 @@ message ListEntitiesSirenResponse {
  bool supports_duration = 8;
  bool supports_volume = 9;
  EntityCategory entity_category = 10;
-  uint32 device_id = 11;
 }
 message SirenStateResponse {
  option (id) = 56;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_SIREN";
  option (no_delay) = true;
@@ -1154,7 +1102,6 @@ enum LockCommand  {
 }
 message ListEntitiesLockResponse {
  option (id) = 58;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_LOCK";

@@ -1173,11 +1120,9 @@ message ListEntitiesLockResponse {

  // Not yet implemented:
  string code_format = 11;
-  uint32 device_id = 12;
 }
 message LockStateResponse {
  option (id) = 59;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_LOCK";
  option (no_delay) = true;
@@ -1200,7 +1145,6 @@ message LockCommandRequest {
 // ==================== BUTTON ====================
 message ListEntitiesButtonResponse {
  option (id) = 61;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_BUTTON";

@@ -1213,7 +1157,6 @@ message ListEntitiesButtonResponse {
  bool disabled_by_default = 6;
  EntityCategory entity_category = 7;
  string device_class = 8;
-  uint32 device_id = 9;
 }
 message ButtonCommandRequest {
  option (id) = 62;
@@ -1253,7 +1196,6 @@ message MediaPlayerSupportedFormat {
 }
 message ListEntitiesMediaPlayerResponse {
  option (id) = 63;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_MEDIA_PLAYER";

@@ -1269,12 +1211,9 @@ message ListEntitiesMediaPlayerResponse {
  bool supports_pause = 8;

  repeated MediaPlayerSupportedFormat supported_formats = 9;
-
-  uint32 device_id = 10;
 }
 message MediaPlayerStateResponse {
  option (id) = 64;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_MEDIA_PLAYER";
  option (no_delay) = true;
@@ -1676,7 +1615,6 @@ enum VoiceAssistantEvent {
  VOICE_ASSISTANT_STT_VAD_END = 12;
  VOICE_ASSISTANT_TTS_STREAM_START = 98;
  VOICE_ASSISTANT_TTS_STREAM_END = 99;
-  VOICE_ASSISTANT_INTENT_PROGRESS = 100;
 }

 message VoiceAssistantEventData {
@@ -1797,7 +1735,6 @@ enum AlarmControlPanelStateCommand {

 message ListEntitiesAlarmControlPanelResponse {
  option (id) = 94;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_ALARM_CONTROL_PANEL";

@@ -1811,12 +1748,10 @@ message ListEntitiesAlarmControlPanelResponse {
  uint32 supported_features = 8;
  bool requires_code = 9;
  bool requires_code_to_arm = 10;
-  uint32 device_id = 11;
 }

 message AlarmControlPanelStateResponse {
  option (id) = 95;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_ALARM_CONTROL_PANEL";
  option (no_delay) = true;
@@ -1841,7 +1776,6 @@ enum TextMode {
 }
 message ListEntitiesTextResponse {
  option (id) = 97;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_TEXT";

@@ -1857,11 +1791,9 @@ message ListEntitiesTextResponse {
  uint32 max_length = 9;
  string pattern = 10;
  TextMode mode = 11;
-  uint32 device_id = 12;
 }
 message TextStateResponse {
  option (id) = 98;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_TEXT";
  option (no_delay) = true;
@@ -1886,7 +1818,6 @@ message TextCommandRequest {
 // ==================== DATETIME DATE ====================
 message ListEntitiesDateResponse {
  option (id) = 100;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_DATE";

@@ -1898,11 +1829,9 @@ message ListEntitiesDateResponse {
  string icon = 5;
  bool disabled_by_default = 6;
  EntityCategory entity_category = 7;
-  uint32 device_id = 8;
 }
 message DateStateResponse {
  option (id) = 101;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_DATE";
  option (no_delay) = true;
@@ -1930,7 +1859,6 @@ message DateCommandRequest {
 // ==================== DATETIME TIME ====================
 message ListEntitiesTimeResponse {
  option (id) = 103;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_TIME";

@@ -1942,11 +1870,9 @@ message ListEntitiesTimeResponse {
  string icon = 5;
  bool disabled_by_default = 6;
  EntityCategory entity_category = 7;
-  uint32 device_id = 8;
 }
 message TimeStateResponse {
  option (id) = 104;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_TIME";
  option (no_delay) = true;
@@ -1974,7 +1900,6 @@ message TimeCommandRequest {
 // ==================== EVENT ====================
 message ListEntitiesEventResponse {
  option (id) = 107;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_EVENT";

@@ -1989,11 +1914,9 @@ message ListEntitiesEventResponse {
  string device_class = 8;

  repeated string event_types = 9;
-  uint32 device_id = 10;
 }
 message EventResponse {
  option (id) = 108;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_EVENT";

@@ -2004,7 +1927,6 @@ message EventResponse {
 // ==================== VALVE ====================
 message ListEntitiesValveResponse {
  option (id) = 109;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_VALVE";

@@ -2021,7 +1943,6 @@ message ListEntitiesValveResponse {
  bool assumed_state = 9;
  bool supports_position = 10;
  bool supports_stop = 11;
-  uint32 device_id = 12;
 }

 enum ValveOperation {
@@ -2031,7 +1952,6 @@ enum ValveOperation {
 }
 message ValveStateResponse {
  option (id) = 110;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_VALVE";
  option (no_delay) = true;
@@ -2056,7 +1976,6 @@ message ValveCommandRequest {
 // ==================== DATETIME DATETIME ====================
 message ListEntitiesDateTimeResponse {
  option (id) = 112;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_DATETIME";

@@ -2068,11 +1987,9 @@ message ListEntitiesDateTimeResponse {
  string icon = 5;
  bool disabled_by_default = 6;
  EntityCategory entity_category = 7;
-  uint32 device_id = 8;
 }
 message DateTimeStateResponse {
  option (id) = 113;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_DATETIME_DATETIME";
  option (no_delay) = true;
@@ -2096,7 +2013,6 @@ message DateTimeCommandRequest {
 // ==================== UPDATE ====================
 message ListEntitiesUpdateResponse {
  option (id) = 116;
-  option (base_class) = "InfoResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_UPDATE";

@@ -2109,11 +2025,9 @@ message ListEntitiesUpdateResponse {
  bool disabled_by_default = 6;
  EntityCategory entity_category = 7;
  string device_class = 8;
-  uint32 device_id = 9;
 }
 message UpdateStateResponse {
  option (id) = 117;
-  option (base_class) = "StateResponseProtoMessage";
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_UPDATE";
  option (no_delay) = true;
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -28,19 +28,8 @@
 namespace esphome {
 namespace api {

-// Read a maximum of 5 messages per loop iteration to prevent starving other components.
-// This is a balance between API responsiveness and allowing other components to run.
-// Since each message could contain multiple protobuf messages when using packet batching,
-// this limits the number of messages processed, not the number of TCP packets.
-static constexpr uint8_t MAX_MESSAGES_PER_LOOP = 5;
-static constexpr uint8_t MAX_PING_RETRIES = 60;
-static constexpr uint16_t PING_RETRY_INTERVAL = 1000;
-static constexpr uint32_t KEEPALIVE_DISCONNECT_TIMEOUT = (KEEPALIVE_TIMEOUT_MS * 5) / 2;
-
 static const char *const TAG = "api.connection";
-#ifdef USE_ESP32_CAMERA
 static const int ESP32_CAMERA_STOP_STREAM = 5000;
-#endif

 APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *parent)
    : parent_(parent), initial_state_iterator_(this), list_entities_iterator_(this) {
@@ -65,11 +54,15 @@ uint32_t APIConnection::get_batch_delay_ms_() const { return this->parent_->get_
 void APIConnection::start() {
  this->last_traffic_ = App.get_loop_component_start_time();

+  // Set next_ping_retry_ to prevent immediate ping
+  // This ensures the first ping happens after the keepalive period
+  this->next_ping_retry_ = this->last_traffic_ + KEEPALIVE_TIMEOUT_MS;
+
  APIError err = this->helper_->init();
  if (err != APIError::OK) {
    on_fatal_error();
-    ESP_LOGW(TAG, "%s: Helper init failed: %s errno=%d", this->get_client_combined_info().c_str(),
-             api_error_to_str(err), errno);
+    ESP_LOGW(TAG, "%s: Helper init failed: %s errno=%d", this->client_combined_info_.c_str(), api_error_to_str(err),
+             errno);
    return;
  }
  this->client_info_ = helper_->getpeername();
@@ -90,96 +83,98 @@ APIConnection::~APIConnection() {
 #endif
 }

-#ifdef HAS_PROTO_MESSAGE_DUMP
-void APIConnection::log_batch_item_(const DeferredBatch::BatchItem &item) {
-  // Set log-only mode
-  this->flags_.log_only_mode = true;
-
-  // Call the creator - it will create the message and log it via encode_message_to_buffer
-  item.creator(item.entity, this, std::numeric_limits<uint16_t>::max(), true, item.message_type);
-
-  // Clear log-only mode
-  this->flags_.log_only_mode = false;
-}
-#endif
-
 void APIConnection::loop() {
-  if (this->flags_.next_close) {
+  if (this->remove_)
+    return;
+
+  if (!network::is_connected()) {
+    // when network is disconnected force disconnect immediately
+    // don't wait for timeout
+    this->on_fatal_error();
+    ESP_LOGW(TAG, "%s: Network unavailable; disconnecting", this->client_combined_info_.c_str());
+    return;
+  }
+  if (this->next_close_) {
    // requested a disconnect
    this->helper_->close();
-    this->flags_.remove = true;
+    this->remove_ = true;
    return;
  }

  APIError err = this->helper_->loop();
  if (err != APIError::OK) {
    on_fatal_error();
-    ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", this->get_client_combined_info().c_str(),
+    ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", this->client_combined_info_.c_str(),
             api_error_to_str(err), errno);
    return;
  }

-  const uint32_t now = App.get_loop_component_start_time();
  // Check if socket has data ready before attempting to read
  if (this->helper_->is_socket_ready()) {
-    // Read up to MAX_MESSAGES_PER_LOOP messages per loop to improve throughput
-    for (uint8_t message_count = 0; message_count < MAX_MESSAGES_PER_LOOP; message_count++) {
-      ReadPacketBuffer buffer;
-      err = this->helper_->read_packet(&buffer);
-      if (err == APIError::WOULD_BLOCK) {
-        // No more data available
-        break;
-      } else if (err != APIError::OK) {
-        on_fatal_error();
-        if (err == APIError::SOCKET_READ_FAILED && errno == ECONNRESET) {
-          ESP_LOGW(TAG, "%s: Connection reset", this->get_client_combined_info().c_str());
-        } else if (err == APIError::CONNECTION_CLOSED) {
-          ESP_LOGW(TAG, "%s: Connection closed", this->get_client_combined_info().c_str());
-        } else {
-          ESP_LOGW(TAG, "%s: Reading failed: %s errno=%d", this->get_client_combined_info().c_str(),
-                   api_error_to_str(err), errno);
-        }
-        return;
+    ReadPacketBuffer buffer;
+    err = this->helper_->read_packet(&buffer);
+    if (err == APIError::WOULD_BLOCK) {
+      // pass
+    } else if (err != APIError::OK) {
+      on_fatal_error();
+      if (err == APIError::SOCKET_READ_FAILED && errno == ECONNRESET) {
+        ESP_LOGW(TAG, "%s: Connection reset", this->client_combined_info_.c_str());
+      } else if (err == APIError::CONNECTION_CLOSED) {
+        ESP_LOGW(TAG, "%s: Connection closed", this->client_combined_info_.c_str());
      } else {
-        this->last_traffic_ = now;
-        // read a packet
-        if (buffer.data_len > 0) {
-          this->read_message(buffer.data_len, buffer.type, &buffer.container[buffer.data_offset]);
-        } else {
-          this->read_message(0, buffer.type, nullptr);
-        }
-        if (this->flags_.remove)
-          return;
+        ESP_LOGW(TAG, "%s: Reading failed: %s errno=%d", this->client_combined_info_.c_str(), api_error_to_str(err),
+                 errno);
      }
+      return;
+    } else {
+      this->last_traffic_ = App.get_loop_component_start_time();
+      // read a packet
+      if (buffer.data_len > 0) {
+        this->read_message(buffer.data_len, buffer.type, &buffer.container[buffer.data_offset]);
+      } else {
+        this->read_message(0, buffer.type, nullptr);
+      }
+      if (this->remove_)
+        return;
    }
  }

  // Process deferred batch if scheduled
-  if (this->flags_.batch_scheduled && now - this->deferred_batch_.batch_start_time >= this->get_batch_delay_ms_()) {
+  if (this->deferred_batch_.batch_scheduled &&
+      App.get_loop_component_start_time() - this->deferred_batch_.batch_start_time >= this->get_batch_delay_ms_()) {
    this->process_batch_();
  }

-  if (!this->list_entities_iterator_.completed()) {
+  if (!this->list_entities_iterator_.completed())
    this->list_entities_iterator_.advance();
-  } else if (!this->initial_state_iterator_.completed()) {
+  if (!this->initial_state_iterator_.completed() && this->list_entities_iterator_.completed())
    this->initial_state_iterator_.advance();
-  }

-  if (this->flags_.sent_ping) {
+  static uint8_t max_ping_retries = 60;
+  static uint16_t ping_retry_interval = 1000;
+  const uint32_t now = App.get_loop_component_start_time();
+  if (this->sent_ping_) {
    // Disconnect if not responded within 2.5*keepalive
-    if (now - this->last_traffic_ > KEEPALIVE_DISCONNECT_TIMEOUT) {
+    if (now - this->last_traffic_ > (KEEPALIVE_TIMEOUT_MS * 5) / 2) {
      on_fatal_error();
-      ESP_LOGW(TAG, "%s is unresponsive; disconnecting", this->get_client_combined_info().c_str());
+      ESP_LOGW(TAG, "%s is unresponsive; disconnecting", this->client_combined_info_.c_str());
    }
-  } else if (now - this->last_traffic_ > KEEPALIVE_TIMEOUT_MS) {
+  } else if (now - this->last_traffic_ > KEEPALIVE_TIMEOUT_MS && now > this->next_ping_retry_) {
    ESP_LOGVV(TAG, "Sending keepalive PING");
-    this->flags_.sent_ping = this->send_message(PingRequest());
-    if (!this->flags_.sent_ping) {
-      // If we can't send the ping request directly (tx_buffer full),
-      // schedule it at the front of the batch so it will be sent with priority
-      ESP_LOGW(TAG, "Buffer full, ping queued");
-      this->schedule_message_front_(nullptr, &APIConnection::try_send_ping_request, PingRequest::MESSAGE_TYPE);
-      this->flags_.sent_ping = true;  // Mark as sent to avoid scheduling multiple pings
+    this->sent_ping_ = this->send_message(PingRequest());
+    if (!this->sent_ping_) {
+      this->next_ping_retry_ = now + ping_retry_interval;
+      this->ping_retries_++;
+      std::string warn_str = str_sprintf("%s: Sending keepalive failed %u time(s);",
+                                         this->client_combined_info_.c_str(), this->ping_retries_);
+      if (this->ping_retries_ >= max_ping_retries) {
+        on_fatal_error();
+        ESP_LOGE(TAG, "%s disconnecting", warn_str.c_str());
+      } else if (this->ping_retries_ >= 10) {
+        ESP_LOGW(TAG, "%s retrying in %u ms", warn_str.c_str(), ping_retry_interval);
+      } else {
+        ESP_LOGD(TAG, "%s retrying in %u ms", warn_str.c_str(), ping_retry_interval);
+      }
    }
  }

@@ -202,20 +197,22 @@ void APIConnection::loop() {
    // bool done = 3;
    buffer.encode_bool(3, done);

-    bool success = this->send_buffer(buffer, CameraImageResponse::MESSAGE_TYPE);
+    bool success = this->send_buffer(buffer, 44);

    if (success) {
      this->image_reader_.consume_data(to_send);
-      if (done) {
-        this->image_reader_.return_image();
-      }
+    }
+    if (success && done) {
+      this->image_reader_.return_image();
    }
  }
 #endif

-  if (state_subs_at_ >= 0) {
+  if (state_subs_at_ != -1) {
    const auto &subs = this->parent_->get_state_subs();
-    if (state_subs_at_ < static_cast<int>(subs.size())) {
+    if (state_subs_at_ >= (int) subs.size()) {
+      state_subs_at_ = -1;
+    } else {
      auto &it = subs[state_subs_at_];
      SubscribeHomeAssistantStateResponse resp;
      resp.entity_id = it.entity_id;
@@ -224,8 +221,6 @@ void APIConnection::loop() {
      if (this->send_message(resp)) {
        state_subs_at_++;
      }
-    } else {
-      state_subs_at_ = -1;
    }
  }
 }
@@ -238,64 +233,40 @@ DisconnectResponse APIConnection::disconnect(const DisconnectRequest &msg) {
  // remote initiated disconnect_client
  // don't close yet, we still need to send the disconnect response
  // close will happen on next loop
-  ESP_LOGD(TAG, "%s disconnected", this->get_client_combined_info().c_str());
-  this->flags_.next_close = true;
+  ESP_LOGD(TAG, "%s disconnected", this->client_combined_info_.c_str());
+  this->next_close_ = true;
  DisconnectResponse resp;
  return resp;
 }
 void APIConnection::on_disconnect_response(const DisconnectResponse &value) {
  this->helper_->close();
-  this->flags_.remove = true;
+  this->remove_ = true;
 }

 // Encodes a message to the buffer and returns the total number of bytes used,
 // including header and footer overhead. Returns 0 if the message doesn't fit.
 uint16_t APIConnection::encode_message_to_buffer(ProtoMessage &msg, uint16_t message_type, APIConnection *conn,
                                                 uint32_t remaining_size, bool is_single) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  // If in log-only mode, just log and return
-  if (conn->flags_.log_only_mode) {
-    conn->log_send_message_(msg.message_name(), msg.dump());
-    return 1;  // Return non-zero to indicate "success" for logging
-  }
-#endif
-
  // Calculate size
-  uint32_t calculated_size = 0;
-  msg.calculate_size(calculated_size);
-
-  // Cache frame sizes to avoid repeated virtual calls
-  const uint8_t header_padding = conn->helper_->frame_header_padding();
-  const uint8_t footer_size = conn->helper_->frame_footer_size();
+  uint32_t size = 0;
+  msg.calculate_size(size);

  // Calculate total size with padding for buffer allocation
-  size_t total_calculated_size = calculated_size + header_padding + footer_size;
+  uint16_t total_size =
+      static_cast<uint16_t>(size) + conn->helper_->frame_header_padding() + conn->helper_->frame_footer_size();

  // Check if it fits
-  if (total_calculated_size > remaining_size) {
+  if (total_size > remaining_size) {
    return 0;  // Doesn't fit
  }

-  // Allocate buffer space - pass payload size, allocation functions add header/footer space
-  ProtoWriteBuffer buffer = is_single ? conn->allocate_single_message_buffer(calculated_size)
-                                      : conn->allocate_batch_message_buffer(calculated_size);
-
-  // Get buffer size after allocation (which includes header padding)
-  std::vector<uint8_t> &shared_buf = conn->parent_->get_shared_buffer_ref();
-  size_t size_before_encode = shared_buf.size();
+  // Allocate exact buffer space needed (just the payload, not the overhead)
+  ProtoWriteBuffer buffer =
+      is_single ? conn->allocate_single_message_buffer(size) : conn->allocate_batch_message_buffer(size);

  // Encode directly into buffer
  msg.encode(buffer);
-
-  // Calculate actual encoded size (not including header that was already added)
-  size_t actual_payload_size = shared_buf.size() - size_before_encode;
-
-  // Return actual total size (header + actual payload + footer)
-  size_t actual_total_size = header_padding + actual_payload_size + footer_size;
-
-  // Verify that calculate_size() returned the correct value
-  assert(calculated_size == actual_payload_size);
-  return static_cast<uint16_t>(actual_total_size);
+  return total_size;
 }

 #ifdef USE_BINARY_SENSOR
@@ -303,6 +274,10 @@ bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary
  return this->schedule_message_(binary_sensor, &APIConnection::try_send_binary_sensor_state,
                                 BinarySensorStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor) {
+  this->schedule_message_(binary_sensor, &APIConnection::try_send_binary_sensor_info,
+                          ListEntitiesBinarySensorResponse::MESSAGE_TYPE);
+}

 uint16_t APIConnection::try_send_binary_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                                     bool is_single) {
@@ -310,7 +285,7 @@ uint16_t APIConnection::try_send_binary_sensor_state(EntityBase *entity, APIConn
  BinarySensorStateResponse resp;
  resp.state = binary_sensor->state;
  resp.missing_state = !binary_sensor->has_state();
-  fill_entity_state_base(binary_sensor, resp);
+  resp.key = binary_sensor->get_object_id_hash();
  return encode_message_to_buffer(resp, BinarySensorStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -330,6 +305,9 @@ uint16_t APIConnection::try_send_binary_sensor_info(EntityBase *entity, APIConne
 bool APIConnection::send_cover_state(cover::Cover *cover) {
  return this->schedule_message_(cover, &APIConnection::try_send_cover_state, CoverStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_cover_info(cover::Cover *cover) {
+  this->schedule_message_(cover, &APIConnection::try_send_cover_info, ListEntitiesCoverResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_cover_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single) {
  auto *cover = static_cast<cover::Cover *>(entity);
@@ -341,7 +319,7 @@ uint16_t APIConnection::try_send_cover_state(EntityBase *entity, APIConnection *
  if (traits.get_supports_tilt())
    msg.tilt = cover->tilt;
  msg.current_operation = static_cast<enums::CoverOperation>(cover->current_operation);
-  fill_entity_state_base(cover, msg);
+  msg.key = cover->get_object_id_hash();
  return encode_message_to_buffer(msg, CoverStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 uint16_t APIConnection::try_send_cover_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -391,6 +369,9 @@ void APIConnection::cover_command(const CoverCommandRequest &msg) {
 bool APIConnection::send_fan_state(fan::Fan *fan) {
  return this->schedule_message_(fan, &APIConnection::try_send_fan_state, FanStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_fan_info(fan::Fan *fan) {
+  this->schedule_message_(fan, &APIConnection::try_send_fan_info, ListEntitiesFanResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_fan_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                           bool is_single) {
  auto *fan = static_cast<fan::Fan *>(entity);
@@ -406,7 +387,7 @@ uint16_t APIConnection::try_send_fan_state(EntityBase *entity, APIConnection *co
    msg.direction = static_cast<enums::FanDirection>(fan->direction);
  if (traits.supports_preset_modes())
    msg.preset_mode = fan->preset_mode;
-  fill_entity_state_base(fan, msg);
+  msg.key = fan->get_object_id_hash();
  return encode_message_to_buffer(msg, FanStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 uint16_t APIConnection::try_send_fan_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -450,6 +431,9 @@ void APIConnection::fan_command(const FanCommandRequest &msg) {
 bool APIConnection::send_light_state(light::LightState *light) {
  return this->schedule_message_(light, &APIConnection::try_send_light_state, LightStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_light_info(light::LightState *light) {
+  this->schedule_message_(light, &APIConnection::try_send_light_info, ListEntitiesLightResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_light_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single) {
  auto *light = static_cast<light::LightState *>(entity);
@@ -470,7 +454,7 @@ uint16_t APIConnection::try_send_light_state(EntityBase *entity, APIConnection *
  resp.warm_white = values.get_warm_white();
  if (light->supports_effects())
    resp.effect = light->get_effect_name();
-  fill_entity_state_base(light, resp);
+  resp.key = light->get_object_id_hash();
  return encode_message_to_buffer(resp, LightStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 uint16_t APIConnection::try_send_light_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -542,6 +526,9 @@ void APIConnection::light_command(const LightCommandRequest &msg) {
 bool APIConnection::send_sensor_state(sensor::Sensor *sensor) {
  return this->schedule_message_(sensor, &APIConnection::try_send_sensor_state, SensorStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_sensor_info(sensor::Sensor *sensor) {
+  this->schedule_message_(sensor, &APIConnection::try_send_sensor_info, ListEntitiesSensorResponse::MESSAGE_TYPE);
+}

 uint16_t APIConnection::try_send_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                              bool is_single) {
@@ -549,7 +536,7 @@ uint16_t APIConnection::try_send_sensor_state(EntityBase *entity, APIConnection
  SensorStateResponse resp;
  resp.state = sensor->state;
  resp.missing_state = !sensor->has_state();
-  fill_entity_state_base(sensor, resp);
+  resp.key = sensor->get_object_id_hash();
  return encode_message_to_buffer(resp, SensorStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -574,13 +561,16 @@ uint16_t APIConnection::try_send_sensor_info(EntityBase *entity, APIConnection *
 bool APIConnection::send_switch_state(switch_::Switch *a_switch) {
  return this->schedule_message_(a_switch, &APIConnection::try_send_switch_state, SwitchStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_switch_info(switch_::Switch *a_switch) {
+  this->schedule_message_(a_switch, &APIConnection::try_send_switch_info, ListEntitiesSwitchResponse::MESSAGE_TYPE);
+}

 uint16_t APIConnection::try_send_switch_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                              bool is_single) {
  auto *a_switch = static_cast<switch_::Switch *>(entity);
  SwitchStateResponse resp;
  resp.state = a_switch->state;
-  fill_entity_state_base(a_switch, resp);
+  resp.key = a_switch->get_object_id_hash();
  return encode_message_to_buffer(resp, SwitchStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -612,6 +602,10 @@ bool APIConnection::send_text_sensor_state(text_sensor::TextSensor *text_sensor)
  return this->schedule_message_(text_sensor, &APIConnection::try_send_text_sensor_state,
                                 TextSensorStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_text_sensor_info(text_sensor::TextSensor *text_sensor) {
+  this->schedule_message_(text_sensor, &APIConnection::try_send_text_sensor_info,
+                          ListEntitiesTextSensorResponse::MESSAGE_TYPE);
+}

 uint16_t APIConnection::try_send_text_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                                   bool is_single) {
@@ -619,7 +613,7 @@ uint16_t APIConnection::try_send_text_sensor_state(EntityBase *entity, APIConnec
  TextSensorStateResponse resp;
  resp.state = text_sensor->state;
  resp.missing_state = !text_sensor->has_state();
-  fill_entity_state_base(text_sensor, resp);
+  resp.key = text_sensor->get_object_id_hash();
  return encode_message_to_buffer(resp, TextSensorStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 uint16_t APIConnection::try_send_text_sensor_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -643,7 +637,7 @@ uint16_t APIConnection::try_send_climate_state(EntityBase *entity, APIConnection
                                               bool is_single) {
  auto *climate = static_cast<climate::Climate *>(entity);
  ClimateStateResponse resp;
-  fill_entity_state_base(climate, resp);
+  resp.key = climate->get_object_id_hash();
  auto traits = climate->get_traits();
  resp.mode = static_cast<enums::ClimateMode>(climate->mode);
  resp.action = static_cast<enums::ClimateAction>(climate->action);
@@ -672,6 +666,9 @@ uint16_t APIConnection::try_send_climate_state(EntityBase *entity, APIConnection
    resp.target_humidity = climate->target_humidity;
  return encode_message_to_buffer(resp, ClimateStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
+void APIConnection::send_climate_info(climate::Climate *climate) {
+  this->schedule_message_(climate, &APIConnection::try_send_climate_info, ListEntitiesClimateResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_climate_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                              bool is_single) {
  auto *climate = static_cast<climate::Climate *>(entity);
@@ -739,6 +736,9 @@ void APIConnection::climate_command(const ClimateCommandRequest &msg) {
 bool APIConnection::send_number_state(number::Number *number) {
  return this->schedule_message_(number, &APIConnection::try_send_number_state, NumberStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_number_info(number::Number *number) {
+  this->schedule_message_(number, &APIConnection::try_send_number_info, ListEntitiesNumberResponse::MESSAGE_TYPE);
+}

 uint16_t APIConnection::try_send_number_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                              bool is_single) {
@@ -746,7 +746,7 @@ uint16_t APIConnection::try_send_number_state(EntityBase *entity, APIConnection
  NumberStateResponse resp;
  resp.state = number->state;
  resp.missing_state = !number->has_state();
-  fill_entity_state_base(number, resp);
+  resp.key = number->get_object_id_hash();
  return encode_message_to_buffer(resp, NumberStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -787,9 +787,12 @@ uint16_t APIConnection::try_send_date_state(EntityBase *entity, APIConnection *c
  resp.year = date->year;
  resp.month = date->month;
  resp.day = date->day;
-  fill_entity_state_base(date, resp);
+  resp.key = date->get_object_id_hash();
  return encode_message_to_buffer(resp, DateStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
+void APIConnection::send_date_info(datetime::DateEntity *date) {
+  this->schedule_message_(date, &APIConnection::try_send_date_info, ListEntitiesDateResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_date_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                           bool is_single) {
  auto *date = static_cast<datetime::DateEntity *>(entity);
@@ -821,9 +824,12 @@ uint16_t APIConnection::try_send_time_state(EntityBase *entity, APIConnection *c
  resp.hour = time->hour;
  resp.minute = time->minute;
  resp.second = time->second;
-  fill_entity_state_base(time, resp);
+  resp.key = time->get_object_id_hash();
  return encode_message_to_buffer(resp, TimeStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
+void APIConnection::send_time_info(datetime::TimeEntity *time) {
+  this->schedule_message_(time, &APIConnection::try_send_time_info, ListEntitiesTimeResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_time_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                           bool is_single) {
  auto *time = static_cast<datetime::TimeEntity *>(entity);
@@ -857,9 +863,12 @@ uint16_t APIConnection::try_send_datetime_state(EntityBase *entity, APIConnectio
    ESPTime state = datetime->state_as_esptime();
    resp.epoch_seconds = state.timestamp;
  }
-  fill_entity_state_base(datetime, resp);
+  resp.key = datetime->get_object_id_hash();
  return encode_message_to_buffer(resp, DateTimeStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
+void APIConnection::send_datetime_info(datetime::DateTimeEntity *datetime) {
+  this->schedule_message_(datetime, &APIConnection::try_send_datetime_info, ListEntitiesDateTimeResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_datetime_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                               bool is_single) {
  auto *datetime = static_cast<datetime::DateTimeEntity *>(entity);
@@ -883,6 +892,9 @@ void APIConnection::datetime_command(const DateTimeCommandRequest &msg) {
 bool APIConnection::send_text_state(text::Text *text) {
  return this->schedule_message_(text, &APIConnection::try_send_text_state, TextStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_text_info(text::Text *text) {
+  this->schedule_message_(text, &APIConnection::try_send_text_info, ListEntitiesTextResponse::MESSAGE_TYPE);
+}

 uint16_t APIConnection::try_send_text_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                            bool is_single) {
@@ -890,7 +902,7 @@ uint16_t APIConnection::try_send_text_state(EntityBase *entity, APIConnection *c
  TextStateResponse resp;
  resp.state = text->state;
  resp.missing_state = !text->has_state();
-  fill_entity_state_base(text, resp);
+  resp.key = text->get_object_id_hash();
  return encode_message_to_buffer(resp, TextStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -921,6 +933,9 @@ void APIConnection::text_command(const TextCommandRequest &msg) {
 bool APIConnection::send_select_state(select::Select *select) {
  return this->schedule_message_(select, &APIConnection::try_send_select_state, SelectStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_select_info(select::Select *select) {
+  this->schedule_message_(select, &APIConnection::try_send_select_info, ListEntitiesSelectResponse::MESSAGE_TYPE);
+}

 uint16_t APIConnection::try_send_select_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                              bool is_single) {
@@ -928,7 +943,7 @@ uint16_t APIConnection::try_send_select_state(EntityBase *entity, APIConnection
  SelectStateResponse resp;
  resp.state = select->state;
  resp.missing_state = !select->has_state();
-  fill_entity_state_base(select, resp);
+  resp.key = select->get_object_id_hash();
  return encode_message_to_buffer(resp, SelectStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -954,6 +969,9 @@ void APIConnection::select_command(const SelectCommandRequest &msg) {
 #endif

 #ifdef USE_BUTTON
+void esphome::api::APIConnection::send_button_info(button::Button *button) {
+  this->schedule_message_(button, &APIConnection::try_send_button_info, ListEntitiesButtonResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_button_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single) {
  auto *button = static_cast<button::Button *>(entity);
@@ -976,13 +994,16 @@ void esphome::api::APIConnection::button_command(const ButtonCommandRequest &msg
 bool APIConnection::send_lock_state(lock::Lock *a_lock) {
  return this->schedule_message_(a_lock, &APIConnection::try_send_lock_state, LockStateResponse::MESSAGE_TYPE);
 }
+void APIConnection::send_lock_info(lock::Lock *a_lock) {
+  this->schedule_message_(a_lock, &APIConnection::try_send_lock_info, ListEntitiesLockResponse::MESSAGE_TYPE);
+}

 uint16_t APIConnection::try_send_lock_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                            bool is_single) {
  auto *a_lock = static_cast<lock::Lock *>(entity);
  LockStateResponse resp;
  resp.state = static_cast<enums::LockState>(a_lock->state);
-  fill_entity_state_base(a_lock, resp);
+  resp.key = a_lock->get_object_id_hash();
  return encode_message_to_buffer(resp, LockStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -1026,9 +1047,12 @@ uint16_t APIConnection::try_send_valve_state(EntityBase *entity, APIConnection *
  ValveStateResponse resp;
  resp.position = valve->position;
  resp.current_operation = static_cast<enums::ValveOperation>(valve->current_operation);
-  fill_entity_state_base(valve, resp);
+  resp.key = valve->get_object_id_hash();
  return encode_message_to_buffer(resp, ValveStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
+void APIConnection::send_valve_info(valve::Valve *valve) {
+  this->schedule_message_(valve, &APIConnection::try_send_valve_info, ListEntitiesValveResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_valve_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                            bool is_single) {
  auto *valve = static_cast<valve::Valve *>(entity);
@@ -1071,9 +1095,13 @@ uint16_t APIConnection::try_send_media_player_state(EntityBase *entity, APIConne
  resp.state = static_cast<enums::MediaPlayerState>(report_state);
  resp.volume = media_player->volume;
  resp.muted = media_player->is_muted();
-  fill_entity_state_base(media_player, resp);
+  resp.key = media_player->get_object_id_hash();
  return encode_message_to_buffer(resp, MediaPlayerStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
+void APIConnection::send_media_player_info(media_player::MediaPlayer *media_player) {
+  this->schedule_message_(media_player, &APIConnection::try_send_media_player_info,
+                          ListEntitiesMediaPlayerResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_media_player_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                                   bool is_single) {
  auto *media_player = static_cast<media_player::MediaPlayer *>(entity);
@@ -1117,7 +1145,7 @@ void APIConnection::media_player_command(const MediaPlayerCommandRequest &msg) {

 #ifdef USE_ESP32_CAMERA
 void APIConnection::set_camera_state(std::shared_ptr<esp32_camera::CameraImage> image) {
-  if (!this->flags_.state_subscription)
+  if (!this->state_subscription_)
    return;
  if (this->image_reader_.available())
    return;
@@ -1125,6 +1153,9 @@ void APIConnection::set_camera_state(std::shared_ptr<esp32_camera::CameraImage>
      image->was_requested_by(esphome::esp32_camera::IDLE))
    this->image_reader_.set_image(std::move(image));
 }
+void APIConnection::send_camera_info(esp32_camera::ESP32Camera *camera) {
+  this->schedule_message_(camera, &APIConnection::try_send_camera_info, ListEntitiesCameraResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_camera_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single) {
  auto *camera = static_cast<esp32_camera::ESP32Camera *>(entity);
@@ -1328,9 +1359,13 @@ uint16_t APIConnection::try_send_alarm_control_panel_state(EntityBase *entity, A
  auto *a_alarm_control_panel = static_cast<alarm_control_panel::AlarmControlPanel *>(entity);
  AlarmControlPanelStateResponse resp;
  resp.state = static_cast<enums::AlarmControlPanelState>(a_alarm_control_panel->get_state());
-  fill_entity_state_base(a_alarm_control_panel, resp);
+  resp.key = a_alarm_control_panel->get_object_id_hash();
  return encode_message_to_buffer(resp, AlarmControlPanelStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
+void APIConnection::send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
+  this->schedule_message_(a_alarm_control_panel, &APIConnection::try_send_alarm_control_panel_info,
+                          ListEntitiesAlarmControlPanelResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_alarm_control_panel_info(EntityBase *entity, APIConnection *conn,
                                                          uint32_t remaining_size, bool is_single) {
  auto *a_alarm_control_panel = static_cast<alarm_control_panel::AlarmControlPanel *>(entity);
@@ -1379,13 +1414,16 @@ void APIConnection::alarm_control_panel_command(const AlarmControlPanelCommandRe

 #ifdef USE_EVENT
 void APIConnection::send_event(event::Event *event, const std::string &event_type) {
-  this->schedule_message_(event, MessageCreator(event_type), EventResponse::MESSAGE_TYPE);
+  this->schedule_message_(event, MessageCreator(event_type, EventResponse::MESSAGE_TYPE), EventResponse::MESSAGE_TYPE);
+}
+void APIConnection::send_event_info(event::Event *event) {
+  this->schedule_message_(event, &APIConnection::try_send_event_info, ListEntitiesEventResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_event_response(event::Event *event, const std::string &event_type, APIConnection *conn,
                                                uint32_t remaining_size, bool is_single) {
  EventResponse resp;
  resp.event_type = event_type;
-  fill_entity_state_base(event, resp);
+  resp.key = event->get_object_id_hash();
  return encode_message_to_buffer(resp, EventResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -1423,9 +1461,12 @@ uint16_t APIConnection::try_send_update_state(EntityBase *entity, APIConnection
    resp.release_summary = update->update_info.summary;
    resp.release_url = update->update_info.release_url;
  }
-  fill_entity_state_base(update, resp);
+  resp.key = update->get_object_id_hash();
  return encode_message_to_buffer(resp, UpdateStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
+void APIConnection::send_update_info(update::UpdateEntity *update) {
+  this->schedule_message_(update, &APIConnection::try_send_update_info, ListEntitiesUpdateResponse::MESSAGE_TYPE);
+}
 uint16_t APIConnection::try_send_update_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single) {
  auto *update = static_cast<update::UpdateEntity *>(entity);
@@ -1458,7 +1499,7 @@ void APIConnection::update_command(const UpdateCommandRequest &msg) {
 #endif

 bool APIConnection::try_send_log_message(int level, const char *tag, const char *line) {
-  if (this->flags_.log_subscription < level)
+  if (this->log_subscription_ < level)
    return false;

  // Pre-calculate message size to avoid reallocations
@@ -1481,13 +1522,14 @@ bool APIConnection::try_send_log_message(int level, const char *tag, const char
  buffer.encode_string(3, line, line_length);             // string message = 3

  // SubscribeLogsResponse - 29
-  return this->send_buffer(buffer, SubscribeLogsResponse::MESSAGE_TYPE);
+  return this->send_buffer(buffer, 29);
 }

 HelloResponse APIConnection::hello(const HelloRequest &msg) {
  this->client_info_ = msg.client_info;
  this->client_peername_ = this->helper_->getpeername();
-  this->helper_->set_log_info(this->get_client_combined_info());
+  this->client_combined_info_ = this->client_info_ + " (" + this->client_peername_ + ")";
+  this->helper_->set_log_info(this->client_combined_info_);
  this->client_api_version_major_ = msg.api_version_major;
  this->client_api_version_minor_ = msg.api_version_minor;
  ESP_LOGV(TAG, "Hello from client: '%s' | %s | API Version %" PRIu32 ".%" PRIu32, this->client_info_.c_str(),
@@ -1499,7 +1541,7 @@ HelloResponse APIConnection::hello(const HelloRequest &msg) {
  resp.server_info = App.get_name() + " (esphome v" ESPHOME_VERSION ")";
  resp.name = App.get_name();

-  this->flags_.connection_state = static_cast<uint8_t>(ConnectionState::CONNECTED);
+  this->connection_state_ = ConnectionState::CONNECTED;
  return resp;
 }
 ConnectResponse APIConnection::connect(const ConnectRequest &msg) {
@@ -1509,8 +1551,8 @@ ConnectResponse APIConnection::connect(const ConnectRequest &msg) {
  // bool invalid_password = 1;
  resp.invalid_password = !correct;
  if (correct) {
-    ESP_LOGD(TAG, "%s connected", this->get_client_combined_info().c_str());
-    this->flags_.connection_state = static_cast<uint8_t>(ConnectionState::AUTHENTICATED);
+    ESP_LOGD(TAG, "%s connected", this->client_combined_info_.c_str());
+    this->connection_state_ = ConnectionState::AUTHENTICATED;
    this->parent_->get_client_connected_trigger()->trigger(this->client_info_, this->client_peername_);
 #ifdef USE_HOMEASSISTANT_TIME
    if (homeassistant::global_homeassistant_time != nullptr) {
@@ -1562,23 +1604,6 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
 #endif
 #ifdef USE_API_NOISE
  resp.api_encryption_supported = true;
-#endif
-#ifdef USE_DEVICES
-  for (auto const &device : App.get_devices()) {
-    DeviceInfo device_info;
-    device_info.device_id = device->get_device_id();
-    device_info.name = device->get_name();
-    device_info.area_id = device->get_area_id();
-    resp.devices.push_back(device_info);
-  }
-#endif
-#ifdef USE_AREAS
-  for (auto const &area : App.get_areas()) {
-    AreaInfo area_info;
-    area_info.area_id = area->get_area_id();
-    area_info.name = area->get_name();
-    resp.areas.push_back(area_info);
-  }
 #endif
  return resp;
 }
@@ -1624,7 +1649,7 @@ void APIConnection::subscribe_home_assistant_states(const SubscribeHomeAssistant
  state_subs_at_ = 0;
 }
 bool APIConnection::try_to_clear_buffer(bool log_out_of_space) {
-  if (this->flags_.remove)
+  if (this->remove_)
    return false;
  if (this->helper_->can_write_without_blocking())
    return true;
@@ -1632,7 +1657,7 @@ bool APIConnection::try_to_clear_buffer(bool log_out_of_space) {
  APIError err = this->helper_->loop();
  if (err != APIError::OK) {
    on_fatal_error();
-    ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", this->get_client_combined_info().c_str(),
+    ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", this->client_combined_info_.c_str(),
             api_error_to_str(err), errno);
    return false;
  }
@@ -1644,7 +1669,7 @@ bool APIConnection::try_to_clear_buffer(bool log_out_of_space) {
  return false;
 }
 bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint16_t message_type) {
-  if (!this->try_to_clear_buffer(message_type != SubscribeLogsResponse::MESSAGE_TYPE)) {  // SubscribeLogsResponse
+  if (!this->try_to_clear_buffer(message_type != 29)) {  // SubscribeLogsResponse
    return false;
  }

@@ -1654,10 +1679,10 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint16_t message_type)
  if (err != APIError::OK) {
    on_fatal_error();
    if (err == APIError::SOCKET_WRITE_FAILED && errno == ECONNRESET) {
-      ESP_LOGW(TAG, "%s: Connection reset", this->get_client_combined_info().c_str());
+      ESP_LOGW(TAG, "%s: Connection reset", this->client_combined_info_.c_str());
    } else {
-      ESP_LOGW(TAG, "%s: Packet write failed %s errno=%d", this->get_client_combined_info().c_str(),
-               api_error_to_str(err), errno);
+      ESP_LOGW(TAG, "%s: Packet write failed %s errno=%d", this->client_combined_info_.c_str(), api_error_to_str(err),
+               errno);
    }
    return false;
  }
@@ -1666,15 +1691,15 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint16_t message_type)
 }
 void APIConnection::on_unauthenticated_access() {
  this->on_fatal_error();
-  ESP_LOGD(TAG, "%s requested access without authentication", this->get_client_combined_info().c_str());
+  ESP_LOGD(TAG, "%s requested access without authentication", this->client_combined_info_.c_str());
 }
 void APIConnection::on_no_setup_connection() {
  this->on_fatal_error();
-  ESP_LOGD(TAG, "%s requested access without full connection", this->get_client_combined_info().c_str());
+  ESP_LOGD(TAG, "%s requested access without full connection", this->client_combined_info_.c_str());
 }
 void APIConnection::on_fatal_error() {
  this->helper_->close();
-  this->flags_.remove = true;
+  this->remove_ = true;
 }

 void APIConnection::DeferredBatch::add_item(EntityBase *entity, MessageCreator creator, uint16_t message_type) {
@@ -1693,14 +1718,9 @@ void APIConnection::DeferredBatch::add_item(EntityBase *entity, MessageCreator c
  items.emplace_back(entity, std::move(creator), message_type);
 }

-void APIConnection::DeferredBatch::add_item_front(EntityBase *entity, MessageCreator creator, uint16_t message_type) {
-  // Insert at front for high priority messages (no deduplication check)
-  items.insert(items.begin(), BatchItem(entity, std::move(creator), message_type));
-}
-
 bool APIConnection::schedule_batch_() {
-  if (!this->flags_.batch_scheduled) {
-    this->flags_.batch_scheduled = true;
+  if (!this->deferred_batch_.batch_scheduled) {
+    this->deferred_batch_.batch_scheduled = true;
    this->deferred_batch_.batch_start_time = App.get_loop_component_start_time();
  }
  return true;
@@ -1709,14 +1729,14 @@ bool APIConnection::schedule_batch_() {
 ProtoWriteBuffer APIConnection::allocate_single_message_buffer(uint16_t size) { return this->create_buffer(size); }

 ProtoWriteBuffer APIConnection::allocate_batch_message_buffer(uint16_t size) {
-  ProtoWriteBuffer result = this->prepare_message_buffer(size, this->flags_.batch_first_message);
-  this->flags_.batch_first_message = false;
+  ProtoWriteBuffer result = this->prepare_message_buffer(size, this->batch_first_message_);
+  this->batch_first_message_ = false;
  return result;
 }

 void APIConnection::process_batch_() {
  if (this->deferred_batch_.empty()) {
-    this->flags_.batch_scheduled = false;
+    this->deferred_batch_.batch_scheduled = false;
    return;
  }

@@ -1733,8 +1753,7 @@ void APIConnection::process_batch_() {
    const auto &item = this->deferred_batch_.items[0];

    // Let the creator calculate size and encode if it fits
-    uint16_t payload_size =
-        item.creator(item.entity, this, std::numeric_limits<uint16_t>::max(), true, item.message_type);
+    uint16_t payload_size = item.creator(item.entity, this, std::numeric_limits<uint16_t>::max(), true);

    if (payload_size > 0 &&
        this->send_buffer(ProtoWriteBuffer{&this->parent_->get_shared_buffer_ref()}, item.message_type)) {
@@ -1769,10 +1788,10 @@ void APIConnection::process_batch_() {

  // Reserve based on estimated size (much more accurate than 24-byte worst-case)
  this->parent_->get_shared_buffer_ref().reserve(total_estimated_size + total_overhead);
-  this->flags_.batch_first_message = true;
+  this->batch_first_message_ = true;

  size_t items_processed = 0;
-  uint16_t remaining_size = std::numeric_limits<uint16_t>::max();
+  uint32_t remaining_size = MAX_PACKET_SIZE;

  // Track where each message's header padding begins in the buffer
  // For plaintext: this is where the 6-byte header padding starts
@@ -1784,7 +1803,7 @@ void APIConnection::process_batch_() {
  for (const auto &item : this->deferred_batch_.items) {
    // Try to encode message
    // The creator will calculate overhead to determine if the message fits
-    uint16_t payload_size = item.creator(item.entity, this, remaining_size, false, item.message_type);
+    uint16_t payload_size = item.creator(item.entity, this, remaining_size, false);

    if (payload_size == 0) {
      // Message won't fit, stop processing
@@ -1797,15 +1816,11 @@ void APIConnection::process_batch_() {
    packet_info.emplace_back(item.message_type, current_offset, proto_payload_size);

    // Update tracking variables
-    items_processed++;
-    // After first message, set remaining size to MAX_PACKET_SIZE to avoid fragmentation
-    if (items_processed == 1) {
-      remaining_size = MAX_PACKET_SIZE;
-    }
    remaining_size -= payload_size;
    // Calculate where the next message's header padding will start
    // Current buffer size + footer space (that prepare_message_buffer will add for this message)
    current_offset = this->parent_->get_shared_buffer_ref().size() + footer_size;
+    items_processed++;
  }

  if (items_processed == 0) {
@@ -1825,22 +1840,13 @@ void APIConnection::process_batch_() {
  if (err != APIError::OK && err != APIError::WOULD_BLOCK) {
    on_fatal_error();
    if (err == APIError::SOCKET_WRITE_FAILED && errno == ECONNRESET) {
-      ESP_LOGW(TAG, "%s: Connection reset during batch write", this->get_client_combined_info().c_str());
+      ESP_LOGW(TAG, "%s: Connection reset during batch write", this->client_combined_info_.c_str());
    } else {
-      ESP_LOGW(TAG, "%s: Batch write failed %s errno=%d", this->get_client_combined_info().c_str(),
-               api_error_to_str(err), errno);
+      ESP_LOGW(TAG, "%s: Batch write failed %s errno=%d", this->client_combined_info_.c_str(), api_error_to_str(err),
+               errno);
    }
  }

-#ifdef HAS_PROTO_MESSAGE_DUMP
-  // Log messages after send attempt for VV debugging
-  // It's safe to use the buffer for logging at this point regardless of send result
-  for (size_t i = 0; i < items_processed; i++) {
-    const auto &item = this->deferred_batch_.items[i];
-    this->log_batch_item_(item);
-  }
-#endif
-
  // Handle remaining items more efficiently
  if (items_processed < this->deferred_batch_.items.size()) {
    // Remove processed items from the beginning
@@ -1856,23 +1862,21 @@ void APIConnection::process_batch_() {
 }

 uint16_t APIConnection::MessageCreator::operator()(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
-                                                   bool is_single, uint16_t message_type) const {
-  if (has_tagged_string_ptr_()) {
-    // Handle string-based messages
-    switch (message_type) {
+                                                   bool is_single) const {
+  switch (message_type_) {
+    case 0:  // Function pointer
+      return data_.ptr(entity, conn, remaining_size, is_single);
+
 #ifdef USE_EVENT
-      case EventResponse::MESSAGE_TYPE: {
-        auto *e = static_cast<event::Event *>(entity);
-        return APIConnection::try_send_event_response(e, *get_string_ptr_(), conn, remaining_size, is_single);
-      }
-#endif
-      default:
-        // Should not happen, return 0 to indicate no message
-        return 0;
+    case EventResponse::MESSAGE_TYPE: {
+      auto *e = static_cast<event::Event *>(entity);
+      return APIConnection::try_send_event_response(e, *data_.string_ptr, conn, remaining_size, is_single);
    }
-  } else {
-    // Function pointer case
-    return data_.ptr(entity, conn, remaining_size, is_single);
+#endif
+
+    default:
+      // Should not happen, return 0 to indicate no message
+      return 0;
  }
 }

@@ -1888,12 +1892,6 @@ uint16_t APIConnection::try_send_disconnect_request(EntityBase *entity, APIConne
  return encode_message_to_buffer(req, DisconnectRequest::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

-uint16_t APIConnection::try_send_ping_request(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
-                                              bool is_single) {
-  PingRequest req;
-  return encode_message_to_buffer(req, PingRequest::MESSAGE_TYPE, conn, remaining_size, is_single);
-}
-
 uint16_t APIConnection::get_estimated_message_size(uint16_t message_type) {
  // Use generated ESTIMATED_SIZE constants from each message type
  switch (message_type) {
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -22,7 +22,6 @@ static constexpr uint32_t KEEPALIVE_TIMEOUT_MS = 60000;
 class APIConnection : public APIServerConnection {
 public:
  friend class APIServer;
-  friend class ListEntitiesIterator;
  APIConnection(std::unique_ptr<socket::Socket> socket, APIServer *parent);
  virtual ~APIConnection();

@@ -35,79 +34,98 @@ class APIConnection : public APIServerConnection {
  }
 #ifdef USE_BINARY_SENSOR
  bool send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor);
+  void send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor);
 #endif
 #ifdef USE_COVER
  bool send_cover_state(cover::Cover *cover);
+  void send_cover_info(cover::Cover *cover);
  void cover_command(const CoverCommandRequest &msg) override;
 #endif
 #ifdef USE_FAN
  bool send_fan_state(fan::Fan *fan);
+  void send_fan_info(fan::Fan *fan);
  void fan_command(const FanCommandRequest &msg) override;
 #endif
 #ifdef USE_LIGHT
  bool send_light_state(light::LightState *light);
+  void send_light_info(light::LightState *light);
  void light_command(const LightCommandRequest &msg) override;
 #endif
 #ifdef USE_SENSOR
  bool send_sensor_state(sensor::Sensor *sensor);
+  void send_sensor_info(sensor::Sensor *sensor);
 #endif
 #ifdef USE_SWITCH
  bool send_switch_state(switch_::Switch *a_switch);
+  void send_switch_info(switch_::Switch *a_switch);
  void switch_command(const SwitchCommandRequest &msg) override;
 #endif
 #ifdef USE_TEXT_SENSOR
  bool send_text_sensor_state(text_sensor::TextSensor *text_sensor);
+  void send_text_sensor_info(text_sensor::TextSensor *text_sensor);
 #endif
 #ifdef USE_ESP32_CAMERA
  void set_camera_state(std::shared_ptr<esp32_camera::CameraImage> image);
+  void send_camera_info(esp32_camera::ESP32Camera *camera);
  void camera_image(const CameraImageRequest &msg) override;
 #endif
 #ifdef USE_CLIMATE
  bool send_climate_state(climate::Climate *climate);
+  void send_climate_info(climate::Climate *climate);
  void climate_command(const ClimateCommandRequest &msg) override;
 #endif
 #ifdef USE_NUMBER
  bool send_number_state(number::Number *number);
+  void send_number_info(number::Number *number);
  void number_command(const NumberCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_DATE
  bool send_date_state(datetime::DateEntity *date);
+  void send_date_info(datetime::DateEntity *date);
  void date_command(const DateCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_TIME
  bool send_time_state(datetime::TimeEntity *time);
+  void send_time_info(datetime::TimeEntity *time);
  void time_command(const TimeCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_DATETIME
  bool send_datetime_state(datetime::DateTimeEntity *datetime);
+  void send_datetime_info(datetime::DateTimeEntity *datetime);
  void datetime_command(const DateTimeCommandRequest &msg) override;
 #endif
 #ifdef USE_TEXT
  bool send_text_state(text::Text *text);
+  void send_text_info(text::Text *text);
  void text_command(const TextCommandRequest &msg) override;
 #endif
 #ifdef USE_SELECT
  bool send_select_state(select::Select *select);
+  void send_select_info(select::Select *select);
  void select_command(const SelectCommandRequest &msg) override;
 #endif
 #ifdef USE_BUTTON
+  void send_button_info(button::Button *button);
  void button_command(const ButtonCommandRequest &msg) override;
 #endif
 #ifdef USE_LOCK
  bool send_lock_state(lock::Lock *a_lock);
+  void send_lock_info(lock::Lock *a_lock);
  void lock_command(const LockCommandRequest &msg) override;
 #endif
 #ifdef USE_VALVE
  bool send_valve_state(valve::Valve *valve);
+  void send_valve_info(valve::Valve *valve);
  void valve_command(const ValveCommandRequest &msg) override;
 #endif
 #ifdef USE_MEDIA_PLAYER
  bool send_media_player_state(media_player::MediaPlayer *media_player);
+  void send_media_player_info(media_player::MediaPlayer *media_player);
  void media_player_command(const MediaPlayerCommandRequest &msg) override;
 #endif
  bool try_send_log_message(int level, const char *tag, const char *line);
  void send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
-    if (!this->flags_.service_call_subscription)
+    if (!this->service_call_subscription_)
      return;
    this->send_message(call);
  }
@@ -149,22 +167,26 @@ class APIConnection : public APIServerConnection {

 #ifdef USE_ALARM_CONTROL_PANEL
  bool send_alarm_control_panel_state(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
+  void send_alarm_control_panel_info(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
  void alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) override;
 #endif

 #ifdef USE_EVENT
  void send_event(event::Event *event, const std::string &event_type);
+  void send_event_info(event::Event *event);
 #endif

 #ifdef USE_UPDATE
  bool send_update_state(update::UpdateEntity *update);
+  void send_update_info(update::UpdateEntity *update);
  void update_command(const UpdateCommandRequest &msg) override;
 #endif

  void on_disconnect_response(const DisconnectResponse &value) override;
  void on_ping_response(const PingResponse &value) override {
    // we initiated ping
-    this->flags_.sent_ping = false;
+    this->ping_retries_ = 0;
+    this->sent_ping_ = false;
  }
  void on_home_assistant_state_response(const HomeAssistantStateResponse &msg) override;
 #ifdef USE_HOMEASSISTANT_TIME
@@ -177,16 +199,16 @@ class APIConnection : public APIServerConnection {
  DeviceInfoResponse device_info(const DeviceInfoRequest &msg) override;
  void list_entities(const ListEntitiesRequest &msg) override { this->list_entities_iterator_.begin(); }
  void subscribe_states(const SubscribeStatesRequest &msg) override {
-    this->flags_.state_subscription = true;
+    this->state_subscription_ = true;
    this->initial_state_iterator_.begin();
  }
  void subscribe_logs(const SubscribeLogsRequest &msg) override {
-    this->flags_.log_subscription = msg.level;
+    this->log_subscription_ = msg.level;
    if (msg.dump_config)
      App.schedule_dump_config();
  }
  void subscribe_homeassistant_services(const SubscribeHomeassistantServicesRequest &msg) override {
-    this->flags_.service_call_subscription = true;
+    this->service_call_subscription_ = true;
  }
  void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) override;
  GetTimeResponse get_time(const GetTimeRequest &msg) override {
@@ -198,12 +220,9 @@ class APIConnection : public APIServerConnection {
  NoiseEncryptionSetKeyResponse noise_encryption_set_key(const NoiseEncryptionSetKeyRequest &msg) override;
 #endif

-  bool is_authenticated() override {
-    return static_cast<ConnectionState>(this->flags_.connection_state) == ConnectionState::AUTHENTICATED;
-  }
+  bool is_authenticated() override { return this->connection_state_ == ConnectionState::AUTHENTICATED; }
  bool is_connection_setup() override {
-    return static_cast<ConnectionState>(this->flags_.connection_state) == ConnectionState::CONNECTED ||
-           this->is_authenticated();
+    return this->connection_state_ == ConnectionState ::CONNECTED || this->is_authenticated();
  }
  void on_fatal_error() override;
  void on_unauthenticated_access() override;
@@ -221,8 +240,8 @@ class APIConnection : public APIServerConnection {
    // - Header padding: space for protocol headers (7 bytes for Noise, 6 for Plaintext)
    // - Footer: space for MAC (16 bytes for Noise, 0 for Plaintext)
    shared_buf.reserve(reserve_size + header_padding + this->helper_->frame_footer_size());
-    // Resize to add header padding so message encoding starts at the correct position
-    shared_buf.resize(header_padding);
+    // Insert header padding bytes so message encoding starts at the correct position
+    shared_buf.insert(shared_buf.begin(), header_padding, 0);
    return {&shared_buf};
  }

@@ -230,25 +249,31 @@ class APIConnection : public APIServerConnection {
  ProtoWriteBuffer prepare_message_buffer(uint16_t message_size, bool is_first_message) {
    // Get reference to shared buffer (it maintains state between batch messages)
    std::vector<uint8_t> &shared_buf = this->parent_->get_shared_buffer_ref();
-
-    if (is_first_message) {
-      shared_buf.clear();
-    }
-
    size_t current_size = shared_buf.size();

-    // Calculate padding to add:
-    // - First message: just header padding
-    // - Subsequent messages: footer for previous message + header padding for this message
-    size_t padding_to_add = is_first_message
-                                ? this->helper_->frame_header_padding()
-                                : this->helper_->frame_header_padding() + this->helper_->frame_footer_size();
+    if (is_first_message) {
+      // For first message, initialize buffer with header padding
+      uint8_t header_padding = this->helper_->frame_header_padding();
+      shared_buf.clear();
+      shared_buf.reserve(message_size + header_padding);
+      shared_buf.resize(header_padding);
+      // Fill header padding with zeros
+      std::fill(shared_buf.begin(), shared_buf.end(), 0);
+    } else {
+      // For subsequent messages, add footer space for previous message and header for this message
+      uint8_t footer_size = this->helper_->frame_footer_size();
+      uint8_t header_padding = this->helper_->frame_header_padding();

-    // Reserve space for padding + message
-    shared_buf.reserve(current_size + padding_to_add + message_size);
+      // Reserve additional space for everything
+      shared_buf.reserve(current_size + footer_size + header_padding + message_size);

-    // Resize to add the padding bytes
-    shared_buf.resize(current_size + padding_to_add);
+      // Single resize to add both footer and header padding
+      size_t new_size = current_size + footer_size + header_padding;
+      shared_buf.resize(new_size);
+
+      // Fill the newly added bytes with zeros (footer + header padding)
+      std::fill(shared_buf.begin() + current_size, shared_buf.end(), 0);
+    }

    return {&shared_buf};
  }
@@ -256,21 +281,15 @@ class APIConnection : public APIServerConnection {
  bool try_to_clear_buffer(bool log_out_of_space);
  bool send_buffer(ProtoWriteBuffer buffer, uint16_t message_type) override;

-  std::string get_client_combined_info() const {
-    if (this->client_info_ == this->client_peername_) {
-      // Before Hello message, both are the same (just IP:port)
-      return this->client_info_;
-    }
-    return this->client_info_ + " (" + this->client_peername_ + ")";
-  }
+  std::string get_client_combined_info() const { return this->client_combined_info_; }

  // Buffer allocator methods for batch processing
  ProtoWriteBuffer allocate_single_message_buffer(uint16_t size);
  ProtoWriteBuffer allocate_batch_message_buffer(uint16_t size);

 protected:
-  // Helper function to fill common entity info fields
-  static void fill_entity_info_base(esphome::EntityBase *entity, InfoResponseProtoMessage &response) {
+  // Helper function to fill common entity fields
+  template<typename ResponseT> static void fill_entity_info_base(esphome::EntityBase *entity, ResponseT &response) {
    // Set common fields that are shared by all entity types
    response.key = entity->get_object_id_hash();
    response.object_id = entity->get_object_id();
@@ -282,14 +301,6 @@ class APIConnection : public APIServerConnection {
    response.icon = entity->get_icon();
    response.disabled_by_default = entity->is_disabled_by_default();
    response.entity_category = static_cast<enums::EntityCategory>(entity->get_entity_category());
-#ifdef USE_DEVICES
-    response.device_id = entity->get_device_id();
-#endif
-  }
-
-  // Helper function to fill common entity state fields
-  static void fill_entity_state_base(esphome::EntityBase *entity, StateResponseProtoMessage &response) {
-    response.key = entity->get_object_id_hash();
  }

  // Non-template helper to encode any ProtoMessage
@@ -422,86 +433,90 @@ class APIConnection : public APIServerConnection {
  // Helper function to get estimated message size for buffer pre-allocation
  static uint16_t get_estimated_message_size(uint16_t message_type);

-  // Batch message method for ping requests
-  static uint16_t try_send_ping_request(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
-                                        bool is_single);
+  enum class ConnectionState {
+    WAITING_FOR_HELLO,
+    CONNECTED,
+    AUTHENTICATED,
+  } connection_state_{ConnectionState::WAITING_FOR_HELLO};

-  // === Optimal member ordering for 32-bit systems ===
+  bool remove_{false};

-  // Group 1: Pointers (4 bytes each on 32-bit)
  std::unique_ptr<APIFrameHelper> helper_;
-  APIServer *parent_;

-  // Group 2: Larger objects (must be 4-byte aligned)
-  // These contain vectors/pointers internally, so putting them early ensures good alignment
-  InitialStateIterator initial_state_iterator_;
-  ListEntitiesIterator list_entities_iterator_;
+  std::string client_info_;
+  std::string client_peername_;
+  std::string client_combined_info_;
+  uint32_t client_api_version_major_{0};
+  uint32_t client_api_version_minor_{0};
 #ifdef USE_ESP32_CAMERA
  esp32_camera::CameraImageReader image_reader_;
 #endif

-  // Group 3: Strings (12 bytes each on 32-bit, 4-byte aligned)
-  std::string client_info_;
-  std::string client_peername_;
-
-  // Group 4: 4-byte types
+  bool state_subscription_{false};
+  int log_subscription_{ESPHOME_LOG_LEVEL_NONE};
  uint32_t last_traffic_;
+  uint32_t next_ping_retry_{0};
+  uint8_t ping_retries_{0};
+  bool sent_ping_{false};
+  bool service_call_subscription_{false};
+  bool next_close_ = false;
+  APIServer *parent_;
+  InitialStateIterator initial_state_iterator_;
+  ListEntitiesIterator list_entities_iterator_;
  int state_subs_at_ = -1;

  // Function pointer type for message encoding
  using MessageCreatorPtr = uint16_t (*)(EntityBase *, APIConnection *, uint32_t remaining_size, bool is_single);

-  // Optimized MessageCreator class using tagged pointer
+  // Optimized MessageCreator class using union dispatch
  class MessageCreator {
-    // Ensure pointer alignment allows LSB tagging
-    static_assert(alignof(std::string *) > 1, "String pointer alignment must be > 1 for LSB tagging");
-
   public:
-    // Constructor for function pointer
-    MessageCreator(MessageCreatorPtr ptr) {
-      // Function pointers are always aligned, so LSB is 0
-      data_.ptr = ptr;
-    }
+    // Constructor for function pointer (message_type = 0)
+    MessageCreator(MessageCreatorPtr ptr) : message_type_(0) { data_.ptr = ptr; }

    // Constructor for string state capture
-    explicit MessageCreator(const std::string &str_value) {
-      // Allocate string and tag the pointer
-      auto *str = new std::string(str_value);
-      // Set LSB to 1 to indicate string pointer
-      data_.tagged = reinterpret_cast<uintptr_t>(str) | 1;
+    MessageCreator(const std::string &value, uint16_t msg_type) : message_type_(msg_type) {
+      data_.string_ptr = new std::string(value);
    }

    // Destructor
    ~MessageCreator() {
-      if (has_tagged_string_ptr_()) {
-        delete get_string_ptr_();
+      // Clean up string data for string-based message types
+      if (uses_string_data_()) {
+        delete data_.string_ptr;
      }
    }

    // Copy constructor
-    MessageCreator(const MessageCreator &other) {
-      if (other.has_tagged_string_ptr_()) {
-        auto *str = new std::string(*other.get_string_ptr_());
-        data_.tagged = reinterpret_cast<uintptr_t>(str) | 1;
+    MessageCreator(const MessageCreator &other) : message_type_(other.message_type_) {
+      if (message_type_ == 0) {
+        data_.ptr = other.data_.ptr;
+      } else if (uses_string_data_()) {
+        data_.string_ptr = new std::string(*other.data_.string_ptr);
      } else {
-        data_ = other.data_;
+        data_ = other.data_;  // For POD types
      }
    }

    // Move constructor
-    MessageCreator(MessageCreator &&other) noexcept : data_(other.data_) { other.data_.ptr = nullptr; }
+    MessageCreator(MessageCreator &&other) noexcept : data_(other.data_), message_type_(other.message_type_) {
+      other.message_type_ = 0;  // Reset other to function pointer type
+      other.data_.ptr = nullptr;
+    }

    // Assignment operators (needed for batch deduplication)
    MessageCreator &operator=(const MessageCreator &other) {
      if (this != &other) {
        // Clean up current string data if needed
-        if (has_tagged_string_ptr_()) {
-          delete get_string_ptr_();
+        if (uses_string_data_()) {
+          delete data_.string_ptr;
        }
        // Copy new data
-        if (other.has_tagged_string_ptr_()) {
-          auto *str = new std::string(*other.get_string_ptr_());
-          data_.tagged = reinterpret_cast<uintptr_t>(str) | 1;
+        message_type_ = other.message_type_;
+        if (other.message_type_ == 0) {
+          data_.ptr = other.data_.ptr;
+        } else if (other.uses_string_data_()) {
+          data_.string_ptr = new std::string(*other.data_.string_ptr);
        } else {
          data_ = other.data_;
        }
@@ -512,35 +527,30 @@ class APIConnection : public APIServerConnection {
    MessageCreator &operator=(MessageCreator &&other) noexcept {
      if (this != &other) {
        // Clean up current string data if needed
-        if (has_tagged_string_ptr_()) {
-          delete get_string_ptr_();
+        if (uses_string_data_()) {
+          delete data_.string_ptr;
        }
        // Move data
+        message_type_ = other.message_type_;
        data_ = other.data_;
        // Reset other to safe state
+        other.message_type_ = 0;
        other.data_.ptr = nullptr;
      }
      return *this;
    }

-    // Call operator - now accepts message_type as parameter
-    uint16_t operator()(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single,
-                        uint16_t message_type) const;
+    // Call operator
+    uint16_t operator()(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single) const;

   private:
-    // Check if this contains a string pointer
-    bool has_tagged_string_ptr_() const { return (data_.tagged & 1) != 0; }
-
-    // Get the actual string pointer (clears the tag bit)
-    std::string *get_string_ptr_() const {
-      // NOLINTNEXTLINE(performance-no-int-to-ptr)
-      return reinterpret_cast<std::string *>(data_.tagged & ~uintptr_t(1));
-    }
-
-    union {
-      MessageCreatorPtr ptr;
-      uintptr_t tagged;
-    } data_;  // 4 bytes on 32-bit
+    // Helper to check if this message type uses heap-allocated strings
+    bool uses_string_data_() const { return message_type_ == EventResponse::MESSAGE_TYPE; }
+    union CreatorData {
+      MessageCreatorPtr ptr;    // 8 bytes
+      std::string *string_ptr;  // 8 bytes
+    } data_;                    // 8 bytes
+    uint16_t message_type_;     // 2 bytes (0 = function ptr, >0 = state capture)
  };

  // Generic batching mechanism for both state updates and entity info
@@ -557,6 +567,7 @@ class APIConnection : public APIServerConnection {

    std::vector<BatchItem> items;
    uint32_t batch_start_time{0};
+    bool batch_scheduled{false};

    DeferredBatch() {
      // Pre-allocate capacity for typical batch sizes to avoid reallocation
@@ -565,51 +576,15 @@ class APIConnection : public APIServerConnection {

    // Add item to the batch
    void add_item(EntityBase *entity, MessageCreator creator, uint16_t message_type);
-    // Add item to the front of the batch (for high priority messages like ping)
-    void add_item_front(EntityBase *entity, MessageCreator creator, uint16_t message_type);
    void clear() {
      items.clear();
+      batch_scheduled = false;
      batch_start_time = 0;
    }
    bool empty() const { return items.empty(); }
  };

-  // DeferredBatch here (16 bytes, 4-byte aligned)
  DeferredBatch deferred_batch_;
-
-  // ConnectionState enum for type safety
-  enum class ConnectionState : uint8_t {
-    WAITING_FOR_HELLO = 0,
-    CONNECTED = 1,
-    AUTHENTICATED = 2,
-  };
-
-  // Group 5: Pack all small members together to minimize padding
-  // This group starts at a 4-byte boundary after DeferredBatch
-  struct APIFlags {
-    // Connection state only needs 2 bits (3 states)
-    uint8_t connection_state : 2;
-    // Log subscription needs 3 bits (log levels 0-7)
-    uint8_t log_subscription : 3;
-    // Boolean flags (1 bit each)
-    uint8_t remove : 1;
-    uint8_t state_subscription : 1;
-    uint8_t sent_ping : 1;
-
-    uint8_t service_call_subscription : 1;
-    uint8_t next_close : 1;
-    uint8_t batch_scheduled : 1;
-    uint8_t batch_first_message : 1;  // For batch buffer allocation
-#ifdef HAS_PROTO_MESSAGE_DUMP
-    uint8_t log_only_mode : 1;
-#endif
-  } flags_{};  // 2 bytes total
-
-  // 2-byte types immediately after flags_ (no padding between them)
-  uint16_t client_api_version_major_{0};
-  uint16_t client_api_version_minor_{0};
-  // Total: 2 (flags) + 2 + 2 = 6 bytes, then 2 bytes padding to next 4-byte boundary
-
  uint32_t get_batch_delay_ms_() const;
  // Message will use 8 more bytes than the minimum size, and typical
  // MTU is 1500. Sometimes users will see as low as 1460 MTU.
@@ -627,9 +602,8 @@ class APIConnection : public APIServerConnection {
  bool schedule_batch_();
  void process_batch_();

-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void log_batch_item_(const DeferredBatch::BatchItem &item);
-#endif
+  // State for batch buffer allocation
+  bool batch_first_message_{false};

  // Helper function to schedule a deferred message with known message type
  bool schedule_message_(EntityBase *entity, MessageCreator creator, uint16_t message_type) {
@@ -641,12 +615,6 @@ class APIConnection : public APIServerConnection {
  bool schedule_message_(EntityBase *entity, MessageCreatorPtr function_ptr, uint16_t message_type) {
    return schedule_message_(entity, MessageCreator(function_ptr), message_type);
  }
-
-  // Helper function to schedule a high priority message at the front of the batch
-  bool schedule_message_front_(EntityBase *entity, MessageCreatorPtr function_ptr, uint16_t message_type) {
-    this->deferred_batch_.add_item_front(entity, MessageCreator(function_ptr), message_type);
-    return this->schedule_batch_();
-  }
 };

 }  // namespace api
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -66,17 +66,6 @@ const char *api_error_to_str(APIError err) {
  return "UNKNOWN";
 }

-// Default implementation for loop - handles sending buffered data
-APIError APIFrameHelper::loop() {
-  if (!this->tx_buf_.empty()) {
-    APIError err = try_send_tx_buf_();
-    if (err != APIError::OK && err != APIError::WOULD_BLOCK) {
-      return err;
-    }
-  }
-  return APIError::OK;  // Convert WOULD_BLOCK to OK to avoid connection termination
-}
-
 // Helper method to buffer data from IOVs
 void APIFrameHelper::buffer_data_from_iov_(const struct iovec *iov, int iovcnt, uint16_t total_write_len) {
  SendBuffer buffer;
@@ -285,21 +274,17 @@ APIError APINoiseFrameHelper::init() {
 }
 /// Run through handshake messages (if in that phase)
 APIError APINoiseFrameHelper::loop() {
-  // During handshake phase, process as many actions as possible until we can't progress
-  // socket_->ready() stays true until next main loop, but state_action() will return
-  // WOULD_BLOCK when no more data is available to read
-  while (state_ != State::DATA && this->socket_->ready()) {
-    APIError err = state_action_();
+  APIError err = state_action_();
+  if (err != APIError::OK && err != APIError::WOULD_BLOCK) {
+    return err;
+  }
+  if (!this->tx_buf_.empty()) {
+    err = try_send_tx_buf_();
    if (err != APIError::OK && err != APIError::WOULD_BLOCK) {
      return err;
    }
-    if (err == APIError::WOULD_BLOCK) {
-      break;
-    }
  }
-
-  // Use base class implementation for buffer sending
-  return APIFrameHelper::loop();
+  return APIError::OK;  // Convert WOULD_BLOCK to OK to avoid connection termination
 }

 /** Read a packet into the rx_buf_. If successful, stores frame data in the frame parameter
@@ -345,15 +330,17 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
      return APIError::WOULD_BLOCK;
    }

-    if (rx_header_buf_[0] != 0x01) {
-      state_ = State::FAILED;
-      HELPER_LOG("Bad indicator byte %u", rx_header_buf_[0]);
-      return APIError::BAD_INDICATOR;
-    }
    // header reading done
  }

  // read body
+  uint8_t indicator = rx_header_buf_[0];
+  if (indicator != 0x01) {
+    state_ = State::FAILED;
+    HELPER_LOG("Bad indicator byte %u", indicator);
+    return APIError::BAD_INDICATOR;
+  }
+
  uint16_t msg_size = (((uint16_t) rx_header_buf_[1]) << 8) | rx_header_buf_[2];

  if (state_ != State::DATA && msg_size > 128) {
@@ -599,6 +586,10 @@ APIError APINoiseFrameHelper::read_packet(ReadPacketBuffer *buffer) {
    return APIError::BAD_DATA_PACKET;
  }

+  // uint16_t type;
+  // uint16_t data_len;
+  // uint8_t *data;
+  // uint8_t *padding;  zero or more bytes to fill up the rest of the packet
  uint16_t type = (((uint16_t) msg_data[0]) << 8) | msg_data[1];
  uint16_t data_len = (((uint16_t) msg_data[2]) << 8) | msg_data[3];
  if (data_len > msg_size - 4) {
@@ -831,12 +822,18 @@ APIError APIPlaintextFrameHelper::init() {
  state_ = State::DATA;
  return APIError::OK;
 }
+/// Not used for plaintext
 APIError APIPlaintextFrameHelper::loop() {
  if (state_ != State::DATA) {
    return APIError::BAD_STATE;
  }
-  // Use base class implementation for buffer sending
-  return APIFrameHelper::loop();
+  if (!this->tx_buf_.empty()) {
+    APIError err = try_send_tx_buf_();
+    if (err != APIError::OK && err != APIError::WOULD_BLOCK) {
+      return err;
+    }
+  }
+  return APIError::OK;  // Convert WOULD_BLOCK to OK to avoid connection termination
 }

 /** Read a packet into the rx_buf_. If successful, stores frame data in the frame parameter
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -38,7 +38,7 @@ struct PacketInfo {
      : message_type(type), offset(off), payload_size(size), padding(0) {}
 };

-enum class APIError : uint16_t {
+enum class APIError : int {
  OK = 0,
  WOULD_BLOCK = 1001,
  BAD_HANDSHAKE_PACKET_LEN = 1002,
@@ -74,7 +74,7 @@ class APIFrameHelper {
  }
  virtual ~APIFrameHelper() = default;
  virtual APIError init() = 0;
-  virtual APIError loop();
+  virtual APIError loop() = 0;
  virtual APIError read_packet(ReadPacketBuffer *buffer) = 0;
  bool can_write_without_blocking() { return state_ == State::DATA && tx_buf_.empty(); }
  std::string getpeername() { return socket_->getpeername(); }
@@ -125,6 +125,38 @@ class APIFrameHelper {
    const uint8_t *current_data() const { return data.data() + offset; }
  };

+  // Queue of data buffers to be sent
+  std::deque<SendBuffer> tx_buf_;
+
+  // Common state enum for all frame helpers
+  // Note: Not all states are used by all implementations
+  // - INITIALIZE: Used by both Noise and Plaintext
+  // - CLIENT_HELLO, SERVER_HELLO, HANDSHAKE: Only used by Noise protocol
+  // - DATA: Used by both Noise and Plaintext
+  // - CLOSED: Used by both Noise and Plaintext
+  // - FAILED: Used by both Noise and Plaintext
+  // - EXPLICIT_REJECT: Only used by Noise protocol
+  enum class State {
+    INITIALIZE = 1,
+    CLIENT_HELLO = 2,  // Noise only
+    SERVER_HELLO = 3,  // Noise only
+    HANDSHAKE = 4,     // Noise only
+    DATA = 5,
+    CLOSED = 6,
+    FAILED = 7,
+    EXPLICIT_REJECT = 8,  // Noise only
+  };
+
+  // Current state of the frame helper
+  State state_{State::INITIALIZE};
+
+  // Helper name for logging
+  std::string info_;
+
+  // Socket for communication
+  socket::Socket *socket_{nullptr};
+  std::unique_ptr<socket::Socket> socket_owned_;
+
  // Common implementation for writing raw data to socket
  APIError write_raw_(const struct iovec *iov, int iovcnt);

@@ -137,41 +169,15 @@ class APIFrameHelper {
  APIError write_raw_(const struct iovec *iov, int iovcnt, socket::Socket *socket, std::vector<uint8_t> &tx_buf,
                      const std::string &info, StateEnum &state, StateEnum failed_state);

-  // Pointers first (4 bytes each)
-  socket::Socket *socket_{nullptr};
-  std::unique_ptr<socket::Socket> socket_owned_;
-
-  // Common state enum for all frame helpers
-  // Note: Not all states are used by all implementations
-  // - INITIALIZE: Used by both Noise and Plaintext
-  // - CLIENT_HELLO, SERVER_HELLO, HANDSHAKE: Only used by Noise protocol
-  // - DATA: Used by both Noise and Plaintext
-  // - CLOSED: Used by both Noise and Plaintext
-  // - FAILED: Used by both Noise and Plaintext
-  // - EXPLICIT_REJECT: Only used by Noise protocol
-  enum class State : uint8_t {
-    INITIALIZE = 1,
-    CLIENT_HELLO = 2,  // Noise only
-    SERVER_HELLO = 3,  // Noise only
-    HANDSHAKE = 4,     // Noise only
-    DATA = 5,
-    CLOSED = 6,
-    FAILED = 7,
-    EXPLICIT_REJECT = 8,  // Noise only
-  };
-
-  // Containers (size varies, but typically 12+ bytes on 32-bit)
-  std::deque<SendBuffer> tx_buf_;
-  std::string info_;
-  std::vector<struct iovec> reusable_iovs_;
-  std::vector<uint8_t> rx_buf_;
-
-  // Group smaller types together
-  uint16_t rx_buf_len_ = 0;
-  State state_{State::INITIALIZE};
  uint8_t frame_header_padding_{0};
  uint8_t frame_footer_size_{0};
-  // 5 bytes total, 3 bytes padding
+
+  // Reusable IOV array for write_protobuf_packets to avoid repeated allocations
+  std::vector<struct iovec> reusable_iovs_;
+
+  // Receive buffer for reading frame data
+  std::vector<uint8_t> rx_buf_;
+  uint16_t rx_buf_len_ = 0;

  // Common initialization for both plaintext and noise protocols
  APIError init_common_();
@@ -207,28 +213,19 @@ class APINoiseFrameHelper : public APIFrameHelper {
  APIError init_handshake_();
  APIError check_handshake_finished_();
  void send_explicit_handshake_reject_(const std::string &reason);
-
-  // Pointers first (4 bytes each)
-  NoiseHandshakeState *handshake_{nullptr};
-  NoiseCipherState *send_cipher_{nullptr};
-  NoiseCipherState *recv_cipher_{nullptr};
-
-  // Shared pointer (8 bytes on 32-bit = 4 bytes control block pointer + 4 bytes object pointer)
-  std::shared_ptr<APINoiseContext> ctx_;
-
-  // Vector (12 bytes on 32-bit)
-  std::vector<uint8_t> prologue_;
-
-  // NoiseProtocolId (size depends on implementation)
-  NoiseProtocolId nid_;
-
-  // Group small types together
  // Fixed-size header buffer for noise protocol:
  // 1 byte for indicator + 2 bytes for message size (16-bit value, not varint)
  // Note: Maximum message size is UINT16_MAX (65535), with a limit of 128 bytes during handshake phase
  uint8_t rx_header_buf_[3];
  uint8_t rx_header_buf_len_ = 0;
-  // 4 bytes total, no padding
+
+  std::vector<uint8_t> prologue_;
+
+  std::shared_ptr<APINoiseContext> ctx_;
+  NoiseHandshakeState *handshake_{nullptr};
+  NoiseCipherState *send_cipher_{nullptr};
+  NoiseCipherState *recv_cipher_{nullptr};
+  NoiseProtocolId nid_;
 };
 #endif  // USE_API_NOISE

@@ -255,12 +252,6 @@ class APIPlaintextFrameHelper : public APIFrameHelper {

 protected:
  APIError try_read_frame_(ParsedFrame *frame);
-
-  // Group 2-byte aligned types
-  uint16_t rx_header_parsed_type_ = 0;
-  uint16_t rx_header_parsed_len_ = 0;
-
-  // Group 1-byte types together
  // Fixed-size header buffer for plaintext protocol:
  // We now store the indicator byte + the two varints.
  // To match noise protocol's maximum message size (UINT16_MAX = 65535), we need:
@@ -272,7 +263,8 @@ class APIPlaintextFrameHelper : public APIFrameHelper {
  uint8_t rx_header_buf_[6];  // 1 byte indicator + 5 bytes for varints (3 for size + 2 for type)
  uint8_t rx_header_buf_pos_ = 0;
  bool rx_header_parsed_ = false;
-  // 8 bytes total, no padding needed
+  uint16_t rx_header_parsed_type_ = 0;
+  uint16_t rx_header_parsed_len_ = 0;
 };
 #endif

--- a/esphome/components/api/api_options.proto
+++ b/esphome/components/api/api_options.proto
@@ -21,5 +21,4 @@ extend google.protobuf.MessageOptions {
    optional string ifdef = 1038;
    optional bool log = 1039 [default=true];
    optional bool no_delay = 1040 [default=false];
-    optional string base_class = 1041;
 }
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -19,7 +19,7 @@ class APIServerConnectionBase : public ProtoService {

  template<typename T> bool send_message(const T &msg) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
-    this->log_send_message_(msg.message_name(), msg.dump());
+    this->log_send_message_(T::message_name(), msg.dump());
 #endif
    return this->send_message_(msg, T::MESSAGE_TYPE);
  }
@@ -199,7 +199,7 @@ class APIServerConnectionBase : public ProtoService {
  virtual void on_update_command_request(const UpdateCommandRequest &value){};
 #endif
 protected:
-  void read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
+  bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
 };

 class APIServerConnection : public APIServerConnectionBase {
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -47,11 +47,6 @@ void APIServer::setup() {
  }
 #endif

-  // Schedule reboot if no clients connect within timeout
-  if (this->reboot_timeout_ != 0) {
-    this->schedule_reboot_timeout_();
-  }
-
  this->socket_ = socket::socket_ip_loop_monitored(SOCK_STREAM, 0);  // monitored for incoming connections
  if (this->socket_ == nullptr) {
    ESP_LOGW(TAG, "Could not create socket");
@@ -104,19 +99,21 @@ void APIServer::setup() {
        return;
      }
      for (auto &c : this->clients_) {
-        if (!c->flags_.remove)
+        if (!c->remove_)
          c->try_send_log_message(level, tag, message);
      }
    });
  }
 #endif

+  this->last_connected_ = millis();
+
 #ifdef USE_ESP32_CAMERA
  if (esp32_camera::global_esp32_camera != nullptr && !esp32_camera::global_esp32_camera->is_internal()) {
    esp32_camera::global_esp32_camera->add_image_callback(
        [this](const std::shared_ptr<esp32_camera::CameraImage> &image) {
          for (auto &c : this->clients_) {
-            if (!c->flags_.remove)
+            if (!c->remove_)
              c->set_camera_state(image);
          }
        });
@@ -124,16 +121,6 @@ void APIServer::setup() {
 #endif
 }

-void APIServer::schedule_reboot_timeout_() {
-  this->status_set_warning();
-  this->set_timeout("api_reboot", this->reboot_timeout_, []() {
-    if (!global_api_server->is_connected()) {
-      ESP_LOGE(TAG, "No clients; rebooting");
-      App.reboot();
-    }
-  });
-}
-
 void APIServer::loop() {
  // Accept new clients only if the socket exists and has incoming connections
  if (this->socket_ && this->socket_->ready()) {
@@ -143,61 +130,51 @@ void APIServer::loop() {
      auto sock = this->socket_->accept_loop_monitored((struct sockaddr *) &source_addr, &addr_len);
      if (!sock)
        break;
-      ESP_LOGD(TAG, "Accept %s", sock->getpeername().c_str());
+      ESP_LOGD(TAG, "Accepted %s", sock->getpeername().c_str());

      auto *conn = new APIConnection(std::move(sock), this);
      this->clients_.emplace_back(conn);
      conn->start();
+    }
+  }

-      // Clear warning status and cancel reboot when first client connects
-      if (this->clients_.size() == 1 && this->reboot_timeout_ != 0) {
-        this->status_clear_warning();
-        this->cancel_timeout("api_reboot");
+  // Process clients and remove disconnected ones in a single pass
+  if (!this->clients_.empty()) {
+    size_t client_index = 0;
+    while (client_index < this->clients_.size()) {
+      auto &client = this->clients_[client_index];
+
+      if (client->remove_) {
+        // Handle disconnection
+        this->client_disconnected_trigger_->trigger(client->client_info_, client->client_peername_);
+        ESP_LOGV(TAG, "Removing connection to %s", client->client_info_.c_str());
+
+        // Swap with the last element and pop (avoids expensive vector shifts)
+        if (client_index < this->clients_.size() - 1) {
+          std::swap(this->clients_[client_index], this->clients_.back());
+        }
+        this->clients_.pop_back();
+        // Don't increment client_index since we need to process the swapped element
+      } else {
+        // Process active client
+        client->loop();
+        client_index++;  // Move to next client
      }
    }
  }

-  if (this->clients_.empty()) {
-    return;
-  }
-
-  // Process clients and remove disconnected ones in a single pass
-  // Check network connectivity once for all clients
-  if (!network::is_connected()) {
-    // Network is down - disconnect all clients
-    for (auto &client : this->clients_) {
-      client->on_fatal_error();
-      ESP_LOGW(TAG, "%s: Network down; disconnect", client->get_client_combined_info().c_str());
+  if (this->reboot_timeout_ != 0) {
+    const uint32_t now = millis();
+    if (!this->is_connected()) {
+      if (now - this->last_connected_ > this->reboot_timeout_) {
+        ESP_LOGE(TAG, "No client connected; rebooting");
+        App.reboot();
+      }
+      this->status_set_warning();
+    } else {
+      this->last_connected_ = now;
+      this->status_clear_warning();
    }
-    // Continue to process and clean up the clients below
-  }
-
-  size_t client_index = 0;
-  while (client_index < this->clients_.size()) {
-    auto &client = this->clients_[client_index];
-
-    if (!client->flags_.remove) {
-      // Common case: process active client
-      client->loop();
-      client_index++;
-      continue;
-    }
-
-    // Rare case: handle disconnection
-    this->client_disconnected_trigger_->trigger(client->client_info_, client->client_peername_);
-    ESP_LOGV(TAG, "Remove connection %s", client->client_info_.c_str());
-
-    // Swap with the last element and pop (avoids expensive vector shifts)
-    if (client_index < this->clients_.size() - 1) {
-      std::swap(this->clients_[client_index], this->clients_.back());
-    }
-    this->clients_.pop_back();
-
-    // Schedule reboot when last client disconnects
-    if (this->clients_.empty() && this->reboot_timeout_ != 0) {
-      this->schedule_reboot_timeout_();
-    }
-    // Don't increment client_index since we need to process the swapped element
  }
 }

@@ -502,7 +479,7 @@ bool APIServer::save_noise_psk(psk_t psk, bool make_active) {
 #ifdef USE_HOMEASSISTANT_TIME
 void APIServer::request_time() {
  for (auto &client : this->clients_) {
-    if (!client->flags_.remove && client->is_authenticated())
+    if (!client->remove_ && client->is_authenticated())
      client->send_time_request();
  }
 }
@@ -526,8 +503,8 @@ void APIServer::on_shutdown() {
  for (auto &c : this->clients_) {
    if (!c->send_message(DisconnectRequest())) {
      // If we can't send the disconnect request directly (tx_buffer full),
-      // schedule it at the front of the batch so it will be sent with priority
-      c->schedule_message_front_(nullptr, &APIConnection::try_send_disconnect_request, DisconnectRequest::MESSAGE_TYPE);
+      // schedule it in the batch so it will be sent with the 5ms timer
+      c->schedule_message_(nullptr, &APIConnection::try_send_disconnect_request, DisconnectRequest::MESSAGE_TYPE);
    }
  }
 }
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -142,27 +142,19 @@ class APIServer : public Component, public Controller {
  }

 protected:
-  void schedule_reboot_timeout_();
-  // Pointers and pointer-like types first (4 bytes each)
+  bool shutting_down_ = false;
  std::unique_ptr<socket::Socket> socket_ = nullptr;
-  Trigger<std::string, std::string> *client_connected_trigger_ = new Trigger<std::string, std::string>();
-  Trigger<std::string, std::string> *client_disconnected_trigger_ = new Trigger<std::string, std::string>();
-
-  // 4-byte aligned types
+  uint16_t port_{6053};
  uint32_t reboot_timeout_{300000};
  uint32_t batch_delay_{100};
-
-  // Vectors and strings (12 bytes each on 32-bit)
+  uint32_t last_connected_{0};
  std::vector<std::unique_ptr<APIConnection>> clients_;
  std::string password_;
  std::vector<uint8_t> shared_write_buffer_;  // Shared proto write buffer for all connections
  std::vector<HomeAssistantStateSubscription> state_subs_;
  std::vector<UserServiceDescriptor *> user_services_;
-
-  // Group smaller types together
-  uint16_t port_{6053};
-  bool shutting_down_ = false;
-  // 3 bytes used, 1 byte padding
+  Trigger<std::string, std::string> *client_connected_trigger_ = new Trigger<std::string, std::string>();
+  Trigger<std::string, std::string> *client_disconnected_trigger_ = new Trigger<std::string, std::string>();

 #ifdef USE_API_NOISE
  std::shared_ptr<APINoiseContext> noise_ctx_ = std::make_shared<APINoiseContext>();
--- a/esphome/components/api/client.py
+++ b/esphome/components/api/client.py
@@ -4,15 +4,9 @@ import asyncio
 from datetime import datetime
 import logging
 from typing import TYPE_CHECKING, Any
-import warnings

-# Suppress protobuf version warnings
-with warnings.catch_warnings():
-    warnings.filterwarnings(
-        "ignore", category=UserWarning, message=".*Protobuf gencode version.*"
-    )
-    from aioesphomeapi import APIClient, parse_log_message
-    from aioesphomeapi.log_runner import async_run
+from aioesphomeapi import APIClient, parse_log_message
+from aioesphomeapi.log_runner import async_run

 from esphome.const import CONF_KEY, CONF_PASSWORD, CONF_PORT, __version__
 from esphome.core import CORE
--- a/esphome/components/api/list_entities.cpp
+++ b/esphome/components/api/list_entities.cpp
@@ -1,7 +1,6 @@
 #include "list_entities.h"
 #ifdef USE_API
 #include "api_connection.h"
-#include "api_pb2.h"
 #include "esphome/core/application.h"
 #include "esphome/core/log.h"
 #include "esphome/core/util.h"
@@ -11,62 +10,62 @@ namespace api {

 #ifdef USE_BINARY_SENSOR
 bool ListEntitiesIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) {
-  return this->client_->schedule_message_(binary_sensor, &APIConnection::try_send_binary_sensor_info,
-                                          ListEntitiesBinarySensorResponse::MESSAGE_TYPE);
+  this->client_->send_binary_sensor_info(binary_sensor);
+  return true;
 }
 #endif
 #ifdef USE_COVER
 bool ListEntitiesIterator::on_cover(cover::Cover *cover) {
-  return this->client_->schedule_message_(cover, &APIConnection::try_send_cover_info,
-                                          ListEntitiesCoverResponse::MESSAGE_TYPE);
+  this->client_->send_cover_info(cover);
+  return true;
 }
 #endif
 #ifdef USE_FAN
 bool ListEntitiesIterator::on_fan(fan::Fan *fan) {
-  return this->client_->schedule_message_(fan, &APIConnection::try_send_fan_info,
-                                          ListEntitiesFanResponse::MESSAGE_TYPE);
+  this->client_->send_fan_info(fan);
+  return true;
 }
 #endif
 #ifdef USE_LIGHT
 bool ListEntitiesIterator::on_light(light::LightState *light) {
-  return this->client_->schedule_message_(light, &APIConnection::try_send_light_info,
-                                          ListEntitiesLightResponse::MESSAGE_TYPE);
+  this->client_->send_light_info(light);
+  return true;
 }
 #endif
 #ifdef USE_SENSOR
 bool ListEntitiesIterator::on_sensor(sensor::Sensor *sensor) {
-  return this->client_->schedule_message_(sensor, &APIConnection::try_send_sensor_info,
-                                          ListEntitiesSensorResponse::MESSAGE_TYPE);
+  this->client_->send_sensor_info(sensor);
+  return true;
 }
 #endif
 #ifdef USE_SWITCH
 bool ListEntitiesIterator::on_switch(switch_::Switch *a_switch) {
-  return this->client_->schedule_message_(a_switch, &APIConnection::try_send_switch_info,
-                                          ListEntitiesSwitchResponse::MESSAGE_TYPE);
+  this->client_->send_switch_info(a_switch);
+  return true;
 }
 #endif
 #ifdef USE_BUTTON
 bool ListEntitiesIterator::on_button(button::Button *button) {
-  return this->client_->schedule_message_(button, &APIConnection::try_send_button_info,
-                                          ListEntitiesButtonResponse::MESSAGE_TYPE);
+  this->client_->send_button_info(button);
+  return true;
 }
 #endif
 #ifdef USE_TEXT_SENSOR
 bool ListEntitiesIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
-  return this->client_->schedule_message_(text_sensor, &APIConnection::try_send_text_sensor_info,
-                                          ListEntitiesTextSensorResponse::MESSAGE_TYPE);
+  this->client_->send_text_sensor_info(text_sensor);
+  return true;
 }
 #endif
 #ifdef USE_LOCK
 bool ListEntitiesIterator::on_lock(lock::Lock *a_lock) {
-  return this->client_->schedule_message_(a_lock, &APIConnection::try_send_lock_info,
-                                          ListEntitiesLockResponse::MESSAGE_TYPE);
+  this->client_->send_lock_info(a_lock);
+  return true;
 }
 #endif
 #ifdef USE_VALVE
 bool ListEntitiesIterator::on_valve(valve::Valve *valve) {
-  return this->client_->schedule_message_(valve, &APIConnection::try_send_valve_info,
-                                          ListEntitiesValveResponse::MESSAGE_TYPE);
+  this->client_->send_valve_info(valve);
+  return true;
 }
 #endif

@@ -79,82 +78,82 @@ bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {

 #ifdef USE_ESP32_CAMERA
 bool ListEntitiesIterator::on_camera(esp32_camera::ESP32Camera *camera) {
-  return this->client_->schedule_message_(camera, &APIConnection::try_send_camera_info,
-                                          ListEntitiesCameraResponse::MESSAGE_TYPE);
+  this->client_->send_camera_info(camera);
+  return true;
 }
 #endif

 #ifdef USE_CLIMATE
 bool ListEntitiesIterator::on_climate(climate::Climate *climate) {
-  return this->client_->schedule_message_(climate, &APIConnection::try_send_climate_info,
-                                          ListEntitiesClimateResponse::MESSAGE_TYPE);
+  this->client_->send_climate_info(climate);
+  return true;
 }
 #endif

 #ifdef USE_NUMBER
 bool ListEntitiesIterator::on_number(number::Number *number) {
-  return this->client_->schedule_message_(number, &APIConnection::try_send_number_info,
-                                          ListEntitiesNumberResponse::MESSAGE_TYPE);
+  this->client_->send_number_info(number);
+  return true;
 }
 #endif

 #ifdef USE_DATETIME_DATE
 bool ListEntitiesIterator::on_date(datetime::DateEntity *date) {
-  return this->client_->schedule_message_(date, &APIConnection::try_send_date_info,
-                                          ListEntitiesDateResponse::MESSAGE_TYPE);
+  this->client_->send_date_info(date);
+  return true;
 }
 #endif

 #ifdef USE_DATETIME_TIME
 bool ListEntitiesIterator::on_time(datetime::TimeEntity *time) {
-  return this->client_->schedule_message_(time, &APIConnection::try_send_time_info,
-                                          ListEntitiesTimeResponse::MESSAGE_TYPE);
+  this->client_->send_time_info(time);
+  return true;
 }
 #endif

 #ifdef USE_DATETIME_DATETIME
 bool ListEntitiesIterator::on_datetime(datetime::DateTimeEntity *datetime) {
-  return this->client_->schedule_message_(datetime, &APIConnection::try_send_datetime_info,
-                                          ListEntitiesDateTimeResponse::MESSAGE_TYPE);
+  this->client_->send_datetime_info(datetime);
+  return true;
 }
 #endif

 #ifdef USE_TEXT
 bool ListEntitiesIterator::on_text(text::Text *text) {
-  return this->client_->schedule_message_(text, &APIConnection::try_send_text_info,
-                                          ListEntitiesTextResponse::MESSAGE_TYPE);
+  this->client_->send_text_info(text);
+  return true;
 }
 #endif

 #ifdef USE_SELECT
 bool ListEntitiesIterator::on_select(select::Select *select) {
-  return this->client_->schedule_message_(select, &APIConnection::try_send_select_info,
-                                          ListEntitiesSelectResponse::MESSAGE_TYPE);
+  this->client_->send_select_info(select);
+  return true;
 }
 #endif

 #ifdef USE_MEDIA_PLAYER
 bool ListEntitiesIterator::on_media_player(media_player::MediaPlayer *media_player) {
-  return this->client_->schedule_message_(media_player, &APIConnection::try_send_media_player_info,
-                                          ListEntitiesMediaPlayerResponse::MESSAGE_TYPE);
+  this->client_->send_media_player_info(media_player);
+  return true;
 }
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
 bool ListEntitiesIterator::on_alarm_control_panel(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
-  return this->client_->schedule_message_(a_alarm_control_panel, &APIConnection::try_send_alarm_control_panel_info,
-                                          ListEntitiesAlarmControlPanelResponse::MESSAGE_TYPE);
+  this->client_->send_alarm_control_panel_info(a_alarm_control_panel);
+  return true;
 }
 #endif
 #ifdef USE_EVENT
 bool ListEntitiesIterator::on_event(event::Event *event) {
-  return this->client_->schedule_message_(event, &APIConnection::try_send_event_info,
-                                          ListEntitiesEventResponse::MESSAGE_TYPE);
+  this->client_->send_event_info(event);
+  return true;
 }
 #endif
 #ifdef USE_UPDATE
 bool ListEntitiesIterator::on_update(update::UpdateEntity *update) {
-  return this->client_->schedule_message_(update, &APIConnection::try_send_update_info,
-                                          ListEntitiesUpdateResponse::MESSAGE_TYPE);
+  this->client_->send_update_info(update);
+  return true;
 }
 #endif

--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -216,7 +216,7 @@ class ProtoWriteBuffer {
    this->buffer_->insert(this->buffer_->end(), data, data + len);
  }
  void encode_string(uint32_t field_id, const std::string &value, bool force = false) {
-    this->encode_string(field_id, value.data(), value.size(), force);
+    this->encode_string(field_id, value.data(), value.size());
  }
  void encode_bytes(uint32_t field_id, const uint8_t *data, size_t len, bool force = false) {
    this->encode_string(field_id, reinterpret_cast<const char *>(data), len, force);
@@ -327,15 +327,12 @@ class ProtoWriteBuffer {
 class ProtoMessage {
 public:
  virtual ~ProtoMessage() = default;
-  // Default implementation for messages with no fields
-  virtual void encode(ProtoWriteBuffer buffer) const {}
+  virtual void encode(ProtoWriteBuffer buffer) const = 0;
  void decode(const uint8_t *buffer, size_t length);
-  // Default implementation for messages with no fields
-  virtual void calculate_size(uint32_t &total_size) const {}
+  virtual void calculate_size(uint32_t &total_size) const = 0;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  std::string dump() const;
  virtual void dump_to(std::string &out) const = 0;
-  virtual const char *message_name() const { return "unknown"; }
 #endif

 protected:
@@ -380,26 +377,6 @@ class ProtoService {
    // Send the buffer
    return this->send_buffer(buffer, message_type);
  }
-
-  // Authentication helper methods
-  bool check_connection_setup_() {
-    if (!this->is_connection_setup()) {
-      this->on_no_setup_connection();
-      return false;
-    }
-    return true;
-  }
-
-  bool check_authenticated_() {
-    if (!this->check_connection_setup_()) {
-      return false;
-    }
-    if (!this->is_authenticated()) {
-      this->on_unauthenticated_access();
-      return false;
-    }
-    return true;
-  }
 };

 }  // namespace api
--- a/esphome/components/async_tcp/init.py
+++ b/esphome/components/async_tcp/init.py
@@ -21,8 +21,8 @@ CONFIG_SCHEMA = cv.All(
@coroutine_with_priority(200.0)
 async def to_code(config):
    if CORE.is_esp32 or CORE.is_libretiny:
-        # https://github.com/ESP32Async/AsyncTCP
-        cg.add_library("ESP32Async/AsyncTCP", "3.4.4")
+        # https://github.com/esphome/AsyncTCP/blob/master/library.json
+        cg.add_library("esphome/AsyncTCP-esphome", "2.1.4")
    elif CORE.is_esp8266:
-        # https://github.com/ESP32Async/ESPAsyncTCP
-        cg.add_library("ESP32Async/ESPAsyncTCP", "2.0.0")
+        # https://github.com/esphome/ESPAsyncTCP
+        cg.add_library("esphome/ESPAsyncTCP-esphome", "2.0.0")
--- a/esphome/components/atm90e32/atm90e32.cpp
+++ b/esphome/components/atm90e32/atm90e32.cpp
@@ -1,7 +1,6 @@
 #include "atm90e32.h"
 #include <cinttypes>
 #include <cmath>
-#include <numbers>
 #include "esphome/core/log.h"

 namespace esphome {
@@ -849,7 +848,7 @@ uint16_t ATM90E32Component::calculate_voltage_threshold(int line_freq, uint16_t
  float nominal_voltage = (line_freq == 60) ? 120.0f : 220.0f;
  float target_voltage = nominal_voltage * multiplier;

-  float peak_01v = target_voltage * 100.0f * std::numbers::sqrt2_v<float>;  // convert RMS → peak, scale to 0.01V
+  float peak_01v = target_voltage * 100.0f * std::sqrt(2.0f);  // convert RMS → peak, scale to 0.01V
  float divider = (2.0f * ugain) / 32768.0f;

  float threshold = peak_01v / divider;
--- a/esphome/components/audio/audio_decoder.cpp
+++ b/esphome/components/audio/audio_decoder.cpp
@@ -312,7 +312,7 @@ FileDecoderState AudioDecoder::decode_mp3_() {
  if (err) {
    switch (err) {
      case esp_audio_libs::helix_decoder::ERR_MP3_OUT_OF_MEMORY:
-        [[fallthrough]];
+        // Intentional fallthrough
      case esp_audio_libs::helix_decoder::ERR_MP3_NULL_POINTER:
        return FileDecoderState::FAILED;
        break;
--- a/esphome/components/audio/audio_reader.cpp
+++ b/esphome/components/audio/audio_reader.cpp
@@ -5,7 +5,6 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
-#include "esphome/core/log.h"

 #if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
 #include "esp_crt_bundle.h"
@@ -17,13 +16,13 @@ namespace audio {
 static const uint32_t READ_WRITE_TIMEOUT_MS = 20;

 static const uint32_t CONNECTION_TIMEOUT_MS = 5000;
-static const uint8_t MAX_FETCHING_HEADER_ATTEMPTS = 6;
+
+// The number of times the http read times out with no data before throwing an error
+static const uint32_t ERROR_COUNT_NO_DATA_READ_TIMEOUT = 100;

 static const size_t HTTP_STREAM_BUFFER_SIZE = 2048;

-static const uint8_t MAX_REDIRECTIONS = 5;
-
-static const char *const TAG = "audio_reader";
+static const uint8_t MAX_REDIRECTION = 5;

 // Some common HTTP status codes - borrowed from http_request component accessed 20241224
 enum HttpStatus {
@@ -95,7 +94,7 @@ esp_err_t AudioReader::start(const std::string &uri, AudioFileType &file_type) {
  client_config.url = uri.c_str();
  client_config.cert_pem = nullptr;
  client_config.disable_auto_redirect = false;
-  client_config.max_redirection_count = MAX_REDIRECTIONS;
+  client_config.max_redirection_count = 10;
  client_config.event_handler = http_event_handler;
  client_config.user_data = this;
  client_config.buffer_size = HTTP_STREAM_BUFFER_SIZE;
@@ -117,29 +116,12 @@ esp_err_t AudioReader::start(const std::string &uri, AudioFileType &file_type) {
  esp_err_t err = esp_http_client_open(this->client_, 0);

  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Failed to open URL");
    this->cleanup_connection_();
    return err;
  }

  int64_t header_length = esp_http_client_fetch_headers(this->client_);
-  uint8_t reattempt_count = 0;
-  while ((header_length < 0) && (reattempt_count < MAX_FETCHING_HEADER_ATTEMPTS)) {
-    this->cleanup_connection_();
-    if (header_length != -ESP_ERR_HTTP_EAGAIN) {
-      // Serious error, no recovery
-      return ESP_FAIL;
-    } else {
-      // Reconnect from a fresh state to avoid a bug where it never reads the headers even if made available
-      this->client_ = esp_http_client_init(&client_config);
-      esp_http_client_open(this->client_, 0);
-      header_length = esp_http_client_fetch_headers(this->client_);
-      ++reattempt_count;
-    }
-  }
-
  if (header_length < 0) {
-    ESP_LOGE(TAG, "Failed to fetch headers");
    this->cleanup_connection_();
    return ESP_FAIL;
  }
@@ -153,7 +135,7 @@ esp_err_t AudioReader::start(const std::string &uri, AudioFileType &file_type) {

  ssize_t redirect_count = 0;

-  while ((esp_http_client_set_redirection(this->client_) == ESP_OK) && (redirect_count < MAX_REDIRECTIONS)) {
+  while ((esp_http_client_set_redirection(this->client_) == ESP_OK) && (redirect_count < MAX_REDIRECTION)) {
    err = esp_http_client_open(this->client_, 0);
    if (err != ESP_OK) {
      this->cleanup_connection_();
@@ -285,29 +267,27 @@ AudioReaderState AudioReader::http_read_() {
      return AudioReaderState::FINISHED;
    }
  } else if (this->output_transfer_buffer_->free() > 0) {
-    int received_len = esp_http_client_read(this->client_, (char *) this->output_transfer_buffer_->get_buffer_end(),
-                                            this->output_transfer_buffer_->free());
+    size_t bytes_to_read = this->output_transfer_buffer_->free();
+    int received_len =
+        esp_http_client_read(this->client_, (char *) this->output_transfer_buffer_->get_buffer_end(), bytes_to_read);

    if (received_len > 0) {
      this->output_transfer_buffer_->increase_buffer_length(received_len);
      this->last_data_read_ms_ = millis();
-      return AudioReaderState::READING;
-    } else if (received_len <= 0) {
+    } else if (received_len < 0) {
      // HTTP read error
-      if (received_len == -1) {
-        // A true connection error occured, no chance at recovery
-        this->cleanup_connection_();
-        return AudioReaderState::FAILED;
-      }
+      this->cleanup_connection_();
+      return AudioReaderState::FAILED;
+    } else {
+      if (bytes_to_read > 0) {
+        // Read timed out
+        if ((millis() - this->last_data_read_ms_) > CONNECTION_TIMEOUT_MS) {
+          this->cleanup_connection_();
+          return AudioReaderState::FAILED;
+        }

-      // Read timed out, manually verify if it has been too long since the last successful read
-      if ((millis() - this->last_data_read_ms_) > MAX_FETCHING_HEADER_ATTEMPTS * CONNECTION_TIMEOUT_MS) {
-        ESP_LOGE(TAG, "Timed out");
-        this->cleanup_connection_();
-        return AudioReaderState::FAILED;
+        delay(READ_WRITE_TIMEOUT_MS);
      }
-
-      delay(READ_WRITE_TIMEOUT_MS);
    }
  }

--- a/esphome/components/audio/audio_transfer_buffer.cpp
+++ b/esphome/components/audio/audio_transfer_buffer.cpp
@@ -86,7 +86,7 @@ bool AudioTransferBuffer::reallocate(size_t new_buffer_size) {
 bool AudioTransferBuffer::allocate_buffer_(size_t buffer_size) {
  this->buffer_size_ = buffer_size;

-  RAMAllocator<uint8_t> allocator;
+  RAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);

  this->buffer_ = allocator.allocate(this->buffer_size_);
  if (this->buffer_ == nullptr) {
@@ -101,7 +101,7 @@ bool AudioTransferBuffer::allocate_buffer_(size_t buffer_size) {

 void AudioTransferBuffer::deallocate_buffer_() {
  if (this->buffer_ != nullptr) {
-    RAMAllocator<uint8_t> allocator;
+    RAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
    allocator.deallocate(this->buffer_, this->buffer_size_);
    this->buffer_ = nullptr;
    this->data_start_ = nullptr;
--- a/esphome/components/bedjet/bedjet_hub.cpp
+++ b/esphome/components/bedjet/bedjet_hub.cpp
@@ -480,11 +480,7 @@ void BedJetHub::set_clock(uint8_t hour, uint8_t minute) {

 /* Internal */

-void BedJetHub::loop() {
-  // Parent BLEClientNode has a loop() method, but this component uses
-  // polling via update() and BLE callbacks so loop isn't needed
-  this->disable_loop();
-}
+void BedJetHub::loop() {}
 void BedJetHub::update() { this->dispatch_status_(); }

 void BedJetHub::dump_config() {
--- a/esphome/components/bedjet/climate/bedjet_climate.cpp
+++ b/esphome/components/bedjet/climate/bedjet_climate.cpp
@@ -83,11 +83,7 @@ void BedJetClimate::reset_state_() {
  this->publish_state();
 }

-void BedJetClimate::loop() {
-  // This component is controlled via the parent BedJetHub
-  // Empty loop not needed, disable to save CPU cycles
-  this->disable_loop();
-}
+void BedJetClimate::loop() {}

 void BedJetClimate::control(const ClimateCall &call) {
  ESP_LOGD(TAG, "Received BedJetClimate::control");
--- a/esphome/components/beken_spi_led_strip/led_strip.cpp
+++ b/esphome/components/beken_spi_led_strip/led_strip.cpp
@@ -7,13 +7,11 @@

 extern "C" {
 #include "rtos_pub.h"
-// rtos_pub.h must be included before the rest of the includes
-
+#include "spi.h"
 #include "arm_arch.h"
 #include "general_dma_pub.h"
 #include "gpio_pub.h"
 #include "icu_pub.h"
-#include "spi.h"
 #undef SPI_DAT
 #undef SPI_BASE
 };
@@ -126,7 +124,7 @@ void BekenSPILEDStripLightOutput::setup() {
  size_t buffer_size = this->get_buffer_size_();
  size_t dma_buffer_size = (buffer_size * 8) + (2 * 64);

-  RAMAllocator<uint8_t> allocator;
+  ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
  this->buf_ = allocator.allocate(buffer_size);
  if (this->buf_ == nullptr) {
    ESP_LOGE(TAG, "Cannot allocate LED buffer!");
--- a/esphome/components/bh1750/bh1750.cpp
+++ b/esphome/components/bh1750/bh1750.cpp
@@ -50,7 +50,7 @@ void BH1750Sensor::read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<
  // turn on (after one-shot sensor automatically powers down)
  uint8_t turn_on = BH1750_COMMAND_POWER_ON;
  if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Power on failed");
+    ESP_LOGW(TAG, "Turning on BH1750 failed");
    f(NAN);
    return;
  }
@@ -60,7 +60,7 @@ void BH1750Sensor::read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<
    uint8_t mtreg_hi = BH1750_COMMAND_MT_REG_HI | ((mtreg >> 5) & 0b111);
    uint8_t mtreg_lo = BH1750_COMMAND_MT_REG_LO | ((mtreg >> 0) & 0b11111);
    if (this->write(&mtreg_hi, 1) != i2c::ERROR_OK || this->write(&mtreg_lo, 1) != i2c::ERROR_OK) {
-      ESP_LOGW(TAG, "Set measurement time failed");
+      ESP_LOGW(TAG, "Setting measurement time for BH1750 failed");
      active_mtreg_ = 0;
      f(NAN);
      return;
@@ -88,7 +88,7 @@ void BH1750Sensor::read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<
      return;
  }
  if (this->write(&cmd, 1) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Start measurement failed");
+    ESP_LOGW(TAG, "Starting measurement for BH1750 failed");
    f(NAN);
    return;
  }
@@ -99,7 +99,7 @@ void BH1750Sensor::read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<
  this->set_timeout("read", meas_time, [this, mode, mtreg, f]() {
    uint16_t raw_value;
    if (this->read(reinterpret_cast<uint8_t *>(&raw_value), 2) != i2c::ERROR_OK) {
-      ESP_LOGW(TAG, "Read data failed");
+      ESP_LOGW(TAG, "Reading BH1750 data failed");
      f(NAN);
      return;
    }
@@ -156,7 +156,7 @@ void BH1750Sensor::update() {
        this->publish_state(NAN);
        return;
      }
-      ESP_LOGD(TAG, "'%s': Illuminance=%.1flx", this->get_name().c_str(), val);
+      ESP_LOGD(TAG, "'%s': Got illuminance=%.1flx", this->get_name().c_str(), val);
      this->status_clear_warning();
      this->publish_state(val);
    });
--- a/esphome/components/binary_sensor/init.py
+++ b/esphome/components/binary_sensor/init.py
@@ -60,8 +60,8 @@ from esphome.const import (
    DEVICE_CLASS_WINDOW,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
+from esphome.cpp_helpers import setup_entity
 from esphome.util import Registry

 CODEOWNERS = ["@esphome/core"]
@@ -148,7 +148,6 @@ BinarySensorCondition = binary_sensor_ns.class_("BinarySensorCondition", Conditi

 # Filters
 Filter = binary_sensor_ns.class_("Filter")
-TimeoutFilter = binary_sensor_ns.class_("TimeoutFilter", Filter, cg.Component)
 DelayedOnOffFilter = binary_sensor_ns.class_("DelayedOnOffFilter", Filter, cg.Component)
 DelayedOnFilter = binary_sensor_ns.class_("DelayedOnFilter", Filter, cg.Component)
 DelayedOffFilter = binary_sensor_ns.class_("DelayedOffFilter", Filter, cg.Component)
@@ -172,19 +171,6 @@ async def invert_filter_to_code(config, filter_id):
    return cg.new_Pvariable(filter_id)


-@register_filter(
-    "timeout",
-    TimeoutFilter,
-    cv.templatable(cv.positive_time_period_milliseconds),
-)
-async def timeout_filter_to_code(config, filter_id):
-    var = cg.new_Pvariable(filter_id)
-    await cg.register_component(var, {})
-    template_ = await cg.templatable(config, [], cg.uint32)
-    cg.add(var.set_timeout_value(template_))
-    return var
-
-
@register_filter(
    "delayed_on_off",
    DelayedOnOffFilter,
@@ -505,9 +491,6 @@ _BINARY_SENSOR_SCHEMA = (
 )


-_BINARY_SENSOR_SCHEMA.add_extra(entity_duplicate_validator("binary_sensor"))
-
-
 def binary_sensor_schema(
    class_: MockObjClass = cv.UNDEFINED,
    *,
@@ -538,7 +521,7 @@ BINARY_SENSOR_SCHEMA.add_extra(cv.deprecated_schema_constant("binary_sensor"))


 async def setup_binary_sensor_core_(var, config):
-    await setup_entity(var, config, "binary_sensor")
+    await setup_entity(var, config)

    if (device_class := config.get(CONF_DEVICE_CLASS)) is not None:
        cg.add(var.set_device_class(device_class))
--- a/esphome/components/binary_sensor/filter.cpp
+++ b/esphome/components/binary_sensor/filter.cpp
@@ -25,12 +25,6 @@ void Filter::input(bool value) {
  }
 }

-void TimeoutFilter::input(bool value) {
-  this->set_timeout("timeout", this->timeout_delay_.value(), [this]() { this->parent_->invalidate_state(); });
-  // we do not de-dup here otherwise changes from invalid to valid state will not be output
-  this->output(value);
-}
-
 optional<bool> DelayedOnOffFilter::new_value(bool value) {
  if (value) {
    this->set_timeout("ON_OFF", this->on_delay_.value(), [this]() { this->output(true); });
--- a/esphome/components/binary_sensor/filter.h
+++ b/esphome/components/binary_sensor/filter.h
@@ -16,7 +16,7 @@ class Filter {
 public:
  virtual optional<bool> new_value(bool value) = 0;

-  virtual void input(bool value);
+  void input(bool value);

  void output(bool value);

@@ -28,16 +28,6 @@ class Filter {
  Deduplicator<bool> dedup_;
 };

-class TimeoutFilter : public Filter, public Component {
- public:
-  optional<bool> new_value(bool value) override { return value; }
-  void input(bool value) override;
-  template<typename T> void set_timeout_value(T timeout) { this->timeout_delay_ = timeout; }
-
- protected:
-  TemplatableValue<uint32_t> timeout_delay_{};
-};
-
 class DelayedOnOffFilter : public Filter, public Component {
 public:
  optional<bool> new_value(bool value) override;
--- a/esphome/components/ble_client/sensor/ble_rssi_sensor.cpp
+++ b/esphome/components/ble_client/sensor/ble_rssi_sensor.cpp
@@ -11,11 +11,7 @@ namespace ble_client {

 static const char *const TAG = "ble_rssi_sensor";

-void BLEClientRSSISensor::loop() {
-  // Parent BLEClientNode has a loop() method, but this component uses
-  // polling via update() and BLE GAP callbacks so loop isn't needed
-  this->disable_loop();
-}
+void BLEClientRSSISensor::loop() {}

 void BLEClientRSSISensor::dump_config() {
  LOG_SENSOR("", "BLE Client RSSI Sensor", this);
--- a/esphome/components/ble_client/sensor/ble_sensor.cpp
+++ b/esphome/components/ble_client/sensor/ble_sensor.cpp
@@ -11,11 +11,7 @@ namespace ble_client {

 static const char *const TAG = "ble_sensor";

-void BLESensor::loop() {
-  // Parent BLEClientNode has a loop() method, but this component uses
-  // polling via update() and BLE callbacks so loop isn't needed
-  this->disable_loop();
-}
+void BLESensor::loop() {}

 void BLESensor::dump_config() {
  LOG_SENSOR("", "BLE Sensor", this);
--- a/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
+++ b/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
@@ -14,11 +14,7 @@ static const char *const TAG = "ble_text_sensor";

 static const std::string EMPTY = "";

-void BLETextSensor::loop() {
-  // Parent BLEClientNode has a loop() method, but this component uses
-  // polling via update() and BLE callbacks so loop isn't needed
-  this->disable_loop();
-}
+void BLETextSensor::loop() {}

 void BLETextSensor::dump_config() {
  LOG_TEXT_SENSOR("", "BLE Text Sensor", this);
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.h
@@ -26,17 +26,10 @@ class BluetoothConnection : public esp32_ble_client::BLEClientBase {

 protected:
  friend class BluetoothProxy;
-
-  // Memory optimized layout for 32-bit systems
-  // Group 1: Pointers (4 bytes each, naturally aligned)
-  BluetoothProxy *proxy_;
-
-  // Group 2: 2-byte types
-  int16_t send_service_{-2};  // Needs to handle negative values and service count
-
-  // Group 3: 1-byte types
  bool seen_mtu_or_services_{false};
-  // 1 byte used, 1 byte padding
+
+  int16_t send_service_{-2};
+  BluetoothProxy *proxy_;
 };

 }  // namespace bluetooth_proxy
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -58,7 +58,7 @@ static std::vector<api::BluetoothLERawAdvertisement> &get_batch_buffer() {
  return batch_buffer;
 }

-bool BluetoothProxy::parse_devices(const esp32_ble::BLEScanResult *scan_results, size_t count) {
+bool BluetoothProxy::parse_devices(esp_ble_gap_cb_param_t::ble_scan_result_evt_param *advertisements, size_t count) {
  if (!api::global_api_server->is_connected() || this->api_connection_ == nullptr || !this->raw_advertisements_)
    return false;

@@ -73,7 +73,7 @@ bool BluetoothProxy::parse_devices(const esp32_ble::BLEScanResult *scan_results,

  // Add new advertisements to the batch buffer
  for (size_t i = 0; i < count; i++) {
-    auto &result = scan_results[i];
+    auto &result = advertisements[i];
    uint8_t length = result.adv_data_len + result.scan_rsp_len;

    batch_buffer.emplace_back();
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -52,7 +52,7 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com
 public:
  BluetoothProxy();
  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
-  bool parse_devices(const esp32_ble::BLEScanResult *scan_results, size_t count) override;
+  bool parse_devices(esp_ble_gap_cb_param_t::ble_scan_result_evt_param *advertisements, size_t count) override;
  void dump_config() override;
  void setup() override;
  void loop() override;
@@ -134,17 +134,11 @@ class BluetoothProxy : public esp32_ble_tracker::ESPBTDeviceListener, public Com

  BluetoothConnection *get_connection_(uint64_t address, bool reserve);

-  // Memory optimized layout for 32-bit systems
-  // Group 1: Pointers (4 bytes each, naturally aligned)
-  api::APIConnection *api_connection_{nullptr};
-
-  // Group 2: Container types (typically 12 bytes on 32-bit)
-  std::vector<BluetoothConnection *> connections_{};
-
-  // Group 3: 1-byte types grouped together
  bool active_;
+
+  std::vector<BluetoothConnection *> connections_{};
+  api::APIConnection *api_connection_{nullptr};
  bool raw_advertisements_{false};
-  // 2 bytes used, 2 bytes padding
 };

 extern BluetoothProxy *global_bluetooth_proxy;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
--- a/esphome/components/bme280_base/bme280_base.cpp
+++ b/esphome/components/bme280_base/bme280_base.cpp
@@ -93,8 +93,9 @@ void BME280Component::setup() {

  // Mark as not failed before initializing. Some devices will turn off sensors to save on batteries
  // and when they come back on, the COMPONENT_STATE_FAILED bit must be unset on the component.
-  if (this->is_failed()) {
-    this->reset_to_construction_state();
+  if ((this->component_state_ & COMPONENT_STATE_MASK) == COMPONENT_STATE_FAILED) {
+    this->component_state_ &= ~COMPONENT_STATE_MASK;
+    this->component_state_ |= COMPONENT_STATE_CONSTRUCTION;
  }

  if (!this->read_byte(BME280_REGISTER_CHIPID, &chip_id)) {
--- a/esphome/components/bme680/sensor.py
+++ b/esphome/components/bme680/sensor.py
@@ -12,8 +12,8 @@ from esphome.const import (
    CONF_OVERSAMPLING,
    CONF_PRESSURE,
    CONF_TEMPERATURE,
-    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
    DEVICE_CLASS_TEMPERATURE,
    ICON_GAS_CYLINDER,
    STATE_CLASS_MEASUREMENT,
--- a/esphome/components/button/init.py
+++ b/esphome/components/button/init.py
@@ -18,8 +18,8 @@ from esphome.const import (
    DEVICE_CLASS_UPDATE,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
+from esphome.cpp_helpers import setup_entity

 CODEOWNERS = ["@esphome/core"]
 IS_PLATFORM_COMPONENT = True
@@ -61,9 +61,6 @@ _BUTTON_SCHEMA = (
 )


-_BUTTON_SCHEMA.add_extra(entity_duplicate_validator("button"))
-
-
 def button_schema(
    class_: MockObjClass,
    *,
@@ -90,7 +87,7 @@ BUTTON_SCHEMA.add_extra(cv.deprecated_schema_constant("button"))


 async def setup_button_core_(var, config):
-    await setup_entity(var, config, "button")
+    await setup_entity(var, config)

    for conf in config.get(CONF_ON_PRESS, []):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
--- a/esphome/components/canbus/init.py
+++ b/esphome/components/canbus/init.py
@@ -1,5 +1,4 @@
 import re
-
 from esphome import automation
 import esphome.codegen as cg
 import esphome.config_validation as cv
--- a/esphome/components/captive_portal/init.py
+++ b/esphome/components/captive_portal/init.py
@@ -41,7 +41,6 @@ async def to_code(config):

    if CORE.using_arduino:
        if CORE.is_esp32:
-            cg.add_library("ESP32 Async UDP", None)
            cg.add_library("DNSServer", None)
            cg.add_library("WiFi", None)
        if CORE.is_esp8266:
--- a/esphome/components/captive_portal/captive_portal.cpp
+++ b/esphome/components/captive_portal/captive_portal.cpp
@@ -37,12 +37,7 @@ void CaptivePortal::handle_wifisave(AsyncWebServerRequest *request) {
  request->redirect("/?save");
 }

-void CaptivePortal::setup() {
-#ifndef USE_ARDUINO
-  // No DNS server needed for non-Arduino frameworks
-  this->disable_loop();
-#endif
-}
+void CaptivePortal::setup() {}
 void CaptivePortal::start() {
  this->base_->init();
  if (!this->initialized_) {
@@ -55,8 +50,6 @@ void CaptivePortal::start() {
  this->dns_server_->setErrorReplyCode(DNSReplyCode::NoError);
  network::IPAddress ip = wifi::global_wifi_component->wifi_soft_ap_ip();
  this->dns_server_->start(53, "*", ip);
-  // Re-enable loop() when DNS server is started
-  this->enable_loop();
 #endif

  this->base_->get_server()->onNotFound([this](AsyncWebServerRequest *req) {
@@ -75,11 +68,7 @@ void CaptivePortal::start() {

 void CaptivePortal::handleRequest(AsyncWebServerRequest *req) {
  if (req->url() == "/") {
-#ifndef USE_ESP8266
-    auto *response = req->beginResponse(200, "text/html", INDEX_GZ, sizeof(INDEX_GZ));
-#else
    auto *response = req->beginResponse_P(200, "text/html", INDEX_GZ, sizeof(INDEX_GZ));
-#endif
    response->addHeader("Content-Encoding", "gzip");
    req->send(response);
    return;
--- a/esphome/components/captive_portal/captive_portal.h
+++ b/esphome/components/captive_portal/captive_portal.h
@@ -21,11 +21,8 @@ class CaptivePortal : public AsyncWebHandler, public Component {
  void dump_config() override;
 #ifdef USE_ARDUINO
  void loop() override {
-    if (this->dns_server_ != nullptr) {
+    if (this->dns_server_ != nullptr)
      this->dns_server_->processNextRequest();
-    } else {
-      this->disable_loop();
-    }
  }
 #endif
  float get_setup_priority() const override;
@@ -40,7 +37,7 @@ class CaptivePortal : public AsyncWebHandler, public Component {
 #endif
  }

-  bool canHandle(AsyncWebServerRequest *request) const override {
+  bool canHandle(AsyncWebServerRequest *request) override {
    if (!this->active_)
      return false;

--- a/esphome/components/climate/init.py
+++ b/esphome/components/climate/init.py
@@ -48,8 +48,8 @@ from esphome.const import (
    CONF_WEB_SERVER,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
+from esphome.cpp_helpers import setup_entity

 IS_PLATFORM_COMPONENT = True

@@ -247,9 +247,6 @@ _CLIMATE_SCHEMA = (
 )


-_CLIMATE_SCHEMA.add_extra(entity_duplicate_validator("climate"))
-
-
 def climate_schema(
    class_: MockObjClass,
    *,
@@ -276,7 +273,7 @@ CLIMATE_SCHEMA.add_extra(cv.deprecated_schema_constant("climate"))


 async def setup_climate_core_(var, config):
-    await setup_entity(var, config, "climate")
+    await setup_entity(var, config)

    visual = config[CONF_VISUAL]
    if (min_temp := visual.get(CONF_MIN_TEMPERATURE)) is not None:
--- a/esphome/components/cm1106/sensor.py
+++ b/esphome/components/cm1106/sensor.py
@@ -1,10 +1,10 @@
 """CM1106 Sensor component for ESPHome."""

+import esphome.codegen as cg
+import esphome.config_validation as cv
 from esphome import automation
 from esphome.automation import maybe_simple_id
-import esphome.codegen as cg
 from esphome.components import sensor, uart
-import esphome.config_validation as cv
 from esphome.const import (
    CONF_CO2,
    CONF_ID,
--- a/esphome/components/cover/init.py
+++ b/esphome/components/cover/init.py
@@ -33,8 +33,8 @@ from esphome.const import (
    DEVICE_CLASS_WINDOW,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
+from esphome.cpp_helpers import setup_entity

 IS_PLATFORM_COMPONENT = True

@@ -126,9 +126,6 @@ _COVER_SCHEMA = (
 )


-_COVER_SCHEMA.add_extra(entity_duplicate_validator("cover"))
-
-
 def cover_schema(
    class_: MockObjClass,
    *,
@@ -157,7 +154,7 @@ COVER_SCHEMA.add_extra(cv.deprecated_schema_constant("cover"))


 async def setup_cover_core_(var, config):
-    await setup_entity(var, config, "cover")
+    await setup_entity(var, config)

    if (device_class := config.get(CONF_DEVICE_CLASS)) is not None:
        cg.add(var.set_device_class(device_class))
--- a/esphome/components/datetime/init.py
+++ b/esphome/components/datetime/init.py
@@ -22,8 +22,8 @@ from esphome.const import (
    CONF_YEAR,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
+from esphome.cpp_helpers import setup_entity

 CODEOWNERS = ["@rfdarter", "@jesserockz"]

@@ -84,8 +84,6 @@ _DATETIME_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
    .extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA)
 ).add_extra(_validate_time_present)

-_DATETIME_SCHEMA.add_extra(entity_duplicate_validator("datetime"))
-

 def date_schema(class_: MockObjClass) -> cv.Schema:
    schema = cv.Schema(
@@ -135,7 +133,7 @@ def datetime_schema(class_: MockObjClass) -> cv.Schema:


 async def setup_datetime_core_(var, config):
-    await setup_entity(var, config, "datetime")
+    await setup_entity(var, config)

    if (mqtt_id := config.get(CONF_MQTT_ID)) is not None:
        mqtt_ = cg.new_Pvariable(mqtt_id, var)
--- a/esphome/components/datetime/date_entity.cpp
+++ b/esphome/components/datetime/date_entity.cpp
@@ -11,25 +11,25 @@ static const char *const TAG = "datetime.date_entity";

 void DateEntity::publish_state() {
  if (this->year_ == 0 || this->month_ == 0 || this->day_ == 0) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    return;
  }
  if (this->year_ < 1970 || this->year_ > 3000) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Year must be between 1970 and 3000");
    return;
  }
  if (this->month_ < 1 || this->month_ > 12) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Month must be between 1 and 12");
    return;
  }
  if (this->day_ > days_in_month(this->month_, this->year_)) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Day must be between 1 and %d for month %d", days_in_month(this->month_, this->year_), this->month_);
    return;
  }
-  this->set_has_state(true);
+  this->has_state_ = true;
  ESP_LOGD(TAG, "'%s': Sending date %d-%d-%d", this->get_name().c_str(), this->year_, this->month_, this->day_);
  this->state_callback_.call();
 }
--- a/esphome/components/datetime/datetime_base.h
+++ b/esphome/components/datetime/datetime_base.h
@@ -13,6 +13,9 @@ namespace datetime {

 class DateTimeBase : public EntityBase {
 public:
+  /// Return whether this Datetime has gotten a full state yet.
+  bool has_state() const { return this->has_state_; }
+
  virtual ESPTime state_as_esptime() const = 0;

  void add_on_state_callback(std::function<void()> &&callback) { this->state_callback_.add(std::move(callback)); }
@@ -28,6 +31,8 @@ class DateTimeBase : public EntityBase {
 #ifdef USE_TIME
  time::RealTimeClock *rtc_;
 #endif
+
+  bool has_state_{false};
 };

 #ifdef USE_TIME
--- a/esphome/components/datetime/datetime_entity.cpp
+++ b/esphome/components/datetime/datetime_entity.cpp
@@ -11,40 +11,40 @@ static const char *const TAG = "datetime.datetime_entity";

 void DateTimeEntity::publish_state() {
  if (this->year_ == 0 || this->month_ == 0 || this->day_ == 0) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    return;
  }
  if (this->year_ < 1970 || this->year_ > 3000) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Year must be between 1970 and 3000");
    return;
  }
  if (this->month_ < 1 || this->month_ > 12) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Month must be between 1 and 12");
    return;
  }
  if (this->day_ > days_in_month(this->month_, this->year_)) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Day must be between 1 and %d for month %d", days_in_month(this->month_, this->year_), this->month_);
    return;
  }
  if (this->hour_ > 23) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Hour must be between 0 and 23");
    return;
  }
  if (this->minute_ > 59) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Minute must be between 0 and 59");
    return;
  }
  if (this->second_ > 59) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Second must be between 0 and 59");
    return;
  }
-  this->set_has_state(true);
+  this->has_state_ = true;
  ESP_LOGD(TAG, "'%s': Sending datetime %04u-%02u-%02u %02d:%02d:%02d", this->get_name().c_str(), this->year_,
           this->month_, this->day_, this->hour_, this->minute_, this->second_);
  this->state_callback_.call();
--- a/esphome/components/datetime/time_entity.cpp
+++ b/esphome/components/datetime/time_entity.cpp
@@ -11,21 +11,21 @@ static const char *const TAG = "datetime.time_entity";

 void TimeEntity::publish_state() {
  if (this->hour_ > 23) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Hour must be between 0 and 23");
    return;
  }
  if (this->minute_ > 59) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Minute must be between 0 and 59");
    return;
  }
  if (this->second_ > 59) {
-    this->set_has_state(false);
+    this->has_state_ = false;
    ESP_LOGE(TAG, "Second must be between 0 and 59");
    return;
  }
-  this->set_has_state(true);
+  this->has_state_ = true;
  ESP_LOGD(TAG, "'%s': Sending time %02d:%02d:%02d", this->get_name().c_str(), this->hour_, this->minute_,
           this->second_);
  this->state_callback_.call();
--- a/esphome/components/demo/init.py
+++ b/esphome/components/demo/init.py
@@ -455,7 +455,7 @@ CONFIG_SCHEMA = cv.Schema(
                    CONF_NAME: "Demo Plain Sensor",
                },
                {
-                    CONF_NAME: "Demo Temperature Sensor 1",
+                    CONF_NAME: "Demo Temperature Sensor",
                    CONF_UNIT_OF_MEASUREMENT: UNIT_CELSIUS,
                    CONF_ICON: ICON_THERMOMETER,
                    CONF_ACCURACY_DECIMALS: 1,
@@ -463,7 +463,7 @@ CONFIG_SCHEMA = cv.Schema(
                    CONF_STATE_CLASS: STATE_CLASS_MEASUREMENT,
                },
                {
-                    CONF_NAME: "Demo Temperature Sensor 2",
+                    CONF_NAME: "Demo Temperature Sensor",
                    CONF_UNIT_OF_MEASUREMENT: UNIT_CELSIUS,
                    CONF_ICON: ICON_THERMOMETER,
                    CONF_ACCURACY_DECIMALS: 1,
--- a/esphome/components/display/display.cpp
+++ b/esphome/components/display/display.cpp
@@ -1,6 +1,5 @@
 #include "display.h"
 #include <utility>
-#include <numbers>
 #include "display_color_utils.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
@@ -425,15 +424,15 @@ void HOT Display::get_regular_polygon_vertex(int vertex_id, int *vertex_x, int *
    // hence we rotate the shape by 270° to orient the polygon up.
    rotation_degrees += ROTATION_270_DEGREES;
    // Convert the rotation to radians, easier to use in trigonometrical calculations
-    float rotation_radians = rotation_degrees * std::numbers::pi / 180;
+    float rotation_radians = rotation_degrees * PI / 180;
    // A pointy top variation means the first vertex of the polygon is at the top center of the shape, this requires no
    // additional rotation of the shape.
    // A flat top variation means the first point of the polygon has to be rotated so that the first edge is horizontal,
    // this requires to rotate the shape by π/edges radians counter-clockwise so that the first point is located on the
    // left side of the first horizontal edge.
-    rotation_radians -= (variation == VARIATION_FLAT_TOP) ? std::numbers::pi / edges : 0.0;
+    rotation_radians -= (variation == VARIATION_FLAT_TOP) ? PI / edges : 0.0;

-    float vertex_angle = ((float) vertex_id) / edges * 2 * std::numbers::pi + rotation_radians;
+    float vertex_angle = ((float) vertex_id) / edges * 2 * PI + rotation_radians;
    *vertex_x = (int) round(cos(vertex_angle) * radius) + center_x;
    *vertex_y = (int) round(sin(vertex_angle) * radius) + center_y;
  }
--- a/esphome/components/display/display.h
+++ b/esphome/components/display/display.h
@@ -138,6 +138,8 @@ enum DisplayRotation {
  DISPLAY_ROTATION_270_DEGREES = 270,
 };

+#define PI 3.1415926535897932384626433832795
+
 const int EDGES_TRIGON = 3;
 const int EDGES_TRIANGLE = 3;
 const int EDGES_TETRAGON = 4;
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -11,7 +11,7 @@ namespace display {
 static const char *const TAG = "display";

 void DisplayBuffer::init_internal_(uint32_t buffer_length) {
-  RAMAllocator<uint8_t> allocator;
+  ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
  this->buffer_ = allocator.allocate(buffer_length);
  if (this->buffer_ == nullptr) {
    ESP_LOGE(TAG, "Could not allocate buffer for display!");
--- a/esphome/components/esp32/init.py
+++ b/esphome/components/esp32/init.py
@@ -4,7 +4,7 @@ import logging
 import os
 from pathlib import Path

-from esphome import yaml_util
+from esphome import git
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import (
@@ -23,6 +23,7 @@ from esphome.const import (
    CONF_REFRESH,
    CONF_SOURCE,
    CONF_TYPE,
+    CONF_URL,
    CONF_VARIANT,
    CONF_VERSION,
    KEY_CORE,
@@ -31,13 +32,14 @@ from esphome.const import (
    KEY_TARGET_FRAMEWORK,
    KEY_TARGET_PLATFORM,
    PLATFORM_ESP32,
+    TYPE_GIT,
+    TYPE_LOCAL,
    __version__,
 )
 from esphome.core import CORE, HexInt, TimePeriod
 from esphome.cpp_generator import RawExpression
 import esphome.final_validate as fv
 from esphome.helpers import copy_file_if_changed, mkdir_p, write_file_if_changed
-from esphome.types import ConfigType

 from .boards import BOARDS
 from .const import (  # noqa
@@ -47,8 +49,10 @@ from .const import (  # noqa
    KEY_EXTRA_BUILD_FILES,
    KEY_PATH,
    KEY_REF,
+    KEY_REFRESH,
    KEY_REPO,
    KEY_SDKCONFIG_OPTIONS,
+    KEY_SUBMODULES,
    KEY_VARIANT,
    VARIANT_ESP32,
    VARIANT_ESP32C2,
@@ -90,13 +94,6 @@ COMPILER_OPTIMIZATIONS = {
    "SIZE": "CONFIG_COMPILER_OPTIMIZATION_SIZE",
 }

-ARDUINO_ALLOWED_VARIANTS = [
-    VARIANT_ESP32,
-    VARIANT_ESP32C3,
-    VARIANT_ESP32S2,
-    VARIANT_ESP32S3,
-]
-

 def get_cpu_frequencies(*frequencies):
    return [str(x) + "MHZ" for x in frequencies]
@@ -128,8 +125,6 @@ def set_core_data(config):
        choices = CPU_FREQUENCIES[variant]
        if "160MHZ" in choices:
            cpu_frequency = "160MHZ"
-        elif "360MHZ" in choices:
-            cpu_frequency = "360MHZ"
        else:
            cpu_frequency = choices[-1]
        config[CONF_CPU_FREQUENCY] = cpu_frequency
@@ -148,17 +143,12 @@ def set_core_data(config):
        CORE.data[KEY_ESP32][KEY_COMPONENTS] = {}
    elif conf[CONF_TYPE] == FRAMEWORK_ARDUINO:
        CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK] = "arduino"
-        if variant not in ARDUINO_ALLOWED_VARIANTS:
-            raise cv.Invalid(
-                f"ESPHome does not support using the Arduino framework for the {variant}. Please use the ESP-IDF framework instead.",
-                path=[CONF_FRAMEWORK, CONF_TYPE],
-            )
    CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] = cv.Version.parse(
        config[CONF_FRAMEWORK][CONF_VERSION]
    )

    CORE.data[KEY_ESP32][KEY_BOARD] = config[CONF_BOARD]
-    CORE.data[KEY_ESP32][KEY_VARIANT] = variant
+    CORE.data[KEY_ESP32][KEY_VARIANT] = config[CONF_VARIANT]
    CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES] = {}

    return config
@@ -231,7 +221,7 @@ def add_idf_sdkconfig_option(name: str, value: SdkconfigValueType):
 def add_idf_component(
    *,
    name: str,
-    repo: str = None,
+    repo: str,
    ref: str = None,
    path: str = None,
    refresh: TimePeriod = None,
@@ -241,27 +231,30 @@ def add_idf_component(
    """Add an esp-idf component to the project."""
    if not CORE.using_esp_idf:
        raise ValueError("Not an esp-idf project")
-    if not repo and not ref and not path:
-        raise ValueError("Requires at least one of repo, ref or path")
-    if refresh or submodules or components:
-        _LOGGER.warning(
-            "The refresh, components and submodules parameters in add_idf_component() are "
-            "deprecated and will be removed in ESPHome 2026.1. If you are seeing this, report "
-            "an issue to the external_component author and ask them to update it."
-        )
-    if components:
-        for comp in components:
-            CORE.data[KEY_ESP32][KEY_COMPONENTS][comp] = {
-                KEY_REPO: repo,
-                KEY_REF: ref,
-                KEY_PATH: f"{path}/{comp}" if path else comp,
-            }
-    else:
+    if components is None:
+        components = []
+    if name not in CORE.data[KEY_ESP32][KEY_COMPONENTS]:
        CORE.data[KEY_ESP32][KEY_COMPONENTS][name] = {
            KEY_REPO: repo,
            KEY_REF: ref,
            KEY_PATH: path,
+            KEY_REFRESH: refresh,
+            KEY_COMPONENTS: components,
+            KEY_SUBMODULES: submodules,
        }
+    else:
+        component_config = CORE.data[KEY_ESP32][KEY_COMPONENTS][name]
+        if components is not None:
+            component_config[KEY_COMPONENTS] = list(
+                set(component_config[KEY_COMPONENTS] + components)
+            )
+        if submodules is not None:
+            if component_config[KEY_SUBMODULES] is None:
+                component_config[KEY_SUBMODULES] = submodules
+            else:
+                component_config[KEY_SUBMODULES] = list(
+                    set(component_config[KEY_SUBMODULES] + submodules)
+                )


 def add_extra_script(stage: str, filename: str, path: str):
@@ -284,8 +277,11 @@ def add_extra_build_file(filename: str, path: str) -> bool:

 def _format_framework_arduino_version(ver: cv.Version) -> str:
    # format the given arduino (https://github.com/espressif/arduino-esp32/releases) version to
-    # a PIO pioarduino/framework-arduinoespressif32 value
-    return f"pioarduino/framework-arduinoespressif32@https://github.com/espressif/arduino-esp32/releases/download/{str(ver)}/esp32-{str(ver)}.zip"
+    # a PIO platformio/framework-arduinoespressif32 value
+    # List of package versions: https://api.registry.platformio.org/v3/packages/platformio/tool/framework-arduinoespressif32
+    if ver <= cv.Version(1, 0, 3):
+        return f"~2.{ver.major}{ver.minor:02d}{ver.patch:02d}.0"
+    return f"~3.{ver.major}{ver.minor:02d}{ver.patch:02d}.0"


 def _format_framework_espidf_version(
@@ -309,10 +305,12 @@ def _format_framework_espidf_version(

 # The default/recommended arduino framework version
 #  - https://github.com/espressif/arduino-esp32/releases
-RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(3, 1, 3)
-# The platform-espressif32 version to use for arduino frameworks
-#  - https://github.com/pioarduino/platform-espressif32/releases
-ARDUINO_PLATFORM_VERSION = cv.Version(53, 3, 13)
+#  - https://api.registry.platformio.org/v3/packages/platformio/tool/framework-arduinoespressif32
+RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(2, 0, 5)
+# The platformio/espressif32 version to use for arduino frameworks
+#  - https://github.com/platformio/platform-espressif32/releases
+#  - https://api.registry.platformio.org/v3/packages/platformio/platform/espressif32
+ARDUINO_PLATFORM_VERSION = cv.Version(5, 4, 0)

 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
@@ -341,7 +339,6 @@ SUPPORTED_PLATFORMIO_ESP_IDF_5X = [
 # List based on https://github.com/pioarduino/esp-idf/releases
 SUPPORTED_PIOARDUINO_ESP_IDF_5X = [
    cv.Version(5, 5, 0),
-    cv.Version(5, 4, 2),
    cv.Version(5, 4, 1),
    cv.Version(5, 4, 0),
    cv.Version(5, 3, 3),
@@ -356,8 +353,8 @@ SUPPORTED_PIOARDUINO_ESP_IDF_5X = [
 def _arduino_check_versions(value):
    value = value.copy()
    lookups = {
-        "dev": (cv.Version(3, 1, 3), "https://github.com/espressif/arduino-esp32.git"),
-        "latest": (cv.Version(3, 1, 3), None),
+        "dev": (cv.Version(2, 1, 0), "https://github.com/espressif/arduino-esp32.git"),
+        "latest": (cv.Version(2, 0, 9), None),
        "recommended": (RECOMMENDED_ARDUINO_FRAMEWORK_VERSION, None),
    }

@@ -379,10 +376,6 @@ def _arduino_check_versions(value):
        CONF_PLATFORM_VERSION, _parse_platform_version(str(ARDUINO_PLATFORM_VERSION))
    )

-    if value[CONF_SOURCE].startswith("http"):
-        # prefix is necessary or platformio will complain with a cryptic error
-        value[CONF_SOURCE] = f"framework-arduinoespressif32@{value[CONF_SOURCE]}"
-
    if version != RECOMMENDED_ARDUINO_FRAMEWORK_VERSION:
        _LOGGER.warning(
            "The selected Arduino framework version is not the recommended one. "
@@ -569,17 +562,6 @@ CONF_ENABLE_LWIP_DHCP_SERVER = "enable_lwip_dhcp_server"
 CONF_ENABLE_LWIP_MDNS_QUERIES = "enable_lwip_mdns_queries"
 CONF_ENABLE_LWIP_BRIDGE_INTERFACE = "enable_lwip_bridge_interface"

-
-def _validate_idf_component(config: ConfigType) -> ConfigType:
-    """Validate IDF component config and warn about deprecated options."""
-    if CONF_REFRESH in config:
-        _LOGGER.warning(
-            "The 'refresh' option for IDF components is deprecated and has no effect. "
-            "It will be removed in ESPHome 2026.1. Please remove it from your configuration."
-        )
-    return config
-
-
 ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
    cv.Schema(
        {
@@ -611,7 +593,7 @@ ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
                        CONF_ENABLE_LWIP_DHCP_SERVER, "wifi", default=False
                    ): cv.boolean,
                    cv.Optional(
-                        CONF_ENABLE_LWIP_MDNS_QUERIES, default=True
+                        CONF_ENABLE_LWIP_MDNS_QUERIES, default=False
                    ): cv.boolean,
                    cv.Optional(
                        CONF_ENABLE_LWIP_BRIDGE_INTERFACE, default=False
@@ -619,19 +601,15 @@ ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
                }
            ),
            cv.Optional(CONF_COMPONENTS, default=[]): cv.ensure_list(
-                cv.All(
-                    cv.Schema(
-                        {
-                            cv.Required(CONF_NAME): cv.string_strict,
-                            cv.Optional(CONF_SOURCE): cv.git_ref,
-                            cv.Optional(CONF_REF): cv.string,
-                            cv.Optional(CONF_PATH): cv.string,
-                            cv.Optional(CONF_REFRESH): cv.All(
-                                cv.string, cv.source_refresh
-                            ),
-                        }
-                    ),
-                    _validate_idf_component,
+                cv.Schema(
+                    {
+                        cv.Required(CONF_NAME): cv.string_strict,
+                        cv.Required(CONF_SOURCE): cv.SOURCE_SCHEMA,
+                        cv.Optional(CONF_PATH): cv.string,
+                        cv.Optional(CONF_REFRESH, default="1d"): cv.All(
+                            cv.string, cv.source_refresh
+                        ),
+                    }
                )
            ),
        }
@@ -640,21 +618,6 @@ ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
 )


-def _set_default_framework(config):
-    if CONF_FRAMEWORK not in config:
-        config = config.copy()
-
-        variant = config[CONF_VARIANT]
-        if variant in ARDUINO_ALLOWED_VARIANTS:
-            config[CONF_FRAMEWORK] = ARDUINO_FRAMEWORK_SCHEMA({})
-            config[CONF_FRAMEWORK][CONF_TYPE] = FRAMEWORK_ARDUINO
-        else:
-            config[CONF_FRAMEWORK] = ESP_IDF_FRAMEWORK_SCHEMA({})
-            config[CONF_FRAMEWORK][CONF_TYPE] = FRAMEWORK_ESP_IDF
-
-    return config
-
-
 FRAMEWORK_ESP_IDF = "esp-idf"
 FRAMEWORK_ARDUINO = "arduino"
 FRAMEWORK_SCHEMA = cv.typed_schema(
@@ -664,6 +627,7 @@ FRAMEWORK_SCHEMA = cv.typed_schema(
    },
    lower=True,
    space="-",
+    default_type=FRAMEWORK_ARDUINO,
 )


@@ -690,11 +654,10 @@ CONFIG_SCHEMA = cv.All(
            ),
            cv.Optional(CONF_PARTITIONS): cv.file_,
            cv.Optional(CONF_VARIANT): cv.one_of(*VARIANTS, upper=True),
-            cv.Optional(CONF_FRAMEWORK): FRAMEWORK_SCHEMA,
+            cv.Optional(CONF_FRAMEWORK, default={}): FRAMEWORK_SCHEMA,
        }
    ),
    _detect_variant,
-    _set_default_framework,
    set_core_data,
 )

@@ -705,7 +668,6 @@ FINAL_VALIDATE_SCHEMA = cv.Schema(final_validate)
 async def to_code(config):
    cg.add_platformio_option("board", config[CONF_BOARD])
    cg.add_platformio_option("board_upload.flash_size", config[CONF_FLASH_SIZE])
-    cg.set_cpp_standard("gnu++20")
    cg.add_build_flag("-DUSE_ESP32")
    cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
    cg.add_build_flag(f"-DUSE_ESP32_VARIANT_{config[CONF_VARIANT]}")
@@ -759,9 +721,6 @@ async def to_code(config):
        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0", False)
        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1", False)

-        # Disable dynamic log level control to save memory
-        add_idf_sdkconfig_option("CONFIG_LOG_DYNAMIC_LEVEL_CONTROL", False)
-
        # Set default CPU frequency
        add_idf_sdkconfig_option(f"CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_{freq}", True)

@@ -774,7 +733,7 @@ async def to_code(config):
            and not advanced[CONF_ENABLE_LWIP_DHCP_SERVER]
        ):
            add_idf_sdkconfig_option("CONFIG_LWIP_DHCPS", False)
-        if not advanced.get(CONF_ENABLE_LWIP_MDNS_QUERIES, True):
+        if not advanced.get(CONF_ENABLE_LWIP_MDNS_QUERIES, False):
            add_idf_sdkconfig_option("CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES", False)
        if not advanced.get(CONF_ENABLE_LWIP_BRIDGE_INTERFACE, False):
            add_idf_sdkconfig_option("CONFIG_LWIP_BRIDGEIF_MAX_PORTS", 0)
@@ -826,17 +785,26 @@ async def to_code(config):
            add_idf_sdkconfig_option(name, RawSdkconfigValue(value))

        for component in conf[CONF_COMPONENTS]:
-            add_idf_component(
-                name=component[CONF_NAME],
-                repo=component.get(CONF_SOURCE),
-                ref=component.get(CONF_REF),
-                path=component.get(CONF_PATH),
-            )
+            source = component[CONF_SOURCE]
+            if source[CONF_TYPE] == TYPE_GIT:
+                add_idf_component(
+                    name=component[CONF_NAME],
+                    repo=source[CONF_URL],
+                    ref=source.get(CONF_REF),
+                    path=component.get(CONF_PATH),
+                    refresh=component[CONF_REFRESH],
+                )
+            elif source[CONF_TYPE] == TYPE_LOCAL:
+                _LOGGER.warning("Local components are not implemented yet.")
+
    elif conf[CONF_TYPE] == FRAMEWORK_ARDUINO:
        cg.add_platformio_option("framework", "arduino")
        cg.add_build_flag("-DUSE_ARDUINO")
        cg.add_build_flag("-DUSE_ESP32_FRAMEWORK_ARDUINO")
-        cg.add_platformio_option("platform_packages", [conf[CONF_SOURCE]])
+        cg.add_platformio_option(
+            "platform_packages",
+            [f"platformio/framework-arduinoespressif32@{conf[CONF_SOURCE]}"],
+        )

        if CONF_PARTITIONS in config:
            cg.add_platformio_option("board_build.partitions", config[CONF_PARTITIONS])
@@ -930,26 +898,6 @@ def _write_sdkconfig():
        write_file_if_changed(sdk_path, contents)


-def _write_idf_component_yml():
-    yml_path = Path(CORE.relative_build_path("src/idf_component.yml"))
-    if CORE.data[KEY_ESP32][KEY_COMPONENTS]:
-        components: dict = CORE.data[KEY_ESP32][KEY_COMPONENTS]
-        dependencies = {}
-        for name, component in components.items():
-            dependency = {}
-            if component[KEY_REF]:
-                dependency["version"] = component[KEY_REF]
-            if component[KEY_REPO]:
-                dependency["git"] = component[KEY_REPO]
-            if component[KEY_PATH]:
-                dependency["path"] = component[KEY_PATH]
-            dependencies[name] = dependency
-        contents = yaml_util.dump({"dependencies": dependencies})
-    else:
-        contents = ""
-    write_file_if_changed(yml_path, contents)
-
-
 # Called by writer.py
 def copy_files():
    if CORE.using_arduino:
@@ -962,7 +910,6 @@ def copy_files():
            )
    if CORE.using_esp_idf:
        _write_sdkconfig()
-        _write_idf_component_yml()
        if "partitions.csv" not in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES]:
            write_file_if_changed(
                CORE.relative_build_path("partitions.csv"),
@@ -979,6 +926,55 @@ def copy_files():
            __version__,
        )

+        import shutil
+
+        shutil.rmtree(CORE.relative_build_path("components"), ignore_errors=True)
+
+        if CORE.data[KEY_ESP32][KEY_COMPONENTS]:
+            components: dict = CORE.data[KEY_ESP32][KEY_COMPONENTS]
+
+            for name, component in components.items():
+                repo_dir, _ = git.clone_or_update(
+                    url=component[KEY_REPO],
+                    ref=component[KEY_REF],
+                    refresh=component[KEY_REFRESH],
+                    domain="idf_components",
+                    submodules=component[KEY_SUBMODULES],
+                )
+                mkdir_p(CORE.relative_build_path("components"))
+                component_dir = repo_dir
+                if component[KEY_PATH] is not None:
+                    component_dir = component_dir / component[KEY_PATH]
+
+                if component[KEY_COMPONENTS] == ["*"]:
+                    shutil.copytree(
+                        component_dir,
+                        CORE.relative_build_path("components"),
+                        dirs_exist_ok=True,
+                        ignore=shutil.ignore_patterns(".git*"),
+                        symlinks=True,
+                        ignore_dangling_symlinks=True,
+                    )
+                elif len(component[KEY_COMPONENTS]) > 0:
+                    for comp in component[KEY_COMPONENTS]:
+                        shutil.copytree(
+                            component_dir / comp,
+                            CORE.relative_build_path(f"components/{comp}"),
+                            dirs_exist_ok=True,
+                            ignore=shutil.ignore_patterns(".git*"),
+                            symlinks=True,
+                            ignore_dangling_symlinks=True,
+                        )
+                else:
+                    shutil.copytree(
+                        component_dir,
+                        CORE.relative_build_path(f"components/{name}"),
+                        dirs_exist_ok=True,
+                        ignore=shutil.ignore_patterns(".git*"),
+                        symlinks=True,
+                        ignore_dangling_symlinks=True,
+                    )
+
    for _, file in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES].items():
        if file[KEY_PATH].startswith("http"):
            import requests
--- a/esphome/components/esp32/gpio.h
+++ b/esphome/components/esp32/gpio.h
@@ -29,9 +29,9 @@ class ESP32InternalGPIOPin : public InternalGPIOPin {
  void attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const override;

  gpio_num_t pin_;
+  bool inverted_;
  gpio_drive_cap_t drive_strength_;
  gpio::Flags flags_;
-  bool inverted_;
  // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
  static bool isr_service_installed;
 };
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -3,7 +3,6 @@
 #include "ble.h"

 #include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"

 #include <esp_bt.h>
@@ -24,6 +23,9 @@ namespace esp32_ble {

 static const char *const TAG = "esp32_ble";

+static RAMAllocator<BLEEvent> EVENT_ALLOCATOR(  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+    RAMAllocator<BLEEvent>::ALLOW_FAILURE | RAMAllocator<BLEEvent>::ALLOC_INTERNAL);
+
 void ESP32BLE::setup() {
  global_ble = this;
  ESP_LOGCONFIG(TAG, "Running setup");
@@ -302,191 +304,82 @@ void ESP32BLE::loop() {
  BLEEvent *ble_event = this->ble_events_.pop();
  while (ble_event != nullptr) {
    switch (ble_event->type_) {
-      case BLEEvent::GATTS: {
-        esp_gatts_cb_event_t event = ble_event->event_.gatts.gatts_event;
-        esp_gatt_if_t gatts_if = ble_event->event_.gatts.gatts_if;
-        esp_ble_gatts_cb_param_t *param = ble_event->event_.gatts.gatts_param;
-        ESP_LOGV(TAG, "gatts_event [esp_gatt_if: %d] - %d", gatts_if, event);
-        for (auto *gatts_handler : this->gatts_event_handlers_) {
-          gatts_handler->gatts_event_handler(event, gatts_if, param);
-        }
+      case BLEEvent::GATTS:
+        this->real_gatts_event_handler_(ble_event->event_.gatts.gatts_event, ble_event->event_.gatts.gatts_if,
+                                        &ble_event->event_.gatts.gatts_param);
        break;
-      }
-      case BLEEvent::GATTC: {
-        esp_gattc_cb_event_t event = ble_event->event_.gattc.gattc_event;
-        esp_gatt_if_t gattc_if = ble_event->event_.gattc.gattc_if;
-        esp_ble_gattc_cb_param_t *param = ble_event->event_.gattc.gattc_param;
-        ESP_LOGV(TAG, "gattc_event [esp_gatt_if: %d] - %d", gattc_if, event);
-        for (auto *gattc_handler : this->gattc_event_handlers_) {
-          gattc_handler->gattc_event_handler(event, gattc_if, param);
-        }
+      case BLEEvent::GATTC:
+        this->real_gattc_event_handler_(ble_event->event_.gattc.gattc_event, ble_event->event_.gattc.gattc_if,
+                                        &ble_event->event_.gattc.gattc_param);
        break;
-      }
-      case BLEEvent::GAP: {
-        esp_gap_ble_cb_event_t gap_event = ble_event->event_.gap.gap_event;
-        switch (gap_event) {
-          case ESP_GAP_BLE_SCAN_RESULT_EVT:
-            // Use the new scan event handler - no memcpy!
-            for (auto *scan_handler : this->gap_scan_event_handlers_) {
-              scan_handler->gap_scan_event_handler(ble_event->scan_result());
-            }
-            break;
-
-          // Scan complete events
-          case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT:
-          case ESP_GAP_BLE_SCAN_START_COMPLETE_EVT:
-          case ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT:
-            // All three scan complete events have the same structure with just status
-            // The scan_complete struct matches ESP-IDF's layout exactly, so this reinterpret_cast is safe
-            // This is verified at compile-time by static_assert checks in ble_event.h
-            // The struct already contains our copy of the status (copied in BLEEvent constructor)
-            ESP_LOGV(TAG, "gap_event_handler - %d", gap_event);
-            for (auto *gap_handler : this->gap_event_handlers_) {
-              gap_handler->gap_event_handler(
-                  gap_event, reinterpret_cast<esp_ble_gap_cb_param_t *>(&ble_event->event_.gap.scan_complete));
-            }
-            break;
-
-          // Advertising complete events
-          case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT:
-          case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT:
-          case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT:
-          case ESP_GAP_BLE_ADV_START_COMPLETE_EVT:
-          case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT:
-            // All advertising complete events have the same structure with just status
-            ESP_LOGV(TAG, "gap_event_handler - %d", gap_event);
-            for (auto *gap_handler : this->gap_event_handlers_) {
-              gap_handler->gap_event_handler(
-                  gap_event, reinterpret_cast<esp_ble_gap_cb_param_t *>(&ble_event->event_.gap.adv_complete));
-            }
-            break;
-
-          // RSSI complete event
-          case ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT:
-            ESP_LOGV(TAG, "gap_event_handler - %d", gap_event);
-            for (auto *gap_handler : this->gap_event_handlers_) {
-              gap_handler->gap_event_handler(
-                  gap_event, reinterpret_cast<esp_ble_gap_cb_param_t *>(&ble_event->event_.gap.read_rssi_complete));
-            }
-            break;
-
-          // Security events
-          case ESP_GAP_BLE_AUTH_CMPL_EVT:
-          case ESP_GAP_BLE_SEC_REQ_EVT:
-          case ESP_GAP_BLE_PASSKEY_NOTIF_EVT:
-          case ESP_GAP_BLE_PASSKEY_REQ_EVT:
-          case ESP_GAP_BLE_NC_REQ_EVT:
-            ESP_LOGV(TAG, "gap_event_handler - %d", gap_event);
-            for (auto *gap_handler : this->gap_event_handlers_) {
-              gap_handler->gap_event_handler(
-                  gap_event, reinterpret_cast<esp_ble_gap_cb_param_t *>(&ble_event->event_.gap.security));
-            }
-            break;
-
-          default:
-            // Unknown/unhandled event
-            ESP_LOGW(TAG, "Unhandled GAP event type in loop: %d", gap_event);
-            break;
-        }
+      case BLEEvent::GAP:
+        this->real_gap_event_handler_(ble_event->event_.gap.gap_event, &ble_event->event_.gap.gap_param);
        break;
-      }
      default:
        break;
    }
-    // Return the event to the pool
-    this->ble_event_pool_.release(ble_event);
+    ble_event->~BLEEvent();
+    EVENT_ALLOCATOR.deallocate(ble_event, 1);
    ble_event = this->ble_events_.pop();
  }
  if (this->advertising_ != nullptr) {
    this->advertising_->loop();
  }
-
-  // Log dropped events periodically
-  uint16_t dropped = this->ble_events_.get_and_reset_dropped_count();
-  if (dropped > 0) {
-    ESP_LOGW(TAG, "Dropped %u BLE events due to buffer overflow", dropped);
-  }
 }

-// Helper function to load new event data based on type
-void load_ble_event(BLEEvent *event, esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
-  event->load_gap_event(e, p);
-}
-
-void load_ble_event(BLEEvent *event, esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
-  event->load_gattc_event(e, i, p);
-}
-
-void load_ble_event(BLEEvent *event, esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
-  event->load_gatts_event(e, i, p);
-}
-
-template<typename... Args> void enqueue_ble_event(Args... args) {
-  // Allocate an event from the pool
-  BLEEvent *event = global_ble->ble_event_pool_.allocate();
-  if (event == nullptr) {
-    // No events available - queue is full or we're out of memory
-    global_ble->ble_events_.increment_dropped_count();
-    return;
-  }
-
-  // Load new event data (replaces previous event)
-  load_ble_event(event, args...);
-
-  // Push the event to the queue
-  global_ble->ble_events_.push(event);
-  // Push always succeeds because we're the only producer and the pool ensures we never exceed queue size
-}
-
-// Explicit template instantiations for the friend function
-template void enqueue_ble_event(esp_gap_ble_cb_event_t, esp_ble_gap_cb_param_t *);
-template void enqueue_ble_event(esp_gatts_cb_event_t, esp_gatt_if_t, esp_ble_gatts_cb_param_t *);
-template void enqueue_ble_event(esp_gattc_cb_event_t, esp_gatt_if_t, esp_ble_gattc_cb_param_t *);
-
 void ESP32BLE::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
-  switch (event) {
-    // Queue GAP events that components need to handle
-    // Scanning events - used by esp32_ble_tracker
-    case ESP_GAP_BLE_SCAN_RESULT_EVT:
-    case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT:
-    case ESP_GAP_BLE_SCAN_START_COMPLETE_EVT:
-    case ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT:
-    // Advertising events - used by esp32_ble_beacon and esp32_ble server
-    case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT:
-    case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT:
-    case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT:
-    case ESP_GAP_BLE_ADV_START_COMPLETE_EVT:
-    case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT:
-    // Connection events - used by ble_client
-    case ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT:
-    // Security events - used by ble_client and bluetooth_proxy
-    case ESP_GAP_BLE_AUTH_CMPL_EVT:
-    case ESP_GAP_BLE_SEC_REQ_EVT:
-    case ESP_GAP_BLE_PASSKEY_NOTIF_EVT:
-    case ESP_GAP_BLE_PASSKEY_REQ_EVT:
-    case ESP_GAP_BLE_NC_REQ_EVT:
-      enqueue_ble_event(event, param);
-      return;
-
-    // Ignore these GAP events as they are not relevant for our use case
-    case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT:
-    case ESP_GAP_BLE_SET_PKT_LENGTH_COMPLETE_EVT:
-      return;
-
-    default:
-      break;
+  BLEEvent *new_event = EVENT_ALLOCATOR.allocate(1);
+  if (new_event == nullptr) {
+    // Memory too fragmented to allocate new event. Can only drop it until memory comes back
+    return;
+  }
+  new (new_event) BLEEvent(event, param);
+  global_ble->ble_events_.push(new_event);
+}  // NOLINT(clang-analyzer-unix.Malloc)
+
+void ESP32BLE::real_gap_event_handler_(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
+  ESP_LOGV(TAG, "(BLE) gap_event_handler - %d", event);
+  for (auto *gap_handler : this->gap_event_handlers_) {
+    gap_handler->gap_event_handler(event, param);
  }
-  ESP_LOGW(TAG, "Ignoring unexpected GAP event type: %d", event);
 }

 void ESP32BLE::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
                                   esp_ble_gatts_cb_param_t *param) {
-  enqueue_ble_event(event, gatts_if, param);
+  BLEEvent *new_event = EVENT_ALLOCATOR.allocate(1);
+  if (new_event == nullptr) {
+    // Memory too fragmented to allocate new event. Can only drop it until memory comes back
+    return;
+  }
+  new (new_event) BLEEvent(event, gatts_if, param);
+  global_ble->ble_events_.push(new_event);
+}  // NOLINT(clang-analyzer-unix.Malloc)
+
+void ESP32BLE::real_gatts_event_handler_(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
+                                         esp_ble_gatts_cb_param_t *param) {
+  ESP_LOGV(TAG, "(BLE) gatts_event [esp_gatt_if: %d] - %d", gatts_if, event);
+  for (auto *gatts_handler : this->gatts_event_handlers_) {
+    gatts_handler->gatts_event_handler(event, gatts_if, param);
+  }
 }

 void ESP32BLE::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                   esp_ble_gattc_cb_param_t *param) {
-  enqueue_ble_event(event, gattc_if, param);
+  BLEEvent *new_event = EVENT_ALLOCATOR.allocate(1);
+  if (new_event == nullptr) {
+    // Memory too fragmented to allocate new event. Can only drop it until memory comes back
+    return;
+  }
+  new (new_event) BLEEvent(event, gattc_if, param);
+  global_ble->ble_events_.push(new_event);
+}  // NOLINT(clang-analyzer-unix.Malloc)
+
+void ESP32BLE::real_gattc_event_handler_(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
+                                         esp_ble_gattc_cb_param_t *param) {
+  ESP_LOGV(TAG, "(BLE) gattc_event [esp_gatt_if: %d] - %d", gattc_if, event);
+  for (auto *gattc_handler : this->gattc_event_handlers_) {
+    gattc_handler->gattc_event_handler(event, gattc_if, param);
+  }
 }

 float ESP32BLE::get_setup_priority() const { return setup_priority::BLUETOOTH; }
@@ -516,12 +409,13 @@ void ESP32BLE::dump_config() {
        break;
    }
    ESP_LOGCONFIG(TAG,
-                  "BLE:\n"
-                  "  MAC address: %s\n"
+                  "ESP32 BLE:\n"
+                  "  MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n"
                  "  IO Capability: %s",
-                  format_mac_address_pretty(mac_address).c_str(), io_capability_s);
+                  mac_address[0], mac_address[1], mac_address[2], mac_address[3], mac_address[4], mac_address[5],
+                  io_capability_s);
  } else {
-    ESP_LOGCONFIG(TAG, "Bluetooth stack is not enabled");
+    ESP_LOGCONFIG(TAG, "ESP32 BLE: bluetooth stack is not enabled");
  }
 }

--- a/esphome/components/esp32_ble/ble.h
+++ b/esphome/components/esp32_ble/ble.h
@@ -2,7 +2,6 @@

 #include "ble_advertising.h"
 #include "ble_uuid.h"
-#include "ble_scan_result.h"

 #include <functional>

@@ -12,8 +11,7 @@
 #include "esphome/core/helpers.h"

 #include "ble_event.h"
-#include "esphome/core/lock_free_queue.h"
-#include "esphome/core/event_pool.h"
+#include "queue.h"

 #ifdef USE_ESP32

@@ -24,16 +22,6 @@
 namespace esphome {
 namespace esp32_ble {

-// Maximum number of BLE scan results to buffer
-#ifdef USE_PSRAM
-static constexpr uint8_t SCAN_RESULT_BUFFER_SIZE = 32;
-#else
-static constexpr uint8_t SCAN_RESULT_BUFFER_SIZE = 20;
-#endif
-
-// Maximum size of the BLE event queue - must be power of 2 for lock-free queue
-static constexpr size_t MAX_BLE_QUEUE_SIZE = 64;
-
 uint64_t ble_addr_to_uint64(const esp_bd_addr_t address);

 // NOLINTNEXTLINE(modernize-use-using)
@@ -69,11 +57,6 @@ class GAPEventHandler {
  virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) = 0;
 };

-class GAPScanEventHandler {
- public:
-  virtual void gap_scan_event_handler(const BLEScanResult &scan_result) = 0;
-};
-
 class GATTcEventHandler {
 public:
  virtual void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
@@ -118,9 +101,6 @@ class ESP32BLE : public Component {
  void advertising_register_raw_advertisement_callback(std::function<void(bool)> &&callback);

  void register_gap_event_handler(GAPEventHandler *handler) { this->gap_event_handlers_.push_back(handler); }
-  void register_gap_scan_event_handler(GAPScanEventHandler *handler) {
-    this->gap_scan_event_handlers_.push_back(handler);
-  }
  void register_gattc_event_handler(GATTcEventHandler *handler) { this->gattc_event_handlers_.push_back(handler); }
  void register_gatts_event_handler(GATTsEventHandler *handler) { this->gatts_event_handlers_.push_back(handler); }
  void register_ble_status_event_handler(BLEStatusEventHandler *handler) {
@@ -133,23 +113,22 @@ class ESP32BLE : public Component {
  static void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t *param);
  static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);

+  void real_gatts_event_handler_(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param);
+  void real_gattc_event_handler_(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t *param);
+  void real_gap_event_handler_(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);
+
  bool ble_setup_();
  bool ble_dismantle_();
  bool ble_pre_setup_();
  void advertising_init_();

- private:
-  template<typename... Args> friend void enqueue_ble_event(Args... args);
-
  std::vector<GAPEventHandler *> gap_event_handlers_;
-  std::vector<GAPScanEventHandler *> gap_scan_event_handlers_;
  std::vector<GATTcEventHandler *> gattc_event_handlers_;
  std::vector<GATTsEventHandler *> gatts_event_handlers_;
  std::vector<BLEStatusEventHandler *> ble_status_event_handlers_;
  BLEComponentState state_{BLE_COMPONENT_STATE_OFF};

-  esphome::LockFreeQueue<BLEEvent, MAX_BLE_QUEUE_SIZE> ble_events_;
-  esphome::EventPool<BLEEvent, MAX_BLE_QUEUE_SIZE> ble_event_pool_;
+  Queue<BLEEvent> ble_events_;
  BLEAdvertising *advertising_{};
  esp_ble_io_cap_t io_cap_{ESP_IO_CAP_NONE};
  uint32_t advertising_cycle_time_{};
--- a/esphome/components/esp32_ble/ble_event.h
+++ b/esphome/components/esp32_ble/ble_event.h
@@ -2,399 +2,92 @@

 #ifdef USE_ESP32

-#include <cstddef>  // for offsetof
 #include <vector>

 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
 #include <esp_gatts_api.h>

-#include "ble_scan_result.h"
-
 namespace esphome {
 namespace esp32_ble {
-
-// Compile-time verification that ESP-IDF scan complete events only contain a status field
-// This ensures our reinterpret_cast in ble.cpp is safe
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_scan_param_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF scan_param_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_scan_start_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF scan_start_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_scan_stop_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF scan_stop_cmpl structure has unexpected size");
-
-// Verify the status field is at offset 0 (first member)
-static_assert(offsetof(esp_ble_gap_cb_param_t, scan_param_cmpl.status) == 0,
-              "status must be first member of scan_param_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, scan_start_cmpl.status) == 0,
-              "status must be first member of scan_start_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, scan_stop_cmpl.status) == 0,
-              "status must be first member of scan_stop_cmpl");
-
-// Compile-time verification for advertising complete events
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_adv_data_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF adv_data_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_scan_rsp_data_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF scan_rsp_data_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_adv_data_raw_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF adv_data_raw_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_adv_start_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF adv_start_cmpl structure has unexpected size");
-static_assert(sizeof(esp_ble_gap_cb_param_t::ble_adv_stop_cmpl_evt_param) == sizeof(esp_bt_status_t),
-              "ESP-IDF adv_stop_cmpl structure has unexpected size");
-
-// Verify the status field is at offset 0 for advertising events
-static_assert(offsetof(esp_ble_gap_cb_param_t, adv_data_cmpl.status) == 0,
-              "status must be first member of adv_data_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, scan_rsp_data_cmpl.status) == 0,
-              "status must be first member of scan_rsp_data_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, adv_data_raw_cmpl.status) == 0,
-              "status must be first member of adv_data_raw_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, adv_start_cmpl.status) == 0,
-              "status must be first member of adv_start_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, adv_stop_cmpl.status) == 0,
-              "status must be first member of adv_stop_cmpl");
-
-// Compile-time verification for RSSI complete event structure
-static_assert(offsetof(esp_ble_gap_cb_param_t, read_rssi_cmpl.status) == 0,
-              "status must be first member of read_rssi_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, read_rssi_cmpl.rssi) == sizeof(esp_bt_status_t),
-              "rssi must immediately follow status in read_rssi_cmpl");
-static_assert(offsetof(esp_ble_gap_cb_param_t, read_rssi_cmpl.remote_addr) == sizeof(esp_bt_status_t) + sizeof(int8_t),
-              "remote_addr must follow rssi in read_rssi_cmpl");
-
 // Received GAP, GATTC and GATTS events are only queued, and get processed in the main loop().
-// This class stores each event with minimal memory usage.
-// GAP events (99% of traffic) don't have the vector overhead.
-// GATTC/GATTS events use heap allocation for their param and data.
-//
-// Event flow:
-// 1. ESP-IDF BLE stack calls our static handlers in the BLE task context
-// 2. The handlers create a BLEEvent instance, copying only the data we need
-// 3. The event is pushed to a thread-safe queue
-// 4. In the main loop(), events are popped from the queue and processed
-// 5. The event destructor cleans up any external allocations
-//
-// Thread safety:
-// - GAP events: We copy only the fields we need directly into the union
-// - GATTC/GATTS events: We heap-allocate and copy the entire param struct, ensuring
-//   the data remains valid even after the BLE callback returns. The original
-//   param pointer from ESP-IDF is only valid during the callback.
-//
-// CRITICAL DESIGN NOTE:
-// The heap allocations for GATTC/GATTS events are REQUIRED for memory safety.
-// DO NOT attempt to optimize by removing these allocations or storing pointers
-// to the original ESP-IDF data. The ESP-IDF callback data has a different lifetime
-// than our event processing, and accessing it after the callback returns would
-// result in use-after-free bugs and crashes.
+// This class stores each event in a single type.
 class BLEEvent {
 public:
-  // NOLINTNEXTLINE(readability-identifier-naming)
-  enum ble_event_t : uint8_t {
-    GAP,
-    GATTC,
-    GATTS,
-  };
-
-  // Type definitions for cleaner method signatures
-  struct StatusOnlyData {
-    esp_bt_status_t status;
-  };
-
-  struct RSSICompleteData {
-    esp_bt_status_t status;
-    int8_t rssi;
-    esp_bd_addr_t remote_addr;
-  };
-
-  // Constructor for GAP events - no external allocations needed
  BLEEvent(esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
+    this->event_.gap.gap_event = e;
+    memcpy(&this->event_.gap.gap_param, p, sizeof(esp_ble_gap_cb_param_t));
    this->type_ = GAP;
-    this->init_gap_data_(e, p);
-  }
+  };

-  // Constructor for GATTC events - uses heap allocation
-  // IMPORTANT: The heap allocation is REQUIRED and must not be removed as an optimization.
-  // The param pointer from ESP-IDF is only valid during the callback execution.
-  // Since BLE events are processed asynchronously in the main loop, we must create
-  // our own copy to ensure the data remains valid until the event is processed.
  BLEEvent(esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
+    this->event_.gattc.gattc_event = e;
+    this->event_.gattc.gattc_if = i;
+    memcpy(&this->event_.gattc.gattc_param, p, sizeof(esp_ble_gattc_cb_param_t));
+    // Need to also make a copy of relevant event data.
+    switch (e) {
+      case ESP_GATTC_NOTIFY_EVT:
+        this->data.assign(p->notify.value, p->notify.value + p->notify.value_len);
+        this->event_.gattc.gattc_param.notify.value = this->data.data();
+        break;
+      case ESP_GATTC_READ_CHAR_EVT:
+      case ESP_GATTC_READ_DESCR_EVT:
+        this->data.assign(p->read.value, p->read.value + p->read.value_len);
+        this->event_.gattc.gattc_param.read.value = this->data.data();
+        break;
+      default:
+        break;
+    }
    this->type_ = GATTC;
-    this->init_gattc_data_(e, i, p);
-  }
+  };

-  // Constructor for GATTS events - uses heap allocation
-  // IMPORTANT: The heap allocation is REQUIRED and must not be removed as an optimization.
-  // The param pointer from ESP-IDF is only valid during the callback execution.
-  // Since BLE events are processed asynchronously in the main loop, we must create
-  // our own copy to ensure the data remains valid until the event is processed.
  BLEEvent(esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
+    this->event_.gatts.gatts_event = e;
+    this->event_.gatts.gatts_if = i;
+    memcpy(&this->event_.gatts.gatts_param, p, sizeof(esp_ble_gatts_cb_param_t));
+    // Need to also make a copy of relevant event data.
+    switch (e) {
+      case ESP_GATTS_WRITE_EVT:
+        this->data.assign(p->write.value, p->write.value + p->write.len);
+        this->event_.gatts.gatts_param.write.value = this->data.data();
+        break;
+      default:
+        break;
+    }
    this->type_ = GATTS;
-    this->init_gatts_data_(e, i, p);
-  }
-
-  // Destructor to clean up heap allocations
-  ~BLEEvent() { this->release(); }
-
-  // Default constructor for pre-allocation in pool
-  BLEEvent() : type_(GAP) {}
-
-  // Invoked on return to EventPool - clean up any heap-allocated data
-  void release() {
-    if (this->type_ == GAP) {
-      return;
-    }
-    if (this->type_ == GATTC) {
-      delete this->event_.gattc.gattc_param;
-      delete this->event_.gattc.data;
-      this->event_.gattc.gattc_param = nullptr;
-      this->event_.gattc.data = nullptr;
-      return;
-    }
-    if (this->type_ == GATTS) {
-      delete this->event_.gatts.gatts_param;
-      delete this->event_.gatts.data;
-      this->event_.gatts.gatts_param = nullptr;
-      this->event_.gatts.data = nullptr;
-    }
-  }
-
-  // Load new event data for reuse (replaces previous event data)
-  void load_gap_event(esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
-    this->release();
-    this->type_ = GAP;
-    this->init_gap_data_(e, p);
-  }
-
-  void load_gattc_event(esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
-    this->release();
-    this->type_ = GATTC;
-    this->init_gattc_data_(e, i, p);
-  }
-
-  void load_gatts_event(esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
-    this->release();
-    this->type_ = GATTS;
-    this->init_gatts_data_(e, i, p);
-  }
-
-  // Disable copy to prevent double-delete
-  BLEEvent(const BLEEvent &) = delete;
-  BLEEvent &operator=(const BLEEvent &) = delete;
+  };

  union {
    // NOLINTNEXTLINE(readability-identifier-naming)
    struct gap_event {
      esp_gap_ble_cb_event_t gap_event;
-      union {
-        BLEScanResult scan_result;  // 73 bytes - Used by: esp32_ble_tracker
-        // This matches ESP-IDF's scan complete event structures
-        // All three (scan_param_cmpl, scan_start_cmpl, scan_stop_cmpl) have identical layout
-        // Used by: esp32_ble_tracker
-        StatusOnlyData scan_complete;  // 1 byte
-        // Advertising complete events all have same structure
-        // Used by: esp32_ble_beacon, esp32_ble server components
-        // ADV_DATA_SET, SCAN_RSP_DATA_SET, ADV_DATA_RAW_SET, ADV_START, ADV_STOP
-        StatusOnlyData adv_complete;  // 1 byte
-        // RSSI complete event
-        // Used by: ble_client (ble_rssi_sensor component)
-        RSSICompleteData read_rssi_complete;  // 8 bytes
-        // Security events - we store the full security union
-        // Used by: ble_client (automation), bluetooth_proxy, esp32_ble_client
-        esp_ble_sec_t security;  // Variable size, but fits within scan_result size
-      };
-    } gap;  // 80 bytes total
+      esp_ble_gap_cb_param_t gap_param;
+    } gap;

    // NOLINTNEXTLINE(readability-identifier-naming)
    struct gattc_event {
      esp_gattc_cb_event_t gattc_event;
      esp_gatt_if_t gattc_if;
-      esp_ble_gattc_cb_param_t *gattc_param;  // Heap-allocated
-      std::vector<uint8_t> *data;             // Heap-allocated
-    } gattc;                                  // 16 bytes (pointers only)
+      esp_ble_gattc_cb_param_t gattc_param;
+    } gattc;

    // NOLINTNEXTLINE(readability-identifier-naming)
    struct gatts_event {
      esp_gatts_cb_event_t gatts_event;
      esp_gatt_if_t gatts_if;
-      esp_ble_gatts_cb_param_t *gatts_param;  // Heap-allocated
-      std::vector<uint8_t> *data;             // Heap-allocated
-    } gatts;                                  // 16 bytes (pointers only)
-  } event_;                                   // 80 bytes
+      esp_ble_gatts_cb_param_t gatts_param;
+    } gatts;
+  } event_;

-  ble_event_t type_;
-
-  // Helper methods to access event data
-  ble_event_t type() const { return type_; }
-  esp_gap_ble_cb_event_t gap_event_type() const { return event_.gap.gap_event; }
-  const BLEScanResult &scan_result() const { return event_.gap.scan_result; }
-  esp_bt_status_t scan_complete_status() const { return event_.gap.scan_complete.status; }
-  esp_bt_status_t adv_complete_status() const { return event_.gap.adv_complete.status; }
-  const RSSICompleteData &read_rssi_complete() const { return event_.gap.read_rssi_complete; }
-  const esp_ble_sec_t &security() const { return event_.gap.security; }
-
- private:
-  // Initialize GAP event data
-  void init_gap_data_(esp_gap_ble_cb_event_t e, esp_ble_gap_cb_param_t *p) {
-    this->event_.gap.gap_event = e;
-
-    if (p == nullptr) {
-      return;  // Invalid event, but we can't log in header file
-    }
-
-    // Copy data based on event type
-    switch (e) {
-      case ESP_GAP_BLE_SCAN_RESULT_EVT:
-        memcpy(this->event_.gap.scan_result.bda, p->scan_rst.bda, sizeof(esp_bd_addr_t));
-        this->event_.gap.scan_result.ble_addr_type = p->scan_rst.ble_addr_type;
-        this->event_.gap.scan_result.rssi = p->scan_rst.rssi;
-        this->event_.gap.scan_result.adv_data_len = p->scan_rst.adv_data_len;
-        this->event_.gap.scan_result.scan_rsp_len = p->scan_rst.scan_rsp_len;
-        this->event_.gap.scan_result.search_evt = p->scan_rst.search_evt;
-        memcpy(this->event_.gap.scan_result.ble_adv, p->scan_rst.ble_adv,
-               ESP_BLE_ADV_DATA_LEN_MAX + ESP_BLE_SCAN_RSP_DATA_LEN_MAX);
-        break;
-
-      case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT:
-        this->event_.gap.scan_complete.status = p->scan_param_cmpl.status;
-        break;
-
-      case ESP_GAP_BLE_SCAN_START_COMPLETE_EVT:
-        this->event_.gap.scan_complete.status = p->scan_start_cmpl.status;
-        break;
-
-      case ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT:
-        this->event_.gap.scan_complete.status = p->scan_stop_cmpl.status;
-        break;
-
-      // Advertising complete events - all have same structure with just status
-      // Used by: esp32_ble_beacon, esp32_ble server components
-      case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT:
-        this->event_.gap.adv_complete.status = p->adv_data_cmpl.status;
-        break;
-      case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT:
-        this->event_.gap.adv_complete.status = p->scan_rsp_data_cmpl.status;
-        break;
-      case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT:  // Used by: esp32_ble_beacon
-        this->event_.gap.adv_complete.status = p->adv_data_raw_cmpl.status;
-        break;
-      case ESP_GAP_BLE_ADV_START_COMPLETE_EVT:  // Used by: esp32_ble_beacon
-        this->event_.gap.adv_complete.status = p->adv_start_cmpl.status;
-        break;
-      case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT:  // Used by: esp32_ble_beacon
-        this->event_.gap.adv_complete.status = p->adv_stop_cmpl.status;
-        break;
-
-      // RSSI complete event
-      // Used by: ble_client (ble_rssi_sensor)
-      case ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT:
-        this->event_.gap.read_rssi_complete.status = p->read_rssi_cmpl.status;
-        this->event_.gap.read_rssi_complete.rssi = p->read_rssi_cmpl.rssi;
-        memcpy(this->event_.gap.read_rssi_complete.remote_addr, p->read_rssi_cmpl.remote_addr, sizeof(esp_bd_addr_t));
-        break;
-
-      // Security events - copy the entire security union
-      // Used by: ble_client, bluetooth_proxy, esp32_ble_client
-      case ESP_GAP_BLE_AUTH_CMPL_EVT:      // Used by: bluetooth_proxy, esp32_ble_client
-      case ESP_GAP_BLE_SEC_REQ_EVT:        // Used by: esp32_ble_client
-      case ESP_GAP_BLE_PASSKEY_NOTIF_EVT:  // Used by: ble_client automation
-      case ESP_GAP_BLE_PASSKEY_REQ_EVT:    // Used by: ble_client automation
-      case ESP_GAP_BLE_NC_REQ_EVT:         // Used by: ble_client automation
-        memcpy(&this->event_.gap.security, &p->ble_security, sizeof(esp_ble_sec_t));
-        break;
-
-      default:
-        // We only store data for GAP events that components currently use
-        // Unknown events still get queued and logged in ble.cpp:375 as
-        // "Unhandled GAP event type in loop" - this helps identify new events
-        // that components might need in the future
-        break;
-    }
-  }
-
-  // Initialize GATTC event data
-  void init_gattc_data_(esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
-    this->event_.gattc.gattc_event = e;
-    this->event_.gattc.gattc_if = i;
-
-    if (p == nullptr) {
-      this->event_.gattc.gattc_param = nullptr;
-      this->event_.gattc.data = nullptr;
-      return;  // Invalid event, but we can't log in header file
-    }
-
-    // Heap-allocate param and data
-    // Heap allocation is used because GATTC/GATTS events are rare (<1% of events)
-    // while GAP events (99%) are stored inline to minimize memory usage
-    // IMPORTANT: This heap allocation provides clear ownership semantics:
-    // - The BLEEvent owns the allocated memory for its lifetime
-    // - The data remains valid from the BLE callback context until processed in the main loop
-    // - Without this copy, we'd have use-after-free bugs as ESP-IDF reuses the callback memory
-    this->event_.gattc.gattc_param = new esp_ble_gattc_cb_param_t(*p);
-
-    // Copy data for events that need it
-    // The param struct contains pointers (e.g., notify.value) that point to temporary buffers.
-    // We must copy this data to ensure it remains valid when the event is processed later.
-    switch (e) {
-      case ESP_GATTC_NOTIFY_EVT:
-        this->event_.gattc.data = new std::vector<uint8_t>(p->notify.value, p->notify.value + p->notify.value_len);
-        this->event_.gattc.gattc_param->notify.value = this->event_.gattc.data->data();
-        break;
-      case ESP_GATTC_READ_CHAR_EVT:
-      case ESP_GATTC_READ_DESCR_EVT:
-        this->event_.gattc.data = new std::vector<uint8_t>(p->read.value, p->read.value + p->read.value_len);
-        this->event_.gattc.gattc_param->read.value = this->event_.gattc.data->data();
-        break;
-      default:
-        this->event_.gattc.data = nullptr;
-        break;
-    }
-  }
-
-  // Initialize GATTS event data
-  void init_gatts_data_(esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
-    this->event_.gatts.gatts_event = e;
-    this->event_.gatts.gatts_if = i;
-
-    if (p == nullptr) {
-      this->event_.gatts.gatts_param = nullptr;
-      this->event_.gatts.data = nullptr;
-      return;  // Invalid event, but we can't log in header file
-    }
-
-    // Heap-allocate param and data
-    // Heap allocation is used because GATTC/GATTS events are rare (<1% of events)
-    // while GAP events (99%) are stored inline to minimize memory usage
-    // IMPORTANT: This heap allocation provides clear ownership semantics:
-    // - The BLEEvent owns the allocated memory for its lifetime
-    // - The data remains valid from the BLE callback context until processed in the main loop
-    // - Without this copy, we'd have use-after-free bugs as ESP-IDF reuses the callback memory
-    this->event_.gatts.gatts_param = new esp_ble_gatts_cb_param_t(*p);
-
-    // Copy data for events that need it
-    // The param struct contains pointers (e.g., write.value) that point to temporary buffers.
-    // We must copy this data to ensure it remains valid when the event is processed later.
-    switch (e) {
-      case ESP_GATTS_WRITE_EVT:
-        this->event_.gatts.data = new std::vector<uint8_t>(p->write.value, p->write.value + p->write.len);
-        this->event_.gatts.gatts_param->write.value = this->event_.gatts.data->data();
-        break;
-      default:
-        this->event_.gatts.data = nullptr;
-        break;
-    }
-  }
+  std::vector<uint8_t> data{};
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  enum ble_event_t : uint8_t {
+    GAP,
+    GATTC,
+    GATTS,
+  } type_;
 };

-// Verify the gap_event struct hasn't grown beyond expected size
-// The gap member in the union should be 80 bytes (including the gap_event enum)
-static_assert(sizeof(decltype(((BLEEvent *) nullptr)->event_.gap)) <= 80, "gap_event struct has grown beyond 80 bytes");
-
-// Verify esp_ble_sec_t fits within our union
-static_assert(sizeof(esp_ble_sec_t) <= 73, "esp_ble_sec_t is larger than BLEScanResult");
-
-// BLEEvent total size: 84 bytes (80 byte union + 1 byte type + 3 bytes padding)
-
 }  // namespace esp32_ble
 }  // namespace esphome

--- a/esphome/components/esp32_ble/ble_scan_result.h
+++ b/esphome/components/esp32_ble/ble_scan_result.h
@@ -1,24 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP32
-
-#include <esp_gap_ble_api.h>
-
-namespace esphome {
-namespace esp32_ble {
-
-// Structure for BLE scan results - only fields we actually use
-struct __attribute__((packed)) BLEScanResult {
-  esp_bd_addr_t bda;
-  uint8_t ble_addr_type;
-  int8_t rssi;
-  uint8_t ble_adv[ESP_BLE_ADV_DATA_LEN_MAX + ESP_BLE_SCAN_RSP_DATA_LEN_MAX];
-  uint8_t adv_data_len;
-  uint8_t scan_rsp_len;
-  uint8_t search_evt;
-};  // ~73 bytes vs ~400 bytes for full esp_ble_gap_cb_param_t
-
-}  // namespace esp32_ble
-}  // namespace esphome
-
-#endif
--- a/esphome/components/esp32_ble/queue.h
+++ b/esphome/components/esp32_ble/queue.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#ifdef USE_ESP32
+
+#include <mutex>
+#include <queue>
+
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
+
+/*
+ * BLE events come in from a separate Task (thread) in the ESP32 stack. Rather
+ * than trying to deal with various locking strategies, all incoming GAP and GATT
+ * events will simply be placed on a semaphore guarded queue. The next time the
+ * component runs loop(), these events are popped off the queue and handed at
+ * this safer time.
+ */
+
+namespace esphome {
+namespace esp32_ble {
+
+template<class T> class Queue {
+ public:
+  Queue() { m_ = xSemaphoreCreateMutex(); }
+
+  void push(T *element) {
+    if (element == nullptr)
+      return;
+    // It is not called from main loop. Thus it won't block main thread.
+    xSemaphoreTake(m_, portMAX_DELAY);
+    q_.push(element);
+    xSemaphoreGive(m_);
+  }
+
+  T *pop() {
+    T *element = nullptr;
+
+    if (xSemaphoreTake(m_, 5L / portTICK_PERIOD_MS)) {
+      if (!q_.empty()) {
+        element = q_.front();
+        q_.pop();
+      }
+      xSemaphoreGive(m_);
+    }
+    return element;
+  }
+
+ protected:
+  std::queue<T *> q_;
+  SemaphoreHandle_t m_;
+};
+
+}  // namespace esp32_ble
+}  // namespace esphome
+
+#endif
--- a/esphome/components/esp32_ble_client/ble_client_base.cpp
+++ b/esphome/components/esp32_ble_client/ble_client_base.cpp
@@ -22,16 +22,6 @@ void BLEClientBase::setup() {
  this->connection_index_ = connection_index++;
 }

-void BLEClientBase::set_state(espbt::ClientState st) {
-  ESP_LOGV(TAG, "[%d] [%s] Set state %d", this->connection_index_, this->address_str_.c_str(), (int) st);
-  ESPBTClient::set_state(st);
-
-  if (st == espbt::ClientState::READY_TO_CONNECT) {
-    // Enable loop when we need to connect
-    this->enable_loop();
-  }
-}
-
 void BLEClientBase::loop() {
  if (!esp32_ble::global_ble->is_active()) {
    this->set_state(espbt::ClientState::INIT);
@@ -47,14 +37,9 @@ void BLEClientBase::loop() {
  }
  // READY_TO_CONNECT means we have discovered the device
  // and the scanner has been stopped by the tracker.
-  else if (this->state_ == espbt::ClientState::READY_TO_CONNECT) {
+  if (this->state_ == espbt::ClientState::READY_TO_CONNECT) {
    this->connect();
  }
-  // If its idle, we can disable the loop as set_state
-  // will enable it again when we need to connect.
-  else if (this->state_ == espbt::ClientState::IDLE) {
-    this->disable_loop();
-  }
 }

 float BLEClientBase::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }
@@ -496,17 +481,17 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
      if (length > 2) {
        return (float) encode_uint16(value[1], value[2]);
      }
-      [[fallthrough]];
+      // fall through
    case 0x7:  // uint24.
      if (length > 3) {
        return (float) encode_uint24(value[1], value[2], value[3]);
      }
-      [[fallthrough]];
+      // fall through
    case 0x8:  // uint32.
      if (length > 4) {
        return (float) encode_uint32(value[1], value[2], value[3], value[4]);
      }
-      [[fallthrough]];
+      // fall through
    case 0xC:  // int8.
      return (float) ((int8_t) value[1]);
    case 0xD:  // int12.
@@ -514,12 +499,12 @@ float BLEClientBase::parse_char_value(uint8_t *value, uint16_t length) {
      if (length > 2) {
        return (float) ((int16_t) (value[1] << 8) + (int16_t) value[2]);
      }
-      [[fallthrough]];
+      // fall through
    case 0xF:  // int24.
      if (length > 3) {
        return (float) ((int32_t) (value[1] << 16) + (int32_t) (value[2] << 8) + (int32_t) (value[3]));
      }
-      [[fallthrough]];
+      // fall through
    case 0x10:  // int32.
      if (length > 4) {
        return (float) ((int32_t) (value[1] << 24) + (int32_t) (value[2] << 16) + (int32_t) (value[3] << 8) +
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -93,36 +93,21 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {

  bool check_addr(esp_bd_addr_t &addr) { return memcmp(addr, this->remote_bda_, sizeof(esp_bd_addr_t)) == 0; }

-  void set_state(espbt::ClientState st) override;
-
 protected:
-  // Memory optimized layout for 32-bit systems
-  // Group 1: 8-byte types
-  uint64_t address_{0};
-
-  // Group 2: Container types (grouped for memory optimization)
-  std::string address_str_{};
-  std::vector<BLEService *> services_;
-
-  // Group 3: 4-byte types
  int gattc_if_;
-  esp_gatt_status_t status_{ESP_GATT_OK};
-
-  // Group 4: Arrays (6 bytes)
  esp_bd_addr_t remote_bda_;
-
-  // Group 5: 2-byte types
-  uint16_t conn_id_{UNSET_CONN_ID};
-  uint16_t mtu_{23};
-
-  // Group 6: 1-byte types and small enums
  esp_ble_addr_type_t remote_addr_type_{BLE_ADDR_TYPE_PUBLIC};
-  espbt::ConnectionType connection_type_{espbt::ConnectionType::V1};
-  uint8_t connection_index_;
-  uint8_t service_count_{0};  // ESP32 has max handles < 255, typical devices have < 50 services
+  uint16_t conn_id_{UNSET_CONN_ID};
+  uint64_t address_{0};
  bool auto_connect_{false};
+  std::string address_str_{};
+  uint8_t connection_index_;
+  int16_t service_count_{0};
+  uint16_t mtu_{23};
  bool paired_{false};
-  // 6 bytes used, 2 bytes padding
+  espbt::ConnectionType connection_type_{espbt::ConnectionType::V1};
+  std::vector<BLEService *> services_;
+  esp_gatt_status_t status_{ESP_GATT_OK};

  void log_event_(const char *name);
 };
--- a/esphome/components/esp32_ble_tracker/init.py
+++ b/esphome/components/esp32_ble_tracker/init.py
@@ -268,7 +268,6 @@ async def to_code(config):

    parent = await cg.get_variable(config[esp32_ble.CONF_BLE_ID])
    cg.add(parent.register_gap_event_handler(var))
-    cg.add(parent.register_gap_scan_event_handler(var))
    cg.add(parent.register_gattc_event_handler(var))
    cg.add(parent.register_ble_status_event_handler(var))
    cg.add(var.set_parent(parent))
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -50,15 +50,17 @@ void ESP32BLETracker::setup() {
    ESP_LOGE(TAG, "BLE Tracker was marked failed by ESP32BLE");
    return;
  }
-  RAMAllocator<BLEScanResult> allocator;
-  this->scan_ring_buffer_ = allocator.allocate(SCAN_RESULT_BUFFER_SIZE);
+  ExternalRAMAllocator<esp_ble_gap_cb_param_t::ble_scan_result_evt_param> allocator(
+      ExternalRAMAllocator<esp_ble_gap_cb_param_t::ble_scan_result_evt_param>::ALLOW_FAILURE);
+  this->scan_result_buffer_ = allocator.allocate(ESP32BLETracker::SCAN_RESULT_BUFFER_SIZE);

-  if (this->scan_ring_buffer_ == nullptr) {
-    ESP_LOGE(TAG, "Could not allocate ring buffer for BLE Tracker!");
+  if (this->scan_result_buffer_ == nullptr) {
+    ESP_LOGE(TAG, "Could not allocate buffer for BLE Tracker!");
    this->mark_failed();
  }

  global_esp32_ble_tracker = this;
+  this->scan_result_lock_ = xSemaphoreCreateMutex();

 #ifdef USE_OTA
  ota::get_global_ota_callback()->add_on_state_callback(
@@ -118,31 +120,27 @@ void ESP32BLETracker::loop() {
  }
  bool promote_to_connecting = discovered && !searching && !connecting;

-  // Process scan results from lock-free SPSC ring buffer
-  // Consumer side: This runs in the main loop thread
-  if (this->scanner_state_ == ScannerState::RUNNING) {
-    // Load our own index with relaxed ordering (we're the only writer)
-    uint8_t read_idx = this->ring_read_index_.load(std::memory_order_relaxed);
+  if (this->scanner_state_ == ScannerState::RUNNING &&
+      this->scan_result_index_ &&  // if it looks like we have a scan result we will take the lock
+      xSemaphoreTake(this->scan_result_lock_, 0)) {
+    uint32_t index = this->scan_result_index_;
+    if (index >= ESP32BLETracker::SCAN_RESULT_BUFFER_SIZE) {
+      ESP_LOGW(TAG, "Too many BLE events to process. Some devices may not show up.");
+    }

-    // Load producer's index with acquire to see their latest writes
-    uint8_t write_idx = this->ring_write_index_.load(std::memory_order_acquire);
-
-    while (read_idx != write_idx) {
-      // Process one result at a time directly from ring buffer
-      BLEScanResult &scan_result = this->scan_ring_buffer_[read_idx];
-
-      if (this->raw_advertisements_) {
-        for (auto *listener : this->listeners_) {
-          listener->parse_devices(&scan_result, 1);
-        }
-        for (auto *client : this->clients_) {
-          client->parse_devices(&scan_result, 1);
-        }
+    if (this->raw_advertisements_) {
+      for (auto *listener : this->listeners_) {
+        listener->parse_devices(this->scan_result_buffer_, this->scan_result_index_);
      }
+      for (auto *client : this->clients_) {
+        client->parse_devices(this->scan_result_buffer_, this->scan_result_index_);
+      }
+    }

-      if (this->parse_advertisements_) {
+    if (this->parse_advertisements_) {
+      for (size_t i = 0; i < index; i++) {
        ESPBTDevice device;
-        device.parse_scan_rst(scan_result);
+        device.parse_scan_rst(this->scan_result_buffer_[i]);

        bool found = false;
        for (auto *listener : this->listeners_) {
@@ -163,19 +161,9 @@ void ESP32BLETracker::loop() {
          this->print_bt_device_info(device);
        }
      }
-
-      // Move to next entry in ring buffer
-      read_idx = (read_idx + 1) % SCAN_RESULT_BUFFER_SIZE;
-
-      // Store with release to ensure reads complete before index update
-      this->ring_read_index_.store(read_idx, std::memory_order_release);
-    }
-
-    // Log dropped results periodically
-    size_t dropped = this->scan_results_dropped_.exchange(0, std::memory_order_relaxed);
-    if (dropped > 0) {
-      ESP_LOGW(TAG, "Dropped %zu BLE scan results due to buffer overflow", dropped);
    }
+    this->scan_result_index_ = 0;
+    xSemaphoreGive(this->scan_result_lock_);
  }
  if (this->scanner_state_ == ScannerState::STOPPED) {
    this->end_of_scan_();  // Change state to IDLE
@@ -382,6 +370,9 @@ void ESP32BLETracker::recalculate_advertisement_parser_types() {

 void ESP32BLETracker::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
  switch (event) {
+    case ESP_GAP_BLE_SCAN_RESULT_EVT:
+      this->gap_scan_result_(param->scan_rst);
+      break;
    case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT:
      this->gap_scan_set_param_complete_(param->scan_param_cmpl);
      break;
@@ -394,57 +385,11 @@ void ESP32BLETracker::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_ga
    default:
      break;
  }
-  // Forward all events to clients (scan results are handled separately via gap_scan_event_handler)
  for (auto *client : this->clients_) {
    client->gap_event_handler(event, param);
  }
 }

-void ESP32BLETracker::gap_scan_event_handler(const BLEScanResult &scan_result) {
-  ESP_LOGV(TAG, "gap_scan_result - event %d", scan_result.search_evt);
-
-  if (scan_result.search_evt == ESP_GAP_SEARCH_INQ_RES_EVT) {
-    // Lock-free SPSC ring buffer write (Producer side)
-    // This runs in the ESP-IDF Bluetooth stack callback thread
-    // IMPORTANT: Only this thread writes to ring_write_index_
-
-    // Load our own index with relaxed ordering (we're the only writer)
-    uint8_t write_idx = this->ring_write_index_.load(std::memory_order_relaxed);
-    uint8_t next_write_idx = (write_idx + 1) % SCAN_RESULT_BUFFER_SIZE;
-
-    // Load consumer's index with acquire to see their latest updates
-    uint8_t read_idx = this->ring_read_index_.load(std::memory_order_acquire);
-
-    // Check if buffer is full
-    if (next_write_idx != read_idx) {
-      // Write to ring buffer
-      this->scan_ring_buffer_[write_idx] = scan_result;
-
-      // Store with release to ensure the write is visible before index update
-      this->ring_write_index_.store(next_write_idx, std::memory_order_release);
-    } else {
-      // Buffer full, track dropped results
-      this->scan_results_dropped_.fetch_add(1, std::memory_order_relaxed);
-    }
-  } else if (scan_result.search_evt == ESP_GAP_SEARCH_INQ_CMPL_EVT) {
-    // Scan finished on its own
-    if (this->scanner_state_ != ScannerState::RUNNING) {
-      if (this->scanner_state_ == ScannerState::STOPPING) {
-        ESP_LOGE(TAG, "Scan was not running when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::STARTING) {
-        ESP_LOGE(TAG, "Scan was not started when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::FAILED) {
-        ESP_LOGE(TAG, "Scan was in failed state when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::IDLE) {
-        ESP_LOGE(TAG, "Scan was idle when scan completed.");
-      } else if (this->scanner_state_ == ScannerState::STOPPED) {
-        ESP_LOGE(TAG, "Scan was stopped when scan completed.");
-      }
-    }
-    this->set_scanner_state_(ScannerState::STOPPED);
-  }
-}
-
 void ESP32BLETracker::gap_scan_set_param_complete_(const esp_ble_gap_cb_param_t::ble_scan_param_cmpl_evt_param &param) {
  ESP_LOGV(TAG, "gap_scan_set_param_complete - status %d", param.status);
  if (param.status == ESP_BT_STATUS_DONE) {
@@ -499,6 +444,34 @@ void ESP32BLETracker::gap_scan_stop_complete_(const esp_ble_gap_cb_param_t::ble_
  this->set_scanner_state_(ScannerState::STOPPED);
 }

+void ESP32BLETracker::gap_scan_result_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
+  ESP_LOGV(TAG, "gap_scan_result - event %d", param.search_evt);
+  if (param.search_evt == ESP_GAP_SEARCH_INQ_RES_EVT) {
+    if (xSemaphoreTake(this->scan_result_lock_, 0)) {
+      if (this->scan_result_index_ < ESP32BLETracker::SCAN_RESULT_BUFFER_SIZE) {
+        this->scan_result_buffer_[this->scan_result_index_++] = param;
+      }
+      xSemaphoreGive(this->scan_result_lock_);
+    }
+  } else if (param.search_evt == ESP_GAP_SEARCH_INQ_CMPL_EVT) {
+    // Scan finished on its own
+    if (this->scanner_state_ != ScannerState::RUNNING) {
+      if (this->scanner_state_ == ScannerState::STOPPING) {
+        ESP_LOGE(TAG, "Scan was not running when scan completed.");
+      } else if (this->scanner_state_ == ScannerState::STARTING) {
+        ESP_LOGE(TAG, "Scan was not started when scan completed.");
+      } else if (this->scanner_state_ == ScannerState::FAILED) {
+        ESP_LOGE(TAG, "Scan was in failed state when scan completed.");
+      } else if (this->scanner_state_ == ScannerState::IDLE) {
+        ESP_LOGE(TAG, "Scan was idle when scan completed.");
+      } else if (this->scanner_state_ == ScannerState::STOPPED) {
+        ESP_LOGE(TAG, "Scan was stopped when scan completed.");
+      }
+    }
+    this->set_scanner_state_(ScannerState::STOPPED);
+  }
+}
+
 void ESP32BLETracker::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                          esp_ble_gattc_cb_param_t *param) {
  for (auto *client : this->clients_) {
@@ -521,16 +494,13 @@ optional<ESPBLEiBeacon> ESPBLEiBeacon::from_manufacturer_data(const ServiceData
  return ESPBLEiBeacon(data.data.data());
 }

-void ESPBTDevice::parse_scan_rst(const BLEScanResult &scan_result) {
-  this->scan_result_ = &scan_result;
+void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
+  this->scan_result_ = param;
  for (uint8_t i = 0; i < ESP_BD_ADDR_LEN; i++)
-    this->address_[i] = scan_result.bda[i];
-  this->address_type_ = static_cast<esp_ble_addr_type_t>(scan_result.ble_addr_type);
-  this->rssi_ = scan_result.rssi;
-
-  // Parse advertisement data directly
-  uint8_t total_len = scan_result.adv_data_len + scan_result.scan_rsp_len;
-  this->parse_adv_(scan_result.ble_adv, total_len);
+    this->address_[i] = param.bda[i];
+  this->address_type_ = param.ble_addr_type;
+  this->rssi_ = param.rssi;
+  this->parse_adv_(param);

 #ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
  ESP_LOGVV(TAG, "Parse Result:");
@@ -588,13 +558,13 @@ void ESPBTDevice::parse_scan_rst(const BLEScanResult &scan_result) {
    ESP_LOGVV(TAG, "    Data: %s", format_hex_pretty(data.data).c_str());
  }

-  ESP_LOGVV(TAG, "  Adv data: %s",
-            format_hex_pretty(scan_result.ble_adv, scan_result.adv_data_len + scan_result.scan_rsp_len).c_str());
+  ESP_LOGVV(TAG, "  Adv data: %s", format_hex_pretty(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
 #endif
 }
-
-void ESPBTDevice::parse_adv_(const uint8_t *payload, uint8_t len) {
+void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
  size_t offset = 0;
+  const uint8_t *payload = param.ble_adv;
+  uint8_t len = param.adv_data_len + param.scan_rsp_len;

  while (offset + 2 < len) {
    const uint8_t field_length = payload[offset++];  // First byte is length of adv record
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -6,7 +6,6 @@
 #include "esphome/core/helpers.h"

 #include <array>
-#include <atomic>
 #include <string>
 #include <vector>

@@ -63,7 +62,7 @@ class ESPBLEiBeacon {

 class ESPBTDevice {
 public:
-  void parse_scan_rst(const BLEScanResult &scan_result);
+  void parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param);

  std::string address_str() const;

@@ -85,8 +84,7 @@ class ESPBTDevice {

  const std::vector<ServiceData> &get_service_datas() const { return service_datas_; }

-  // Exposed through a function for use in lambdas
-  const BLEScanResult &get_scan_result() const { return *scan_result_; }
+  const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &get_scan_result() const { return scan_result_; }

  bool resolve_irk(const uint8_t *irk) const;

@@ -100,7 +98,7 @@ class ESPBTDevice {
  }

 protected:
-  void parse_adv_(const uint8_t *payload, uint8_t len);
+  void parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param);

  esp_bd_addr_t address_{
      0,
@@ -114,7 +112,7 @@ class ESPBTDevice {
  std::vector<ESPBTUUID> service_uuids_{};
  std::vector<ServiceData> manufacturer_datas_{};
  std::vector<ServiceData> service_datas_{};
-  const BLEScanResult *scan_result_{nullptr};
+  esp_ble_gap_cb_param_t::ble_scan_result_evt_param scan_result_{};
 };

 class ESP32BLETracker;
@@ -123,7 +121,9 @@ class ESPBTDeviceListener {
 public:
  virtual void on_scan_end() {}
  virtual bool parse_device(const ESPBTDevice &device) = 0;
-  virtual bool parse_devices(const BLEScanResult *scan_results, size_t count) { return false; };
+  virtual bool parse_devices(esp_ble_gap_cb_param_t::ble_scan_result_evt_param *advertisements, size_t count) {
+    return false;
+  };
  virtual AdvertisementParserType get_advertisement_parser_type() {
    return AdvertisementParserType::PARSED_ADVERTISEMENTS;
  };
@@ -133,7 +133,7 @@ class ESPBTDeviceListener {
  ESP32BLETracker *parent_{nullptr};
 };

-enum class ClientState : uint8_t {
+enum class ClientState {
  // Connection is allocated
  INIT,
  // Client is disconnecting
@@ -169,7 +169,7 @@ enum class ScannerState {
  STOPPED,
 };

-enum class ConnectionType : uint8_t {
+enum class ConnectionType {
  // The default connection type, we hold all the services in ram
  // for the duration of the connection.
  V1,
@@ -197,24 +197,19 @@ class ESPBTClient : public ESPBTDeviceListener {
    }
  }
  ClientState state() const { return state_; }
-
-  // Memory optimized layout
-  uint8_t app_id;  // App IDs are small integers assigned sequentially
+  int app_id;

 protected:
-  // Group 1: 1-byte types
  ClientState state_{ClientState::INIT};
  // want_disconnect_ is set to true when a disconnect is requested
  // while the client is connecting. This is used to disconnect the
  // client as soon as we get the connection id (conn_id_) from the
  // ESP_GATTC_OPEN_EVT event.
  bool want_disconnect_{false};
-  // 2 bytes used, 2 bytes padding
 };

 class ESP32BLETracker : public Component,
                        public GAPEventHandler,
-                        public GAPScanEventHandler,
                        public GATTcEventHandler,
                        public BLEStatusEventHandler,
                        public Parented<ESP32BLE> {
@@ -245,7 +240,6 @@ class ESP32BLETracker : public Component,
  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                           esp_ble_gattc_cb_param_t *param) override;
  void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
-  void gap_scan_event_handler(const BLEScanResult &scan_result) override;
  void ble_before_disabled_event_handler() override;

  void add_scanner_state_callback(std::function<void(ScannerState)> &&callback) {
@@ -270,7 +264,7 @@ class ESP32BLETracker : public Component,
  /// Called to set the scanner state. Will also call callbacks to let listeners know when state is changed.
  void set_scanner_state_(ScannerState state);

-  uint8_t app_id_{0};
+  int app_id_{0};

  /// Vector of addresses that have already been printed in print_bt_device_info
  std::vector<uint64_t> already_discovered_;
@@ -291,16 +285,14 @@ class ESP32BLETracker : public Component,
  bool ble_was_disabled_{true};
  bool raw_advertisements_{false};
  bool parse_advertisements_{false};
-
-  // Lock-free Single-Producer Single-Consumer (SPSC) ring buffer for scan results
-  // Producer: ESP-IDF Bluetooth stack callback (gap_scan_event_handler)
-  // Consumer: ESPHome main loop (loop() method)
-  // This design ensures zero blocking in the BT callback and prevents scan result loss
-  BLEScanResult *scan_ring_buffer_;
-  std::atomic<uint8_t> ring_write_index_{0};       // Written only by BT callback (producer)
-  std::atomic<uint8_t> ring_read_index_{0};        // Written only by main loop (consumer)
-  std::atomic<uint16_t> scan_results_dropped_{0};  // Tracks buffer overflow events
-
+  SemaphoreHandle_t scan_result_lock_;
+  size_t scan_result_index_{0};
+#ifdef USE_PSRAM
+  const static u_int8_t SCAN_RESULT_BUFFER_SIZE = 32;
+#else
+  const static u_int8_t SCAN_RESULT_BUFFER_SIZE = 20;
+#endif  // USE_PSRAM
+  esp_ble_gap_cb_param_t::ble_scan_result_evt_param *scan_result_buffer_;
  esp_bt_status_t scan_start_failed_{ESP_BT_STATUS_SUCCESS};
  esp_bt_status_t scan_set_param_failed_{ESP_BT_STATUS_SUCCESS};
  int connecting_{0};
--- a/esphome/components/esp32_camera/init.py
+++ b/esphome/components/esp32_camera/init.py
@@ -1,6 +1,5 @@
 from esphome import automation, pins
 import esphome.codegen as cg
-from esphome.components import i2c
 from esphome.components.esp32 import add_idf_component
 import esphome.config_validation as cv
 from esphome.const import (
@@ -8,7 +7,6 @@ from esphome.const import (
    CONF_CONTRAST,
    CONF_DATA_PINS,
    CONF_FREQUENCY,
-    CONF_I2C_ID,
    CONF_ID,
    CONF_PIN,
    CONF_RESET_PIN,
@@ -19,7 +17,7 @@ from esphome.const import (
    CONF_VSYNC_PIN,
 )
 from esphome.core import CORE
-from esphome.core.entity_helpers import setup_entity
+from esphome.cpp_helpers import setup_entity

 DEPENDENCIES = ["esp32"]

@@ -151,104 +149,93 @@ CONF_ON_IMAGE = "on_image"

 camera_range_param = cv.int_range(min=-2, max=2)

-CONFIG_SCHEMA = cv.All(
-    cv.ENTITY_BASE_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(ESP32Camera),
-            # pin assignment
-            cv.Required(CONF_DATA_PINS): cv.All(
-                [pins.internal_gpio_input_pin_number], cv.Length(min=8, max=8)
-            ),
-            cv.Required(CONF_VSYNC_PIN): pins.internal_gpio_input_pin_number,
-            cv.Required(CONF_HREF_PIN): pins.internal_gpio_input_pin_number,
-            cv.Required(CONF_PIXEL_CLOCK_PIN): pins.internal_gpio_input_pin_number,
-            cv.Required(CONF_EXTERNAL_CLOCK): cv.Schema(
-                {
-                    cv.Required(CONF_PIN): pins.internal_gpio_input_pin_number,
-                    cv.Optional(CONF_FREQUENCY, default="20MHz"): cv.All(
-                        cv.frequency, cv.Range(min=8e6, max=20e6)
-                    ),
-                }
-            ),
-            cv.Optional(CONF_I2C_PINS): cv.Schema(
-                {
-                    cv.Required(CONF_SDA): pins.internal_gpio_output_pin_number,
-                    cv.Required(CONF_SCL): pins.internal_gpio_output_pin_number,
-                }
-            ),
-            cv.Optional(CONF_I2C_ID): cv.Any(
-                cv.use_id(i2c.InternalI2CBus),
-                msg="I2C bus must be an internal ESP32 I2C bus",
-            ),
-            cv.Optional(CONF_RESET_PIN): pins.internal_gpio_output_pin_number,
-            cv.Optional(CONF_POWER_DOWN_PIN): pins.internal_gpio_output_pin_number,
-            # image
-            cv.Optional(CONF_RESOLUTION, default="640X480"): cv.enum(
-                FRAME_SIZES, upper=True
-            ),
-            cv.Optional(CONF_JPEG_QUALITY, default=10): cv.int_range(min=6, max=63),
-            cv.Optional(CONF_CONTRAST, default=0): camera_range_param,
-            cv.Optional(CONF_BRIGHTNESS, default=0): camera_range_param,
-            cv.Optional(CONF_SATURATION, default=0): camera_range_param,
-            cv.Optional(CONF_VERTICAL_FLIP, default=True): cv.boolean,
-            cv.Optional(CONF_HORIZONTAL_MIRROR, default=True): cv.boolean,
-            cv.Optional(CONF_SPECIAL_EFFECT, default="NONE"): cv.enum(
-                ENUM_SPECIAL_EFFECT, upper=True
-            ),
-            # exposure
-            cv.Optional(CONF_AGC_MODE, default="AUTO"): cv.enum(
-                ENUM_GAIN_CONTROL_MODE, upper=True
-            ),
-            cv.Optional(CONF_AEC2, default=False): cv.boolean,
-            cv.Optional(CONF_AE_LEVEL, default=0): camera_range_param,
-            cv.Optional(CONF_AEC_VALUE, default=300): cv.int_range(min=0, max=1200),
-            # gains
-            cv.Optional(CONF_AEC_MODE, default="AUTO"): cv.enum(
-                ENUM_GAIN_CONTROL_MODE, upper=True
-            ),
-            cv.Optional(CONF_AGC_VALUE, default=0): cv.int_range(min=0, max=30),
-            cv.Optional(CONF_AGC_GAIN_CEILING, default="2X"): cv.enum(
-                ENUM_GAIN_CEILING, upper=True
-            ),
-            # white balance
-            cv.Optional(CONF_WB_MODE, default="AUTO"): cv.enum(
-                ENUM_WB_MODE, upper=True
-            ),
-            # test pattern
-            cv.Optional(CONF_TEST_PATTERN, default=False): cv.boolean,
-            # framerates
-            cv.Optional(CONF_MAX_FRAMERATE, default="10 fps"): cv.All(
-                cv.framerate, cv.Range(min=0, min_included=False, max=60)
-            ),
-            cv.Optional(CONF_IDLE_FRAMERATE, default="0.1 fps"): cv.All(
-                cv.framerate, cv.Range(min=0, max=1)
-            ),
-            cv.Optional(CONF_FRAME_BUFFER_COUNT, default=1): cv.int_range(min=1, max=2),
-            cv.Optional(CONF_ON_STREAM_START): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
-                        ESP32CameraStreamStartTrigger
-                    ),
-                }
-            ),
-            cv.Optional(CONF_ON_STREAM_STOP): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
-                        ESP32CameraStreamStopTrigger
-                    ),
-                }
-            ),
-            cv.Optional(CONF_ON_IMAGE): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
-                        ESP32CameraImageTrigger
-                    ),
-                }
-            ),
-        }
-    ).extend(cv.COMPONENT_SCHEMA),
-    cv.has_exactly_one_key(CONF_I2C_PINS, CONF_I2C_ID),
-)
+CONFIG_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(ESP32Camera),
+        # pin assignment
+        cv.Required(CONF_DATA_PINS): cv.All(
+            [pins.internal_gpio_input_pin_number], cv.Length(min=8, max=8)
+        ),
+        cv.Required(CONF_VSYNC_PIN): pins.internal_gpio_input_pin_number,
+        cv.Required(CONF_HREF_PIN): pins.internal_gpio_input_pin_number,
+        cv.Required(CONF_PIXEL_CLOCK_PIN): pins.internal_gpio_input_pin_number,
+        cv.Required(CONF_EXTERNAL_CLOCK): cv.Schema(
+            {
+                cv.Required(CONF_PIN): pins.internal_gpio_input_pin_number,
+                cv.Optional(CONF_FREQUENCY, default="20MHz"): cv.All(
+                    cv.frequency, cv.Range(min=8e6, max=20e6)
+                ),
+            }
+        ),
+        cv.Required(CONF_I2C_PINS): cv.Schema(
+            {
+                cv.Required(CONF_SDA): pins.internal_gpio_output_pin_number,
+                cv.Required(CONF_SCL): pins.internal_gpio_output_pin_number,
+            }
+        ),
+        cv.Optional(CONF_RESET_PIN): pins.internal_gpio_output_pin_number,
+        cv.Optional(CONF_POWER_DOWN_PIN): pins.internal_gpio_output_pin_number,
+        # image
+        cv.Optional(CONF_RESOLUTION, default="640X480"): cv.enum(
+            FRAME_SIZES, upper=True
+        ),
+        cv.Optional(CONF_JPEG_QUALITY, default=10): cv.int_range(min=6, max=63),
+        cv.Optional(CONF_CONTRAST, default=0): camera_range_param,
+        cv.Optional(CONF_BRIGHTNESS, default=0): camera_range_param,
+        cv.Optional(CONF_SATURATION, default=0): camera_range_param,
+        cv.Optional(CONF_VERTICAL_FLIP, default=True): cv.boolean,
+        cv.Optional(CONF_HORIZONTAL_MIRROR, default=True): cv.boolean,
+        cv.Optional(CONF_SPECIAL_EFFECT, default="NONE"): cv.enum(
+            ENUM_SPECIAL_EFFECT, upper=True
+        ),
+        # exposure
+        cv.Optional(CONF_AGC_MODE, default="AUTO"): cv.enum(
+            ENUM_GAIN_CONTROL_MODE, upper=True
+        ),
+        cv.Optional(CONF_AEC2, default=False): cv.boolean,
+        cv.Optional(CONF_AE_LEVEL, default=0): camera_range_param,
+        cv.Optional(CONF_AEC_VALUE, default=300): cv.int_range(min=0, max=1200),
+        # gains
+        cv.Optional(CONF_AEC_MODE, default="AUTO"): cv.enum(
+            ENUM_GAIN_CONTROL_MODE, upper=True
+        ),
+        cv.Optional(CONF_AGC_VALUE, default=0): cv.int_range(min=0, max=30),
+        cv.Optional(CONF_AGC_GAIN_CEILING, default="2X"): cv.enum(
+            ENUM_GAIN_CEILING, upper=True
+        ),
+        # white balance
+        cv.Optional(CONF_WB_MODE, default="AUTO"): cv.enum(ENUM_WB_MODE, upper=True),
+        # test pattern
+        cv.Optional(CONF_TEST_PATTERN, default=False): cv.boolean,
+        # framerates
+        cv.Optional(CONF_MAX_FRAMERATE, default="10 fps"): cv.All(
+            cv.framerate, cv.Range(min=0, min_included=False, max=60)
+        ),
+        cv.Optional(CONF_IDLE_FRAMERATE, default="0.1 fps"): cv.All(
+            cv.framerate, cv.Range(min=0, max=1)
+        ),
+        cv.Optional(CONF_FRAME_BUFFER_COUNT, default=1): cv.int_range(min=1, max=2),
+        cv.Optional(CONF_ON_STREAM_START): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                    ESP32CameraStreamStartTrigger
+                ),
+            }
+        ),
+        cv.Optional(CONF_ON_STREAM_STOP): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                    ESP32CameraStreamStopTrigger
+                ),
+            }
+        ),
+        cv.Optional(CONF_ON_IMAGE): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ESP32CameraImageTrigger),
+            }
+        ),
+    }
+).extend(cv.COMPONENT_SCHEMA)

 SETTERS = {
    # pin assignment
@@ -284,7 +271,7 @@ SETTERS = {

 async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
-    await setup_entity(var, config, "camera")
+    await setup_entity(var, config)
    await cg.register_component(var, config)

    for key, setter in SETTERS.items():
@@ -293,12 +280,8 @@ async def to_code(config):

    extclk = config[CONF_EXTERNAL_CLOCK]
    cg.add(var.set_external_clock(extclk[CONF_PIN], extclk[CONF_FREQUENCY]))
-    if i2c_id := config.get(CONF_I2C_ID):
-        i2c_hub = await cg.get_variable(i2c_id)
-        cg.add(var.set_i2c_id(i2c_hub))
-    else:
-        i2c_pins = config[CONF_I2C_PINS]
-        cg.add(var.set_i2c_pins(i2c_pins[CONF_SDA], i2c_pins[CONF_SCL]))
+    i2c_pins = config[CONF_I2C_PINS]
+    cg.add(var.set_i2c_pins(i2c_pins[CONF_SDA], i2c_pins[CONF_SCL]))
    cg.add(var.set_max_update_interval(1000 / config[CONF_MAX_FRAMERATE]))
    if config[CONF_IDLE_FRAMERATE] == 0:
        cg.add(var.set_idle_update_interval(0))
@@ -310,7 +293,11 @@ async def to_code(config):
    cg.add_define("USE_ESP32_CAMERA")

    if CORE.using_esp_idf:
-        add_idf_component(name="espressif/esp32-camera", ref="2.0.15")
+        add_idf_component(
+            name="esp32-camera",
+            repo="https://github.com/espressif/esp32-camera.git",
+            ref="v2.0.15",
+        )

    for conf in config.get(CONF_ON_STREAM_START, []):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
--- a/esphome/components/esp32_camera/esp32_camera.cpp
+++ b/esphome/components/esp32_camera/esp32_camera.cpp
@@ -1,9 +1,9 @@
 #ifdef USE_ESP32

 #include "esp32_camera.h"
-#include "esphome/core/application.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/log.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/application.h"

 #include <freertos/task.h>

@@ -16,12 +16,6 @@ static const char *const TAG = "esp32_camera";
 void ESP32Camera::setup() {
  global_esp32_camera = this;

-#ifdef USE_I2C
-  if (this->i2c_bus_ != nullptr) {
-    this->config_.sccb_i2c_port = this->i2c_bus_->get_port();
-  }
-#endif
-
  /* initialize time to now */
  this->last_update_ = millis();

@@ -63,7 +57,7 @@ void ESP32Camera::dump_config() {
                "  External Clock: Pin:%d Frequency:%u\n"
                "  I2C Pins: SDA:%d SCL:%d\n"
                "  Reset Pin: %d",
-                this->name_.c_str(), YESNO(this->is_internal()), conf.pin_d0, conf.pin_d1, conf.pin_d2, conf.pin_d3,
+                this->name_.c_str(), YESNO(this->internal_), conf.pin_d0, conf.pin_d1, conf.pin_d2, conf.pin_d3,
                conf.pin_d4, conf.pin_d5, conf.pin_d6, conf.pin_d7, conf.pin_vsync, conf.pin_href, conf.pin_pclk,
                conf.pin_xclk, conf.xclk_freq_hz, conf.pin_sccb_sda, conf.pin_sccb_scl, conf.pin_reset);
  switch (this->config_.frame_size) {
@@ -252,13 +246,6 @@ void ESP32Camera::set_i2c_pins(uint8_t sda, uint8_t scl) {
  this->config_.pin_sccb_sda = sda;
  this->config_.pin_sccb_scl = scl;
 }
-#ifdef USE_I2C
-void ESP32Camera::set_i2c_id(i2c::InternalI2CBus *i2c_bus) {
-  this->i2c_bus_ = i2c_bus;
-  this->config_.pin_sccb_sda = -1;
-  this->config_.pin_sccb_scl = -1;
-}
-#endif  // USE_I2C
 void ESP32Camera::set_reset_pin(uint8_t pin) { this->config_.pin_reset = pin; }
 void ESP32Camera::set_power_down_pin(uint8_t pin) { this->config_.pin_pwdn = pin; }

--- a/esphome/components/esp32_camera/esp32_camera.h
+++ b/esphome/components/esp32_camera/esp32_camera.h
@@ -2,17 +2,13 @@

 #ifdef USE_ESP32

-#include <esp_camera.h>
-#include <freertos/FreeRTOS.h>
-#include <freertos/queue.h>
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/entity_base.h"
 #include "esphome/core/helpers.h"
-
-#ifdef USE_I2C
-#include "esphome/components/i2c/i2c_bus.h"
-#endif  // USE_I2C
+#include <esp_camera.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/queue.h>

 namespace esphome {
 namespace esp32_camera {
@@ -122,9 +118,6 @@ class ESP32Camera : public EntityBase, public Component {
  void set_pixel_clock_pin(uint8_t pin);
  void set_external_clock(uint8_t pin, uint32_t frequency);
  void set_i2c_pins(uint8_t sda, uint8_t scl);
-#ifdef USE_I2C
-  void set_i2c_id(i2c::InternalI2CBus *i2c_bus);
-#endif  // USE_I2C
  void set_reset_pin(uint8_t pin);
  void set_power_down_pin(uint8_t pin);
  /* -- image */
@@ -217,9 +210,6 @@ class ESP32Camera : public EntityBase, public Component {

  uint32_t last_idle_request_{0};
  uint32_t last_update_{0};
-#ifdef USE_I2C
-  i2c::InternalI2CBus *i2c_bus_{nullptr};
-#endif  // USE_I2C
 };

 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
--- a/esphome/components/esp32_camera_web_server/init.py
+++ b/esphome/components/esp32_camera_web_server/init.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MODE, CONF_PORT

 CODEOWNERS = ["@ayufan"]
-DEPENDENCIES = ["esp32_camera", "network"]
+DEPENDENCIES = ["esp32_camera"]
 MULTI_CONF = True

 esp32_camera_web_server_ns = cg.esphome_ns.namespace("esp32_camera_web_server")
--- a/esphome/components/esp32_hall/esp32_hall.cpp
+++ b/esphome/components/esp32_hall/esp32_hall.cpp
@@ -0,0 +1,25 @@
+#ifdef USE_ESP32
+#include "esp32_hall.h"
+#include "esphome/core/log.h"
+#include "esphome/core/hal.h"
+#include <driver/adc.h>
+
+namespace esphome {
+namespace esp32_hall {
+
+static const char *const TAG = "esp32_hall";
+
+void ESP32HallSensor::update() {
+  adc1_config_width(ADC_WIDTH_BIT_12);
+  int value_int = hall_sensor_read();
+  float value = (value_int / 4095.0f) * 10000.0f;
+  ESP_LOGD(TAG, "'%s': Got reading %.0f µT", this->name_.c_str(), value);
+  this->publish_state(value);
+}
+std::string ESP32HallSensor::unique_id() { return get_mac_address() + "-hall"; }
+void ESP32HallSensor::dump_config() { LOG_SENSOR("", "ESP32 Hall Sensor", this); }
+
+}  // namespace esp32_hall
+}  // namespace esphome
+
+#endif
--- a/esphome/components/esp32_hall/esp32_hall.h
+++ b/esphome/components/esp32_hall/esp32_hall.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+
+#ifdef USE_ESP32
+
+namespace esphome {
+namespace esp32_hall {
+
+class ESP32HallSensor : public sensor::Sensor, public PollingComponent {
+ public:
+  void dump_config() override;
+
+  void update() override;
+
+  std::string unique_id() override;
+};
+
+}  // namespace esp32_hall
+}  // namespace esphome
+
+#endif
--- a/esphome/components/esp32_hall/sensor.py
+++ b/esphome/components/esp32_hall/sensor.py
@@ -1,5 +1,24 @@
+import esphome.codegen as cg
+from esphome.components import sensor
 import esphome.config_validation as cv
+from esphome.const import ICON_MAGNET, STATE_CLASS_MEASUREMENT, UNIT_MICROTESLA

-CONFIG_SCHEMA = cv.invalid(
-    "The esp32_hall component has been removed as of ESPHome 2025.7.0. See https://github.com/esphome/esphome/pull/9117 for details."
+DEPENDENCIES = ["esp32"]
+
+esp32_hall_ns = cg.esphome_ns.namespace("esp32_hall")
+ESP32HallSensor = esp32_hall_ns.class_(
+    "ESP32HallSensor", sensor.Sensor, cg.PollingComponent
 )
+
+CONFIG_SCHEMA = sensor.sensor_schema(
+    ESP32HallSensor,
+    unit_of_measurement=UNIT_MICROTESLA,
+    icon=ICON_MAGNET,
+    accuracy_decimals=1,
+    state_class=STATE_CLASS_MEASUREMENT,
+).extend(cv.polling_component_schema("60s"))
+
+
+async def to_code(config):
+    var = await sensor.new_sensor(config)
+    await cg.register_component(var, config)
--- a/esphome/components/esp32_hosted/init.py
+++ b/esphome/components/esp32_hosted/init.py
@@ -1,101 +0,0 @@
-import os
-
-from esphome import pins
-from esphome.components import esp32
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_CLK_PIN,
-    CONF_RESET_PIN,
-    CONF_VARIANT,
-    KEY_CORE,
-    KEY_FRAMEWORK_VERSION,
-)
-from esphome.core import CORE
-
-CODEOWNERS = ["@swoboda1337"]
-
-CONF_ACTIVE_HIGH = "active_high"
-CONF_CMD_PIN = "cmd_pin"
-CONF_D0_PIN = "d0_pin"
-CONF_D1_PIN = "d1_pin"
-CONF_D2_PIN = "d2_pin"
-CONF_D3_PIN = "d3_pin"
-CONF_SLOT = "slot"
-
-CONFIG_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            cv.Required(CONF_VARIANT): cv.one_of(*esp32.VARIANTS, upper=True),
-            cv.Required(CONF_ACTIVE_HIGH): cv.boolean,
-            cv.Required(CONF_CLK_PIN): pins.internal_gpio_output_pin_number,
-            cv.Required(CONF_CMD_PIN): pins.internal_gpio_output_pin_number,
-            cv.Required(CONF_D0_PIN): pins.internal_gpio_output_pin_number,
-            cv.Required(CONF_D1_PIN): pins.internal_gpio_output_pin_number,
-            cv.Required(CONF_D2_PIN): pins.internal_gpio_output_pin_number,
-            cv.Required(CONF_D3_PIN): pins.internal_gpio_output_pin_number,
-            cv.Required(CONF_RESET_PIN): pins.internal_gpio_output_pin_number,
-            cv.Optional(CONF_SLOT, default=1): cv.int_range(min=0, max=1),
-        }
-    ),
-)
-
-
-async def to_code(config):
-    if config[CONF_ACTIVE_HIGH]:
-        esp32.add_idf_sdkconfig_option(
-            "CONFIG_ESP_HOSTED_SDIO_RESET_ACTIVE_HIGH",
-            True,
-        )
-    else:
-        esp32.add_idf_sdkconfig_option(
-            "CONFIG_ESP_HOSTED_SDIO_RESET_ACTIVE_LOW",
-            True,
-        )
-    esp32.add_idf_sdkconfig_option(
-        "CONFIG_ESP_HOSTED_SDIO_GPIO_RESET_SLAVE",  # NOLINT
-        config[CONF_RESET_PIN],
-    )
-    esp32.add_idf_sdkconfig_option(
-        f"CONFIG_SLAVE_IDF_TARGET_{config[CONF_VARIANT]}",  # NOLINT
-        True,
-    )
-    esp32.add_idf_sdkconfig_option(
-        f"CONFIG_ESP_HOSTED_SDIO_SLOT_{config[CONF_SLOT]}",
-        True,
-    )
-    esp32.add_idf_sdkconfig_option(
-        f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CLK_SLOT_{config[CONF_SLOT]}",
-        config[CONF_CLK_PIN],
-    )
-    esp32.add_idf_sdkconfig_option(
-        f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CMD_SLOT_{config[CONF_SLOT]}",
-        config[CONF_CMD_PIN],
-    )
-    esp32.add_idf_sdkconfig_option(
-        f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D0_SLOT_{config[CONF_SLOT]}",
-        config[CONF_D0_PIN],
-    )
-    esp32.add_idf_sdkconfig_option(
-        f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D1_4BIT_BUS_SLOT_{config[CONF_SLOT]}",
-        config[CONF_D1_PIN],
-    )
-    esp32.add_idf_sdkconfig_option(
-        f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D2_4BIT_BUS_SLOT_{config[CONF_SLOT]}",
-        config[CONF_D2_PIN],
-    )
-    esp32.add_idf_sdkconfig_option(
-        f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D3_4BIT_BUS_SLOT_{config[CONF_SLOT]}",
-        config[CONF_D3_PIN],
-    )
-    esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_CUSTOM_SDIO_PINS", True)
-
-    framework_ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
-    os.environ["ESP_IDF_VERSION"] = f"{framework_ver.major}.{framework_ver.minor}"
-    esp32.add_idf_component(name="espressif/esp_wifi_remote", ref="0.10.2")
-    esp32.add_idf_component(name="espressif/eppp_link", ref="0.2.0")
-    esp32.add_idf_component(name="espressif/esp_hosted", ref="2.0.11")
-    esp32.add_extra_script(
-        "post",
-        "esp32_hosted.py",
-        os.path.join(os.path.dirname(__file__), "esp32_hosted.py.script"),
-    )
--- a/esphome/components/esp32_hosted/esp32_hosted.py.script
+++ b/esphome/components/esp32_hosted/esp32_hosted.py.script
@@ -1,12 +0,0 @@
-# pylint: disable=E0602
-Import("env")  # noqa
-
-# Workaround whole archive issue
-if "__LIB_DEPS" in env and "libespressif__esp_hosted.a" in env["__LIB_DEPS"]:
-    env.Append(
-        LINKFLAGS=[
-            "-Wl,--whole-archive",
-            env["BUILD_DIR"] + "/esp-idf/espressif__esp_hosted/libespressif__esp_hosted.a",
-            "-Wl,--no-whole-archive",
-        ]
-    )
--- a/esphome/components/esp32_improv/esp32_improv_component.cpp
+++ b/esphome/components/esp32_improv/esp32_improv_component.cpp
@@ -168,8 +168,6 @@ void ESP32ImprovComponent::loop() {
    case improv::STATE_PROVISIONED: {
      this->incoming_data_.clear();
      this->set_status_indicator_state_(false);
-      // Provisioning complete, no further loop execution needed
-      this->disable_loop();
      break;
    }
  }
@@ -256,7 +254,6 @@ void ESP32ImprovComponent::start() {

  ESP_LOGD(TAG, "Setting Improv to start");
  this->should_start_ = true;
-  this->enable_loop();
 }

 void ESP32ImprovComponent::stop() {
--- a/esphome/components/esp32_rmt/init.py
+++ b/esphome/components/esp32_rmt/init.py
@@ -1,8 +1,48 @@
+import esphome.codegen as cg
 from esphome.components import esp32
 import esphome.config_validation as cv
+from esphome.const import KEY_CORE, KEY_FRAMEWORK_VERSION
+from esphome.core import CORE

 CODEOWNERS = ["@jesserockz"]

+RMT_TX_CHANNELS = {
+    esp32.const.VARIANT_ESP32: [0, 1, 2, 3, 4, 5, 6, 7],
+    esp32.const.VARIANT_ESP32S2: [0, 1, 2, 3],
+    esp32.const.VARIANT_ESP32S3: [0, 1, 2, 3],
+    esp32.const.VARIANT_ESP32C3: [0, 1],
+    esp32.const.VARIANT_ESP32C6: [0, 1],
+    esp32.const.VARIANT_ESP32H2: [0, 1],
+}
+
+RMT_RX_CHANNELS = {
+    esp32.const.VARIANT_ESP32: [0, 1, 2, 3, 4, 5, 6, 7],
+    esp32.const.VARIANT_ESP32S2: [0, 1, 2, 3],
+    esp32.const.VARIANT_ESP32S3: [4, 5, 6, 7],
+    esp32.const.VARIANT_ESP32C3: [2, 3],
+    esp32.const.VARIANT_ESP32C6: [2, 3],
+    esp32.const.VARIANT_ESP32H2: [2, 3],
+}
+
+rmt_channel_t = cg.global_ns.enum("rmt_channel_t")
+RMT_CHANNEL_ENUMS = {
+    0: rmt_channel_t.RMT_CHANNEL_0,
+    1: rmt_channel_t.RMT_CHANNEL_1,
+    2: rmt_channel_t.RMT_CHANNEL_2,
+    3: rmt_channel_t.RMT_CHANNEL_3,
+    4: rmt_channel_t.RMT_CHANNEL_4,
+    5: rmt_channel_t.RMT_CHANNEL_5,
+    6: rmt_channel_t.RMT_CHANNEL_6,
+    7: rmt_channel_t.RMT_CHANNEL_7,
+}
+
+
+def use_new_rmt_driver():
+    framework_version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
+    if CORE.using_esp_idf and framework_version >= cv.Version(5, 0, 0):
+        return True
+    return False
+

 def validate_clock_resolution():
    def _validator(value):
@@ -20,3 +60,21 @@ def validate_clock_resolution():
        return value

    return _validator
+
+
+def validate_rmt_channel(*, tx: bool):
+    rmt_channels = RMT_TX_CHANNELS if tx else RMT_RX_CHANNELS
+
+    def _validator(value):
+        cv.only_on_esp32(value)
+        value = cv.int_(value)
+        variant = esp32.get_esp32_variant()
+        if variant not in rmt_channels:
+            raise cv.Invalid(f"ESP32 variant {variant} does not support RMT.")
+        if value not in rmt_channels[variant]:
+            raise cv.Invalid(
+                f"RMT channel {value} does not support {'transmitting' if tx else 'receiving'} for ESP32 variant {variant}."
+            )
+        return cv.enum(RMT_CHANNEL_ENUMS)(value)
+
+    return _validator
--- a/esphome/components/esp32_rmt_led_strip/led_strip.cpp
+++ b/esphome/components/esp32_rmt_led_strip/led_strip.cpp
@@ -42,6 +42,7 @@ void ESP32RMTLEDStripLightOutput::setup() {
    return;
  }

+#if ESP_IDF_VERSION_MAJOR >= 5
  RAMAllocator<rmt_symbol_word_t> rmt_allocator(this->use_psram_ ? 0 : RAMAllocator<rmt_symbol_word_t>::ALLOC_INTERNAL);

  // 8 bits per byte, 1 rmt_symbol_word_t per bit + 1 rmt_symbol_word_t for reset
@@ -78,6 +79,36 @@ void ESP32RMTLEDStripLightOutput::setup() {
    this->mark_failed();
    return;
  }
+#else
+  RAMAllocator<rmt_item32_t> rmt_allocator(this->use_psram_ ? 0 : RAMAllocator<rmt_item32_t>::ALLOC_INTERNAL);
+
+  // 8 bits per byte, 1 rmt_item32_t per bit + 1 rmt_item32_t for reset
+  this->rmt_buf_ = rmt_allocator.allocate(buffer_size * 8 + 1);
+
+  rmt_config_t config;
+  memset(&config, 0, sizeof(config));
+  config.channel = this->channel_;
+  config.rmt_mode = RMT_MODE_TX;
+  config.gpio_num = gpio_num_t(this->pin_);
+  config.mem_block_num = 1;
+  config.clk_div = RMT_CLK_DIV;
+  config.tx_config.loop_en = false;
+  config.tx_config.carrier_level = RMT_CARRIER_LEVEL_LOW;
+  config.tx_config.carrier_en = false;
+  config.tx_config.idle_level = RMT_IDLE_LEVEL_LOW;
+  config.tx_config.idle_output_en = true;
+
+  if (rmt_config(&config) != ESP_OK) {
+    ESP_LOGE(TAG, "Cannot initialize RMT!");
+    this->mark_failed();
+    return;
+  }
+  if (rmt_driver_install(config.channel, 0, 0) != ESP_OK) {
+    ESP_LOGE(TAG, "Cannot install RMT driver!");
+    this->mark_failed();
+    return;
+  }
+#endif
 }

 void ESP32RMTLEDStripLightOutput::set_led_params(uint32_t bit0_high, uint32_t bit0_low, uint32_t bit1_high,
@@ -114,7 +145,11 @@ void ESP32RMTLEDStripLightOutput::write_state(light::LightState *state) {

  ESP_LOGVV(TAG, "Writing RGB values to bus");

+#if ESP_IDF_VERSION_MAJOR >= 5
  esp_err_t error = rmt_tx_wait_all_done(this->channel_, 1000);
+#else
+  esp_err_t error = rmt_wait_tx_done(this->channel_, pdMS_TO_TICKS(1000));
+#endif
  if (error != ESP_OK) {
    ESP_LOGE(TAG, "RMT TX timeout");
    this->status_set_warning();
@@ -127,7 +162,11 @@ void ESP32RMTLEDStripLightOutput::write_state(light::LightState *state) {
  size_t size = 0;
  size_t len = 0;
  uint8_t *psrc = this->buf_;
+#if ESP_IDF_VERSION_MAJOR >= 5
  rmt_symbol_word_t *pdest = this->rmt_buf_;
+#else
+  rmt_item32_t *pdest = this->rmt_buf_;
+#endif
  while (size < buffer_size) {
    uint8_t b = *psrc;
    for (int i = 0; i < 8; i++) {
@@ -145,11 +184,15 @@ void ESP32RMTLEDStripLightOutput::write_state(light::LightState *state) {
    len++;
  }

+#if ESP_IDF_VERSION_MAJOR >= 5
  rmt_transmit_config_t config;
  memset(&config, 0, sizeof(config));
  config.loop_count = 0;
  config.flags.eot_level = 0;
  error = rmt_transmit(this->channel_, this->encoder_, this->rmt_buf_, len * sizeof(rmt_symbol_word_t), &config);
+#else
+  error = rmt_write_items(this->channel_, this->rmt_buf_, len, false);
+#endif
  if (error != ESP_OK) {
    ESP_LOGE(TAG, "RMT TX error");
    this->status_set_warning();
@@ -208,7 +251,11 @@ void ESP32RMTLEDStripLightOutput::dump_config() {
                "ESP32 RMT LED Strip:\n"
                "  Pin: %u",
                this->pin_);
+#if ESP_IDF_VERSION_MAJOR >= 5
  ESP_LOGCONFIG(TAG, "  RMT Symbols: %" PRIu32, this->rmt_symbols_);
+#else
+  ESP_LOGCONFIG(TAG, "  Channel: %u", this->channel_);
+#endif
  const char *rgb_order;
  switch (this->rgb_order_) {
    case ORDER_RGB:
--- a/esphome/components/esp32_rmt_led_strip/led_strip.h
+++ b/esphome/components/esp32_rmt_led_strip/led_strip.h
@@ -11,7 +11,12 @@
 #include <driver/gpio.h>
 #include <esp_err.h>
 #include <esp_idf_version.h>
+
+#if ESP_IDF_VERSION_MAJOR >= 5
 #include <driver/rmt_tx.h>
+#else
+#include <driver/rmt.h>
+#endif

 namespace esphome {
 namespace esp32_rmt_led_strip {
@@ -56,7 +61,11 @@ class ESP32RMTLEDStripLightOutput : public light::AddressableLight {
                      uint32_t reset_time_high, uint32_t reset_time_low);

  void set_rgb_order(RGBOrder rgb_order) { this->rgb_order_ = rgb_order; }
+#if ESP_IDF_VERSION_MAJOR >= 5
  void set_rmt_symbols(uint32_t rmt_symbols) { this->rmt_symbols_ = rmt_symbols; }
+#else
+  void set_rmt_channel(rmt_channel_t channel) { this->channel_ = channel; }
+#endif

  void clear_effect_data() override {
    for (int i = 0; i < this->size(); i++)
@@ -72,11 +81,17 @@ class ESP32RMTLEDStripLightOutput : public light::AddressableLight {

  uint8_t *buf_{nullptr};
  uint8_t *effect_data_{nullptr};
+#if ESP_IDF_VERSION_MAJOR >= 5
  rmt_channel_handle_t channel_{nullptr};
  rmt_encoder_handle_t encoder_{nullptr};
  rmt_symbol_word_t *rmt_buf_{nullptr};
  rmt_symbol_word_t bit0_, bit1_, reset_;
  uint32_t rmt_symbols_{48};
+#else
+  rmt_item32_t *rmt_buf_{nullptr};
+  rmt_item32_t bit0_, bit1_, reset_;
+  rmt_channel_t channel_{RMT_CHANNEL_0};
+#endif

  uint8_t pin_;
  uint16_t num_leds_;
--- a/esphome/components/esp32_rmt_led_strip/light.py
+++ b/esphome/components/esp32_rmt_led_strip/light.py
@@ -3,7 +3,7 @@ import logging

 from esphome import pins
 import esphome.codegen as cg
-from esphome.components import esp32, light
+from esphome.components import esp32, esp32_rmt, light
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_CHIPSET,
@@ -13,9 +13,11 @@ from esphome.const import (
    CONF_OUTPUT_ID,
    CONF_PIN,
    CONF_RGB_ORDER,
+    CONF_RMT_CHANNEL,
    CONF_RMT_SYMBOLS,
    CONF_USE_DMA,
 )
+from esphome.core import CORE

 _LOGGER = logging.getLogger(__name__)

@@ -67,6 +69,53 @@ CONF_RESET_HIGH = "reset_high"
 CONF_RESET_LOW = "reset_low"


+class OptionalForIDF5(cv.SplitDefault):
+    @property
+    def default(self):
+        if not esp32_rmt.use_new_rmt_driver():
+            return cv.UNDEFINED
+        return super().default
+
+    @default.setter
+    def default(self, value):
+        # Ignore default set from vol.Optional
+        pass
+
+
+def only_with_new_rmt_driver(obj):
+    if not esp32_rmt.use_new_rmt_driver():
+        raise cv.Invalid(
+            "This feature is only available for the IDF framework version 5."
+        )
+    return obj
+
+
+def not_with_new_rmt_driver(obj):
+    if esp32_rmt.use_new_rmt_driver():
+        raise cv.Invalid(
+            "This feature is not available for the IDF framework version 5."
+        )
+    return obj
+
+
+def final_validation(config):
+    if not esp32_rmt.use_new_rmt_driver():
+        if CONF_RMT_CHANNEL not in config:
+            if CORE.using_esp_idf:
+                raise cv.Invalid(
+                    "rmt_channel is a required option for IDF version < 5."
+                )
+            raise cv.Invalid(
+                "rmt_channel is a required option for the Arduino framework."
+            )
+        _LOGGER.warning(
+            "RMT_LED_STRIP support for IDF version < 5 is deprecated and will be removed soon."
+        )
+
+
+FINAL_VALIDATE_SCHEMA = final_validation
+
+
 CONFIG_SCHEMA = cv.All(
    light.ADDRESSABLE_LIGHT_SCHEMA.extend(
        {
@@ -74,17 +123,20 @@ CONFIG_SCHEMA = cv.All(
            cv.Required(CONF_PIN): pins.internal_gpio_output_pin_number,
            cv.Required(CONF_NUM_LEDS): cv.positive_not_null_int,
            cv.Required(CONF_RGB_ORDER): cv.enum(RGB_ORDERS, upper=True),
-            cv.SplitDefault(
+            cv.Optional(CONF_RMT_CHANNEL): cv.All(
+                not_with_new_rmt_driver, esp32_rmt.validate_rmt_channel(tx=True)
+            ),
+            OptionalForIDF5(
                CONF_RMT_SYMBOLS,
-                esp32=192,
-                esp32_s2=192,
-                esp32_s3=192,
-                esp32_p4=192,
-                esp32_c3=96,
-                esp32_c5=96,
-                esp32_c6=96,
-                esp32_h2=96,
-            ): cv.int_range(min=2),
+                esp32_idf=192,
+                esp32_s2_idf=192,
+                esp32_s3_idf=192,
+                esp32_p4_idf=192,
+                esp32_c3_idf=96,
+                esp32_c5_idf=96,
+                esp32_c6_idf=96,
+                esp32_h2_idf=96,
+            ): cv.All(only_with_new_rmt_driver, cv.int_range(min=2)),
            cv.Optional(CONF_MAX_REFRESH_RATE): cv.positive_time_period_microseconds,
            cv.Optional(CONF_CHIPSET): cv.one_of(*CHIPSETS, upper=True),
            cv.Optional(CONF_IS_RGBW, default=False): cv.boolean,
@@ -93,6 +145,7 @@ CONFIG_SCHEMA = cv.All(
                esp32.only_on_variant(
                    supported=[esp32.const.VARIANT_ESP32S3, esp32.const.VARIANT_ESP32P4]
                ),
+                cv.only_with_esp_idf,
                cv.boolean,
            ),
            cv.Optional(CONF_USE_PSRAM, default=True): cv.boolean,
@@ -165,6 +218,15 @@ async def to_code(config):
    cg.add(var.set_is_rgbw(config[CONF_IS_RGBW]))
    cg.add(var.set_is_wrgb(config[CONF_IS_WRGB]))
    cg.add(var.set_use_psram(config[CONF_USE_PSRAM]))
-    cg.add(var.set_rmt_symbols(config[CONF_RMT_SYMBOLS]))
-    if CONF_USE_DMA in config:
-        cg.add(var.set_use_dma(config[CONF_USE_DMA]))
+
+    if esp32_rmt.use_new_rmt_driver():
+        cg.add(var.set_rmt_symbols(config[CONF_RMT_SYMBOLS]))
+        if CONF_USE_DMA in config:
+            cg.add(var.set_use_dma(config[CONF_USE_DMA]))
+    else:
+        rmt_channel_t = cg.global_ns.enum("rmt_channel_t")
+        cg.add(
+            var.set_rmt_channel(
+                getattr(rmt_channel_t, f"RMT_CHANNEL_{config[CONF_RMT_CHANNEL]}")
+            )
+        )
--- a/esphome/components/esp8266/init.py
+++ b/esphome/components/esp8266/init.py
@@ -183,7 +183,6 @@ async def to_code(config):

    cg.add_platformio_option("board", config[CONF_BOARD])
    cg.add_build_flag("-DUSE_ESP8266")
-    cg.set_cpp_standard("gnu++20")
    cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
    cg.add_define("ESPHOME_VARIANT", "ESP8266")

--- a/esphome/components/esp8266/gpio.cpp
+++ b/esphome/components/esp8266/gpio.cpp
@@ -129,9 +129,9 @@ void IRAM_ATTR ISRInternalGPIOPin::digital_write(bool value) {
    }
  } else {
    if (value != arg->inverted) {
-      *arg->out_set_reg = *arg->out_set_reg | 1;
+      *arg->out_set_reg |= 1;
    } else {
-      *arg->out_set_reg = *arg->out_set_reg & ~1;
+      *arg->out_set_reg &= ~1;
    }
  }
 }
@@ -147,7 +147,7 @@ void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
    if (flags & gpio::FLAG_OUTPUT) {
      *arg->mode_set_reg = arg->mask;
      if (flags & gpio::FLAG_OPEN_DRAIN) {
-        *arg->control_reg = *arg->control_reg | (1 << GPCD);
+        *arg->control_reg |= 1 << GPCD;
      } else {
        *arg->control_reg &= ~(1 << GPCD);
      }
@@ -155,21 +155,21 @@ void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
      *arg->mode_clr_reg = arg->mask;
    }
    if (flags & gpio::FLAG_PULLUP) {
-      *arg->func_reg = *arg->func_reg | (1 << GPFPU);
-      *arg->control_reg = *arg->control_reg | (1 << GPCD);
+      *arg->func_reg |= 1 << GPFPU;
+      *arg->control_reg |= 1 << GPCD;
    } else {
-      *arg->func_reg = *arg->func_reg & ~(1 << GPFPU);
+      *arg->func_reg &= ~(1 << GPFPU);
    }
  } else {
    if (flags & gpio::FLAG_OUTPUT) {
-      *arg->mode_set_reg = *arg->mode_set_reg | 1;
+      *arg->mode_set_reg |= 1;
    } else {
-      *arg->mode_set_reg = *arg->mode_set_reg & ~1;
+      *arg->mode_set_reg &= ~1;
    }
    if (flags & gpio::FLAG_PULLDOWN) {
-      *arg->func_reg = *arg->func_reg | (1 << GP16FPD);
+      *arg->func_reg |= 1 << GP16FPD;
    } else {
-      *arg->func_reg = *arg->func_reg & ~(1 << GP16FPD);
+      *arg->func_reg &= ~(1 << GP16FPD);
    }
  }
 }
--- a/esphome/components/esphome/ota/ota_esphome.cpp
+++ b/esphome/components/esphome/ota/ota_esphome.cpp
@@ -26,19 +26,19 @@ void ESPHomeOTAComponent::setup() {
  ota::register_ota_platform(this);
 #endif

-  this->server_ = socket::socket_ip_loop_monitored(SOCK_STREAM, 0);  // monitored for incoming connections
-  if (this->server_ == nullptr) {
+  server_ = socket::socket_ip_loop_monitored(SOCK_STREAM, 0);  // monitored for incoming connections
+  if (server_ == nullptr) {
    ESP_LOGW(TAG, "Could not create socket");
    this->mark_failed();
    return;
  }
  int enable = 1;
-  int err = this->server_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
+  int err = server_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
  if (err != 0) {
    ESP_LOGW(TAG, "Socket unable to set reuseaddr: errno %d", err);
    // we can still continue
  }
-  err = this->server_->setblocking(false);
+  err = server_->setblocking(false);
  if (err != 0) {
    ESP_LOGW(TAG, "Socket unable to set nonblocking mode: errno %d", err);
    this->mark_failed();
@@ -54,14 +54,14 @@ void ESPHomeOTAComponent::setup() {
    return;
  }

-  err = this->server_->bind((struct sockaddr *) &server, sizeof(server));
+  err = server_->bind((struct sockaddr *) &server, sizeof(server));
  if (err != 0) {
    ESP_LOGW(TAG, "Socket unable to bind: errno %d", errno);
    this->mark_failed();
    return;
  }

-  err = this->server_->listen(4);
+  err = server_->listen(4);
  if (err != 0) {
    ESP_LOGW(TAG, "Socket unable to listen: errno %d", errno);
    this->mark_failed();
@@ -82,14 +82,7 @@ void ESPHomeOTAComponent::dump_config() {
 #endif
 }

-void ESPHomeOTAComponent::loop() {
-  // Skip handle_() call if no client connected and no incoming connections
-  // This optimization reduces idle loop overhead when OTA is not active
-  // Note: No need to check server_ for null as the component is marked failed in setup() if server_ creation fails
-  if (this->client_ != nullptr || this->server_->ready()) {
-    this->handle_();
-  }
-}
+void ESPHomeOTAComponent::loop() { this->handle_(); }

 static const uint8_t FEATURE_SUPPORTS_COMPRESSION = 0x01;

@@ -108,21 +101,23 @@ void ESPHomeOTAComponent::handle_() {
  size_t size_acknowledged = 0;
 #endif

-  if (this->client_ == nullptr) {
-    // We already checked server_->ready() in loop(), so we can accept directly
-    struct sockaddr_storage source_addr;
-    socklen_t addr_len = sizeof(source_addr);
-    this->client_ = this->server_->accept((struct sockaddr *) &source_addr, &addr_len);
-    if (this->client_ == nullptr)
-      return;
+  if (client_ == nullptr) {
+    // Check if the server socket is ready before accepting
+    if (this->server_->ready()) {
+      struct sockaddr_storage source_addr;
+      socklen_t addr_len = sizeof(source_addr);
+      client_ = server_->accept((struct sockaddr *) &source_addr, &addr_len);
+    }
  }
+  if (client_ == nullptr)
+    return;

  int enable = 1;
-  int err = this->client_->setsockopt(IPPROTO_TCP, TCP_NODELAY, &enable, sizeof(int));
+  int err = client_->setsockopt(IPPROTO_TCP, TCP_NODELAY, &enable, sizeof(int));
  if (err != 0) {
    ESP_LOGW(TAG, "Socket could not enable TCP nodelay, errno %d", errno);
-    this->client_->close();
-    this->client_ = nullptr;
+    client_->close();
+    client_ = nullptr;
    return;
  }

--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -106,7 +106,7 @@ void EthernetComponent::setup() {
      .post_cb = nullptr,
  };

-#if ESP_IDF_VERSION_MAJOR >= 5
+#if USE_ESP_IDF && (ESP_IDF_VERSION_MAJOR >= 5)
  eth_w5500_config_t w5500_config = ETH_W5500_DEFAULT_CONFIG(host, &devcfg);
 #else
  spi_device_handle_t spi_handle = nullptr;
@@ -274,9 +274,6 @@ void EthernetComponent::loop() {
        ESP_LOGW(TAG, "Connection lost; reconnecting");
        this->state_ = EthernetComponentState::CONNECTING;
        this->start_connect_();
-      } else {
-        // When connected and stable, disable the loop to save CPU cycles
-        this->disable_loop();
      }
      break;
  }
@@ -400,13 +397,11 @@ void EthernetComponent::eth_event_handler(void *arg, esp_event_base_t event_base
    case ETHERNET_EVENT_START:
      event_name = "ETH started";
      global_eth_component->started_ = true;
-      global_eth_component->enable_loop_soon_any_context();
      break;
    case ETHERNET_EVENT_STOP:
      event_name = "ETH stopped";
      global_eth_component->started_ = false;
      global_eth_component->connected_ = false;
-      global_eth_component->enable_loop_soon_any_context();  // Enable loop when connection state changes
      break;
    case ETHERNET_EVENT_CONNECTED:
      event_name = "ETH connected";
@@ -414,7 +409,6 @@ void EthernetComponent::eth_event_handler(void *arg, esp_event_base_t event_base
    case ETHERNET_EVENT_DISCONNECTED:
      event_name = "ETH disconnected";
      global_eth_component->connected_ = false;
-      global_eth_component->enable_loop_soon_any_context();  // Enable loop when connection state changes
      break;
    default:
      return;
@@ -431,10 +425,8 @@ void EthernetComponent::got_ip_event_handler(void *arg, esp_event_base_t event_b
  global_eth_component->got_ipv4_address_ = true;
 #if USE_NETWORK_IPV6 && (USE_NETWORK_MIN_IPV6_ADDR_COUNT > 0)
  global_eth_component->connected_ = global_eth_component->ipv6_count_ >= USE_NETWORK_MIN_IPV6_ADDR_COUNT;
-  global_eth_component->enable_loop_soon_any_context();  // Enable loop when connection state changes
 #else
  global_eth_component->connected_ = true;
-  global_eth_component->enable_loop_soon_any_context();  // Enable loop when connection state changes
 #endif /* USE_NETWORK_IPV6 */
 }

@@ -447,10 +439,8 @@ void EthernetComponent::got_ip6_event_handler(void *arg, esp_event_base_t event_
 #if (USE_NETWORK_MIN_IPV6_ADDR_COUNT > 0)
  global_eth_component->connected_ =
      global_eth_component->got_ipv4_address_ && (global_eth_component->ipv6_count_ >= USE_NETWORK_MIN_IPV6_ADDR_COUNT);
-  global_eth_component->enable_loop_soon_any_context();  // Enable loop when connection state changes
 #else
  global_eth_component->connected_ = global_eth_component->got_ipv4_address_;
-  global_eth_component->enable_loop_soon_any_context();  // Enable loop when connection state changes
 #endif
 }
 #endif /* USE_NETWORK_IPV6 */
@@ -630,7 +620,6 @@ bool EthernetComponent::powerdown() {
  }
  this->connected_ = false;
  this->started_ = false;
-  // No need to enable_loop() here as this is only called during shutdown/reboot
  if (this->phy_->pwrctl(this->phy_, false) != ESP_OK) {
    ESP_LOGE(TAG, "Error powering down ethernet PHY");
    return false;
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -15,7 +15,7 @@
 namespace esphome {
 namespace ethernet {

-enum EthernetType : uint8_t {
+enum EthernetType {
  ETHERNET_TYPE_UNKNOWN = 0,
  ETHERNET_TYPE_LAN8720,
  ETHERNET_TYPE_RTL8201,
@@ -42,7 +42,7 @@ struct PHYRegister {
  uint32_t page;
 };

-enum class EthernetComponentState : uint8_t {
+enum class EthernetComponentState {
  STOPPED,
  CONNECTING,
  CONNECTED,
@@ -119,31 +119,25 @@ class EthernetComponent : public Component {
  uint32_t polling_interval_{0};
 #endif
 #else
-  // Group all 32-bit members first
+  uint8_t phy_addr_{0};
  int power_pin_{-1};
+  uint8_t mdc_pin_{23};
+  uint8_t mdio_pin_{18};
  emac_rmii_clock_mode_t clk_mode_{EMAC_CLK_EXT_IN};
  emac_rmii_clock_gpio_t clk_gpio_{EMAC_CLK_IN_GPIO};
  std::vector<PHYRegister> phy_registers_{};
-
-  // Group all 8-bit members together
-  uint8_t phy_addr_{0};
-  uint8_t mdc_pin_{23};
-  uint8_t mdio_pin_{18};
 #endif
-  optional<ManualIP> manual_ip_{};
-  uint32_t connect_begin_;
-
-  // Group all uint8_t types together (enums and bools)
  EthernetType type_{ETHERNET_TYPE_UNKNOWN};
-  EthernetComponentState state_{EthernetComponentState::STOPPED};
+  optional<ManualIP> manual_ip_{};
+
  bool started_{false};
  bool connected_{false};
  bool got_ipv4_address_{false};
 #if LWIP_IPV6
  uint8_t ipv6_count_{0};
 #endif /* LWIP_IPV6 */
-
-  // Pointers at the end (naturally aligned)
+  EthernetComponentState state_{EthernetComponentState::STOPPED};
+  uint32_t connect_begin_;
  esp_netif_t *eth_netif_{nullptr};
  esp_eth_handle_t eth_handle_;
  esp_eth_phy_t *phy_{nullptr};
--- a/esphome/components/event/init.py
+++ b/esphome/components/event/init.py
@@ -18,8 +18,8 @@ from esphome.const import (
    DEVICE_CLASS_MOTION,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
+from esphome.cpp_helpers import setup_entity

 CODEOWNERS = ["@nohat"]
 IS_PLATFORM_COMPONENT = True
@@ -59,9 +59,6 @@ _EVENT_SCHEMA = (
 )


-_EVENT_SCHEMA.add_extra(entity_duplicate_validator("event"))
-
-
 def event_schema(
    class_: MockObjClass = cv.UNDEFINED,
    *,
@@ -91,7 +88,7 @@ EVENT_SCHEMA.add_extra(cv.deprecated_schema_constant("event"))


 async def setup_event_core_(var, config, *, event_types: list[str]):
-    await setup_entity(var, config, "event")
+    await setup_entity(var, config)

    for conf in config.get(CONF_ON_EVENT, []):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
--- a/esphome/components/fan/init.py
+++ b/esphome/components/fan/init.py
@@ -32,7 +32,7 @@ from esphome.const import (
    CONF_WEB_SERVER,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
+from esphome.cpp_helpers import setup_entity

 IS_PLATFORM_COMPONENT = True

@@ -161,9 +161,6 @@ _FAN_SCHEMA = (
 )


-_FAN_SCHEMA.add_extra(entity_duplicate_validator("fan"))
-
-
 def fan_schema(
    class_: cg.Pvariable,
    *,
@@ -228,7 +225,7 @@ def validate_preset_modes(value):


 async def setup_fan_core_(var, config):
-    await setup_entity(var, config, "fan")
+    await setup_entity(var, config)

    cg.add(var.set_restore_mode(config[CONF_RESTORE_MODE]))

--- a/esphome/components/fan/fan.cpp
+++ b/esphome/components/fan/fan.cpp
@@ -41,48 +41,39 @@ void FanCall::perform() {
 void FanCall::validate_() {
  auto traits = this->parent_.get_traits();

-  if (this->speed_.has_value()) {
+  if (this->speed_.has_value())
    this->speed_ = clamp(*this->speed_, 1, traits.supported_speed_count());

-    // https://developers.home-assistant.io/docs/core/entity/fan/#preset-modes
-    // "Manually setting a speed must disable any set preset mode"
-    this->preset_mode_.clear();
+  if (this->binary_state_.has_value() && *this->binary_state_) {
+    // when turning on, if neither current nor new speed available, set speed to 100%
+    if (traits.supports_speed() && !this->parent_.state && this->parent_.speed == 0 && !this->speed_.has_value()) {
+      this->speed_ = traits.supported_speed_count();
+    }
+  }
+
+  if (this->oscillating_.has_value() && !traits.supports_oscillation()) {
+    ESP_LOGW(TAG, "'%s' - This fan does not support oscillation!", this->parent_.get_name().c_str());
+    this->oscillating_.reset();
+  }
+
+  if (this->speed_.has_value() && !traits.supports_speed()) {
+    ESP_LOGW(TAG, "'%s' - This fan does not support speeds!", this->parent_.get_name().c_str());
+    this->speed_.reset();
+  }
+
+  if (this->direction_.has_value() && !traits.supports_direction()) {
+    ESP_LOGW(TAG, "'%s' - This fan does not support directions!", this->parent_.get_name().c_str());
+    this->direction_.reset();
  }

  if (!this->preset_mode_.empty()) {
    const auto &preset_modes = traits.supported_preset_modes();
    if (preset_modes.find(this->preset_mode_) == preset_modes.end()) {
-      ESP_LOGW(TAG, "%s: Preset mode '%s' not supported", this->parent_.get_name().c_str(), this->preset_mode_.c_str());
+      ESP_LOGW(TAG, "'%s' - This fan does not support preset mode '%s'!", this->parent_.get_name().c_str(),
+               this->preset_mode_.c_str());
      this->preset_mode_.clear();
    }
  }
-
-  // when turning on...
-  if (!this->parent_.state && this->binary_state_.has_value() &&
-      *this->binary_state_
-      // ..,and no preset mode will be active...
-      && this->preset_mode_.empty() &&
-      this->parent_.preset_mode.empty()
-      // ...and neither current nor new speed is available...
-      && traits.supports_speed() && this->parent_.speed == 0 && !this->speed_.has_value()) {
-    // ...set speed to 100%
-    this->speed_ = traits.supported_speed_count();
-  }
-
-  if (this->oscillating_.has_value() && !traits.supports_oscillation()) {
-    ESP_LOGW(TAG, "%s: Oscillation not supported", this->parent_.get_name().c_str());
-    this->oscillating_.reset();
-  }
-
-  if (this->speed_.has_value() && !traits.supports_speed()) {
-    ESP_LOGW(TAG, "%s: Speed control not supported", this->parent_.get_name().c_str());
-    this->speed_.reset();
-  }
-
-  if (this->direction_.has_value() && !traits.supports_direction()) {
-    ESP_LOGW(TAG, "%s: Direction control not supported", this->parent_.get_name().c_str());
-    this->direction_.reset();
-  }
 }

 FanCall FanRestoreState::to_call(Fan &fan) {
--- a/esphome/components/font/init.py
+++ b/esphome/components/font/init.py
@@ -1,7 +1,6 @@
 from collections.abc import MutableMapping
 import functools
 import hashlib
-from itertools import accumulate
 import logging
 import os
 from pathlib import Path
@@ -469,9 +468,8 @@ class EFont:


 class GlyphInfo:
-    def __init__(self, glyph, data, advance, offset_x, offset_y, width, height):
-        self.glyph = glyph
-        self.bitmap_data = data
+    def __init__(self, data_len, advance, offset_x, offset_y, width, height):
+        self.data_len = data_len
        self.advance = advance
        self.offset_x = offset_x
        self.offset_y = offset_y
@@ -479,62 +477,6 @@ class GlyphInfo:
        self.height = height


-def glyph_to_glyphinfo(glyph, font, size, bpp):
-    scale = 256 // (1 << bpp)
-    if not font.is_scalable:
-        sizes = [pt_to_px(x.size) for x in font.available_sizes]
-        if size in sizes:
-            font.select_size(sizes.index(size))
-    else:
-        font.set_pixel_sizes(size, 0)
-    flags = FT_LOAD_RENDER
-    if bpp != 1:
-        flags |= FT_LOAD_NO_BITMAP
-    else:
-        flags |= FT_LOAD_TARGET_MONO
-    font.load_char(glyph, flags)
-    width = font.glyph.bitmap.width
-    height = font.glyph.bitmap.rows
-    buffer = font.glyph.bitmap.buffer
-    pitch = font.glyph.bitmap.pitch
-    glyph_data = [0] * ((height * width * bpp + 7) // 8)
-    src_mode = font.glyph.bitmap.pixel_mode
-    pos = 0
-    for y in range(height):
-        for x in range(width):
-            if src_mode == ft_pixel_mode_mono:
-                pixel = (
-                    (1 << bpp) - 1
-                    if buffer[y * pitch + x // 8] & (1 << (7 - x % 8))
-                    else 0
-                )
-            else:
-                pixel = buffer[y * pitch + x] // scale
-            for bit_num in range(bpp):
-                if pixel & (1 << (bpp - bit_num - 1)):
-                    glyph_data[pos // 8] |= 0x80 >> (pos % 8)
-                pos += 1
-    ascender = pt_to_px(font.size.ascender)
-    if ascender == 0:
-        if not font.is_scalable:
-            ascender = size
-        else:
-            _LOGGER.error(
-                "Unable to determine ascender of font %s %s",
-                font.family_name,
-                font.style_name,
-            )
-    return GlyphInfo(
-        glyph,
-        glyph_data,
-        pt_to_px(font.glyph.metrics.horiAdvance),
-        font.glyph.bitmap_left,
-        ascender - font.glyph.bitmap_top,
-        width,
-        height,
-    )
-
-
 async def to_code(config):
    """
    Collect all glyph codepoints, construct a map from a codepoint to a font file.
@@ -564,47 +506,98 @@ async def to_code(config):

    codepoints = list(point_set)
    codepoints.sort(key=functools.cmp_to_key(glyph_comparator))
+    glyph_args = {}
+    data = []
    bpp = config[CONF_BPP]
+    scale = 256 // (1 << bpp)
    size = config[CONF_SIZE]
    # create the data array for all glyphs
-    glyph_args = [
-        glyph_to_glyphinfo(x, point_font_map[x], size, bpp) for x in codepoints
-    ]
-    rhs = [HexInt(x) for x in flatten([x.bitmap_data for x in glyph_args])]
+    for codepoint in codepoints:
+        font = point_font_map[codepoint]
+        if not font.is_scalable:
+            sizes = [pt_to_px(x.size) for x in font.available_sizes]
+            if size in sizes:
+                font.select_size(sizes.index(size))
+        else:
+            font.set_pixel_sizes(size, 0)
+        flags = FT_LOAD_RENDER
+        if bpp != 1:
+            flags |= FT_LOAD_NO_BITMAP
+        else:
+            flags |= FT_LOAD_TARGET_MONO
+        font.load_char(codepoint, flags)
+        width = font.glyph.bitmap.width
+        height = font.glyph.bitmap.rows
+        buffer = font.glyph.bitmap.buffer
+        pitch = font.glyph.bitmap.pitch
+        glyph_data = [0] * ((height * width * bpp + 7) // 8)
+        src_mode = font.glyph.bitmap.pixel_mode
+        pos = 0
+        for y in range(height):
+            for x in range(width):
+                if src_mode == ft_pixel_mode_mono:
+                    pixel = (
+                        (1 << bpp) - 1
+                        if buffer[y * pitch + x // 8] & (1 << (7 - x % 8))
+                        else 0
+                    )
+                else:
+                    pixel = buffer[y * pitch + x] // scale
+                for bit_num in range(bpp):
+                    if pixel & (1 << (bpp - bit_num - 1)):
+                        glyph_data[pos // 8] |= 0x80 >> (pos % 8)
+                    pos += 1
+        ascender = pt_to_px(font.size.ascender)
+        if ascender == 0:
+            if not font.is_scalable:
+                ascender = size
+            else:
+                _LOGGER.error(
+                    "Unable to determine ascender of font %s", config[CONF_FILE]
+                )
+        glyph_args[codepoint] = GlyphInfo(
+            len(data),
+            pt_to_px(font.glyph.metrics.horiAdvance),
+            font.glyph.bitmap_left,
+            ascender - font.glyph.bitmap_top,
+            width,
+            height,
+        )
+        data += glyph_data
+
+    rhs = [HexInt(x) for x in data]
    prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)

    # Create the glyph table that points to data in the above array.
-    glyph_initializer = [
-        cg.StructInitializer(
-            GlyphData,
-            (
-                "a_char",
-                cg.RawExpression(f"(const uint8_t *){cpp_string_escape(x.glyph)}"),
-            ),
-            (
-                "data",
-                cg.RawExpression(f"{str(prog_arr)} + {str(y - len(x.bitmap_data))}"),
-            ),
-            ("advance", x.advance),
-            ("offset_x", x.offset_x),
-            ("offset_y", x.offset_y),
-            ("width", x.width),
-            ("height", x.height),
+    glyph_initializer = []
+    for codepoint in codepoints:
+        glyph_initializer.append(
+            cg.StructInitializer(
+                GlyphData,
+                (
+                    "a_char",
+                    cg.RawExpression(
+                        f"(const uint8_t *){cpp_string_escape(codepoint)}"
+                    ),
+                ),
+                (
+                    "data",
+                    cg.RawExpression(
+                        f"{str(prog_arr)} + {str(glyph_args[codepoint].data_len)}"
+                    ),
+                ),
+                ("advance", glyph_args[codepoint].advance),
+                ("offset_x", glyph_args[codepoint].offset_x),
+                ("offset_y", glyph_args[codepoint].offset_y),
+                ("width", glyph_args[codepoint].width),
+                ("height", glyph_args[codepoint].height),
+            )
        )
-        for (x, y) in zip(
-            glyph_args, list(accumulate([len(x.bitmap_data) for x in glyph_args]))
-        )
-    ]

    glyphs = cg.static_const_array(config[CONF_RAW_GLYPH_ID], glyph_initializer)

    font_height = pt_to_px(base_font.size.height)
    ascender = pt_to_px(base_font.size.ascender)
-    descender = abs(pt_to_px(base_font.size.descender))
-    g = glyph_to_glyphinfo("x", base_font, size, bpp)
-    xheight = g.height if len(g.bitmap_data) > 1 else 0
-    g = glyph_to_glyphinfo("X", base_font, size, bpp)
-    capheight = g.height if len(g.bitmap_data) > 1 else 0
    if font_height == 0:
        if not base_font.is_scalable:
            font_height = size
@@ -617,8 +610,5 @@ async def to_code(config):
        len(glyph_initializer),
        ascender,
        font_height,
-        descender,
-        xheight,
-        capheight,
        bpp,
    )
--- a/esphome/components/font/font.cpp
+++ b/esphome/components/font/font.cpp
@@ -45,15 +45,8 @@ void Glyph::scan_area(int *x1, int *y1, int *width, int *height) const {
  *height = this->glyph_data_->height;
 }

-Font::Font(const GlyphData *data, int data_nr, int baseline, int height, int descender, int xheight, int capheight,
-           uint8_t bpp)
-    : baseline_(baseline),
-      height_(height),
-      descender_(descender),
-      linegap_(height - baseline - descender),
-      xheight_(xheight),
-      capheight_(capheight),
-      bpp_(bpp) {
+Font::Font(const GlyphData *data, int data_nr, int baseline, int height, uint8_t bpp)
+    : baseline_(baseline), height_(height), bpp_(bpp) {
  glyphs_.reserve(data_nr);
  for (int i = 0; i < data_nr; ++i)
    glyphs_.emplace_back(&data[i]);
--- a/esphome/components/font/font.h
+++ b/esphome/components/font/font.h
@@ -50,17 +50,11 @@ class Font
 public:
  /** Construct the font with the given glyphs.
   *
-   * @param data A vector of glyphs, must be sorted lexicographically.
-   * @param data_nr The number of glyphs in data.
+   * @param glyphs A vector of glyphs, must be sorted lexicographically.
   * @param baseline The y-offset from the top of the text to the baseline.
-   * @param height The y-offset from the top of the text to the bottom.
-   * @param descender The y-offset from the baseline to the lowest stroke in the font (e.g. from letters like g or p).
-   * @param xheight The height of lowercase letters, usually measured at the "x" glyph.
-   * @param capheight The height of capital letters, usually measured at the "X" glyph.
-   * @param bpp The bits per pixel used for this font. Used to read data out of the glyph bitmaps.
+   * @param bottom The y-offset from the top of the text to the bottom (i.e. height).
   */
-  Font(const GlyphData *data, int data_nr, int baseline, int height, int descender, int xheight, int capheight,
-       uint8_t bpp = 1);
+  Font(const GlyphData *data, int data_nr, int baseline, int height, uint8_t bpp = 1);

  int match_next_glyph(const uint8_t *str, int *match_length);

@@ -71,23 +65,14 @@ class Font
 #endif
  inline int get_baseline() { return this->baseline_; }
  inline int get_height() { return this->height_; }
-  inline int get_ascender() { return this->baseline_; }
-  inline int get_descender() { return this->descender_; }
-  inline int get_linegap() { return this->linegap_; }
-  inline int get_xheight() { return this->xheight_; }
-  inline int get_capheight() { return this->capheight_; }
  inline int get_bpp() { return this->bpp_; }

-  const std::vector<Glyph, RAMAllocator<Glyph>> &get_glyphs() const { return glyphs_; }
+  const std::vector<Glyph, ExternalRAMAllocator<Glyph>> &get_glyphs() const { return glyphs_; }

 protected:
-  std::vector<Glyph, RAMAllocator<Glyph>> glyphs_;
+  std::vector<Glyph, ExternalRAMAllocator<Glyph>> glyphs_;
  int baseline_;
  int height_;
-  int descender_;
-  int linegap_;
-  int xheight_;
-  int capheight_;
  uint8_t bpp_;  // bits per pixel
 };

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
J. Nick Koston	dd345106f7	lock	2025-06-12 22:37:26 -05:00
J. Nick Koston	9763821d68	lock	2025-06-12 22:34:03 -05:00
J. Nick Koston	3d358cf431	lock	2025-06-12 22:21:15 -05:00
J. Nick Koston	1cebeb53d3	lock	2025-06-12 22:10:40 -05:00
J. Nick Koston	09bfa7f527	lock	2025-06-12 22:09:53 -05:00
J. Nick Koston	a61138c4f7	lock	2025-06-12 22:05:31 -05:00
J. Nick Koston	b23445e1c3	lock	2025-06-12 22:00:28 -05:00
J. Nick Koston	b887c1bf08	lock	2025-06-12 21:58:52 -05:00
J. Nick Koston	9206888966	label	2025-06-12 21:46:38 -05:00
J. Nick Koston	567cba4510	speed up	2025-06-12 21:37:22 -05:00
J. Nick Koston	7da5e02388	tweak	2025-06-12 21:34:03 -05:00
J. Nick Koston	1dd189cf36	tweak	2025-06-12 21:33:53 -05:00
J. Nick Koston	9e5dc01fd4	tweak	2025-06-12 21:33:29 -05:00