diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a7ed035063..4ebbe52d20 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -299,7 +299,7 @@ jobs:
       # Pushes any fixes the hooks made back to the pull request. This step
       # must keep its default name: the GitHub App that performs the push
       # locates the workflow run by that name.
-      - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 # v1.1.0
+      - uses: pre-commit-ci/lite-action@062bca0919bc9d6e66755cc05074b70c77e111fc # v1.2.0
         if: always()
         with:
           msg: apply automatic formatting fixes
diff --git a/CODEOWNERS b/CODEOWNERS
index 5f89315d23..b453cf4538 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -602,6 +602,7 @@ esphome/components/uart/button/* @ssieb
 esphome/components/uart/event/* @eoasmxd
 esphome/components/uart/packet_transport/* @clydebarrow
 esphome/components/uart_mux/* @kbx81
+esphome/components/uart_tcp/* @Bascht74
 esphome/components/udp/* @clydebarrow
 esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
diff --git a/esphome/components/ags10/sensor.py b/esphome/components/ags10/sensor.py
index fbd4bf590e..d20d80b2fc 100644
--- a/esphome/components/ags10/sensor.py
+++ b/esphome/components/ags10/sensor.py
@@ -62,16 +62,10 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    sens = await sensor.new_sensor(config[CONF_TVOC])
-    cg.add(var.set_tvoc(sens))
-
-    if version_config := config.get(CONF_VERSION):
-        sens = await sensor.new_sensor(version_config)
-        cg.add(var.set_version(sens))
-
-    if resistance_config := config.get(CONF_RESISTANCE):
-        sens = await sensor.new_sensor(resistance_config)
-        cg.add(var.set_resistance(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TVOC, var.set_tvoc)
+    await sensors(CONF_VERSION, var.set_version)
+    await sensors(CONF_RESISTANCE, var.set_resistance)
 
 
 AGS10_NEW_I2C_ADDRESS_SCHEMA = cv.maybe_simple_value(
diff --git a/esphome/components/aht10/sensor.py b/esphome/components/aht10/sensor.py
index ae669d0000..add86e16a6 100644
--- a/esphome/components/aht10/sensor.py
+++ b/esphome/components/aht10/sensor.py
@@ -57,10 +57,6 @@ async def to_code(config: ConfigType) -> None:
     await i2c.register_i2c_device(var, config)
     cg.add(var.set_variant(config[CONF_VARIANT]))
 
-    if temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if humidity := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity)
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/components/am2315c/sensor.py b/esphome/components/am2315c/sensor.py
index febb11409c..39ded956c3 100644
--- a/esphome/components/am2315c/sensor.py
+++ b/esphome/components/am2315c/sensor.py
@@ -46,10 +46,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/components/am2320/sensor.py b/esphome/components/am2320/sensor.py
index ffac0e6407..30a1b1d8a3 100644
--- a/esphome/components/am2320/sensor.py
+++ b/esphome/components/am2320/sensor.py
@@ -48,10 +48,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/components/am43/sensor/__init__.py b/esphome/components/am43/sensor/__init__.py
index 80341972a9..ef746f3e52 100644
--- a/esphome/components/am43/sensor/__init__.py
+++ b/esphome/components/am43/sensor/__init__.py
@@ -48,10 +48,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await ble_client.register_ble_node(var, config)
 
-    if battery_level_config := config.get(CONF_BATTERY_LEVEL):
-        sens = await sensor.new_sensor(battery_level_config)
-        cg.add(var.set_battery(sens))
-
-    if illuminance_config := config.get(CONF_ILLUMINANCE):
-        sens = await sensor.new_sensor(illuminance_config)
-        cg.add(var.set_illuminance(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery)
+    await sensors(CONF_ILLUMINANCE, var.set_illuminance)
diff --git a/esphome/components/as3935/sensor.py b/esphome/components/as3935/sensor.py
index b727b8fdb9..f03213c8ca 100644
--- a/esphome/components/as3935/sensor.py
+++ b/esphome/components/as3935/sensor.py
@@ -35,10 +35,6 @@ CONFIG_SCHEMA = cv.Schema(
 async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_AS3935_ID])
 
-    if distance_config := config.get(CONF_DISTANCE):
-        sens = await sensor.new_sensor(distance_config)
-        cg.add(hub.set_distance_sensor(sens))
-
-    if lightning_energy_config := config.get(CONF_LIGHTNING_ENERGY):
-        sens = await sensor.new_sensor(lightning_energy_config)
-        cg.add(hub.set_energy_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_DISTANCE, hub.set_distance_sensor)
+    await sensors(CONF_LIGHTNING_ENERGY, hub.set_energy_sensor)
diff --git a/esphome/components/atm90e32/sensor.py b/esphome/components/atm90e32/sensor.py
index 38b24c7cf6..e3d5fa2de2 100644
--- a/esphome/components/atm90e32/sensor.py
+++ b/esphome/components/atm90e32/sensor.py
@@ -241,12 +241,9 @@ async def to_code(config: ConfigType) -> None:
         if peak_current_config := conf.get(CONF_PEAK_CURRENT):
             sens = await sensor.new_sensor(peak_current_config)
             cg.add(var.set_peak_current_sensor(i, sens))
-    if frequency_config := config.get(CONF_FREQUENCY):
-        sens = await sensor.new_sensor(frequency_config)
-        cg.add(var.set_freq_sensor(sens))
-    if chip_temperature_config := config.get(CONF_CHIP_TEMPERATURE):
-        sens = await sensor.new_sensor(chip_temperature_config)
-        cg.add(var.set_chip_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_FREQUENCY, var.set_freq_sensor)
+    await sensors(CONF_CHIP_TEMPERATURE, var.set_chip_temperature_sensor)
     cg.add(var.set_line_freq(config[CONF_LINE_FREQUENCY]))
     cg.add(var.set_current_phases(config[CONF_CURRENT_PHASES]))
     cg.add(var.set_pga_gain(config[CONF_GAIN_PGA]))
diff --git a/esphome/components/atm90e32/text_sensor/__init__.py b/esphome/components/atm90e32/text_sensor/__init__.py
index 30585cb873..6b959c19fa 100644
--- a/esphome/components/atm90e32/text_sensor/__init__.py
+++ b/esphome/components/atm90e32/text_sensor/__init__.py
@@ -36,14 +36,13 @@ CONFIG_SCHEMA = cv.Schema(
 
 
 async def to_code(config: ConfigType) -> None:
-    parent = await cg.get_variable(config[CONF_ID])
+    hub = await cg.get_variable(config[CONF_ID])
 
     if phase_cfg := config.get(CONF_PHASE_STATUS):
         for i, key in enumerate(PHASE_KEYS):
             if sub_phase_cfg := phase_cfg.get(key):
                 sens = await text_sensor.new_text_sensor(sub_phase_cfg)
-                cg.add(parent.set_phase_status_text_sensor(i, sens))
+                cg.add(hub.set_phase_status_text_sensor(i, sens))
 
-    if freq_status_config := config.get(CONF_FREQUENCY_STATUS):
-        sens = await text_sensor.new_text_sensor(freq_status_config)
-        cg.add(parent.set_freq_status_text_sensor(sens))
+    text_sensors = text_sensor.sub_text_sensors(config)
+    await text_sensors(CONF_FREQUENCY_STATUS, hub.set_freq_status_text_sensor)
diff --git a/esphome/components/bedjet/sensor/__init__.py b/esphome/components/bedjet/sensor/__init__.py
index 595e798e49..9319af664f 100644
--- a/esphome/components/bedjet/sensor/__init__.py
+++ b/esphome/components/bedjet/sensor/__init__.py
@@ -44,10 +44,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await register_bedjet_child(var, config)
 
-    if outlet_temperature_sensor := config.get(CONF_OUTLET_TEMPERATURE):
-        sensor_var = await sensor.new_sensor(outlet_temperature_sensor)
-        cg.add(var.set_outlet_temperature_sensor(sensor_var))
-
-    if ambient_temperature_sensor := config.get(CONF_AMBIENT_TEMPERATURE):
-        sensor_var = await sensor.new_sensor(ambient_temperature_sensor)
-        cg.add(var.set_ambient_temperature_sensor(sensor_var))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_OUTLET_TEMPERATURE, var.set_outlet_temperature_sensor)
+    await sensors(CONF_AMBIENT_TEMPERATURE, var.set_ambient_temperature_sensor)
diff --git a/esphome/components/bmi160/sensor.py b/esphome/components/bmi160/sensor.py
index 4309f0a79f..9ad1b19fa0 100644
--- a/esphome/components/bmi160/sensor.py
+++ b/esphome/components/bmi160/sensor.py
@@ -88,16 +88,11 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    for d in ["x", "y", "z"]:
-        accel_key = f"acceleration_{d}"
-        if accel_key in config:
-            sens = await sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, f"set_accel_{d}_sensor")(sens))
-        accel_key = f"gyroscope_{d}"
-        if accel_key in config:
-            sens = await sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, f"set_gyro_{d}_sensor")(sens))
-
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_ACCELERATION_X, var.set_accel_x_sensor)
+    await sensors(CONF_GYROSCOPE_X, var.set_gyro_x_sensor)
+    await sensors(CONF_ACCELERATION_Y, var.set_accel_y_sensor)
+    await sensors(CONF_GYROSCOPE_Y, var.set_gyro_y_sensor)
+    await sensors(CONF_ACCELERATION_Z, var.set_accel_z_sensor)
+    await sensors(CONF_GYROSCOPE_Z, var.set_gyro_z_sensor)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
diff --git a/esphome/components/bmp085/sensor.py b/esphome/components/bmp085/sensor.py
index e4e559844e..5eb8dae731 100644
--- a/esphome/components/bmp085/sensor.py
+++ b/esphome/components/bmp085/sensor.py
@@ -48,10 +48,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature(sens))
-
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_PRESSURE, var.set_pressure)
diff --git a/esphome/components/bmp280_base/__init__.py b/esphome/components/bmp280_base/__init__.py
index c0f0ae90bf..a956ed34f6 100644
--- a/esphome/components/bmp280_base/__init__.py
+++ b/esphome/components/bmp280_base/__init__.py
@@ -75,14 +75,13 @@ async def to_code_base(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    if await sensors(CONF_TEMPERATURE, var.set_temperature_sensor):
+        temperature_config = config[CONF_TEMPERATURE]
         cg.add(var.set_temperature_oversampling(temperature_config[CONF_OVERSAMPLING]))
 
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
+    if await sensors(CONF_PRESSURE, var.set_pressure_sensor):
+        pressure_config = config[CONF_PRESSURE]
         cg.add(var.set_pressure_oversampling(pressure_config[CONF_OVERSAMPLING]))
 
     cg.add(var.set_iir_filter(config[CONF_IIR_FILTER]))
diff --git a/esphome/components/bmp3xx_base/__init__.py b/esphome/components/bmp3xx_base/__init__.py
index 75e168378e..6d0618e136 100644
--- a/esphome/components/bmp3xx_base/__init__.py
+++ b/esphome/components/bmp3xx_base/__init__.py
@@ -80,18 +80,17 @@ async def to_code_base(config: ConfigType) -> MockObj:
     await cg.register_component(var, config)
 
     cg.add(var.set_iir_filter_config(config[CONF_IIR_FILTER]))
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    if await sensors(CONF_TEMPERATURE, var.set_temperature_sensor):
+        temperature_config = config[CONF_TEMPERATURE]
         cg.add(
             var.set_temperature_oversampling_config(
                 temperature_config[CONF_OVERSAMPLING]
             )
         )
 
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
+    if await sensors(CONF_PRESSURE, var.set_pressure_sensor):
+        pressure_config = config[CONF_PRESSURE]
         cg.add(var.set_pressure_oversampling_config(pressure_config[CONF_OVERSAMPLING]))
 
     return var
diff --git a/esphome/components/bmp581_base/__init__.py b/esphome/components/bmp581_base/__init__.py
index 1c2c5c37d4..5d031a8208 100644
--- a/esphome/components/bmp581_base/__init__.py
+++ b/esphome/components/bmp581_base/__init__.py
@@ -137,9 +137,9 @@ CONFIG_SCHEMA_BASE = cv.Schema(
 async def to_code_base(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    if await sensors(CONF_TEMPERATURE, var.set_temperature_sensor):
+        temperature_config = config[CONF_TEMPERATURE]
         cg.add(
             var.set_temperature_oversampling_config(
                 temperature_config[CONF_OVERSAMPLING]
@@ -149,9 +149,8 @@ async def to_code_base(config: ConfigType) -> MockObj:
             var.set_temperature_iir_filter_config(temperature_config[CONF_IIR_FILTER])
         )
 
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
+    if await sensors(CONF_PRESSURE, var.set_pressure_sensor):
+        pressure_config = config[CONF_PRESSURE]
         cg.add(var.set_pressure_oversampling_config(pressure_config[CONF_OVERSAMPLING]))
         cg.add(var.set_pressure_iir_filter_config(pressure_config[CONF_IIR_FILTER]))
 
diff --git a/esphome/components/cm1106/sensor.py b/esphome/components/cm1106/sensor.py
index bf12bc38d9..c3939735a4 100644
--- a/esphome/components/cm1106/sensor.py
+++ b/esphome/components/cm1106/sensor.py
@@ -54,9 +54,8 @@ async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
-    if co2_config := config.get(CONF_CO2):
-        sens = await sensor.new_sensor(co2_config)
-        cg.add(var.set_co2_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_CO2, var.set_co2_sensor)
 
 
 CALIBRATION_ACTION_SCHEMA = maybe_simple_id(
diff --git a/esphome/components/combination/sensor.py b/esphome/components/combination/sensor.py
index ccc5a03964..34e9b99ce8 100644
--- a/esphome/components/combination/sensor.py
+++ b/esphome/components/combination/sensor.py
@@ -203,6 +203,5 @@ async def to_code(config: ConfigType) -> None:
         else:
             cg.add(var.add_source(source))
 
-    if CONF_STD_DEV in config:
-        sens = await sensor.new_sensor(config[CONF_STD_DEV])
-        cg.add(var.set_std_dev_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_STD_DEV, var.set_std_dev_sensor)
diff --git a/esphome/components/const/__init__.py b/esphome/components/const/__init__.py
index 97d757c9d4..6e98162baa 100644
--- a/esphome/components/const/__init__.py
+++ b/esphome/components/const/__init__.py
@@ -7,6 +7,7 @@ BYTE_ORDER_BIG = "big_endian"
 
 CONF_ACCELEROMETER_ODR = "accelerometer_odr"
 CONF_ACCELEROMETER_RANGE = "accelerometer_range"
+CONF_ALLOWED_IPS = "allowed_ips"
 CONF_B_CONSTANT = "b_constant"
 CONF_BREATH_VOC_EQUIVALENT = "breath_voc_equivalent"
 CONF_BYTE_ORDER = "byte_order"
@@ -15,6 +16,7 @@ CONF_CLIMATE_ID = "climate_id"
 CONF_CO2_EQUIVALENT = "co2_equivalent"
 CONF_COLOR_DEPTH = "color_depth"
 CONF_COLUMNS = "columns"
+CONF_CONNECTED = "connected"
 CONF_CONVERSION_RATE = "conversion_rate"
 CONF_CRC_ENABLE = "crc_enable"
 CONF_DATA_BITS = "data_bits"
@@ -41,7 +43,9 @@ CONF_ON_SCAN_END = "on_scan_end"
 CONF_ON_STATE_CHANGE = "on_state_change"
 CONF_PARITY = "parity"
 CONF_RECEIVER_FREQUENCY = "receiver_frequency"
+CONF_RECONNECT_INTERVAL = "reconnect_interval"
 CONF_REQUEST_HEADERS = "request_headers"
+CONF_ROLE = "role"
 CONF_ROWS = "rows"
 CONF_SCAN_PARAMETERS = "scan_parameters"
 CONF_SHA256 = "sha256"
diff --git a/esphome/components/cs5460a/sensor.py b/esphome/components/cs5460a/sensor.py
index 17ea41ed04..d087c99bf1 100644
--- a/esphome/components/cs5460a/sensor.py
+++ b/esphome/components/cs5460a/sensor.py
@@ -117,15 +117,10 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_hpf_enable(config[CONF_CURRENT_HPF], config[CONF_VOLTAGE_HPF]))
     cg.add(var.set_pulse_energy_wh(config[CONF_PULSE_ENERGY]))
 
-    if voltage_config := config.get(CONF_VOLTAGE):
-        sens = await sensor.new_sensor(voltage_config)
-        cg.add(var.set_voltage_sensor(sens))
-    if current_config := config.get(CONF_CURRENT):
-        sens = await sensor.new_sensor(current_config)
-        cg.add(var.set_current_sensor(sens))
-    if power_config := config.get(CONF_POWER):
-        sens = await sensor.new_sensor(power_config)
-        cg.add(var.set_power_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_VOLTAGE, var.set_voltage_sensor)
+    await sensors(CONF_CURRENT, var.set_current_sensor)
+    await sensors(CONF_POWER, var.set_power_sensor)
 
 
 automation.register_apply_action(
diff --git a/esphome/components/dht/sensor.py b/esphome/components/dht/sensor.py
index 7376adb287..c7ae70b834 100644
--- a/esphome/components/dht/sensor.py
+++ b/esphome/components/dht/sensor.py
@@ -61,11 +61,8 @@ async def to_code(config: ConfigType) -> None:
     pin = await gpio_pin_expression(config[CONF_PIN])
     cg.add(var.set_pin(pin))
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
 
     cg.add(var.set_dht_model(config[CONF_MODEL]))
diff --git a/esphome/components/dht12/sensor.py b/esphome/components/dht12/sensor.py
index 2bc6e94515..88877b2dc2 100644
--- a/esphome/components/dht12/sensor.py
+++ b/esphome/components/dht12/sensor.py
@@ -46,10 +46,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))
-
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/components/dps310/sensor.py b/esphome/components/dps310/sensor.py
index 8b8fd8373b..e3827b484c 100644
--- a/esphome/components/dps310/sensor.py
+++ b/esphome/components/dps310/sensor.py
@@ -54,10 +54,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if pressure := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure)
-        cg.add(var.set_pressure_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_PRESSURE, var.set_pressure_sensor)
diff --git a/esphome/components/duty_time/sensor.py b/esphome/components/duty_time/sensor.py
index 7fd01db836..6b035d5c98 100644
--- a/esphome/components/duty_time/sensor.py
+++ b/esphome/components/duty_time/sensor.py
@@ -63,9 +63,8 @@ async def to_code(config: ConfigType) -> None:
     if CONF_LAMBDA in config:
         lambda_ = await cg.process_lambda(config[CONF_LAMBDA], [], return_type=cg.bool_)
         cg.add(var.set_lambda(lambda_))
-    if CONF_LAST_TIME in config:
-        sens = await sensor.new_sensor(config[CONF_LAST_TIME])
-        cg.add(var.set_last_duty_time_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_LAST_TIME, var.set_last_duty_time_sensor)
 
 
 # AUTOMATIONS
diff --git a/esphome/components/ee895/sensor.py b/esphome/components/ee895/sensor.py
index fdad47fb05..a7110bd6d2 100644
--- a/esphome/components/ee895/sensor.py
+++ b/esphome/components/ee895/sensor.py
@@ -57,14 +57,7 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if co2 := config.get(CONF_CO2):
-        sens = await sensor.new_sensor(co2)
-        cg.add(var.set_co2_sensor(sens))
-
-    if pressure := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure)
-        cg.add(var.set_pressure_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_CO2, var.set_co2_sensor)
+    await sensors(CONF_PRESSURE, var.set_pressure_sensor)
diff --git a/esphome/components/ens210/sensor.py b/esphome/components/ens210/sensor.py
index bfd758f92f..cb49986f7c 100644
--- a/esphome/components/ens210/sensor.py
+++ b/esphome/components/ens210/sensor.py
@@ -50,10 +50,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))
-
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/components/es8388/select/__init__.py b/esphome/components/es8388/select/__init__.py
index b81bcd13cf..62ddd6cb38 100644
--- a/esphome/components/es8388/select/__init__.py
+++ b/esphome/components/es8388/select/__init__.py
@@ -30,19 +30,13 @@ CONFIG_SCHEMA = cv.All(
 
 
 async def to_code(config: ConfigType) -> None:
-    parent = await cg.get_variable(config[CONF_ES8388_ID])
-    if dac_output_config := config.get(CONF_DAC_OUTPUT):
-        s = await select.new_select(
-            dac_output_config,
-            options=["LINE1", "LINE2", "BOTH"],
-        )
-        await cg.register_parented(s, parent)
-        cg.add(parent.set_dac_output_select(s))
-
-    if adc_input_mic_config := config.get(CONF_ADC_INPUT_MIC):
-        s = await select.new_select(
-            adc_input_mic_config,
-            options=["LINE1", "LINE2", "DIFFERENCE"],
-        )
-        await cg.register_parented(s, parent)
-        cg.add(parent.set_adc_input_mic_select(s))
+    hub = await cg.get_variable(config[CONF_ES8388_ID])
+    selects = select.sub_selects(config, parent=hub)
+    await selects(
+        CONF_DAC_OUTPUT, hub.set_dac_output_select, options=["LINE1", "LINE2", "BOTH"]
+    )
+    await selects(
+        CONF_ADC_INPUT_MIC,
+        hub.set_adc_input_mic_select,
+        options=["LINE1", "LINE2", "DIFFERENCE"],
+    )
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index 75dcfb45f6..71fa9d40b6 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -220,6 +220,9 @@ class EthernetComponent final : public Component {
  protected:
   void start_connect_();
   void finish_connect_();
+#if LWIP_IPV6
+  esp_err_t ensure_ip6_linklocal_();
+#endif
   void dump_connect_params_();
 
 #ifdef USE_ESP32
diff --git a/esphome/components/ethernet/ethernet_component_esp32.cpp b/esphome/components/ethernet/ethernet_component_esp32.cpp
index d15ef5a34c..2c3c5f1ef9 100644
--- a/esphome/components/ethernet/ethernet_component_esp32.cpp
+++ b/esphome/components/ethernet/ethernet_component_esp32.cpp
@@ -10,6 +10,10 @@
 #include <lwip/dns.h>
 #include <cinttypes>
 #include "esp_event.h"
+#if USE_NETWORK_IPV6
+#include <esp_netif_net_stack.h>
+#include <lwip/netif.h>
+#endif
 #ifdef USE_PSRAM
 #include <esp_psram.h>
 #endif
@@ -509,6 +513,18 @@ void EthernetComponent::ethernet_lazy_init_() {
     }
   }
 #endif
+#if USE_NETWORK_IPV6 && ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
+  // Since IDF 5.5 the internal EMAC drops multicast groups that were never added (before,
+  // it passed all multicast), and lwIP never adds all-nodes, so router advertisements
+  // were lost and SLAAC never ran.
+  {
+    uint8_t all_nodes[6] = {0x33, 0x33, 0x00, 0x00, 0x00, 0x01};
+    if (esp_err_t filter_err = esp_eth_ioctl(this->eth_handle_, ETH_CMD_ADD_MAC_FILTER, all_nodes);
+        filter_err != ESP_OK) {
+      ESP_LOGD(TAG, "IPv6 all-nodes multicast filter not added: %s", esp_err_to_name(filter_err));
+    }
+  }
+#endif
 
   // Register user defined event handers
   err = esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, &EthernetComponent::eth_event_handler, nullptr);
@@ -755,6 +771,13 @@ void EthernetComponent::eth_event_handler(void *arg, esp_event_base_t event_base
         global_eth_component->notify_ip_state_listeners_();
       }
 #endif
+#if USE_NETWORK_IPV6
+      // Start SLAAC on link-up, not after the DHCPv4 lease. This also restores the
+      // link-local after a link flap, which clears the IPv6 addresses.
+      if (esp_err_t ll_err = esp_netif_create_ip6_linklocal(global_eth_component->eth_netif_); ll_err != ESP_OK) {
+        ESP_LOGW(TAG, "esp_netif_create_ip6_linklocal failed on link-up: %s", esp_err_to_name(ll_err));
+      }
+#endif /* USE_NETWORK_IPV6 */
       break;
     case ETHERNET_EVENT_DISCONNECTED:
       event_name = "ETH disconnected";
@@ -791,7 +814,10 @@ void EthernetComponent::got_ip6_event_handler(void *arg, esp_event_base_t event_
                                               void *event_data) {
   ip_event_got_ip6_t *event = (ip_event_got_ip6_t *) event_data;
   ESP_LOGV(TAG, "[Ethernet event] ETH Got IPv6: " IPV6STR, IPV62STR(event->ip6_info.ip));
-  global_eth_component->ipv6_count_ += 1;
+  // Count the addresses on the interface, not the events: recreating the link-local
+  // after a link flap fires another event for the same address.
+  struct esp_ip6_addr if_ip6s[CONFIG_LWIP_IPV6_NUM_ADDRESSES];
+  global_eth_component->ipv6_count_ = esp_netif_get_all_ip6(global_eth_component->eth_netif_, if_ip6s);
 #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);
@@ -806,6 +832,29 @@ void EthernetComponent::got_ip6_event_handler(void *arg, esp_event_base_t event_
 }
 #endif /* USE_NETWORK_IPV6 */
 
+#if USE_NETWORK_IPV6
+// Create the link-local address unless the interface already has one, including one still in
+// duplicate address detection: recreating it would restart DAD. esp_netif_get_ip6_linklocal()
+// only reports a preferred address, so ask lwIP for the slot state instead.
+esp_err_t EthernetComponent::ensure_ip6_linklocal_() {
+  if (auto *netif = static_cast<struct netif *>(esp_netif_get_netif_impl(this->eth_netif_)); netif != nullptr) {
+    u8_t state;
+    {
+      LwIPLock lock;
+      state = netif_ip6_addr_state(netif, 0);
+    }
+    if (ip6_addr_istentative(state) || ip6_addr_isvalid(state)) {
+      return ESP_OK;
+    }
+  }
+  esp_err_t err = esp_netif_create_ip6_linklocal(this->eth_netif_);
+  if (err == ESP_OK) {
+    ESP_LOGD(TAG, "IPv6 link-local address created");
+  }
+  return err;
+}
+#endif /* USE_NETWORK_IPV6 */
+
 void EthernetComponent::finish_connect_() {
 #if USE_NETWORK_IPV6
   // Retry IPv6 link-local setup if it failed during initial connect
@@ -816,10 +865,7 @@ void EthernetComponent::finish_connect_() {
   // - Cable unplugged/network interruption (#10705)
   // We can now retry since we're in CONNECTED state and the interface is definitely up.
   if (!this->ipv6_setup_done_) {
-    esp_err_t err = esp_netif_create_ip6_linklocal(this->eth_netif_);
-    if (err == ESP_OK) {
-      ESP_LOGD(TAG, "IPv6 link-local address created (retry succeeded)");
-    }
+    this->ensure_ip6_linklocal_();
     // Always set the flag to prevent continuous retries
     // If IPv6 setup fails here with the interface up and stable, it's
     // likely a persistent issue (IPv6 disabled at router, hardware
@@ -833,7 +879,9 @@ void EthernetComponent::finish_connect_() {
 void EthernetComponent::start_connect_() {
   global_eth_component->got_ipv4_address_ = false;
 #if USE_NETWORK_IPV6
-  global_eth_component->ipv6_count_ = 0;
+  // Recount rather than zero: addresses that survive a reconnect are not announced again.
+  struct esp_ip6_addr if_ip6s[CONFIG_LWIP_IPV6_NUM_ADDRESSES];
+  global_eth_component->ipv6_count_ = esp_netif_get_all_ip6(this->eth_netif_, if_ip6s);
   this->ipv6_setup_done_ = false;
 #endif /* USE_NETWORK_IPV6 */
   this->connect_begin_ = millis();
@@ -912,7 +960,7 @@ void EthernetComponent::start_connect_() {
   // - At bootup when link isn't ready (#10281)
   // - After disconnection/cable unplugged (#10705)
   // We'll retry in finish_connect_() if it fails here.
-  err = esp_netif_create_ip6_linklocal(this->eth_netif_);
+  err = this->ensure_ip6_linklocal_();
   if (err != ESP_OK) {
     if (err == ESP_ERR_ESP_NETIF_INVALID_PARAMS) {
       // This is a programming error, not a transient failure
diff --git a/esphome/components/hc8/sensor.py b/esphome/components/hc8/sensor.py
index 05d8e233ef..10074fbf10 100644
--- a/esphome/components/hc8/sensor.py
+++ b/esphome/components/hc8/sensor.py
@@ -55,9 +55,8 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
 
-    if co2 := config.get(CONF_CO2):
-        sens = await sensor.new_sensor(co2)
-        cg.add(var.set_co2_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_CO2, var.set_co2_sensor)
 
     cg.add(var.set_warmup_seconds(config[CONF_WARMUP_TIME]))
 
diff --git a/esphome/components/hdc1080/sensor.py b/esphome/components/hdc1080/sensor.py
index b2b6dc533a..c35488c96c 100644
--- a/esphome/components/hdc1080/sensor.py
+++ b/esphome/components/hdc1080/sensor.py
@@ -48,10 +48,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature(sens))
-
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
diff --git a/esphome/components/hdc2010/sensor.py b/esphome/components/hdc2010/sensor.py
index ad0311fb4f..9837b9af33 100644
--- a/esphome/components/hdc2010/sensor.py
+++ b/esphome/components/hdc2010/sensor.py
@@ -48,10 +48,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/components/hdc2080/sensor.py b/esphome/components/hdc2080/sensor.py
index b5388b4c2b..63625bbf94 100644
--- a/esphome/components/hdc2080/sensor.py
+++ b/esphome/components/hdc2080/sensor.py
@@ -49,10 +49,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature(sens))
-
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
diff --git a/esphome/components/hdc302x/sensor.py b/esphome/components/hdc302x/sensor.py
index 2686ba5322..46e1a95cb1 100644
--- a/esphome/components/hdc302x/sensor.py
+++ b/esphome/components/hdc302x/sensor.py
@@ -66,13 +66,9 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temp_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temp_config)
-        cg.add(var.set_temp_sensor(sens))
-
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temp_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
 
     cg.add(var.set_power_mode(config[CONF_POWER_MODE]))
 
diff --git a/esphome/components/hoermann_hcp/text_sensor/__init__.py b/esphome/components/hoermann_hcp/text_sensor/__init__.py
index 2f038025b9..da460905c0 100644
--- a/esphome/components/hoermann_hcp/text_sensor/__init__.py
+++ b/esphome/components/hoermann_hcp/text_sensor/__init__.py
@@ -35,16 +35,13 @@ CONFIG_SCHEMA = cv.All(
 
 
 async def to_code(config: ConfigType) -> None:
-    parent = await cg.get_variable(config[CONF_HOERMANN_HCP_ID])
+    hub = await cg.get_variable(config[CONF_HOERMANN_HCP_ID])
     if (conf := config.get(CONF_DOOR_STATE)) is not None:
-        var = await text_sensor.new_text_sensor(conf, parent)
+        var = await text_sensor.new_text_sensor(conf, hub)
         await cg.register_component(var, conf)
     # Only the identity sensors need the exchange with the motor compiled in.
     if CONF_SERIAL_NUMBER in config or CONF_VERSION in config:
         cg.add_define("USE_HOERMANN_HCP_IDENTITY")
-    if (conf := config.get(CONF_SERIAL_NUMBER)) is not None:
-        sens = await text_sensor.new_text_sensor(conf)
-        cg.add(parent.set_serial_number_text_sensor(sens))
-    if (conf := config.get(CONF_VERSION)) is not None:
-        sens = await text_sensor.new_text_sensor(conf)
-        cg.add(parent.set_version_text_sensor(sens))
+    text_sensors = text_sensor.sub_text_sensors(config)
+    await text_sensors(CONF_SERIAL_NUMBER, hub.set_serial_number_text_sensor)
+    await text_sensors(CONF_VERSION, hub.set_version_text_sensor)
diff --git a/esphome/components/honeywell_hih_i2c/sensor.py b/esphome/components/honeywell_hih_i2c/sensor.py
index 5250e1c1c7..8ab2cd16b8 100644
--- a/esphome/components/honeywell_hih_i2c/sensor.py
+++ b/esphome/components/honeywell_hih_i2c/sensor.py
@@ -48,10 +48,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/components/honeywellabp/sensor.py b/esphome/components/honeywellabp/sensor.py
index 4b116f0f16..d7e7cf29a4 100644
--- a/esphome/components/honeywellabp/sensor.py
+++ b/esphome/components/honeywellabp/sensor.py
@@ -56,14 +56,9 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
 
-    if CONF_PRESSURE in config:
+    sensors = sensor.sub_sensors(config)
+    if await sensors(CONF_PRESSURE, var.set_pressure_sensor):
         conf = config[CONF_PRESSURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_pressure_sensor(sens))
         cg.add(var.set_honeywellabp_min_pressure(conf[CONF_MIN_PRESSURE]))
         cg.add(var.set_honeywellabp_max_pressure(conf[CONF_MAX_PRESSURE]))
-
-    if CONF_TEMPERATURE in config:
-        conf = config[CONF_TEMPERATURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_temperature_sensor(sens))
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
diff --git a/esphome/components/honeywellabp2_i2c/sensor.py b/esphome/components/honeywellabp2_i2c/sensor.py
index 299acd4b52..d4c4e44a3b 100644
--- a/esphome/components/honeywellabp2_i2c/sensor.py
+++ b/esphome/components/honeywellabp2_i2c/sensor.py
@@ -63,13 +63,11 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    if await sensors(CONF_PRESSURE, var.set_pressure_sensor):
+        pressure_config = config[CONF_PRESSURE]
         cg.add(var.set_min_pressure(pressure_config[CONF_MIN_PRESSURE]))
         cg.add(var.set_max_pressure(pressure_config[CONF_MAX_PRESSURE]))
         cg.add(var.set_transfer_function(pressure_config[TRANSFER_FUNCTION]))
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
diff --git a/esphome/components/hte501/sensor.py b/esphome/components/hte501/sensor.py
index bf9fe4000e..80d5986295 100644
--- a/esphome/components/hte501/sensor.py
+++ b/esphome/components/hte501/sensor.py
@@ -50,10 +50,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if humidity := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity)
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/components/htu31d/sensor.py b/esphome/components/htu31d/sensor.py
index 8960759d9b..41cc54686a 100644
--- a/esphome/components/htu31d/sensor.py
+++ b/esphome/components/htu31d/sensor.py
@@ -48,10 +48,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature(sens))
-
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
diff --git a/esphome/components/hyt271/sensor.py b/esphome/components/hyt271/sensor.py
index 3f006a65fe..1fe5d9e14a 100644
--- a/esphome/components/hyt271/sensor.py
+++ b/esphome/components/hyt271/sensor.py
@@ -48,10 +48,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature)
-        cg.add(var.set_temperature(sens))
-
-    if humidity := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity)
-        cg.add(var.set_humidity(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
diff --git a/esphome/components/iaqcore/sensor.py b/esphome/components/iaqcore/sensor.py
index 1b905e4c63..daee46f083 100644
--- a/esphome/components/iaqcore/sensor.py
+++ b/esphome/components/iaqcore/sensor.py
@@ -47,12 +47,8 @@ async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
-    if co2_config := config.get(CONF_CO2):
-        sens = await sensor.new_sensor(co2_config)
-        cg.add(var.set_co2(sens))
-
-    if tvoc_config := config.get(CONF_TVOC):
-        sens = await sensor.new_sensor(tvoc_config)
-        cg.add(var.set_tvoc(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_CO2, var.set_co2)
+    await sensors(CONF_TVOC, var.set_tvoc)
 
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/kmeteriso/sensor.py b/esphome/components/kmeteriso/sensor.py
index 3e007d1310..5b7087362f 100644
--- a/esphome/components/kmeteriso/sensor.py
+++ b/esphome/components/kmeteriso/sensor.py
@@ -48,9 +48,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-    if internal_temperature_config := config.get(CONF_INTERNAL_TEMPERATURE):
-        sens = await sensor.new_sensor(internal_temperature_config)
-        cg.add(var.set_internal_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_INTERNAL_TEMPERATURE, var.set_internal_temperature_sensor)
diff --git a/esphome/components/lc709203f/sensor.py b/esphome/components/lc709203f/sensor.py
index 3319c9be4b..0281609edf 100644
--- a/esphome/components/lc709203f/sensor.py
+++ b/esphome/components/lc709203f/sensor.py
@@ -79,15 +79,10 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_pack_size(config.get(CONF_SIZE)))
     cg.add(var.set_pack_voltage(BATTERY_VOLTAGE_OPTIONS[config[CONF_VOLTAGE]]))
 
-    if voltage_config := config.get(CONF_BATTERY_VOLTAGE):
-        sens = await sensor.new_sensor(voltage_config)
-        cg.add(var.set_voltage_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_BATTERY_VOLTAGE, var.set_voltage_sensor)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_remaining_sensor)
 
-    if level_config := config.get(CONF_BATTERY_LEVEL):
-        sens = await sensor.new_sensor(level_config)
-        cg.add(var.set_battery_remaining_sensor(sens))
-
-    if temp_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temp_config)
-        cg.add(var.set_temperature_sensor(sens))
-        cg.add(var.set_thermistor_b_constant(temp_config[CONF_B_CONSTANT]))
+    if await sensors(CONF_TEMPERATURE, var.set_temperature_sensor):
+        b_constant = config[CONF_TEMPERATURE][CONF_B_CONSTANT]
+        cg.add(var.set_thermistor_b_constant(b_constant))
diff --git a/esphome/components/libretiny/text_sensor.py b/esphome/components/libretiny/text_sensor.py
index c1012774c8..18b412c460 100644
--- a/esphome/components/libretiny/text_sensor.py
+++ b/esphome/components/libretiny/text_sensor.py
@@ -25,8 +25,7 @@ CONFIG_SCHEMA = cv.Schema(
 
 
 async def to_code(config):
-    lt_component = await cg.get_variable(config[CONF_LIBRETINY])
+    hub = await cg.get_variable(config[CONF_LIBRETINY])
 
-    if CONF_VERSION in config:
-        sens = await text_sensor.new_text_sensor(config[CONF_VERSION])
-        cg.add(lt_component.set_version_sensor(sens))
+    text_sensors = text_sensor.sub_text_sensors(config)
+    await text_sensors(CONF_VERSION, hub.set_version_sensor)
diff --git a/esphome/components/lps22/sensor.py b/esphome/components/lps22/sensor.py
index 2eec2c586c..f219639eee 100644
--- a/esphome/components/lps22/sensor.py
+++ b/esphome/components/lps22/sensor.py
@@ -50,10 +50,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_PRESSURE, var.set_pressure_sensor)
diff --git a/esphome/components/max17043/sensor.py b/esphome/components/max17043/sensor.py
index 0b72955c74..1b621057c6 100644
--- a/esphome/components/max17043/sensor.py
+++ b/esphome/components/max17043/sensor.py
@@ -53,13 +53,9 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if voltage_config := config.get(CONF_BATTERY_VOLTAGE):
-        sens = await sensor.new_sensor(voltage_config)
-        cg.add(var.set_voltage_sensor(sens))
-
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_remaining_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_BATTERY_VOLTAGE, var.set_voltage_sensor)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_remaining_sensor)
 
 
 MAX17043_ACTION_SCHEMA = maybe_simple_id(
diff --git a/esphome/components/max31855/sensor.py b/esphome/components/max31855/sensor.py
index a52f45a18f..3d2a83f8cd 100644
--- a/esphome/components/max31855/sensor.py
+++ b/esphome/components/max31855/sensor.py
@@ -41,6 +41,5 @@ async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
-    if CONF_REFERENCE_TEMPERATURE in config:
-        tc_ref = await sensor.new_sensor(config[CONF_REFERENCE_TEMPERATURE])
-        cg.add(var.set_reference_sensor(tc_ref))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_REFERENCE_TEMPERATURE, var.set_reference_sensor)
diff --git a/esphome/components/mcp9600/sensor.py b/esphome/components/mcp9600/sensor.py
index 5542ffaa6c..75f2e025c7 100644
--- a/esphome/components/mcp9600/sensor.py
+++ b/esphome/components/mcp9600/sensor.py
@@ -71,12 +71,6 @@ async def to_code(config: ConfigType) -> None:
 
     cg.add(var.set_thermocouple_type(config[CONF_THERMOCOUPLE_TYPE]))
 
-    if CONF_HOT_JUNCTION in config:
-        conf = config[CONF_HOT_JUNCTION]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_hot_junction(sens))
-
-    if CONF_COLD_JUNCTION in config:
-        conf = config[CONF_COLD_JUNCTION]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_cold_junction(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_HOT_JUNCTION, var.set_hot_junction)
+    await sensors(CONF_COLD_JUNCTION, var.set_cold_junction)
diff --git a/esphome/components/mhz19/sensor.py b/esphome/components/mhz19/sensor.py
index 9b0eeeb28e..053f17765e 100644
--- a/esphome/components/mhz19/sensor.py
+++ b/esphome/components/mhz19/sensor.py
@@ -77,13 +77,9 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
 
-    if co2 := config.get(CONF_CO2):
-        sens = await sensor.new_sensor(co2)
-        cg.add(var.set_co2_sensor(sens))
-
-    if temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature)
-        cg.add(var.set_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_CO2, var.set_co2_sensor)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
 
     if (
         automatic_baseline_calibration := config.get(
diff --git a/esphome/components/mlx90393/sensor.py b/esphome/components/mlx90393/sensor.py
index 59bdffc114..4ff42c7d9c 100644
--- a/esphome/components/mlx90393/sensor.py
+++ b/esphome/components/mlx90393/sensor.py
@@ -139,21 +139,14 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_temperature_compensation(config[CONF_TEMPERATURE_COMPENSATION]))
     cg.add(var.set_hallconf(config[CONF_HALLCONF]))
 
-    if CONF_X_AXIS in config:
-        sens = await sensor.new_sensor(config[CONF_X_AXIS])
-        cg.add(var.set_x_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    if await sensors(CONF_X_AXIS, var.set_x_sensor):
         cg.add(var.set_resolution(0, RESOLUTION[config[CONF_X_AXIS][CONF_RESOLUTION]]))
-    if CONF_Y_AXIS in config:
-        sens = await sensor.new_sensor(config[CONF_Y_AXIS])
-        cg.add(var.set_y_sensor(sens))
+    if await sensors(CONF_Y_AXIS, var.set_y_sensor):
         cg.add(var.set_resolution(1, RESOLUTION[config[CONF_Y_AXIS][CONF_RESOLUTION]]))
-    if CONF_Z_AXIS in config:
-        sens = await sensor.new_sensor(config[CONF_Z_AXIS])
-        cg.add(var.set_z_sensor(sens))
+    if await sensors(CONF_Z_AXIS, var.set_z_sensor):
         cg.add(var.set_resolution(2, RESOLUTION[config[CONF_Z_AXIS][CONF_RESOLUTION]]))
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_t_sensor(sens))
+    if await sensors(CONF_TEMPERATURE, var.set_t_sensor):
         cg.add(var.set_t_oversampling(config[CONF_TEMPERATURE][CONF_OVERSAMPLING]))
     if CONF_DRDY_PIN in config:
         pin = await cg.gpio_pin_expression(config[CONF_DRDY_PIN])
diff --git a/esphome/components/mlx90614/sensor.py b/esphome/components/mlx90614/sensor.py
index 0cf9b95dde..e818ea708d 100644
--- a/esphome/components/mlx90614/sensor.py
+++ b/esphome/components/mlx90614/sensor.py
@@ -53,12 +53,7 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if CONF_AMBIENT in config:
-        sens = await sensor.new_sensor(config[CONF_AMBIENT])
-        cg.add(var.set_ambient_sensor(sens))
-
-    if CONF_OBJECT in config:
-        sens = await sensor.new_sensor(config[CONF_OBJECT])
-        cg.add(var.set_object_sensor(sens))
-
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_AMBIENT, var.set_ambient_sensor)
+    if await sensors(CONF_OBJECT, var.set_object_sensor):
         cg.add(var.set_emissivity(config[CONF_OBJECT][CONF_EMISSIVITY]))
diff --git a/esphome/components/mmc5983/sensor.py b/esphome/components/mmc5983/sensor.py
index 797181690f..48c532b0c6 100644
--- a/esphome/components/mmc5983/sensor.py
+++ b/esphome/components/mmc5983/sensor.py
@@ -45,12 +45,7 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if x_config := config.get(CONF_FIELD_STRENGTH_X):
-        sens = await sensor.new_sensor(x_config)
-        cg.add(var.set_x_sensor(sens))
-    if y_config := config.get(CONF_FIELD_STRENGTH_Y):
-        sens = await sensor.new_sensor(y_config)
-        cg.add(var.set_y_sensor(sens))
-    if z_config := config.get(CONF_FIELD_STRENGTH_Z):
-        sens = await sensor.new_sensor(z_config)
-        cg.add(var.set_z_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_FIELD_STRENGTH_X, var.set_x_sensor)
+    await sensors(CONF_FIELD_STRENGTH_Y, var.set_y_sensor)
+    await sensors(CONF_FIELD_STRENGTH_Z, var.set_z_sensor)
diff --git a/esphome/components/modbus/__init__.py b/esphome/components/modbus/__init__.py
index fe93758726..db7484e306 100644
--- a/esphome/components/modbus/__init__.py
+++ b/esphome/components/modbus/__init__.py
@@ -7,6 +7,7 @@ from typing import Any, Literal, NamedTuple
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components import uart
+from esphome.components.const import CONF_ROLE
 import esphome.config_validation as cv
 from esphome.const import CONF_ADDRESS, CONF_CONTINUOUS, CONF_FLOW_CONTROL_PIN, CONF_ID
 from esphome.cpp_generator import MockObj
@@ -45,7 +46,6 @@ MULTI_CONF = True
 
 CONF_ALLOW_BROADCAST_READ = "allow_broadcast_read"
 CONF_EXPECT_BROADCAST_WRITE_RESPONSE = "expect_broadcast_write_response"
-CONF_ROLE = "role"
 CONF_MODBUS_ID = "modbus_id"
 CONF_SEND_WAIT_TIME = "send_wait_time"
 CONF_TURNAROUND_TIME = "turnaround_time"
diff --git a/esphome/components/mpl3115a2/sensor.py b/esphome/components/mpl3115a2/sensor.py
index 4fbc353644..8235e2d618 100644
--- a/esphome/components/mpl3115a2/sensor.py
+++ b/esphome/components/mpl3115a2/sensor.py
@@ -64,13 +64,7 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if CONF_PRESSURE in config:
-        sens = await sensor.new_sensor(config[CONF_PRESSURE])
-        cg.add(var.set_pressure(sens))
-    elif CONF_ALTITUDE in config:
-        sens = await sensor.new_sensor(config[CONF_ALTITUDE])
-        cg.add(var.set_altitude(sens))
-
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_PRESSURE, var.set_pressure)
+    await sensors(CONF_ALTITUDE, var.set_altitude)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
diff --git a/esphome/components/mpu6050/sensor.py b/esphome/components/mpu6050/sensor.py
index a8370ced7f..bd3de2d32c 100644
--- a/esphome/components/mpu6050/sensor.py
+++ b/esphome/components/mpu6050/sensor.py
@@ -70,16 +70,11 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    for d in ["x", "y", "z"]:
-        accel_key = f"accel_{d}"
-        if accel_key in config:
-            sens = await sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, f"set_accel_{d}_sensor")(sens))
-        accel_key = f"gyro_{d}"
-        if accel_key in config:
-            sens = await sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, f"set_gyro_{d}_sensor")(sens))
-
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_ACCEL_X, var.set_accel_x_sensor)
+    await sensors(CONF_GYRO_X, var.set_gyro_x_sensor)
+    await sensors(CONF_ACCEL_Y, var.set_accel_y_sensor)
+    await sensors(CONF_GYRO_Y, var.set_gyro_y_sensor)
+    await sensors(CONF_ACCEL_Z, var.set_accel_z_sensor)
+    await sensors(CONF_GYRO_Z, var.set_gyro_z_sensor)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
diff --git a/esphome/components/mpu6886/sensor.py b/esphome/components/mpu6886/sensor.py
index 5bdb836128..878540d516 100644
--- a/esphome/components/mpu6886/sensor.py
+++ b/esphome/components/mpu6886/sensor.py
@@ -71,16 +71,11 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    for d in ["x", "y", "z"]:
-        accel_key = f"accel_{d}"
-        if accel_key in config:
-            sens = await sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, f"set_accel_{d}_sensor")(sens))
-        accel_key = f"gyro_{d}"
-        if accel_key in config:
-            sens = await sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, f"set_gyro_{d}_sensor")(sens))
-
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_ACCEL_X, var.set_accel_x_sensor)
+    await sensors(CONF_GYRO_X, var.set_gyro_x_sensor)
+    await sensors(CONF_ACCEL_Y, var.set_accel_y_sensor)
+    await sensors(CONF_GYRO_Y, var.set_gyro_y_sensor)
+    await sensors(CONF_ACCEL_Z, var.set_accel_z_sensor)
+    await sensors(CONF_GYRO_Z, var.set_gyro_z_sensor)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
diff --git a/esphome/components/ms5611/sensor.py b/esphome/components/ms5611/sensor.py
index e42e0824dd..bf6d4528e6 100644
--- a/esphome/components/ms5611/sensor.py
+++ b/esphome/components/ms5611/sensor.py
@@ -50,10 +50,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if pressure := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure)
-        cg.add(var.set_pressure_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_PRESSURE, var.set_pressure_sensor)
diff --git a/esphome/components/ms8607/sensor.py b/esphome/components/ms8607/sensor.py
index e5d90432d8..13377394be 100644
--- a/esphome/components/ms8607/sensor.py
+++ b/esphome/components/ms8607/sensor.py
@@ -68,17 +68,12 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_PRESSURE, var.set_pressure_sensor)
 
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
-
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity_sensor(sens))
+    if await sensors(CONF_HUMIDITY, var.set_humidity_sensor):
+        humidity_config = config[CONF_HUMIDITY]
         humidity_device = cg.new_Pvariable(humidity_config[CONF_HUMIDITY_I2C_ID])
         await i2c.register_i2c_device(humidity_device, humidity_config)
         cg.add(var.set_humidity_device(humidity_device))
diff --git a/esphome/components/npi19/sensor.py b/esphome/components/npi19/sensor.py
index 4c7db10ce9..14dcd72384 100644
--- a/esphome/components/npi19/sensor.py
+++ b/esphome/components/npi19/sensor.py
@@ -44,10 +44,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if raw_pressure_config := config.get(CONF_RAW_PRESSURE):
-        sens = await sensor.new_sensor(raw_pressure_config)
-        cg.add(var.set_raw_pressure_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_RAW_PRESSURE, var.set_raw_pressure_sensor)
diff --git a/esphome/components/nrf52/__init__.py b/esphome/components/nrf52/__init__.py
index 5ebf5b747f..1e841fffcf 100644
--- a/esphome/components/nrf52/__init__.py
+++ b/esphome/components/nrf52/__init__.py
@@ -9,6 +9,7 @@ import subprocess
 
 from esphome import pins
 from esphome.build_helpers import pch
+from esphome.build_helpers.ccache import resolve_ccache_path
 import esphome.codegen as cg
 from esphome.components.zephyr import (
     add_extra_script,
@@ -584,7 +585,7 @@ def upload_program(config: ConfigType, args, host: str) -> bool:
                     raise EsphomeError("Not implemented yet")
                 check_and_install()
                 paths = get_build_paths()
-                env = get_build_env()
+                env = get_build_env(None)  # no compile, just nrfutil
                 build_dir = CORE.relative_pioenvs_path(CORE.name)
                 dfu_package = build_dir / "firmware.zip"
                 if not dfu_package.is_file():
@@ -666,7 +667,7 @@ def upload_program(config: ConfigType, args, host: str) -> bool:
         if not CORE.using_toolchain_platformio:
             check_and_install()
             paths = get_build_paths()
-            env = get_build_env()
+            env = get_build_env(resolve_ccache_path())  # west flash may rebuild
             build_dir = CORE.relative_pioenvs_path(CORE.name)
             west_cmd = [
                 str(paths["python_executable"]),
@@ -949,7 +950,10 @@ def run_compile(args, config: ConfigType) -> bool:
     check_and_install()
 
     paths = get_build_paths()
-    env = get_build_env()
+    # Depend mode in the shared ccache settings keeps the .gch sound
+    # across Kconfig flips.
+    ccache = resolve_ccache_path()
+    env = get_build_env(ccache)
 
     pch_on = _pch_usable()
     cmake_lists_changed = _generate_cmake_lists(pch_on)
@@ -976,8 +980,6 @@ def run_compile(args, config: ConfigType) -> bool:
 
     if pch_on:
         pch.log_pch_in_use()
-        # Zephyr turns ccache on by itself when it is installed
-        env.update(pch.ccache_pch_env())
         _write_pch_checksum(build_dir, source_dir)
 
     west_cmd = _west_build_command(
diff --git a/esphome/components/nrf52/clang_tidy.py b/esphome/components/nrf52/clang_tidy.py
index 89272cd406..d1f9597976 100644
--- a/esphome/components/nrf52/clang_tidy.py
+++ b/esphome/components/nrf52/clang_tidy.py
@@ -277,7 +277,7 @@ def generate_compile_commands(work_dir: Path, platformio_ini: Path) -> Path:
     ]
     if not run_command_ok(
         west_cmd,
-        env=get_build_env(),
+        env=get_build_env(None),  # configure only, nothing compiles
         stream_output=True,
         cwd=str(paths["framework_path"]),
     ):
diff --git a/esphome/components/nrf52/framework.py b/esphome/components/nrf52/framework.py
index 58c87619bf..e6ccde6a2d 100644
--- a/esphome/components/nrf52/framework.py
+++ b/esphome/components/nrf52/framework.py
@@ -10,6 +10,7 @@ import platform
 import shutil
 import sys
 
+from esphome.build_helpers.ccache import ccache_env
 from esphome.build_helpers.tools_cache import SDK_NRF_TOOLS_CACHE, tools_cache_path
 from esphome.components.zephyr.const import KEY_SYSBUILD, KEY_ZEPHYR
 import esphome.config_validation as cv
@@ -194,7 +195,14 @@ def get_build_paths() -> dict:
     }
 
 
-def get_build_env() -> dict:
+def get_build_env(ccache: str | None) -> dict:
+    """Build the west/sdk-nrf process environment.
+
+    ``ccache`` is the resolved binary (resolve_ccache_path), or None when
+    ccache is disabled or the caller never compiles; it brings the shared
+    managed-ccache settings and the pch sloppiness, so every caller that
+    may compile gets the same cache.
+    """
     version = _get_version_str()
     venv_bin_dir = get_python_env_executable_path(
         _get_python_env_path(version), "python"
@@ -211,6 +219,12 @@ def get_build_env() -> dict:
     # non-root builds failed to locate the SDK with it, while
     # ZEPHYR_SDK_INSTALL_DIR fixed the same invocation.
     env["ZEPHYR_SDK_INSTALL_DIR"] = str(_get_toolchain_path(_get_toolchain_version()))
+    if ccache is None:
+        # Zephyr wraps compiles with any ccache it finds; unmanaged it
+        # must not cache (a sysbuild image never sees USE_CCACHE=0).
+        env.setdefault("CCACHE_DISABLE", "1")
+    else:
+        env.update(ccache_env(ccache, SDK_NRF_TOOLS_CACHE))
     return env
 
 
diff --git a/esphome/components/openthread_info/text_sensor.py b/esphome/components/openthread_info/text_sensor.py
index da789ae706..4d3e8cd6c3 100644
--- a/esphome/components/openthread_info/text_sensor.py
+++ b/esphome/components/openthread_info/text_sensor.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import text_sensor
+from esphome.components.const import CONF_ROLE
 from esphome.components.openthread.const import (
     CONF_EXT_PAN_ID,
     CONF_NETWORK_KEY,
@@ -10,7 +11,6 @@ import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_IP_ADDRESS, ENTITY_CATEGORY_DIAGNOSTIC
 from esphome.types import ConfigType
 
-CONF_ROLE = "role"
 CONF_RLOC16 = "rloc16"
 CONF_EUI64 = "eui64"
 CONF_EXT_ADDR = "ext_addr"
diff --git a/esphome/components/pm1006/sensor.py b/esphome/components/pm1006/sensor.py
index 447671ebb3..98c6406676 100644
--- a/esphome/components/pm1006/sensor.py
+++ b/esphome/components/pm1006/sensor.py
@@ -62,6 +62,5 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
 
-    if CONF_PM_2_5 in config:
-        sens = await sensor.new_sensor(config[CONF_PM_2_5])
-        cg.add(var.set_pm_2_5_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_PM_2_5, var.set_pm_2_5_sensor)
diff --git a/esphome/components/pm2005/sensor.py b/esphome/components/pm2005/sensor.py
index f16c100e5e..a0c133eba1 100644
--- a/esphome/components/pm2005/sensor.py
+++ b/esphome/components/pm2005/sensor.py
@@ -74,14 +74,7 @@ async def to_code(config: ConfigType) -> None:
 
     cg.add(var.set_sensor_type(config[CONF_TYPE]))
 
-    if pm_1_0_config := config.get(CONF_PM_1_0):
-        sens = await sensor.new_sensor(pm_1_0_config)
-        cg.add(var.set_pm_1_0_sensor(sens))
-
-    if pm_2_5_config := config.get(CONF_PM_2_5):
-        sens = await sensor.new_sensor(pm_2_5_config)
-        cg.add(var.set_pm_2_5_sensor(sens))
-
-    if pm_10_0_config := config.get(CONF_PM_10_0):
-        sens = await sensor.new_sensor(pm_10_0_config)
-        cg.add(var.set_pm_10_0_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_PM_1_0, var.set_pm_1_0_sensor)
+    await sensors(CONF_PM_2_5, var.set_pm_2_5_sensor)
+    await sensors(CONF_PM_10_0, var.set_pm_10_0_sensor)
diff --git a/esphome/components/pulse_counter/sensor.py b/esphome/components/pulse_counter/sensor.py
index 677cfb6a5e..4cf88bafe9 100644
--- a/esphome/components/pulse_counter/sensor.py
+++ b/esphome/components/pulse_counter/sensor.py
@@ -140,9 +140,8 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_falling_edge_mode(count[CONF_FALLING_EDGE]))
     cg.add(var.set_filter_us(config[CONF_INTERNAL_FILTER]))
 
-    if CONF_TOTAL in config:
-        sens = await sensor.new_sensor(config[CONF_TOTAL])
-        cg.add(var.set_total_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TOTAL, var.set_total_sensor)
 
 
 automation.register_apply_action(
diff --git a/esphome/components/pulse_meter/sensor.py b/esphome/components/pulse_meter/sensor.py
index 2df1ba96e9..e523ebe756 100644
--- a/esphome/components/pulse_meter/sensor.py
+++ b/esphome/components/pulse_meter/sensor.py
@@ -92,9 +92,8 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_timeout_us(config[CONF_TIMEOUT]))
     cg.add(var.set_filter_mode(config[CONF_INTERNAL_FILTER_MODE]))
 
-    if CONF_TOTAL in config:
-        sens = await sensor.new_sensor(config[CONF_TOTAL])
-        cg.add(var.set_total_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TOTAL, var.set_total_sensor)
 
 
 automation.register_apply_action(
diff --git a/esphome/components/radon_eye_rd200/sensor.py b/esphome/components/radon_eye_rd200/sensor.py
index f38a035226..0e691e382d 100644
--- a/esphome/components/radon_eye_rd200/sensor.py
+++ b/esphome/components/radon_eye_rd200/sensor.py
@@ -47,9 +47,6 @@ async def to_code(config: ConfigType) -> None:
 
     await ble_client.register_ble_node(var, config)
 
-    if CONF_RADON in config:
-        sens = await sensor.new_sensor(config[CONF_RADON])
-        cg.add(var.set_radon(sens))
-    if CONF_RADON_LONG_TERM in config:
-        sens = await sensor.new_sensor(config[CONF_RADON_LONG_TERM])
-        cg.add(var.set_radon_long_term(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_RADON, var.set_radon)
+    await sensors(CONF_RADON_LONG_TERM, var.set_radon_long_term)
diff --git a/esphome/components/rd03d/binary_sensor.py b/esphome/components/rd03d/binary_sensor.py
index 2c040d0560..9971c413bd 100644
--- a/esphome/components/rd03d/binary_sensor.py
+++ b/esphome/components/rd03d/binary_sensor.py
@@ -30,9 +30,8 @@ CONFIG_SCHEMA = cv.Schema(
 async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_RD03D_ID])
 
-    if target_config := config.get(CONF_TARGET):
-        sens = await binary_sensor.new_binary_sensor(target_config)
-        cg.add(hub.set_target_binary_sensor(sens))
+    binary_sensors = binary_sensor.sub_binary_sensors(config)
+    await binary_sensors(CONF_TARGET, hub.set_target_binary_sensor)
 
     for i in range(MAX_TARGETS):
         if target_config := config.get(f"target_{i + 1}"):
diff --git a/esphome/components/rd03d/sensor.py b/esphome/components/rd03d/sensor.py
index d29656bab0..fe47e5ae32 100644
--- a/esphome/components/rd03d/sensor.py
+++ b/esphome/components/rd03d/sensor.py
@@ -79,9 +79,8 @@ CONFIG_SCHEMA = cv.Schema(
 async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_RD03D_ID])
 
-    if target_count_config := config.get(CONF_TARGET_COUNT):
-        sens = await sensor.new_sensor(target_count_config)
-        cg.add(hub.set_target_count_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TARGET_COUNT, hub.set_target_count_sensor)
 
     for i in range(MAX_TARGETS):
         if target_config := config.get(f"target_{i + 1}"):
diff --git a/esphome/components/sds011/sensor.py b/esphome/components/sds011/sensor.py
index e05d3b02e6..fe1481df9a 100644
--- a/esphome/components/sds011/sensor.py
+++ b/esphome/components/sds011/sensor.py
@@ -93,10 +93,6 @@ async def to_code(config: ConfigType) -> None:
         cg.add(var.set_update_interval_min(update_interval))
     cg.add(var.set_rx_mode_only(config[CONF_RX_ONLY]))
 
-    if CONF_PM_2_5 in config:
-        sens = await sensor.new_sensor(config[CONF_PM_2_5])
-        cg.add(var.set_pm_2_5_sensor(sens))
-
-    if CONF_PM_10_0 in config:
-        sens = await sensor.new_sensor(config[CONF_PM_10_0])
-        cg.add(var.set_pm_10_0_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_PM_2_5, var.set_pm_2_5_sensor)
+    await sensors(CONF_PM_10_0, var.set_pm_10_0_sensor)
diff --git a/esphome/components/senseair/sensor.py b/esphome/components/senseair/sensor.py
index 9445e5867c..2494e9a6d1 100644
--- a/esphome/components/senseair/sensor.py
+++ b/esphome/components/senseair/sensor.py
@@ -53,9 +53,8 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
 
-    if co2 := config.get(CONF_CO2):
-        sens = await sensor.new_sensor(co2)
-        cg.add(var.set_co2_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_CO2, var.set_co2_sensor)
 
 
 CALIBRATION_ACTION_SCHEMA = maybe_simple_id(
diff --git a/esphome/components/sht3xd/sensor.py b/esphome/components/sht3xd/sensor.py
index eadca15050..baee146a22 100644
--- a/esphome/components/sht3xd/sensor.py
+++ b/esphome/components/sht3xd/sensor.py
@@ -56,10 +56,6 @@ async def to_code(config: ConfigType) -> None:
 
     cg.add(var.set_heater_enabled(config[CONF_HEATER_ENABLED]))
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))
-
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/components/shtcx/sensor.py b/esphome/components/shtcx/sensor.py
index bda48c07ce..d6ca2b131b 100644
--- a/esphome/components/shtcx/sensor.py
+++ b/esphome/components/shtcx/sensor.py
@@ -51,10 +51,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if humidity := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity)
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/components/sim800l/binary_sensor.py b/esphome/components/sim800l/binary_sensor.py
index 1cf0b4e1b8..c2bfa94fd5 100644
--- a/esphome/components/sim800l/binary_sensor.py
+++ b/esphome/components/sim800l/binary_sensor.py
@@ -19,8 +19,7 @@ CONFIG_SCHEMA = {
 
 
 async def to_code(config):
-    sim800l_component = await cg.get_variable(config[CONF_SIM800L_ID])
+    hub = await cg.get_variable(config[CONF_SIM800L_ID])
 
-    if CONF_REGISTERED in config:
-        sens = await binary_sensor.new_binary_sensor(config[CONF_REGISTERED])
-        cg.add(sim800l_component.set_registered_binary_sensor(sens))
+    binary_sensors = binary_sensor.sub_binary_sensors(config)
+    await binary_sensors(CONF_REGISTERED, hub.set_registered_binary_sensor)
diff --git a/esphome/components/sim800l/sensor.py b/esphome/components/sim800l/sensor.py
index 010e325df4..cc2ebb93a7 100644
--- a/esphome/components/sim800l/sensor.py
+++ b/esphome/components/sim800l/sensor.py
@@ -27,8 +27,7 @@ CONFIG_SCHEMA = {
 
 
 async def to_code(config):
-    sim800l_component = await cg.get_variable(config[CONF_SIM800L_ID])
+    hub = await cg.get_variable(config[CONF_SIM800L_ID])
 
-    if CONF_RSSI in config:
-        sens = await sensor.new_sensor(config[CONF_RSSI])
-        cg.add(sim800l_component.set_rssi_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_RSSI, hub.set_rssi_sensor)
diff --git a/esphome/components/socket/__init__.py b/esphome/components/socket/__init__.py
index d9b2a935f8..67e86dbe61 100644
--- a/esphome/components/socket/__init__.py
+++ b/esphome/components/socket/__init__.py
@@ -1,18 +1,23 @@
 from collections.abc import Callable, MutableMapping
 from dataclasses import dataclass
 from enum import StrEnum
+from ipaddress import IPv4Address, IPv4Network
 import logging
 
 import esphome.codegen as cg
+from esphome.components.const import CONF_ROLE
 from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
-from esphome.core import CORE
+from esphome.core import CORE, ID
 from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
 CODEOWNERS = ["@esphome/core"]
 
+socket_ns = cg.esphome_ns.namespace("socket")
+Ipv4AllowEntry = socket_ns.struct("Ipv4AllowEntry")
+
 CONF_IMPLEMENTATION = "implementation"
 IMPLEMENTATION_LWIP_TCP = "lwip_tcp"
 IMPLEMENTATION_LWIP_SOCKETS = "lwip_sockets"
@@ -140,6 +145,38 @@ def require_wake_loop_threadsafe() -> None:
     cg.add_define("USE_SOCKET_SELECT_SUPPORT")
 
 
+# For an Ipv4Allow config option; a sanity cap on the list length.
+IPV4_ALLOW_SCHEMA = cv.All(cv.ensure_list(cv.ipv4network), cv.Length(max=255))
+
+
+def _network_order(addr: IPv4Address) -> int:
+    """The s_addr value for addr on the little endian targets."""
+    return int.from_bytes(addr.packed, "little")
+
+
+def add_ipv4_allow(
+    setter: cg.MockObj, networks: list[IPv4Network], owner_id: ID | str
+) -> None:
+    """Emit a flash array for validated IPV4_ALLOW_SCHEMA entries and wire it to setter.
+
+    PROGMEM on esp8266. Emits nothing for an empty list.
+    """
+    if not networks:
+        return
+    cg.add_define("USE_SOCKET_IPV4_ALLOW")
+    entries = [
+        cg.StructInitializer(
+            Ipv4AllowEntry,
+            ("addr", _network_order(net.network_address)),
+            ("mask", _network_order(net.netmask)),
+        )
+        for net in networks
+    ]
+    arr_id = ID(f"{owner_id}_ipv4_allow", is_declaration=True, type=Ipv4AllowEntry)
+    arr = cg.progmem_array(arr_id, cg.ArrayInitializer(*entries))
+    cg.add(setter(arr, len(entries)))
+
+
 def require_ipv4_resolve() -> None:
     """Compile the shared IPv4 lookup; call from a consumer's to_code."""
     cg.add_define("USE_SOCKET_IPV4_RESOLVE")
@@ -151,6 +188,23 @@ def require_tcp_client_link() -> None:
     cg.add_define("USE_SOCKET_TCP_CLIENT_LINK")
 
 
+def require_tcp_listener() -> None:
+    """Compile the TCP listener; call from a server role's to_code."""
+    require_tcp_client_link()
+    cg.add_define("USE_SOCKET_TCP_LISTENER")
+
+
+def consume_role_sockets(component: str) -> Callable[[ConfigType], ConfigType]:
+    """Socket accounting for a role keyed client or server schema."""
+
+    def validator(config: ConfigType) -> ConfigType:
+        if config[CONF_ROLE] == "server":
+            consume_sockets(1, component, SocketType.TCP_LISTEN)(config)
+        return consume_sockets(1, component)(config)
+
+    return validator
+
+
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.SplitDefault(
@@ -206,5 +260,6 @@ FILTER_SOURCE_FILES = filter_source_files_from_defines(
         "lwip_sockets_impl.cpp": "USE_SOCKET_IMPL_LWIP_SOCKETS",
         "ipv4_resolve.cpp": "USE_SOCKET_IPV4_RESOLVE",
         "tcp_client_link.cpp": "USE_SOCKET_TCP_CLIENT_LINK",
+        "tcp_listener.cpp": "USE_SOCKET_TCP_LISTENER",
     }
 )
diff --git a/esphome/components/socket/ipv4_allow.h b/esphome/components/socket/ipv4_allow.h
new file mode 100644
index 0000000000..f2f66edc05
--- /dev/null
+++ b/esphome/components/socket/ipv4_allow.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "headers.h"
+#include "socket.h"
+#include "esphome/core/hal.h"
+
+#include <cstddef>
+#include <cstdint>
+
+namespace esphome::socket {
+
+/// One allowed IPv4 network, network byte order, host bits cleared.
+/// Lives in flash; read via progmem_memcpy.
+struct Ipv4AllowEntry {
+  uint32_t addr;
+  uint32_t mask;
+};
+
+/// IPv4 peers that may connect. An empty list allows every peer.
+class Ipv4Allow {
+ public:
+  void set(const Ipv4AllowEntry *entries, size_t count) {
+    this->entries_ = entries;
+    this->count_ = count;
+  }
+
+  /// A v4 mapped IPv6 peer is unwrapped; any other family fails a non empty list.
+  bool allows(const struct sockaddr *peer) const {
+    if (this->count_ == 0) {
+      return true;
+    }
+    uint32_t addr;
+    return sockaddr_to_ipv4(peer, &addr) && this->allows(addr);
+  }
+
+  /// addr is network byte order, as it sits in a sockaddr_in.
+  bool allows(uint32_t addr) const {
+    if (this->count_ == 0) {
+      return true;
+    }
+    for (size_t i = 0; i != this->count_; i++) {
+      Ipv4AllowEntry e = this->entry(i);
+      if ((addr & e.mask) == e.addr) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  size_t size() const { return this->count_; }
+  /// A copy of entry i, read from flash.
+  Ipv4AllowEntry entry(size_t i) const {
+    Ipv4AllowEntry e;
+    progmem_memcpy(&e, &this->entries_[i], sizeof(e));
+    return e;
+  }
+
+ private:
+  const Ipv4AllowEntry *entries_{nullptr};
+  size_t count_{0};
+};
+
+}  // namespace esphome::socket
diff --git a/esphome/components/socket/socket.cpp b/esphome/components/socket/socket.cpp
index 5ed5544c4d..cf12c94ce3 100644
--- a/esphome/components/socket/socket.cpp
+++ b/esphome/components/socket/socket.cpp
@@ -78,6 +78,25 @@ static inline const char *esphome_inet_ntop6(const void *addr, char *buf, size_t
 #endif
 #endif
 
+bool sockaddr_to_ipv4(const struct sockaddr *addr, uint32_t *out) {
+  if (addr->sa_family == AF_INET) {
+    *out = reinterpret_cast<const struct sockaddr_in *>(addr)->sin_addr.s_addr;
+    return true;
+  }
+#if USE_NETWORK_IPV6
+  if (addr->sa_family == AF_INET6) {
+    // ::ffff:a.b.c.d; s6_addr is the portable byte view on every stack.
+    static constexpr uint8_t V4_MAPPED_PREFIX[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF};
+    const uint8_t *bytes = reinterpret_cast<const struct sockaddr_in6 *>(addr)->sin6_addr.s6_addr;
+    if (memcmp(bytes, V4_MAPPED_PREFIX, sizeof(V4_MAPPED_PREFIX)) == 0) {
+      memcpy(out, bytes + sizeof(V4_MAPPED_PREFIX), sizeof(*out));
+      return true;
+    }
+  }
+#endif
+  return false;
+}
+
 // Format sockaddr into caller-provided buffer, returns length written (excluding null)
 size_t format_sockaddr_to(const struct sockaddr *addr_ptr, socklen_t len, std::span<char, SOCKADDR_STR_LEN> buf) {
   if (addr_ptr->sa_family == AF_INET && len >= sizeof(const struct sockaddr_in)) {
@@ -88,29 +107,10 @@ size_t format_sockaddr_to(const struct sockaddr *addr_ptr, socklen_t len, std::s
 #if USE_NETWORK_IPV6
   else if (addr_ptr->sa_family == AF_INET6 && len >= sizeof(sockaddr_in6)) {
     const auto *addr = reinterpret_cast<const struct sockaddr_in6 *>(addr_ptr);
-#ifdef USE_HOST
-    // Format IPv4-mapped IPv6 addresses as regular IPv4 (POSIX layout, no LWIP union)
-    if (IN6_IS_ADDR_V4MAPPED(&addr->sin6_addr) &&
-        esphome_inet_ntop4(&addr->sin6_addr.s6_addr[12], buf.data(), buf.size()) != nullptr) {
+    uint32_t v4;
+    // Format a v4 mapped peer as plain IPv4.
+    if (sockaddr_to_ipv4(addr_ptr, &v4) && esphome_inet_ntop4(&v4, buf.data(), buf.size()) != nullptr)
       return strlen(buf.data());
-    }
-#elif defined(USE_ZEPHYR)
-    // Format IPv4-mapped IPv6 addresses as regular IPv4. Zephyr uses the standard POSIX
-    // s6_addr layout (not the LWIP union) but provides no IN6_IS_ADDR_V4MAPPED macro, so
-    // detect the ::ffff:0:0/96 prefix directly on the address words.
-    if (addr->sin6_addr.s6_addr32[0] == 0 && addr->sin6_addr.s6_addr32[1] == 0 &&
-        addr->sin6_addr.s6_addr32[2] == htonl(0xFFFF) &&
-        esphome_inet_ntop4(&addr->sin6_addr.s6_addr32[3], buf.data(), buf.size()) != nullptr) {
-      return strlen(buf.data());
-    }
-#elif !defined(USE_SOCKET_IMPL_LWIP_TCP)
-    // Format IPv4-mapped IPv6 addresses as regular IPv4 (LWIP layout)
-    if (addr->sin6_addr.un.u32_addr[0] == 0 && addr->sin6_addr.un.u32_addr[1] == 0 &&
-        addr->sin6_addr.un.u32_addr[2] == htonl(0xFFFF) &&
-        esphome_inet_ntop4(&addr->sin6_addr.un.u32_addr[3], buf.data(), buf.size()) != nullptr) {
-      return strlen(buf.data());
-    }
-#endif
     if (esphome_inet_ntop6(&addr->sin6_addr, buf.data(), buf.size()) != nullptr)
       return strlen(buf.data());
   }
diff --git a/esphome/components/socket/socket.h b/esphome/components/socket/socket.h
index 68dbf166a6..c4f59ac2cb 100644
--- a/esphome/components/socket/socket.h
+++ b/esphome/components/socket/socket.h
@@ -178,6 +178,10 @@ inline std::unique_ptr<ListenSocket> socket_ip_loop_monitored(int type, int prot
 /// @return Size of the sockaddr structure used, or 0 on error
 socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const char *ip_address, uint16_t port);
 
+/// Network order IPv4 of an AF_INET or v4 mapped AF_INET6 peer; false for anything else.
+/// addr must hold the family's full struct.
+bool sockaddr_to_ipv4(const struct sockaddr *addr, uint32_t *out);
+
 /// Convenience overload for std::string (backward compatible).
 inline socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::string &ip_address, uint16_t port) {
   return set_sockaddr(addr, addrlen, ip_address.c_str(), port);
diff --git a/esphome/components/socket/tcp_client_link.cpp b/esphome/components/socket/tcp_client_link.cpp
index f2c1b8e4c1..141695a4bb 100644
--- a/esphome/components/socket/tcp_client_link.cpp
+++ b/esphome/components/socket/tcp_client_link.cpp
@@ -7,6 +7,7 @@
 
 #include <algorithm>
 #include <cerrno>
+#include <cstring>
 
 namespace esphome::socket {
 
@@ -114,7 +115,7 @@ ssize_t TcpClientLink::read(uint8_t *buf, size_t len) {
   return 0;
 }
 
-ssize_t TcpClientLink::write(const uint8_t *buf, size_t len) {
+ssize_t TcpClientLink::write_(const uint8_t *buf, size_t len) {
   if (!this->connected_ || len == 0) {
     return 0;
   }
@@ -129,6 +130,26 @@ ssize_t TcpClientLink::write(const uint8_t *buf, size_t len) {
   return -1;
 }
 
+size_t TcpClientLink::queue(const uint8_t *data, size_t len) {
+  size_t room = this->tx_free();
+  if (len > room) {
+    len = room;
+  }
+  std::memcpy(this->tx_ + this->tx_len_, data, len);
+  this->tx_len_ += static_cast<uint16_t>(len);
+  return len;
+}
+
+void TcpClientLink::flush_tx_slow_() {
+  ssize_t sent = this->write_(this->tx_, this->tx_len_);
+  if (sent > 0) {
+    this->tx_len_ -= static_cast<uint16_t>(sent);
+    if (this->tx_len_ != 0) {
+      std::memmove(this->tx_, this->tx_ + sent, this->tx_len_);
+    }
+  }
+}
+
 void TcpClientLink::close() {
   if (this->sock_ != nullptr) {
     this->sock_->shutdown(SHUT_RDWR);
@@ -136,6 +157,7 @@ void TcpClientLink::close() {
     this->sock_.reset();
   }
   this->connected_ = false;
+  this->tx_len_ = 0;
   this->resolved_.forget();
 }
 
diff --git a/esphome/components/socket/tcp_client_link.h b/esphome/components/socket/tcp_client_link.h
index 065c4df562..f77ee05055 100644
--- a/esphome/components/socket/tcp_client_link.h
+++ b/esphome/components/socket/tcp_client_link.h
@@ -16,8 +16,9 @@
 namespace esphome::socket {
 
 /// A reconnecting TCP stream driven from loop(). Owns the socket, the DNS
-/// lookup and the retry backoff. A fatal read/write error closes the link
-/// and schedules the next attempt; the caller sees the edge via connected().
+/// lookup, the retry backoff and the outgoing buffer. A fatal read/write
+/// error closes the link and schedules the next attempt; the caller sees
+/// the edge via connected().
 class TcpClientLink {
  public:
   void set_host(const char *host) { this->host_ = StringRef(host); }
@@ -41,7 +42,21 @@ class TcpClientLink {
   void adopt(std::unique_ptr<Socket> sock);
   /// Returns bytes moved, 0 when nothing can move now, -1 when the link dropped.
   ssize_t read(uint8_t *buf, size_t len);
-  ssize_t write(const uint8_t *buf, size_t len);
+  /// Copy into the outgoing buffer; returns how many bytes fit.
+  size_t queue(const uint8_t *data, size_t len);
+  /// Direct access to the buffer's free tail. Fill at most tx_free() bytes,
+  /// then tx_commit() the count; neither is bounds checked.
+  uint8_t *tx_tail() { return this->tx_ + this->tx_len_; }
+  void tx_commit(size_t len) { this->tx_len_ += static_cast<uint16_t>(len); }
+  size_t tx_free() const { return this->connected_ ? TX_BUFFER_SIZE - this->tx_len_ : 0; }
+  /// Send the front of the buffer; true once it is empty.
+  /// A partial write keeps the rest; inline no-op while nothing is queued.
+  bool flush_tx() {
+    if (this->tx_len_ != 0) {
+      this->flush_tx_slow_();
+    }
+    return this->tx_len_ == 0;
+  }
   /// Close without scheduling a reconnect (shutdown).
   void close();
 
@@ -54,6 +69,11 @@ class TcpClientLink {
   }
 
  protected:
+  static constexpr size_t TX_BUFFER_SIZE = 1024;
+
+  /// The raw stream write behind flush_tx(); drops the link on a fatal error.
+  ssize_t write_(const uint8_t *buf, size_t len);
+  void flush_tx_slow_();
   void poll_slow_();
   void try_connect_();
   /// Close after a failure, log what and errno, schedule the next attempt.
@@ -66,7 +86,9 @@ class TcpClientLink {
   uint32_t reconnect_interval_ms_{5000};
   Ipv4Resolve resolved_;
   uint16_t port_{0};
+  uint16_t tx_len_{0};
   bool connected_{false};
+  uint8_t tx_[TX_BUFFER_SIZE]{};
 };
 
 }  // namespace esphome::socket
diff --git a/esphome/components/socket/tcp_listener.cpp b/esphome/components/socket/tcp_listener.cpp
new file mode 100644
index 0000000000..e1f00e2927
--- /dev/null
+++ b/esphome/components/socket/tcp_listener.cpp
@@ -0,0 +1,90 @@
+#include "tcp_listener.h"
+
+#if defined(USE_SOCKET_IMPL_LWIP_TCP) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS) || defined(USE_SOCKET_IMPL_BSD_SOCKETS)
+
+#include "esphome/core/application.h"
+#include "esphome/core/log.h"
+
+#include <cerrno>
+#include <span>
+
+namespace esphome::socket {
+
+// One client at a time; a second connection waits in the stack until the first drops.
+static constexpr int LISTEN_BACKLOG = 1;
+#ifdef USE_SOCKET_IPV4_ALLOW
+static constexpr uint32_t REJECT_LOG_INTERVAL_MS = 5000;
+#endif
+
+void TcpListener::try_listen_(TcpClientLink &link) {
+  this->listen_ = socket_ip_loop_monitored(SOCK_STREAM, IPPROTO_TCP);
+  int err = errno;
+  if (this->listen_ != nullptr) {
+    int yes = 1;
+    this->listen_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+    struct sockaddr_storage local;
+    socklen_t local_len = set_sockaddr_any(reinterpret_cast<struct sockaddr *>(&local), sizeof(local), link.port());
+    // A blocking listener would stall loop() inside accept(), so its
+    // setblocking result is part of the success condition.
+    if (this->listen_->setblocking(false) == 0 && local_len != 0 &&
+        this->listen_->bind(reinterpret_cast<struct sockaddr *>(&local), local_len) == 0 &&
+        this->listen_->listen(LISTEN_BACKLOG) == 0) {
+      ESP_LOGI(this->tag_, "Listening on %u", link.port());
+      return;
+    }
+    // Captured before reset(); the close inside can overwrite errno.
+    err = errno;
+    this->listen_.reset();
+  }
+  ESP_LOGW(this->tag_, "Listen on %u failed: %d", link.port(), err);
+  link.note_attempt();
+}
+
+void TcpListener::accept_(TcpClientLink &link) {
+  struct sockaddr_storage peer {};
+  socklen_t peer_len = sizeof(peer);
+  auto client = this->listen_->accept_loop_monitored(reinterpret_cast<struct sockaddr *>(&peer), &peer_len);
+  if (client == nullptr) {
+    // A reset during the handshake or a signal only affects that connection.
+    if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ECONNABORTED || errno == EINTR) {
+      return;
+    }
+    // Rebuild the listener after the backoff instead of spinning on it.
+    int err = errno;
+    this->listen_.reset();
+    ESP_LOGW(this->tag_, "Accept failed: %d", err);
+    link.note_attempt();
+    return;
+  }
+  const auto *sa = reinterpret_cast<const struct sockaddr *>(&peer);
+  char text[SOCKADDR_STR_LEN];
+  format_sockaddr_to(sa, peer_len, std::span<char, SOCKADDR_STR_LEN>(text));
+#ifdef USE_SOCKET_IPV4_ALLOW
+  if (!this->allow_.allows(sa)) {
+    uint32_t now = App.get_loop_component_start_time();
+    if (this->last_reject_log_ms_ == 0 || now - this->last_reject_log_ms_ >= REJECT_LOG_INTERVAL_MS) {
+      this->last_reject_log_ms_ = now;
+      ESP_LOGW(this->tag_, "Rejected %s", text);
+    }
+    return;
+  }
+#endif
+  link.adopt(std::move(client));
+  ESP_LOGI(this->tag_, "Client connected from %s", text);
+}
+
+void TcpListener::dump_config() const {
+#ifdef USE_SOCKET_IPV4_ALLOW
+  for (size_t i = 0; i < this->allow_.size(); i++) {
+    Ipv4AllowEntry e = this->allow_.entry(i);
+    // Network order is dotted order, and the contiguous mask's popcount is the prefix.
+    const auto *b = reinterpret_cast<const uint8_t *>(&e.addr);
+    ESP_LOGCONFIG(this->tag_, "  Allowed IP: %u.%u.%u.%u/%u", b[0], b[1], b[2], b[3],
+                  static_cast<unsigned>(__builtin_popcount(e.mask)));
+  }
+#endif
+}
+
+}  // namespace esphome::socket
+
+#endif
diff --git a/esphome/components/socket/tcp_listener.h b/esphome/components/socket/tcp_listener.h
new file mode 100644
index 0000000000..a42080e641
--- /dev/null
+++ b/esphome/components/socket/tcp_listener.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include "headers.h"
+
+#if defined(USE_SOCKET_IMPL_LWIP_TCP) || defined(USE_SOCKET_IMPL_LWIP_SOCKETS) || defined(USE_SOCKET_IMPL_BSD_SOCKETS)
+
+#ifdef USE_SOCKET_IPV4_ALLOW
+#include "ipv4_allow.h"
+#endif
+#include "socket.h"
+#include "tcp_client_link.h"
+
+#include <cstdint>
+#include <memory>
+
+namespace esphome::socket {
+
+/// The server side of a bridged TCP link: owns the listen socket and the
+/// allow list, accepts one peer at a time and adopts it into a TcpClientLink,
+/// sharing that link's retry clock and connect port.
+class TcpListener {
+ public:
+#ifdef USE_SOCKET_IPV4_ALLOW
+  void set_allow(const Ipv4AllowEntry *entries, size_t count) { this->allow_.set(entries, count); }
+#endif
+
+  /// Call from setup(); tag names the log lines.
+  void begin(const char *tag) { this->tag_ = tag; }
+  /// Server state machine; call every loop. may_accept lets the caller hold
+  /// accepts until its own disconnect edge has run.
+  void poll(TcpClientLink &link, bool may_accept) {
+    if (this->listen_ == nullptr) {
+      if (!link.in_backoff()) {
+        this->try_listen_(link);
+      }
+      return;
+    }
+    if (may_accept && !link.connected() && this->listen_->ready()) {
+      this->accept_(link);
+    }
+  }
+  void close() { this->listen_.reset(); }
+  /// One config line per allowed network.
+  void dump_config() const;
+
+ protected:
+  void try_listen_(TcpClientLink &link);
+  void accept_(TcpClientLink &link);
+
+  std::unique_ptr<ListenSocket> listen_;
+  const char *tag_{nullptr};
+#ifdef USE_SOCKET_IPV4_ALLOW
+  uint32_t last_reject_log_ms_{0};
+  Ipv4Allow allow_;
+#endif
+};
+
+}  // namespace esphome::socket
+
+#endif
diff --git a/esphome/components/sound_level/sensor.py b/esphome/components/sound_level/sensor.py
index a28e91dfd5..c8e31226ef 100644
--- a/esphome/components/sound_level/sensor.py
+++ b/esphome/components/sound_level/sensor.py
@@ -73,12 +73,9 @@ async def to_code(config: ConfigType) -> None:
 
     cg.add(var.set_measurement_duration(config[CONF_MEASUREMENT_DURATION]))
 
-    if peak_config := config.get(CONF_PEAK):
-        sens = await sensor.new_sensor(peak_config)
-        cg.add(var.set_peak_sensor(sens))
-    if rms_config := config.get(CONF_RMS):
-        sens = await sensor.new_sensor(rms_config)
-        cg.add(var.set_rms_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_PEAK, var.set_peak_sensor)
+    await sensors(CONF_RMS, var.set_rms_sensor)
 
 
 SOUND_LEVEL_ACTION_SCHEMA = automation.maybe_simple_id(
diff --git a/esphome/components/spa06_base/__init__.py b/esphome/components/spa06_base/__init__.py
index c995c2c087..e084020a14 100644
--- a/esphome/components/spa06_base/__init__.py
+++ b/esphome/components/spa06_base/__init__.py
@@ -181,9 +181,9 @@ CONFIG_SCHEMA_BASE.add_extra(measurement_timing_check)
 async def to_code_base(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    if await sensors(CONF_TEMPERATURE, var.set_temperature_sensor):
+        temperature_config = config[CONF_TEMPERATURE]
         cg.add(
             var.set_temperature_oversampling_config(
                 temperature_config[CONF_OVERSAMPLING]
@@ -193,9 +193,8 @@ async def to_code_base(config: ConfigType) -> MockObj:
             var.set_temperature_sample_rate_config(temperature_config[CONF_SAMPLE_RATE])
         )
 
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
+    if await sensors(CONF_PRESSURE, var.set_pressure_sensor):
+        pressure_config = config[CONF_PRESSURE]
         cg.add(var.set_pressure_oversampling_config(pressure_config[CONF_OVERSAMPLING]))
         cg.add(var.set_pressure_sample_rate_config(pressure_config[CONF_SAMPLE_RATE]))
 
diff --git a/esphome/components/t6615/sensor.py b/esphome/components/t6615/sensor.py
index 44dba52ae8..4b055516e7 100644
--- a/esphome/components/t6615/sensor.py
+++ b/esphome/components/t6615/sensor.py
@@ -48,6 +48,5 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
 
-    if co2 := config.get(CONF_CO2):
-        sens = await sensor.new_sensor(co2)
-        cg.add(var.set_co2_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_CO2, var.set_co2_sensor)
diff --git a/esphome/components/tas58xx/binary_sensor.py b/esphome/components/tas58xx/binary_sensor.py
index 8a5bb03dd7..398cfa2440 100644
--- a/esphome/components/tas58xx/binary_sensor.py
+++ b/esphome/components/tas58xx/binary_sensor.py
@@ -40,12 +40,11 @@ CONFIG_SCHEMA = cv.Schema(
 
 
 async def to_code(config: ConfigType) -> None:
-    parent = await cg.get_variable(config[CONF_TAS58XX_ID])
-    if sensor_config := config.get(CONF_HAVE_FAULT):
-        sens = await binary_sensor.new_binary_sensor(sensor_config)
-        cg.add(parent.set_have_fault_binary_sensor(sens))
+    hub = await cg.get_variable(config[CONF_TAS58XX_ID])
+    binary_sensors = binary_sensor.sub_binary_sensors(config)
+    await binary_sensors(CONF_HAVE_FAULT, hub.set_have_fault_binary_sensor)
     for key in FAULT_SENSORS:
         if sensor_config := config.get(key):
             sens = await binary_sensor.new_binary_sensor(sensor_config)
             fault = getattr(FaultSensor, f"FAULT_SENSOR_{key.upper()}")
-            cg.add(parent.set_fault_binary_sensor(fault, sens))
+            cg.add(hub.set_fault_binary_sensor(fault, sens))
diff --git a/esphome/components/tcp_uart/__init__.py b/esphome/components/tcp_uart/__init__.py
index 20866d1a0c..8e14e690f9 100644
--- a/esphome/components/tcp_uart/__init__.py
+++ b/esphome/components/tcp_uart/__init__.py
@@ -1,9 +1,13 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor, socket, uart
 from esphome.components.const import (
+    CONF_ALLOWED_IPS,
+    CONF_CONNECTED,
     CONF_DATA_BITS,
     CONF_HOST,
     CONF_PARITY,
+    CONF_RECONNECT_INTERVAL,
+    CONF_ROLE,
     CONF_STOP_BITS,
 )
 import esphome.config_validation as cv
@@ -24,44 +28,68 @@ MULTI_CONF = True
 tcp_uart_ns = cg.esphome_ns.namespace("tcp_uart")
 TcpUart = tcp_uart_ns.class_("TcpUart", uart.UARTComponent, cg.Component)
 
-CONF_RECONNECT_INTERVAL = "reconnect_interval"
-CONF_CONNECTED = "connected"
 
+BASE_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(TcpUart),
+        cv.Required(CONF_PORT): cv.port,
+        cv.Optional(CONF_BAUD_RATE, default=9600): cv.int_range(min=1),
+        cv.Optional(CONF_DATA_BITS, default=8): cv.int_range(min=5, max=8),
+        cv.Optional(CONF_PARITY, default="NONE"): cv.enum(
+            uart.UART_PARITY_OPTIONS, upper=True
+        ),
+        cv.Optional(CONF_STOP_BITS, default=1): cv.one_of(1, 2, int=True),
+        cv.Optional(
+            CONF_RECONNECT_INTERVAL, default="5s"
+        ): cv.positive_time_period_milliseconds,
+        cv.Optional(CONF_CONNECTED): binary_sensor.binary_sensor_schema(
+            device_class=DEVICE_CLASS_CONNECTIVITY,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+    }
+).extend(cv.COMPONENT_SCHEMA)
 
 CONFIG_SCHEMA = cv.All(
-    cv.Schema(
+    cv.typed_schema(
         {
-            cv.GenerateID(): cv.declare_id(TcpUart),
-            cv.Required(CONF_HOST): cv.string,
-            cv.Required(CONF_PORT): cv.port,
-            cv.Optional(CONF_BAUD_RATE, default=9600): cv.int_range(min=1),
-            cv.Optional(CONF_DATA_BITS, default=8): cv.int_range(min=5, max=8),
-            cv.Optional(CONF_PARITY, default="NONE"): cv.enum(
-                uart.UART_PARITY_OPTIONS, upper=True
+            "client": BASE_SCHEMA.extend(
+                {
+                    cv.Required(CONF_HOST): cv.string,
+                }
             ),
-            cv.Optional(CONF_STOP_BITS, default=1): cv.one_of(1, 2, int=True),
-            cv.Optional(
-                CONF_RECONNECT_INTERVAL, default="5s"
-            ): cv.positive_time_period_milliseconds,
-            cv.Optional(CONF_CONNECTED): binary_sensor.binary_sensor_schema(
-                device_class=DEVICE_CLASS_CONNECTIVITY,
-                entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+            "server": BASE_SCHEMA.extend(
+                {
+                    cv.Optional(CONF_ALLOWED_IPS): socket.IPV4_ALLOW_SCHEMA,
+                }
             ),
-        }
-    ).extend(cv.COMPONENT_SCHEMA),
-    socket.consume_sockets(1, "tcp_uart"),
+        },
+        key=CONF_ROLE,
+        default_type="client",
+        lower=True,
+    ),
+    socket.consume_role_sockets("tcp_uart"),
 )
 
 
 async def to_code(config: ConfigType) -> None:
-    socket.require_tcp_client_link()
-    var = cg.new_Pvariable(config[CONF_ID], config[CONF_HOST], config[CONF_PORT])
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    if config[CONF_ROLE] == "server":
+        socket.require_tcp_listener()
+        cg.add(var.set_server(True))
+        socket.add_ipv4_allow(
+            var.set_allow, config.get(CONF_ALLOWED_IPS), config[CONF_ID]
+        )
+    else:
+        socket.require_tcp_client_link()
+    cg.add(var.set_port(config[CONF_PORT]))
     cg.add(var.set_reconnect_interval(config[CONF_RECONNECT_INTERVAL]))
     # The socket is not clocked. These only satisfy UARTComponent and a consumer check.
     cg.add(var.set_baud_rate(config[CONF_BAUD_RATE]))
     cg.add(var.set_data_bits(config[CONF_DATA_BITS]))
     cg.add(var.set_stop_bits(config[CONF_STOP_BITS]))
     cg.add(var.set_parity(config[CONF_PARITY]))
+    if (host := config.get(CONF_HOST)) is not None:
+        cg.add(var.set_host(host))
     binary_sensors = binary_sensor.sub_binary_sensors(config)
     await binary_sensors(CONF_CONNECTED, var.set_connected_sensor)
diff --git a/esphome/components/tcp_uart/tcp_uart.cpp b/esphome/components/tcp_uart/tcp_uart.cpp
index fc81f6ecfe..5913610ee8 100644
--- a/esphome/components/tcp_uart/tcp_uart.cpp
+++ b/esphome/components/tcp_uart/tcp_uart.cpp
@@ -14,6 +14,9 @@ static constexpr uint32_t DROP_LOG_INTERVAL_MS = 5000;
 
 void TcpUart::setup() {
   this->link_.begin(TAG);
+#ifdef USE_SOCKET_TCP_LISTENER
+  this->listener_.begin(TAG);
+#endif
   if (this->connected_sensor_ != nullptr) {
     this->connected_sensor_->publish_state(false);
   }
@@ -22,18 +25,29 @@ void TcpUart::setup() {
 void TcpUart::dump_config() {
   ESP_LOGCONFIG(TAG,
                 "TCP UART:\n"
-                "  Host: %s:%u\n"
+                "  %s: %s:%u\n"
                 "  Reconnect Interval: %" PRIu32 "ms",
-                this->link_.host(), this->link_.port(), this->link_.reconnect_interval());
+                this->server_ ? LOG_STR_LITERAL("Listen") : LOG_STR_LITERAL("Host"),
+                this->server_ ? LOG_STR_LITERAL("*") : this->link_.host(), this->link_.port(),
+                this->link_.reconnect_interval());
+#ifdef USE_SOCKET_TCP_LISTENER
+  this->listener_.dump_config();
+#endif
   LOG_BINARY_SENSOR("  ", "Connected", this->connected_sensor_);
 }
 
+void TcpUart::on_shutdown() {
+  this->link_.close();
+#ifdef USE_SOCKET_TCP_LISTENER
+  this->listener_.close();
+#endif
+}
+
 void TcpUart::sync_link_() {
   bool up = this->link_.connected();
   this->link_was_up_ = up;
   if (!up) {
     this->rx_start_ = this->rx_end_ = 0;
-    this->tx_len_ = 0;
   }
   if (this->connected_sensor_ != nullptr) {
     this->connected_sensor_->publish_state(up);
@@ -63,16 +77,18 @@ void TcpUart::read_socket_() {
   this->rx_pending_ = static_cast<size_t>(count) == room;
 }
 
-void TcpUart::flush_tx_() {
-  ssize_t sent = this->link_.write(this->tx_, this->tx_len_);
-  if (sent > 0) {
-    this->tx_len_ -= static_cast<uint16_t>(sent);
-    std::memmove(this->tx_, this->tx_ + sent, this->tx_len_);
-  }
-}
-
 void TcpUart::loop() {
+#ifdef USE_SOCKET_TCP_LISTENER
+  if (this->server_) {
+    // link_was_up_ holds the accept until the previous drop's edge has run,
+    // so the sensor and the cleared RX buffer always see the disconnect.
+    this->listener_.poll(this->link_, !this->link_was_up_);
+  } else {
+    this->link_.poll();
+  }
+#else
   this->link_.poll();
+#endif
   if (this->link_.connected() != this->link_was_up_) {
     this->sync_link_();
   }
@@ -82,25 +98,20 @@ void TcpUart::loop() {
   if (this->rx_pending_ || this->link_.ready()) {
     this->read_socket_();
   }
-  if (this->tx_len_ != 0) {
-    this->flush_tx_();
-  }
+  this->link_.flush_tx();
 }
 
 void TcpUart::write_array(const uint8_t *data, size_t len) {
-  size_t room = this->link_.connected() ? sizeof(this->tx_) - this->tx_len_ : 0;
-  if (len > room) {
+  size_t queued = this->link_.queue(data, len);
+  if (queued < len) {
     uint32_t now = App.get_loop_component_start_time();
     if (this->last_drop_log_ms_ == 0 || now - this->last_drop_log_ms_ >= DROP_LOG_INTERVAL_MS) {
       ESP_LOGW(TAG, "%s, dropped %u bytes",
                this->link_.connected() ? LOG_STR_LITERAL("TX buffer full") : LOG_STR_LITERAL("Not connected"),
-               static_cast<unsigned>(len - room));
+               static_cast<unsigned>(len - queued));
       this->last_drop_log_ms_ = now;
     }
-    len = room;
   }
-  std::memcpy(this->tx_ + this->tx_len_, data, len);
-  this->tx_len_ += static_cast<uint16_t>(len);
 }
 
 bool TcpUart::peek_byte(uint8_t *data) {
@@ -121,11 +132,13 @@ bool TcpUart::read_array(uint8_t *data, size_t len) {
 }
 
 uart::UARTFlushResult TcpUart::flush() {
-  this->flush_tx_();
-  if (this->tx_len_ == 0) {
-    return uart::UARTFlushResult::UART_FLUSH_RESULT_SUCCESS;
+  bool emptied = this->link_.flush_tx();
+  if (!this->link_.connected()) {
+    // A down link cannot have delivered anything, whether this flush dropped
+    // it or an earlier loop() write did.
+    return uart::UARTFlushResult::UART_FLUSH_RESULT_FAILED;
   }
-  return uart::UARTFlushResult::UART_FLUSH_RESULT_TIMEOUT;
+  return emptied ? uart::UARTFlushResult::UART_FLUSH_RESULT_SUCCESS : uart::UARTFlushResult::UART_FLUSH_RESULT_TIMEOUT;
 }
 
 }  // namespace esphome::tcp_uart
diff --git a/esphome/components/tcp_uart/tcp_uart.h b/esphome/components/tcp_uart/tcp_uart.h
index c13d2ef6f0..29f7af564a 100644
--- a/esphome/components/tcp_uart/tcp_uart.h
+++ b/esphome/components/tcp_uart/tcp_uart.h
@@ -2,6 +2,9 @@
 
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include "esphome/components/socket/tcp_client_link.h"
+#ifdef USE_SOCKET_TCP_LISTENER
+#include "esphome/components/socket/tcp_listener.h"
+#endif
 #include "esphome/components/uart/uart_component.h"
 #include "esphome/core/component.h"
 
@@ -9,22 +12,26 @@
 
 namespace esphome::tcp_uart {
 
-/// TCP client presented as a UART. Bytes are copied unchanged.
+/// TCP client or server presented as a UART. Bytes are copied unchanged.
 class TcpUart : public uart::UARTComponent, public Component {
  public:
-  TcpUart(const char *host, uint16_t port) {
-    this->link_.set_host(host);
-    this->link_.set_port(port);
-    this->rx_buffer_size_ = RX_BUFFER_SIZE;
-  }
+  TcpUart() { this->rx_buffer_size_ = RX_BUFFER_SIZE; }
 
+  void set_host(const char *host) { this->link_.set_host(host); }
+  void set_port(uint16_t port) { this->link_.set_port(port); }
   void set_reconnect_interval(uint32_t ms) { this->link_.set_reconnect_interval(ms); }
   void set_connected_sensor(binary_sensor::BinarySensor *sensor) { this->connected_sensor_ = sensor; }
+#ifdef USE_SOCKET_TCP_LISTENER
+  void set_server(bool server) { this->server_ = server; }
+#ifdef USE_SOCKET_IPV4_ALLOW
+  void set_allow(const socket::Ipv4AllowEntry *entries, size_t count) { this->listener_.set_allow(entries, count); }
+#endif
+#endif
 
   void setup() override;
   void loop() override;
   void dump_config() override;
-  void on_shutdown() override { this->link_.close(); }
+  void on_shutdown() override;
   float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
 
   void write_array(const uint8_t *data, size_t len) override;
@@ -32,7 +39,7 @@ class TcpUart : public uart::UARTComponent, public Component {
   bool read_array(uint8_t *data, size_t len) override;
   size_t available() override { return static_cast<size_t>(this->rx_end_ - this->rx_start_); }
   // Same room write_array() grants, so consumers can apply backpressure.
-  size_t available_for_write() override { return this->link_.connected() ? sizeof(this->tx_) - this->tx_len_ : 0; }
+  size_t available_for_write() override { return this->link_.tx_free(); }
   uart::UARTFlushResult flush() override;
   bool is_connected() override { return this->link_.connected(); }
 #if defined(USE_ESP8266) || defined(USE_ESP32)
@@ -43,24 +50,24 @@ class TcpUart : public uart::UARTComponent, public Component {
   void check_logger_conflict() override {}
   void sync_link_();
   void read_socket_();
-  void flush_tx_();
 
   static constexpr size_t RX_BUFFER_SIZE = 1024;
-  static constexpr size_t TX_BUFFER_SIZE = 1024;
 
   socket::TcpClientLink link_;
+#ifdef USE_SOCKET_TCP_LISTENER
+  socket::TcpListener listener_;
+#endif
   binary_sensor::BinarySensor *connected_sensor_{nullptr};
   uint32_t last_drop_log_ms_{0};
-  uint16_t tx_len_{0};
   // rx_[rx_start_, rx_end_) holds unread bytes; read_socket_() compacts to the front.
   uint16_t rx_start_{0};
   uint16_t rx_end_{0};
-  // The link state loop() saw last; edges clear the buffers and publish the sensor.
+  bool server_{false};
+  // The link state loop() saw last; edges clear rx_ and publish the sensor.
   bool link_was_up_{false};
   // A read stopped before EAGAIN. ready() stays false until new data arrives.
   bool rx_pending_{false};
   uint8_t rx_[RX_BUFFER_SIZE]{};
-  uint8_t tx_[TX_BUFFER_SIZE]{};
 };
 
 }  // namespace esphome::tcp_uart
diff --git a/esphome/components/tem3200/sensor.py b/esphome/components/tem3200/sensor.py
index 289641f951..2b1839c529 100644
--- a/esphome/components/tem3200/sensor.py
+++ b/esphome/components/tem3200/sensor.py
@@ -46,10 +46,6 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if raw_pressure_config := config.get(CONF_RAW_PRESSURE):
-        sens = await sensor.new_sensor(raw_pressure_config)
-        cg.add(var.set_raw_pressure_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_RAW_PRESSURE, var.set_raw_pressure_sensor)
diff --git a/esphome/components/tx20/sensor.py b/esphome/components/tx20/sensor.py
index 3a24b8dc0b..77418e5284 100644
--- a/esphome/components/tx20/sensor.py
+++ b/esphome/components/tx20/sensor.py
@@ -44,15 +44,9 @@ async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
-    if CONF_WIND_SPEED in config:
-        conf = config[CONF_WIND_SPEED]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_wind_speed_sensor(sens))
-
-    if CONF_WIND_DIRECTION_DEGREES in config:
-        conf = config[CONF_WIND_DIRECTION_DEGREES]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_wind_direction_degrees_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_WIND_SPEED, var.set_wind_speed_sensor)
+    await sensors(CONF_WIND_DIRECTION_DEGREES, var.set_wind_direction_degrees_sensor)
 
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     cg.add(var.set_pin(pin))
diff --git a/esphome/components/uart_tcp/__init__.py b/esphome/components/uart_tcp/__init__.py
new file mode 100644
index 0000000000..3829f046ca
--- /dev/null
+++ b/esphome/components/uart_tcp/__init__.py
@@ -0,0 +1,77 @@
+import esphome.codegen as cg
+from esphome.components import binary_sensor, socket, uart
+from esphome.components.const import (
+    CONF_ALLOWED_IPS,
+    CONF_CONNECTED,
+    CONF_HOST,
+    CONF_RECONNECT_INTERVAL,
+    CONF_ROLE,
+)
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_ID,
+    CONF_PORT,
+    CONF_UART_ID,
+    DEVICE_CLASS_CONNECTIVITY,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+)
+from esphome.types import ConfigType
+
+CODEOWNERS = ["@Bascht74"]
+DEPENDENCIES = ["network", "uart"]
+AUTO_LOAD = ["binary_sensor", "socket"]
+MULTI_CONF = True
+
+uart_tcp_ns = cg.esphome_ns.namespace("uart_tcp")
+UartTcp = uart_tcp_ns.class_("UartTcp", cg.Component, uart.UARTDevice)
+
+
+BASE_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(UartTcp),
+        cv.Required(CONF_UART_ID): cv.use_id(uart.UARTComponent),
+        cv.Required(CONF_PORT): cv.port,
+        cv.Optional(
+            CONF_RECONNECT_INTERVAL, default="5s"
+        ): cv.positive_time_period_milliseconds,
+        cv.Optional(CONF_CONNECTED): binary_sensor.binary_sensor_schema(
+            device_class=DEVICE_CLASS_CONNECTIVITY,
+            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        ),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+CONFIG_SCHEMA = cv.All(
+    cv.typed_schema(
+        {
+            "client": BASE_SCHEMA.extend({cv.Required(CONF_HOST): cv.string}),
+            "server": BASE_SCHEMA.extend(
+                {cv.Optional(CONF_ALLOWED_IPS): socket.IPV4_ALLOW_SCHEMA}
+            ),
+        },
+        key=CONF_ROLE,
+        default_type="client",
+        lower=True,
+    ),
+    socket.consume_role_sockets("uart_tcp"),
+)
+
+
+async def to_code(config: ConfigType) -> None:
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await uart.register_uart_device(var, config)
+    if config[CONF_ROLE] == "server":
+        socket.require_tcp_listener()
+        cg.add(var.set_server(True))
+        socket.add_ipv4_allow(
+            var.set_allow, config.get(CONF_ALLOWED_IPS), config[CONF_ID]
+        )
+    else:
+        socket.require_tcp_client_link()
+    cg.add(var.set_port(config[CONF_PORT]))
+    cg.add(var.set_reconnect_interval(config[CONF_RECONNECT_INTERVAL]))
+    if (host := config.get(CONF_HOST)) is not None:
+        cg.add(var.set_host(host))
+    binary_sensors = binary_sensor.sub_binary_sensors(config)
+    await binary_sensors(CONF_CONNECTED, var.set_connected_sensor)
diff --git a/esphome/components/uart_tcp/uart_tcp.cpp b/esphome/components/uart_tcp/uart_tcp.cpp
new file mode 100644
index 0000000000..cf15802b55
--- /dev/null
+++ b/esphome/components/uart_tcp/uart_tcp.cpp
@@ -0,0 +1,132 @@
+#include "uart_tcp.h"
+
+#include "esphome/core/log.h"
+
+#include <algorithm>
+#include <cerrno>
+#include <cinttypes>
+
+namespace esphome::uart_tcp {
+
+static const char *const TAG = "uart_tcp";
+
+// Bytes per 16 ms loop pass at 10 bits per byte: baud / 10 / 62.5.
+static constexpr uint32_t BAUD_PACE_DIVISOR = 625;
+
+void UartTcp::setup() {
+  this->link_.begin(TAG);
+#ifdef USE_SOCKET_TCP_LISTENER
+  this->listener_.begin(TAG);
+#endif
+  if (this->connected_sensor_ != nullptr) {
+    this->connected_sensor_->publish_state(false);
+  }
+}
+
+void UartTcp::dump_config() {
+  ESP_LOGCONFIG(TAG,
+                "UART TCP:\n"
+                "  %s: %s:%u\n"
+                "  Reconnect Interval: %" PRIu32 "ms",
+                this->server_ ? LOG_STR_LITERAL("Listen") : LOG_STR_LITERAL("Host"),
+                this->server_ ? LOG_STR_LITERAL("*") : this->link_.host(), this->link_.port(),
+                this->link_.reconnect_interval());
+#ifdef USE_SOCKET_TCP_LISTENER
+  this->listener_.dump_config();
+#endif
+  LOG_BINARY_SENSOR("  ", "Connected", this->connected_sensor_);
+}
+
+void UartTcp::on_shutdown() {
+  this->link_.close();
+#ifdef USE_SOCKET_TCP_LISTENER
+  this->listener_.close();
+#endif
+}
+
+void UartTcp::sync_link_() {
+  bool up = this->link_.connected();
+  this->link_was_up_ = up;
+  if (up) {
+    // The driver kept whatever arrived while the link was down.
+    this->discard_uart_();
+  }
+  if (this->connected_sensor_ != nullptr) {
+    this->connected_sensor_->publish_state(up);
+  }
+}
+
+void UartTcp::read_socket_() {
+  // A hardware write blocks until the driver takes every byte. Leave what does
+  // not fit in the socket, so TCP flow control throttles the peer.
+  size_t room = this->parent_->available_for_write();
+  if (room == SIZE_MAX) {
+    // Capacity unknown on this platform; pace to one loop pass of UART time
+    // (16 ms at 10 bits per byte) so a blocking write stays short.
+    room = std::max<size_t>(1, this->parent_->get_baud_rate() / BAUD_PACE_DIVISOR);
+  }
+  if (room == 0) {
+    this->rx_pending_ = true;
+    return;
+  }
+  uint8_t tmp[READ_CHUNK];
+  size_t want = std::min(room, sizeof(tmp));
+  ssize_t count = this->link_.read(tmp, want);
+  if (count <= 0) {
+    // A dropped link (-1) is cleaned up by sync_link_() on the next loop.
+    if (count == 0) {
+      this->rx_pending_ = false;
+    }
+    return;
+  }
+  this->rx_pending_ = static_cast<size_t>(count) == want;
+  this->write_array(tmp, static_cast<size_t>(count));
+}
+
+void UartTcp::discard_uart_() {
+  // Drain exactly what was buffered while the link was down; later bytes are live.
+  uint8_t dump[32];
+  size_t left = this->available();
+  while (left != 0) {
+    size_t n = std::min(left, sizeof(dump));
+    if (!this->read_array(dump, n)) {
+      return;
+    }
+    left -= n;
+  }
+}
+
+void UartTcp::read_uart_() {
+  size_t want = std::min<size_t>(this->available(), this->link_.tx_free());
+  if (want != 0 && this->read_array(this->link_.tx_tail(), want)) {
+    this->link_.tx_commit(want);
+  }
+}
+
+void UartTcp::loop() {
+#ifdef USE_SOCKET_TCP_LISTENER
+  if (this->server_) {
+    // link_was_up_ holds the accept until the previous drop's edge has run,
+    // so the sensor and the stale UART discard always see the disconnect.
+    this->listener_.poll(this->link_, !this->link_was_up_);
+  } else {
+    this->link_.poll();
+  }
+#else
+  this->link_.poll();
+#endif
+  if (this->link_.connected() != this->link_was_up_) {
+    this->sync_link_();
+  }
+  if (!this->link_was_up_) {
+    return;
+  }
+  if (this->rx_pending_ || this->link_.ready()) {
+    this->read_socket_();
+  }
+  // UART bytes picked up here go out in the same pass.
+  this->read_uart_();
+  this->link_.flush_tx();
+}
+
+}  // namespace esphome::uart_tcp
diff --git a/esphome/components/uart_tcp/uart_tcp.h b/esphome/components/uart_tcp/uart_tcp.h
new file mode 100644
index 0000000000..1e19166f87
--- /dev/null
+++ b/esphome/components/uart_tcp/uart_tcp.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#include "esphome/components/socket/tcp_client_link.h"
+#ifdef USE_SOCKET_TCP_LISTENER
+#include "esphome/components/socket/tcp_listener.h"
+#endif
+#include "esphome/components/uart/uart.h"
+#include "esphome/core/component.h"
+
+#include <cstdint>
+#include <memory>
+
+namespace esphome::uart_tcp {
+
+/// Copies raw bytes between one hardware UART and one TCP socket.
+class UartTcp : public Component, public uart::UARTDevice {
+ public:
+  void set_host(const char *host) { this->link_.set_host(host); }
+  void set_port(uint16_t port) { this->link_.set_port(port); }
+  void set_reconnect_interval(uint32_t ms) { this->link_.set_reconnect_interval(ms); }
+  void set_connected_sensor(binary_sensor::BinarySensor *sensor) { this->connected_sensor_ = sensor; }
+#ifdef USE_SOCKET_TCP_LISTENER
+  void set_server(bool server) { this->server_ = server; }
+#ifdef USE_SOCKET_IPV4_ALLOW
+  void set_allow(const socket::Ipv4AllowEntry *entries, size_t count) { this->listener_.set_allow(entries, count); }
+#endif
+#endif
+
+  void setup() override;
+  void loop() override;
+  void dump_config() override;
+  void on_shutdown() override;
+  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
+
+ protected:
+  void sync_link_();
+  void read_socket_();
+  void read_uart_();
+  void discard_uart_();
+
+  static constexpr size_t READ_CHUNK = 128;
+
+  socket::TcpClientLink link_;
+#ifdef USE_SOCKET_TCP_LISTENER
+  socket::TcpListener listener_;
+#endif
+  binary_sensor::BinarySensor *connected_sensor_{nullptr};
+  bool server_{false};
+  // The link state loop() saw last; edges clear the buffer and publish the sensor.
+  bool link_was_up_{false};
+  // A read stopped before EAGAIN. ready() stays false until new data arrives.
+  bool rx_pending_{false};
+};
+
+}  // namespace esphome::uart_tcp
diff --git a/esphome/components/ufire_ec/sensor.py b/esphome/components/ufire_ec/sensor.py
index 5bfa959c04..6a632e05cd 100644
--- a/esphome/components/ufire_ec/sensor.py
+++ b/esphome/components/ufire_ec/sensor.py
@@ -64,13 +64,9 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_temperature_compensation(config[CONF_TEMPERATURE_COMPENSATION]))
     cg.add(var.set_temperature_coefficient(config[CONF_TEMPERATURE_COEFFICIENT]))
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))
-
-    if CONF_EC in config:
-        sens = await sensor.new_sensor(config[CONF_EC])
-        cg.add(var.set_ec_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_EC, var.set_ec_sensor)
 
     if CONF_TEMPERATURE_SENSOR in config:
         sens = await cg.get_variable(config[CONF_TEMPERATURE_SENSOR])
diff --git a/esphome/components/ufire_ise/sensor.py b/esphome/components/ufire_ise/sensor.py
index 5399692e3c..6f205af784 100644
--- a/esphome/components/ufire_ise/sensor.py
+++ b/esphome/components/ufire_ise/sensor.py
@@ -56,13 +56,9 @@ async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))
-
-    if CONF_PH in config:
-        sens = await sensor.new_sensor(config[CONF_PH])
-        cg.add(var.set_ph_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_PH, var.set_ph_sensor)
 
     if CONF_TEMPERATURE_SENSOR in config:
         sens = await cg.get_variable(config[CONF_TEMPERATURE_SENSOR])
diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index 1ba8946841..fa552da969 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -368,6 +368,13 @@ def final_validate(config):
             "The AP will not be usable for configuration or monitoring. "
             "Add 'captive_portal:' or 'web_server:' to your configuration."
         )
+    if "esp32_hosted" in full_config and any(
+        CONF_EAP in net for net in config.get(CONF_NETWORKS, [])
+    ):
+        _LOGGER.warning(
+            "WPA2 Enterprise ('eap:') is not supported by the esp32_hosted coprocessor "
+            "firmware ESPHome provides"
+        )
 
 
 def _consume_wifi_sockets(config: ConfigType) -> ConfigType:
diff --git a/esphome/components/wifi/wifi_component_esp_idf.cpp b/esphome/components/wifi/wifi_component_esp_idf.cpp
index 24bf64a99c..c44ee5b1de 100644
--- a/esphome/components/wifi/wifi_component_esp_idf.cpp
+++ b/esphome/components/wifi/wifi_component_esp_idf.cpp
@@ -829,6 +829,12 @@ void WiFiComponent::wifi_process_event_(IDFWiFiEvent *data) {
              (const char *) it.ssid, bssid_buf, it.channel, get_auth_mode_str(it.authmode));
 #endif
     s_sta_connected = true;
+#if USE_NETWORK_IPV6
+    // Start SLAAC on association, not after a DHCPv4 lease that may never arrive.
+    if (esp_err_t ll_err = esp_netif_create_ip6_linklocal(s_sta_netif); ll_err != ESP_OK) {
+      ESP_LOGW(TAG, "esp_netif_create_ip6_linklocal failed: %s", esp_err_to_name(ll_err));
+    }
+#endif /* USE_NETWORK_IPV6 */
     if (this->state_ == WIFI_COMPONENT_STATE_STA_CONNECTED) {
       // Driver-initiated roam: the WIFI_REASON_ROAMING disconnect was ignored,
       // so the state machine never left STA_CONNECTED.
@@ -881,9 +887,6 @@ void WiFiComponent::wifi_process_event_(IDFWiFiEvent *data) {
 
   } else if (data->event_base == IP_EVENT && data->event_id == IP_EVENT_STA_GOT_IP) {
     const auto &it = data->data.ip_got_ip;
-#if USE_NETWORK_IPV6
-    esp_netif_create_ip6_linklocal(s_sta_netif);
-#endif /* USE_NETWORK_IPV6 */
     ESP_LOGV(TAG, "static_ip=" IPSTR " gateway=" IPSTR, IP2STR(&it.ip_info.ip), IP2STR(&it.ip_info.gw));
     this->got_ipv4_address_ = true;
 #ifdef USE_WIFI_IP_STATE_LISTENERS
diff --git a/esphome/components/xdb401/sensor.py b/esphome/components/xdb401/sensor.py
index c629e46650..df274ac09b 100644
--- a/esphome/components/xdb401/sensor.py
+++ b/esphome/components/xdb401/sensor.py
@@ -56,10 +56,6 @@ async def to_code(config: ConfigType) -> None:
 
     cg.add(var.set_pressure_range_bar(config[CONF_PRESSURE_RANGE_BAR]))
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_PRESSURE, var.set_pressure_sensor)
diff --git a/esphome/components/xgzp68xx/sensor.py b/esphome/components/xgzp68xx/sensor.py
index 83c20dfbd8..eb3b042cb7 100644
--- a/esphome/components/xgzp68xx/sensor.py
+++ b/esphome/components/xgzp68xx/sensor.py
@@ -70,13 +70,11 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
 
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))
-        cg.add(var.set_pressure_oversampling(pressure_config[CONF_OVERSAMPLING]))
+    if await sensors(CONF_PRESSURE, var.set_pressure_sensor):
+        oversampling = config[CONF_PRESSURE][CONF_OVERSAMPLING]
+        cg.add(var.set_pressure_oversampling(oversampling))
 
     cg.add(var.set_k_value(config[CONF_K_VALUE]))
diff --git a/esphome/components/xiaomi_cgd1/sensor.py b/esphome/components/xiaomi_cgd1/sensor.py
index 09337df5ca..162ba7016b 100644
--- a/esphome/components/xiaomi_cgd1/sensor.py
+++ b/esphome/components/xiaomi_cgd1/sensor.py
@@ -66,12 +66,7 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
     cg.add(var.set_bindkey(config[CONF_BINDKEY]))
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature(sens))
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
diff --git a/esphome/components/xiaomi_cgdk2/sensor.py b/esphome/components/xiaomi_cgdk2/sensor.py
index 83de32f411..e1d44d6bac 100644
--- a/esphome/components/xiaomi_cgdk2/sensor.py
+++ b/esphome/components/xiaomi_cgdk2/sensor.py
@@ -66,12 +66,7 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
     cg.add(var.set_bindkey(config[CONF_BINDKEY]))
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature(sens))
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
diff --git a/esphome/components/xiaomi_cgg1/sensor.py b/esphome/components/xiaomi_cgg1/sensor.py
index 3f0df9eafe..01ca8d1f84 100644
--- a/esphome/components/xiaomi_cgg1/sensor.py
+++ b/esphome/components/xiaomi_cgg1/sensor.py
@@ -67,12 +67,7 @@ async def to_code(config: ConfigType) -> None:
     if CONF_BINDKEY in config:
         cg.add(var.set_bindkey(config[CONF_BINDKEY]))
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature(sens))
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
diff --git a/esphome/components/xiaomi_cgpr1/binary_sensor.py b/esphome/components/xiaomi_cgpr1/binary_sensor.py
index 219432c1fc..b742f1eaec 100644
--- a/esphome/components/xiaomi_cgpr1/binary_sensor.py
+++ b/esphome/components/xiaomi_cgpr1/binary_sensor.py
@@ -71,12 +71,7 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
     cg.add(var.set_bindkey(config[CONF_BINDKEY]))
 
-    if CONF_IDLE_TIME in config:
-        sens = await sensor.new_sensor(config[CONF_IDLE_TIME])
-        cg.add(var.set_idle_time(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))
-    if CONF_ILLUMINANCE in config:
-        sens = await sensor.new_sensor(config[CONF_ILLUMINANCE])
-        cg.add(var.set_illuminance(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_IDLE_TIME, var.set_idle_time)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
+    await sensors(CONF_ILLUMINANCE, var.set_illuminance)
diff --git a/esphome/components/xiaomi_hhccpot002/sensor.py b/esphome/components/xiaomi_hhccpot002/sensor.py
index 061753c44c..73d5f3ff19 100644
--- a/esphome/components/xiaomi_hhccpot002/sensor.py
+++ b/esphome/components/xiaomi_hhccpot002/sensor.py
@@ -53,9 +53,6 @@ async def to_code(config: ConfigType) -> None:
 
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
 
-    if CONF_MOISTURE in config:
-        sens = await sensor.new_sensor(config[CONF_MOISTURE])
-        cg.add(var.set_moisture(sens))
-    if CONF_CONDUCTIVITY in config:
-        sens = await sensor.new_sensor(config[CONF_CONDUCTIVITY])
-        cg.add(var.set_conductivity(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_MOISTURE, var.set_moisture)
+    await sensors(CONF_CONDUCTIVITY, var.set_conductivity)
diff --git a/esphome/components/xiaomi_lywsd02/sensor.py b/esphome/components/xiaomi_lywsd02/sensor.py
index f79b81dce2..d37d7540c7 100644
--- a/esphome/components/xiaomi_lywsd02/sensor.py
+++ b/esphome/components/xiaomi_lywsd02/sensor.py
@@ -63,12 +63,7 @@ async def to_code(config: ConfigType) -> None:
 
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature(sens))
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
diff --git a/esphome/components/xiaomi_lywsd02mmc/sensor.py b/esphome/components/xiaomi_lywsd02mmc/sensor.py
index 05e0204def..5b088318ae 100644
--- a/esphome/components/xiaomi_lywsd02mmc/sensor.py
+++ b/esphome/components/xiaomi_lywsd02mmc/sensor.py
@@ -67,12 +67,7 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
     cg.add(var.set_bindkey(config[CONF_BINDKEY]))
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature(sens))
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity(sens))
-    if battery_level_config := config.get(CONF_BATTERY_LEVEL):
-        sens = await sensor.new_sensor(battery_level_config)
-        cg.add(var.set_battery_level(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
diff --git a/esphome/components/xiaomi_lywsdcgq/sensor.py b/esphome/components/xiaomi_lywsdcgq/sensor.py
index 8f0b93a22e..75a8a2d847 100644
--- a/esphome/components/xiaomi_lywsdcgq/sensor.py
+++ b/esphome/components/xiaomi_lywsdcgq/sensor.py
@@ -63,12 +63,7 @@ async def to_code(config: ConfigType) -> None:
 
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature(sens))
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
diff --git a/esphome/components/xiaomi_mhoc303/sensor.py b/esphome/components/xiaomi_mhoc303/sensor.py
index 9ce544fc59..44fb9c7654 100644
--- a/esphome/components/xiaomi_mhoc303/sensor.py
+++ b/esphome/components/xiaomi_mhoc303/sensor.py
@@ -63,12 +63,7 @@ async def to_code(config: ConfigType) -> None:
 
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature(sens))
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
diff --git a/esphome/components/xiaomi_mhoc401/sensor.py b/esphome/components/xiaomi_mhoc401/sensor.py
index 52cae36fcd..e74c656e51 100644
--- a/esphome/components/xiaomi_mhoc401/sensor.py
+++ b/esphome/components/xiaomi_mhoc401/sensor.py
@@ -67,12 +67,7 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
     cg.add(var.set_bindkey(config[CONF_BINDKEY]))
 
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature(sens))
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
diff --git a/esphome/components/xiaomi_miscale/sensor.py b/esphome/components/xiaomi_miscale/sensor.py
index fa4296d7a9..c6277a515d 100644
--- a/esphome/components/xiaomi_miscale/sensor.py
+++ b/esphome/components/xiaomi_miscale/sensor.py
@@ -58,9 +58,6 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
     cg.add(var.set_clear_impedance(config[CONF_CLEAR_IMPEDANCE]))
 
-    if CONF_WEIGHT in config:
-        sens = await sensor.new_sensor(config[CONF_WEIGHT])
-        cg.add(var.set_weight(sens))
-    if CONF_IMPEDANCE in config:
-        sens = await sensor.new_sensor(config[CONF_IMPEDANCE])
-        cg.add(var.set_impedance(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_WEIGHT, var.set_weight)
+    await sensors(CONF_IMPEDANCE, var.set_impedance)
diff --git a/esphome/components/xiaomi_wx08zm/binary_sensor.py b/esphome/components/xiaomi_wx08zm/binary_sensor.py
index 4a6267f8b9..8e9b32b797 100644
--- a/esphome/components/xiaomi_wx08zm/binary_sensor.py
+++ b/esphome/components/xiaomi_wx08zm/binary_sensor.py
@@ -56,9 +56,6 @@ async def to_code(config: ConfigType) -> None:
 
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
 
-    if CONF_TABLET in config:
-        sens = await sensor.new_sensor(config[CONF_TABLET])
-        cg.add(var.set_tablet(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TABLET, var.set_tablet)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
diff --git a/esphome/components/xiaomi_xmwsdj04mmc/sensor.py b/esphome/components/xiaomi_xmwsdj04mmc/sensor.py
index 8282523129..8c47b526b1 100644
--- a/esphome/components/xiaomi_xmwsdj04mmc/sensor.py
+++ b/esphome/components/xiaomi_xmwsdj04mmc/sensor.py
@@ -67,12 +67,7 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
     cg.add(var.set_bindkey(config[CONF_BINDKEY]))
 
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature(sens))
-    if humidity_config := config.get(CONF_HUMIDITY):
-        sens = await sensor.new_sensor(humidity_config)
-        cg.add(var.set_humidity(sens))
-    if battery_level_config := config.get(CONF_BATTERY_LEVEL):
-        sens = await sensor.new_sensor(battery_level_config)
-        cg.add(var.set_battery_level(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TEMPERATURE, var.set_temperature)
+    await sensors(CONF_HUMIDITY, var.set_humidity)
+    await sensors(CONF_BATTERY_LEVEL, var.set_battery_level)
diff --git a/esphome/components/zyaura/sensor.py b/esphome/components/zyaura/sensor.py
index 0508f456e4..cfe980f037 100644
--- a/esphome/components/zyaura/sensor.py
+++ b/esphome/components/zyaura/sensor.py
@@ -61,12 +61,7 @@ async def to_code(config: ConfigType) -> None:
     pin_data = await gpio_pin_expression(config[CONF_DATA_PIN])
     cg.add(var.set_pin_data(pin_data))
 
-    if CONF_CO2 in config:
-        sens = await sensor.new_sensor(config[CONF_CO2])
-        cg.add(var.set_co2_sensor(sens))
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))
-    if CONF_HUMIDITY in config:
-        sens = await sensor.new_sensor(config[CONF_HUMIDITY])
-        cg.add(var.set_humidity_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_CO2, var.set_co2_sensor)
+    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
+    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
diff --git a/esphome/config.py b/esphome/config.py
index 13ec744ce4..bc69661d8f 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -1226,6 +1226,7 @@ class CoreFinalValidateStep(ConfigValidationStep):
         with result.catch_error([CONF_ESPHOME]):
             if CONF_ESPHOME in result:
                 core_config.validate_ids_and_references(result[CONF_ESPHOME])
+                core_config.validate_loop_interval(result[CONF_ESPHOME])
         fv.full_config.reset(token)
 
 
diff --git a/esphome/core/application.h b/esphome/core/application.h
index 8ed4c09096..2f399cbdcd 100644
--- a/esphome/core/application.h
+++ b/esphome/core/application.h
@@ -208,8 +208,8 @@ class Application {
    * Each component can request a high frequency loop execution by using the HighFrequencyLoopRequester
    * helper in helpers.h
    *
-   * Note: This method is not called by ESPHome core code. It is only used by lambda functions
-   * in YAML configurations or by external components.
+   * Sleep per wake is capped at 2 * WDT_FEED_INTERVAL_MS (except host and ESP8266);
+   * raise the platform watchdog timeout to sleep longer.
    *
    * @param loop_interval The interval in milliseconds to run the core loop at. Defaults to 16 milliseconds.
    */
@@ -232,6 +232,7 @@ class Application {
   ///   - ESP8266 soft WDT (~1.6 s):           ~16x  <-- 100 ms feed (see USE_ESP8266 below)
   ///   - ESP8266 HW WDT (~6 s):               ~60x
   ///   - BK72xx HW WDT (10 s):                ~5x   <-- platform override below
+  /// Important: if these are modified align validate_loop_interval in config.py
 #ifdef USE_BK72XX
   // BDK busy-waits 200us per WDT reload (sctrl_dpll_delay200us). LibreTiny
   // sets HW WDT to 10s; 2000ms keeps ~5x margin. See wdt_ctrl WCMD_RELOAD_PERIOD:
@@ -775,8 +776,8 @@ inline void ESPHOME_ALWAYS_INLINE Application::loop() {
   }
 #endif
 
-  // Compute sleep: bounded by time-until-next-component-phase and the
-  // scheduler's next deadline. When a scheduler timer fires it re-enters
+  // Compute sleep: bounded by time-until-next-component-phase if there are
+  // components with loop enabled and the scheduler's next deadline. When a scheduler timer fires it re-enters
   // loop(), Phase A services it, and the component phase stays gated by
   // loop_interval_. When a background producer calls wake_loop_threadsafe()
   // it sets the wake_request flag and wakes select() / the task notification;
@@ -795,16 +796,47 @@ inline void ESPHOME_ALWAYS_INLINE Application::loop() {
   uint32_t delay_time = 0;
   if (!HighFrequencyLoopRequester::is_high_frequency()) {
     const uint32_t elapsed_since_phase = now - this->last_loop_;
-    const uint32_t until_phase =
+#ifdef ESPHOME_SUSPEND_LOOP
+    const bool has_loop_work =
+        this->looping_components_active_end_ > 0 || this->dump_config_at_ < this->components_.size();
+    uint32_t until_phase = std::numeric_limits<uint32_t>::max();
+    if (has_loop_work) {
+      until_phase = (elapsed_since_phase >= this->loop_interval_) ? 0 : (this->loop_interval_ - elapsed_since_phase);
+    }
+#else
+    uint32_t until_phase =
         (elapsed_since_phase >= this->loop_interval_) ? 0 : (this->loop_interval_ - elapsed_since_phase);
+#endif
     const uint32_t until_sched = this->scheduler.next_schedule_in(now).value_or(until_phase);
     delay_time = std::min(until_phase, until_sched);
   }
   // All platforms route loop yields through the platform wake primitive.
   // On host this drains the loopback wake socket via select(); on FreeRTOS
   // targets it uses task notifications; on ESP8266/RP2040 it uses esp_delay/WFE.
-  esphome::internal::wakeable_delay(delay_time);
+  // Cap the sleep so the WDT feed and status-LED dispatch rate limits still get
+  // exercised even when loop_interval is raised or the scheduler and component
+  // phases are gated out for a long sleep. Waking every 2*WDT_FEED_INTERVAL_MS
+  // clears the feed rate limit on every wake, so the WDT is fed at least that
+  // often -- well inside every platform's timeout.
+#if defined(USE_ESP8266)
+  // SDK os_timer_arm() accepts at most 0x68D7A3 ms without system_timer_reinit();
+  // the SDK feeds both watchdogs while the cont task is suspended, so no WDT cap needed.
+  static constexpr uint32_t MAX_SLEEP_BASE = 0x68D7A3;
+#elif defined(USE_HOST)
+  // arch_feed_wdt() is a no-op on host and ESPHOME_SUSPEND_LOOP is rejected by
+  // the config validator, so delay_time is already bounded by loop_interval_.
+  static constexpr uint32_t MAX_SLEEP_BASE = std::numeric_limits<uint32_t>::max();
+#else
+  static constexpr uint32_t MAX_SLEEP_BASE = WDT_FEED_INTERVAL_MS * 2;
+#endif
+  uint32_t max_sleep = MAX_SLEEP_BASE;
+#ifdef USE_STATUS_LED
+  if ((this->app_state_ & STATUS_LED_MASK) != 0) {
+    max_sleep = std::min(max_sleep, STATUS_LED_DISPATCH_INTERVAL_MS);
+  }
+#endif
 
+  esphome::internal::wakeable_delay(std::min(delay_time, max_sleep));
   if (this->dump_config_at_ < this->components_.size()) {
     this->process_dump_config_();
   }
diff --git a/esphome/core/config.py b/esphome/core/config.py
index 532ca7c36d..531a027647 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -43,7 +43,11 @@ from esphome.const import (
     CONF_PROJECT,
     CONF_TRIGGER_ID,
     CONF_VERSION,
+    CONF_WATCHDOG_TIMEOUT,
     KEY_CORE,
+    PLATFORM_ESP32,
+    PLATFORM_HOST,
+    PLATFORM_RP2,
     PlatformFramework,
     __version__ as ESPHOME_VERSION,
 )
@@ -53,6 +57,7 @@ from esphome.core import (
     CoroPriority,
     coroutine_with_priority,
 )
+import esphome.final_validate as fv
 from esphome.helpers import (
     copy_file_if_changed,
     cpp_string_escape,
@@ -63,6 +68,9 @@ from esphome.helpers import (
 )
 from esphome.types import ConfigType
 
+CONF_LOOP_INTERVAL = "loop_interval"
+CONF_SUSPEND_LOOP = "suspend_loop"
+
 _LOGGER = logging.getLogger(__name__)
 
 # C++ variable names and separators for app name buffers (used with MAC suffix)
@@ -186,6 +194,35 @@ def validate_ids_and_references(config: ConfigType) -> ConfigType:
     return config
 
 
+def validate_loop_interval(config: ConfigType) -> ConfigType:
+    if CONF_LOOP_INTERVAL in config and not (CORE.is_host or CORE.is_esp8266):
+        # max_loop interval is calculated from WDT_FEED_INTERVAL_MS. Make sure to align with application.h
+        max_loop = 600  # 2 * 300ms default for other platforms
+        if CORE.is_esp32:
+            max_loop = (
+                2
+                * fv.full_config.get()[PLATFORM_ESP32][
+                    CONF_WATCHDOG_TIMEOUT
+                ].total_milliseconds
+                // 5
+            )
+        elif CORE.is_bk72xx:
+            max_loop = 4000  # 10000ms / 5 * 2 default value
+        if config[CONF_LOOP_INTERVAL].total_milliseconds > max_loop:
+            _LOGGER.warning(
+                "%s of %s exceeds the %sms maximum sleep on this platform; the loop will still "
+                "wake every %sms.%s",
+                CONF_LOOP_INTERVAL,
+                config[CONF_LOOP_INTERVAL],
+                max_loop,
+                max_loop,
+                " Raise esp32.watchdog_timeout to sleep longer."
+                if CORE.is_esp32
+                else "",
+            )
+    return config
+
+
 def valid_include(value: str) -> str:
     # Look for "<...>" includes
     if value.startswith("<") and value.endswith(">"):
@@ -266,6 +303,15 @@ def validate_area_config(config: dict | str) -> dict[str, str | core.ID]:
     return cv.maybe_simple_value(AREA_SCHEMA, key=CONF_NAME)(config)
 
 
+def _validate_suspend_loop(value: bool) -> bool:
+    # host and RP2 platforms have unwakeable delay fallbacks, so suspending the main loop is unsafe
+    if value and CORE.target_platform in [PLATFORM_HOST, PLATFORM_RP2]:
+        raise cv.Invalid(
+            f"Suspend loop is not available on {CORE.target_platform} platform"
+        )
+    return value
+
+
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
@@ -331,6 +377,19 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(
                 CONF_DEBUG_SCHEDULER, default=False, visibility=cv.Visibility.YAML_ONLY
             ): cv.boolean,
+            cv.Optional(CONF_LOOP_INTERVAL, visibility=cv.Visibility.YAML_ONLY): cv.All(
+                cv.positive_time_period_milliseconds,
+                cv.Range(
+                    min=cv.TimePeriod(milliseconds=1),
+                    max=cv.TimePeriod(milliseconds=65535),
+                ),
+            ),
+            cv.Optional(
+                CONF_SUSPEND_LOOP, default=False, visibility=cv.Visibility.YAML_ONLY
+            ): cv.All(
+                cv.boolean,
+                _validate_suspend_loop,
+            ),
             cv.Optional(CONF_PROJECT): cv.Schema(
                 {
                     cv.Required(CONF_NAME): cv.All(
@@ -806,6 +865,10 @@ async def to_code(config: ConfigType) -> None:
         cg.add_cxx_build_flag("-Wno-volatile")
     if config[CONF_DEBUG_SCHEDULER]:
         cg.add_define("ESPHOME_DEBUG_SCHEDULER")
+    if config[CONF_SUSPEND_LOOP]:
+        cg.add_define("ESPHOME_SUSPEND_LOOP")
+    if CONF_LOOP_INTERVAL in config:
+        cg.add(cg.App.set_loop_interval(config[CONF_LOOP_INTERVAL]))
 
     if CORE.using_arduino:
         CORE.add_job(add_arduino_global_workaround)
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 558bbd54cd..97b1395553 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -403,6 +403,7 @@
 #define ESPHOME_ESP32_BLE_BLE_STATUS_EVENT_HANDLER_COUNT 2
 #define ESPHOME_ESP32_BLE_EXTENDED_AUTH_PARAMS
 #define ESPHOME_LOOP_TASK_STACK_SIZE 8192
+#define ESPHOME_SUSPEND_LOOP
 #define USE_ESP32_CAMERA_JPEG_ENCODER
 #define USE_HTTP_REQUEST_RESPONSE
 #define USE_I2C
@@ -418,8 +419,10 @@
 #define USE_SENDSPIN_VISUALIZER
 #define USE_SENDSPIN_PORT 8928  // NOLINT
 #define USE_SOCKET_IMPL_BSD_SOCKETS
+#define USE_SOCKET_IPV4_ALLOW
 #define USE_SOCKET_IPV4_RESOLVE
 #define USE_SOCKET_TCP_CLIENT_LINK
+#define USE_SOCKET_TCP_LISTENER
 #define USE_LWIP_FAST_SELECT
 
 #define USE_SPEAKER
@@ -520,6 +523,7 @@
 
 // ESP8266-specific feature flags
 #ifdef USE_ESP8266
+#define ESPHOME_SUSPEND_LOOP
 #define USE_ADC_SENSOR_VCC
 #define USE_ESP8266_CRASH_HANDLER
 #define USE_ARDUINO_VERSION_CODE VERSION_CODE(3, 1, 2)
@@ -597,6 +601,7 @@
 #define USE_BK72XX_BLE_TRACKER
 #endif
 #define ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT 1
+#define ESPHOME_SUSPEND_LOOP
 #define USE_BLE_SCAN_RESPONSE_MERGER
 #define USE_CAPTIVE_PORTAL
 #define USE_WIFI_SCAN_RESULTS_LOCK
@@ -622,6 +627,7 @@
 #ifdef USE_NRF52
 #define ESPHOME_BLE_NUS_TX_RING_BUFFER_SIZE 512
 #define ESPHOME_BLE_NUS_RX_RING_BUFFER_SIZE 512
+#define ESPHOME_SUSPEND_LOOP
 #define USE_ESPHOME_TASK_LOG_BUFFER
 #define ESPHOME_TASK_LOG_BUFFER_SIZE 768
 #define USE_LOGGER_EARLY_MESSAGE
diff --git a/requirements.txt b/requirements.txt
index 32931b650e..1f21fd8160 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,9 +27,9 @@ bleak==3.0.2
 smpclient==7.2.0
 requests==2.34.2
 py7zr==1.1.3
-platformdirs==4.12.1  # native esp-idf toolchain global cache dir
+platformdirs==4.12.2  # native esp-idf toolchain global cache dir
 ninja==1.13.2  # native host and esp8266 arduino toolchain build driver
-filelock==4.0.5  # inter-process locks (PlatformIO cache heal, git clone cache); >=3.32 for FileLock(fallback_to_soft=...), older versions silently drop the kwarg
+filelock==4.0.6  # inter-process locks (PlatformIO cache heal, git clone cache); >=3.32 for FileLock(fallback_to_soft=...), older versions silently drop the kwarg
 
 # esp-idf >= 5.0 requires this
 pyparsing >= 3.3.3
diff --git a/requirements_test.txt b/requirements_test.txt
index a66e05ba74..fa56852637 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==4.0.9
+pylint==4.0.10
 flake8==7.4.1  # .pre-commit-config.yaml rev synced by script/sync_dependency_versions.py
 ruff==0.16.9  # .pre-commit-config.yaml rev synced by script/sync_dependency_versions.py
 pyupgrade==3.21.2  # .pre-commit-config.yaml rev synced by script/sync_dependency_versions.py
diff --git a/tests/components/esphome/common.yaml b/tests/components/esphome/common.yaml
index 93f82824e6..fd3d6a0efe 100644
--- a/tests/components/esphome/common.yaml
+++ b/tests/components/esphome/common.yaml
@@ -1,5 +1,7 @@
 esphome:
   debug_scheduler: true
+  loop_interval: 50ms
+  suspend_loop: false
   platformio_options:
     board_build.flash_mode: dio
   build_flags:
diff --git a/tests/components/esphome/test.esp32-idf.yaml b/tests/components/esphome/test.esp32-idf.yaml
index dade44d145..7c571c7f51 100644
--- a/tests/components/esphome/test.esp32-idf.yaml
+++ b/tests/components/esphome/test.esp32-idf.yaml
@@ -1 +1,5 @@
-<<: !include common.yaml
+packages:
+  base: !include common.yaml
+
+esphome:
+  suspend_loop: true
diff --git a/tests/components/esphome/test.esp8266-ard.yaml b/tests/components/esphome/test.esp8266-ard.yaml
index dade44d145..7c571c7f51 100644
--- a/tests/components/esphome/test.esp8266-ard.yaml
+++ b/tests/components/esphome/test.esp8266-ard.yaml
@@ -1 +1,5 @@
-<<: !include common.yaml
+packages:
+  base: !include common.yaml
+
+esphome:
+  suspend_loop: true
diff --git a/tests/components/esphome/test.nrf52-adafruit.yaml b/tests/components/esphome/test.nrf52-adafruit.yaml
index dade44d145..7c571c7f51 100644
--- a/tests/components/esphome/test.nrf52-adafruit.yaml
+++ b/tests/components/esphome/test.nrf52-adafruit.yaml
@@ -1 +1,5 @@
-<<: !include common.yaml
+packages:
+  base: !include common.yaml
+
+esphome:
+  suspend_loop: true
diff --git a/tests/components/ethernet/test-ipv6.esp32-idf.yaml b/tests/components/ethernet/test-ipv6.esp32-idf.yaml
new file mode 100644
index 0000000000..607e82dfa9
--- /dev/null
+++ b/tests/components/ethernet/test-ipv6.esp32-idf.yaml
@@ -0,0 +1,12 @@
+network:
+  enable_ipv6: true
+
+ethernet:
+  type: IP101
+  mdc_pin: 23
+  mdio_pin: 18
+  clk:
+    pin: 0
+    mode: CLK_EXT_IN
+  phy_addr: 1
+  power_pin: 5
diff --git a/tests/components/socket/test_ipv4_allow_host.cpp b/tests/components/socket/test_ipv4_allow_host.cpp
new file mode 100644
index 0000000000..e4257b41c4
--- /dev/null
+++ b/tests/components/socket/test_ipv4_allow_host.cpp
@@ -0,0 +1,75 @@
+#include <gtest/gtest.h>
+
+#include <iterator>
+
+#include "esphome/components/socket/ipv4_allow.h"
+#include "esphome/components/socket/socket.h"
+
+#ifdef USE_HOST
+
+namespace esphome::socket::testing {
+
+// The size_t count packs into the pointer's padding; no RAM over a uint8_t.
+static_assert(sizeof(Ipv4Allow) == 2 * sizeof(void *), "unexpected padding in Ipv4Allow");
+
+// 192.168.175.20/32 and 192.168.175.0/24, network order, host bits cleared,
+// mirroring what add_ipv4_allow emits.
+static const Ipv4AllowEntry ENTRIES[] = {
+    {htonl(0xC0A8AF14), htonl(0xFFFFFFFF)},
+    {htonl(0xC0A8AF00), htonl(0xFFFFFF00)},
+};
+
+// Runs the peer through the same parser production addresses go through.
+static bool allows_peer(const Ipv4Allow &list, const char *ip) {
+  struct sockaddr_storage peer {};
+  EXPECT_NE(set_sockaddr(reinterpret_cast<struct sockaddr *>(&peer), sizeof(peer), ip, 0), 0);
+  return list.allows(reinterpret_cast<const struct sockaddr *>(&peer));
+}
+
+TEST(Ipv4Allow, EmptyAllowsEveryPeer) {
+  Ipv4Allow list;
+  EXPECT_TRUE(list.allows(htonl(0xC0A8AF01)));
+  EXPECT_TRUE(allows_peer(list, "10.0.0.1"));
+  EXPECT_TRUE(allows_peer(list, "fe80::1"));
+}
+
+TEST(Ipv4Allow, MatchesHostAndNetworkEntries) {
+  Ipv4Allow list;
+  list.set(ENTRIES, std::size(ENTRIES));
+  EXPECT_TRUE(list.allows(htonl(0xC0A8AF14)));
+  EXPECT_TRUE(list.allows(htonl(0xC0A8AF01)));
+  EXPECT_TRUE(list.allows(htonl(0xC0A8AFFF)));
+  EXPECT_FALSE(list.allows(htonl(0xC0A8B001)));
+}
+
+TEST(Ipv4Allow, ChecksTheV4PeerInsideASockaddr) {
+  Ipv4Allow list;
+  list.set(ENTRIES, std::size(ENTRIES));
+  EXPECT_TRUE(allows_peer(list, "192.168.175.66"));
+  EXPECT_FALSE(allows_peer(list, "10.0.0.1"));
+}
+
+TEST(Ipv4Allow, UnwrapsAV4MappedIpv6Peer) {
+  Ipv4Allow list;
+  list.set(ENTRIES, std::size(ENTRIES));
+  EXPECT_TRUE(allows_peer(list, "::ffff:192.168.175.66"));
+  // A native IPv6 peer cannot match an IPv4 list.
+  EXPECT_FALSE(allows_peer(list, "fe80::1"));
+}
+
+TEST(Ipv4Allow, InstancesKeepIndependentLists) {
+  // One bridge per allow list; each instance points at its own entries.
+  static const Ipv4AllowEntry OTHER[] = {{htonl(0x0A000000), htonl(0xFF000000)}};
+  Ipv4Allow first;
+  Ipv4Allow second;
+  first.set(ENTRIES, std::size(ENTRIES));
+  second.set(OTHER, std::size(OTHER));
+  EXPECT_TRUE(first.allows(htonl(0xC0A8AF14)));
+  EXPECT_FALSE(second.allows(htonl(0xC0A8AF14)));
+  EXPECT_TRUE(second.allows(htonl(0x0A00002A)));
+  EXPECT_FALSE(first.allows(htonl(0x0A00002A)));
+}
+
+}  // namespace esphome::socket::testing
+
+#endif
diff --git a/tests/components/socket/test_tcp_client_link_host.cpp b/tests/components/socket/test_tcp_client_link_host.cpp
new file mode 100644
index 0000000000..9a6d388b72
--- /dev/null
+++ b/tests/components/socket/test_tcp_client_link_host.cpp
@@ -0,0 +1,77 @@
+#include <gtest/gtest.h>
+
+#include <csignal>
+#include <cstring>
+#include <memory>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include "esphome/components/socket/tcp_client_link.h"
+
+#ifdef USE_HOST
+
+namespace esphome::socket::testing {
+
+class LinkPeer {
+ public:
+  LinkPeer() {
+    // EPIPE must come back as an errno, not a signal.
+    signal(SIGPIPE, SIG_IGN);
+    int fds[2];
+    EXPECT_EQ(socketpair(AF_UNIX, SOCK_STREAM, 0, fds), 0);
+    this->peer_fd_ = fds[1];
+    this->link_.set_host("peer");
+    this->link_.set_port(1);
+    this->link_.begin("link_test");
+    this->link_.adopt(std::make_unique<Socket>(fds[0]));
+  }
+  ~LinkPeer() {
+    if (this->peer_fd_ >= 0) {
+      ::close(this->peer_fd_);
+    }
+    this->link_.close();
+  }
+  void close_peer() {
+    ::close(this->peer_fd_);
+    this->peer_fd_ = -1;
+  }
+
+  TcpClientLink link_;
+  int peer_fd_{-1};
+};
+
+TEST(TcpClientLink, AdoptedSocketFlushesQueuedBytes) {
+  LinkPeer p;
+  ASSERT_TRUE(p.link_.connected());
+  EXPECT_EQ(p.link_.queue(reinterpret_cast<const uint8_t *>("ping"), 4), 4u);
+  EXPECT_TRUE(p.link_.flush_tx());
+  char buf[8];
+  EXPECT_EQ(::read(p.peer_fd_, buf, sizeof(buf)), 4);
+  EXPECT_EQ(std::memcmp(buf, "ping", 4), 0);
+}
+
+TEST(TcpClientLink, CloseClearsQueuedBytes) {
+  LinkPeer p;
+  EXPECT_EQ(p.link_.queue(reinterpret_cast<const uint8_t *>("MARKER"), 6), 6u);
+  p.link_.close();
+  EXPECT_FALSE(p.link_.connected());
+  EXPECT_EQ(p.link_.tx_free(), 0u);
+  // An uncleared buffer would make flush_tx() report it as still pending.
+  EXPECT_TRUE(p.link_.flush_tx());
+}
+
+TEST(TcpClientLink, FatalWriteInsideFlushDropsTheLink) {
+  LinkPeer p;
+  EXPECT_EQ(p.link_.queue(reinterpret_cast<const uint8_t *>("MARKER"), 6), 6u);
+  p.close_peer();
+  // Still connected from the link's point of view: the drop must happen
+  // inside this flush, the exact ordering TcpUart::flush() reports FAILED.
+  ASSERT_TRUE(p.link_.connected());
+  bool emptied = p.link_.flush_tx();
+  EXPECT_TRUE(emptied);
+  EXPECT_FALSE(p.link_.connected());
+}
+
+}  // namespace esphome::socket::testing
+
+#endif
diff --git a/tests/components/tcp_uart/__init__.py b/tests/components/tcp_uart/__init__.py
new file mode 100644
index 0000000000..1e4de448b7
--- /dev/null
+++ b/tests/components/tcp_uart/__init__.py
@@ -0,0 +1,7 @@
+# This file's presence makes pytest treat this directory as a package named
+# "tcp_uart"; required for cpp unit testing.
+from tests.testing_helpers import ComponentManifestOverride
+
+
+def override_manifest(manifest: ComponentManifestOverride) -> None:
+    manifest.multi_conf = False
diff --git a/tests/components/tcp_uart/common.yaml b/tests/components/tcp_uart/common.yaml
index f3c1d061aa..2c2d264f7f 100644
--- a/tests/components/tcp_uart/common.yaml
+++ b/tests/components/tcp_uart/common.yaml
@@ -3,18 +3,21 @@ wifi:
   password: password1
 
 tcp_uart:
-  - id: tcp_uart_1
-    host: 192.0.2.10
-    port: 502
+  - id: tcp_uart_server
+    role: server
+    port: 5020
     reconnect_interval: 10s
+    allowed_ips:
+      - 192.0.2.20
+      - 192.0.2.0/24
     connected:
-      name: TCP UART Connected
+      name: TCP UART Server Connected
 
 interval:
   - interval: 60s
     then:
       - lambda: |-
           uint8_t byte;
-          if (id(tcp_uart_1).available() && id(tcp_uart_1).read_byte(&byte)) {
-            id(tcp_uart_1).write_byte(byte);
+          if (id(tcp_uart_server).available() && id(tcp_uart_server).read_byte(&byte)) {
+            id(tcp_uart_server).write_byte(byte);
           }
diff --git a/tests/components/tcp_uart/test-client.esp32-idf.yaml b/tests/components/tcp_uart/test-client.esp32-idf.yaml
new file mode 100644
index 0000000000..c63c6a7c7d
--- /dev/null
+++ b/tests/components/tcp_uart/test-client.esp32-idf.yaml
@@ -0,0 +1,11 @@
+wifi:
+  ssid: MySSID
+  password: password1
+
+tcp_uart:
+  - id: tcp_uart_1
+    host: 192.0.2.10
+    port: 502
+    reconnect_interval: 10s
+    connected:
+      name: TCP UART Connected
diff --git a/tests/components/tcp_uart/test_flush_host.cpp b/tests/components/tcp_uart/test_flush_host.cpp
new file mode 100644
index 0000000000..5573d587ce
--- /dev/null
+++ b/tests/components/tcp_uart/test_flush_host.cpp
@@ -0,0 +1,73 @@
+#include <gtest/gtest.h>
+
+#include <csignal>
+#include <memory>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include "esphome/components/tcp_uart/tcp_uart.h"
+
+#ifdef USE_HOST
+
+namespace esphome::tcp_uart::testing {
+
+class TcpUartUnderTest : public TcpUart {
+ public:
+  TcpUartUnderTest() {
+    this->set_host("peer");
+    this->set_port(1);
+    this->link_.begin("flush_test");
+  }
+  socket::TcpClientLink &link() { return this->link_; }
+};
+
+class TcpUartFlush : public ::testing::Test {
+ protected:
+  void SetUp() override {
+    // EPIPE must come back as an errno, not a signal.
+    signal(SIGPIPE, SIG_IGN);
+    int fds[2];
+    ASSERT_EQ(socketpair(AF_UNIX, SOCK_STREAM, 0, fds), 0);
+    this->peer_fd_ = fds[1];
+    this->uart_.link().adopt(std::make_unique<socket::Socket>(fds[0]));
+  }
+  void TearDown() override {
+    if (this->peer_fd_ >= 0) {
+      ::close(this->peer_fd_);
+    }
+    this->uart_.link().close();
+  }
+
+  TcpUartUnderTest uart_;
+  int peer_fd_{-1};
+};
+
+TEST_F(TcpUartFlush, SuccessWhenTheByteGoesOut) {
+  uint8_t b = 'x';
+  this->uart_.write_array(&b, 1);
+  EXPECT_EQ(this->uart_.flush(), uart::UARTFlushResult::UART_FLUSH_RESULT_SUCCESS);
+  char got;
+  EXPECT_EQ(::read(this->peer_fd_, &got, 1), 1);
+  EXPECT_EQ(got, 'x');
+}
+
+TEST_F(TcpUartFlush, FailedWhenTheFlushDropsTheLink) {
+  uint8_t b = 'x';
+  this->uart_.write_array(&b, 1);
+  ::close(this->peer_fd_);
+  this->peer_fd_ = -1;
+  // The drop happens inside this flush; checking connected() first would
+  // wrongly report success.
+  ASSERT_TRUE(this->uart_.is_connected());
+  EXPECT_EQ(this->uart_.flush(), uart::UARTFlushResult::UART_FLUSH_RESULT_FAILED);
+  EXPECT_FALSE(this->uart_.is_connected());
+}
+
+TEST_F(TcpUartFlush, FailedWhileTheLinkIsDown) {
+  this->uart_.link().close();
+  EXPECT_EQ(this->uart_.flush(), uart::UARTFlushResult::UART_FLUSH_RESULT_FAILED);
+}
+
+}  // namespace esphome::tcp_uart::testing
+
+#endif
diff --git a/tests/components/uart_tcp/common.yaml b/tests/components/uart_tcp/common.yaml
new file mode 100644
index 0000000000..eacad3dd6d
--- /dev/null
+++ b/tests/components/uart_tcp/common.yaml
@@ -0,0 +1,14 @@
+wifi:
+  ssid: MySSID
+  password: password1
+
+uart_tcp:
+  - id: bridge
+    uart_id: uart_bus
+    role: server
+    port: 502
+    allowed_ips:
+      - 192.168.1.10
+      - 192.168.1.0/24
+    connected:
+      name: UART TCP Connected
diff --git a/tests/components/uart_tcp/test-client.esp32-idf.yaml b/tests/components/uart_tcp/test-client.esp32-idf.yaml
new file mode 100644
index 0000000000..92b0213f74
--- /dev/null
+++ b/tests/components/uart_tcp/test-client.esp32-idf.yaml
@@ -0,0 +1,16 @@
+packages:
+  uart: !include ../../test_build_components/common/uart/esp32-idf.yaml
+
+wifi:
+  ssid: MySSID
+  password: password1
+
+uart_tcp:
+  - id: bridge
+    uart_id: uart_bus
+    role: client
+    host: 192.0.2.20
+    port: 502
+    reconnect_interval: 10s
+    connected:
+      name: UART TCP Connected
diff --git a/tests/components/uart_tcp/test.bk72xx-ard.yaml b/tests/components/uart_tcp/test.bk72xx-ard.yaml
new file mode 100644
index 0000000000..719d654f14
--- /dev/null
+++ b/tests/components/uart_tcp/test.bk72xx-ard.yaml
@@ -0,0 +1,3 @@
+packages:
+  uart: !include ../../test_build_components/common/uart/bk72xx-ard.yaml
+  uart_tcp: !include common.yaml
diff --git a/tests/components/uart_tcp/test.esp32-idf.yaml b/tests/components/uart_tcp/test.esp32-idf.yaml
new file mode 100644
index 0000000000..8e7422f24b
--- /dev/null
+++ b/tests/components/uart_tcp/test.esp32-idf.yaml
@@ -0,0 +1,3 @@
+packages:
+  uart: !include ../../test_build_components/common/uart/esp32-idf.yaml
+  uart_tcp: !include common.yaml
diff --git a/tests/components/uart_tcp/test.esp8266-ard.yaml b/tests/components/uart_tcp/test.esp8266-ard.yaml
new file mode 100644
index 0000000000..18ae2ef804
--- /dev/null
+++ b/tests/components/uart_tcp/test.esp8266-ard.yaml
@@ -0,0 +1,3 @@
+packages:
+  uart: !include ../../test_build_components/common/uart/esp8266-ard.yaml
+  uart_tcp: !include common.yaml
diff --git a/tests/components/uart_tcp/test.host.yaml b/tests/components/uart_tcp/test.host.yaml
new file mode 100644
index 0000000000..96a636fa98
--- /dev/null
+++ b/tests/components/uart_tcp/test.host.yaml
@@ -0,0 +1,12 @@
+uart:
+  - id: uart_bus
+    baud_rate: 9600
+    port: /dev/ttyS0
+
+uart_tcp:
+  - id: bridge
+    uart_id: uart_bus
+    host: 127.0.0.1
+    port: 44502
+    connected:
+      name: UART TCP Connected
diff --git a/tests/components/uart_tcp/test.rp2040-ard.yaml b/tests/components/uart_tcp/test.rp2040-ard.yaml
new file mode 100644
index 0000000000..5ece3bc3f4
--- /dev/null
+++ b/tests/components/uart_tcp/test.rp2040-ard.yaml
@@ -0,0 +1,3 @@
+packages:
+  uart: !include ../../test_build_components/common/uart/rp2040-ard.yaml
+  uart_tcp: !include common.yaml
diff --git a/tests/integration/fixtures/external_components/tcp_client_link_test_component/__init__.py b/tests/integration/fixtures/external_components/tcp_client_link_test_component/__init__.py
index 24637ae586..58affd23b7 100644
--- a/tests/integration/fixtures/external_components/tcp_client_link_test_component/__init__.py
+++ b/tests/integration/fixtures/external_components/tcp_client_link_test_component/__init__.py
@@ -1,14 +1,12 @@
 import esphome.codegen as cg
 from esphome.components import socket
-from esphome.components.const import CONF_HOST
+from esphome.components.const import CONF_HOST, CONF_RECONNECT_INTERVAL
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PORT
 from esphome.types import ConfigType
 
 AUTO_LOAD = ["socket"]
 
-CONF_RECONNECT_INTERVAL = "reconnect_interval"
-
 tcp_client_link_test_component_ns = cg.esphome_ns.namespace(
     "tcp_client_link_test_component"
 )
diff --git a/tests/integration/fixtures/external_components/tcp_client_link_test_component/tcp_client_link_test_component.cpp b/tests/integration/fixtures/external_components/tcp_client_link_test_component/tcp_client_link_test_component.cpp
index 7f2af8add8..0f6de0ee9f 100644
--- a/tests/integration/fixtures/external_components/tcp_client_link_test_component/tcp_client_link_test_component.cpp
+++ b/tests/integration/fixtures/external_components/tcp_client_link_test_component/tcp_client_link_test_component.cpp
@@ -14,14 +14,19 @@ void TcpClientLinkTestComponent::loop() {
     this->was_up_ = up;
     ESP_LOGI(TAG, "Link %s", up ? LOG_STR_LITERAL("up") : LOG_STR_LITERAL("down"));
   }
-  if (!up || !this->link_.ready()) {
+  if (!up) {
+    return;
+  }
+  // Echo only once the previous echo is fully sent, so it never drops bytes.
+  if (!this->link_.flush_tx() || !this->link_.ready()) {
     return;
   }
   uint8_t buf[64];
   ssize_t count = this->link_.read(buf, sizeof(buf));
   if (count > 0) {
     ESP_LOGI(TAG, "Echoing %d bytes", static_cast<int>(count));
-    this->link_.write(buf, static_cast<size_t>(count));
+    this->link_.queue(buf, static_cast<size_t>(count));
+    this->link_.flush_tx();
   }
 }
 
diff --git a/tests/integration/fixtures/tcp_uart_bridge.yaml b/tests/integration/fixtures/tcp_uart_bridge.yaml
new file mode 100644
index 0000000000..12791e7dd4
--- /dev/null
+++ b/tests/integration/fixtures/tcp_uart_bridge.yaml
@@ -0,0 +1,33 @@
+esphome:
+  name: tcp-uart-bridge-test
+
+host:
+
+api:
+  services:
+    - service: send_byte
+      then:
+        - lambda: |-
+            id(tcp_uart_1).write_byte('X');
+            auto r = id(tcp_uart_1).flush();
+            ESP_LOGI("bridge_test", "Flush result %d", (int) r);
+
+logger:
+  level: INFO
+
+tcp_uart:
+  - id: tcp_uart_1
+    host: 127.0.0.1
+    port: 18125
+    reconnect_interval: 3s
+    connected:
+      name: Bridge Connected
+
+interval:
+  - interval: 50ms
+    then:
+      - lambda: |-
+          uint8_t b;
+          while (id(tcp_uart_1).read_byte(&b)) {
+            id(tcp_uart_1).write_byte(b);
+          }
diff --git a/tests/integration/fixtures/tcp_uart_server.yaml b/tests/integration/fixtures/tcp_uart_server.yaml
new file mode 100644
index 0000000000..20bc221d9d
--- /dev/null
+++ b/tests/integration/fixtures/tcp_uart_server.yaml
@@ -0,0 +1,30 @@
+esphome:
+  name: tcp-uart-server-test
+
+host:
+
+api:
+
+logger:
+  level: INFO
+
+tcp_uart:
+  - id: allowed_bus
+    role: server
+    port: 18126
+    allowed_ips:
+      - 127.0.0.1
+  - id: denied_bus
+    role: server
+    port: 18127
+    allowed_ips:
+      - 192.0.2.1
+
+interval:
+  - interval: 50ms
+    then:
+      - lambda: |-
+          uint8_t b;
+          while (id(allowed_bus).read_byte(&b)) {
+            id(allowed_bus).write_byte(b);
+          }
diff --git a/tests/integration/fixtures/uart_tcp_bridge.yaml b/tests/integration/fixtures/uart_tcp_bridge.yaml
new file mode 100644
index 0000000000..2ab70a03b6
--- /dev/null
+++ b/tests/integration/fixtures/uart_tcp_bridge.yaml
@@ -0,0 +1,30 @@
+esphome:
+  name: uart-tcp-bridge-test
+
+host:
+
+api:
+
+logger:
+  level: INFO
+
+uart:
+  - id: uart_bus
+    baud_rate: 115200
+    port: PTY_PATH
+
+uart_tcp:
+  - id: bridge
+    uart_id: uart_bus
+    role: server
+    port: 18126
+    allowed_ips:
+      - 127.0.0.1
+    connected:
+      name: Bridge Connected
+  - id: denied_bridge
+    uart_id: uart_bus
+    role: server
+    port: 18127
+    allowed_ips:
+      - 192.0.2.1
diff --git a/tests/integration/test_socket_tcp_client_link.py b/tests/integration/test_socket_tcp_client_link.py
index 31cc344f67..16b5f544f7 100644
--- a/tests/integration/test_socket_tcp_client_link.py
+++ b/tests/integration/test_socket_tcp_client_link.py
@@ -1,7 +1,8 @@
 """Integration test for socket::TcpClientLink on host.
 
 Pytest runs a real TCP server; the device echoes through the link.
-Covers connect, read, write, a server-initiated drop and the reconnect.
+Covers connect, read, write, a server-initiated drop, the reconnect and
+that no bytes from the first session leak into the second.
 """
 
 from __future__ import annotations
@@ -14,6 +15,7 @@ import pytest
 from .types import APIClientConnectedFactory, RunCompiledFunction
 
 PAYLOAD = b"hello link"
+SECOND_PAYLOAD = b"second session"
 
 
 @pytest.mark.asyncio
@@ -27,6 +29,7 @@ async def test_socket_tcp_client_link(
     yaml_config = yaml_config.replace("port: 18123", f"port: {server_port}")
 
     echoed: list[bytes] = []
+    second_echoed: list[bytes] = []
     echo_done = asyncio.Event()
     reconnected = asyncio.Event()
     link_down = asyncio.Event()
@@ -56,6 +59,14 @@ async def test_socket_tcp_client_link(
             # Drop the connection so the link has to reconnect.
             writer.close()
             return
+        # Second session: the first bytes back must be this session's echo;
+        # anything left over from the first session would arrive ahead of it.
+        writer.write(SECOND_PAYLOAD)
+        await writer.drain()
+        with contextlib.suppress(TimeoutError, asyncio.IncompleteReadError):
+            second_echoed.append(
+                await asyncio.wait_for(reader.readexactly(len(SECOND_PAYLOAD)), 10)
+            )
         reconnected.set()
 
     server = await asyncio.start_server(handle, "127.0.0.1", server_port)
@@ -83,6 +94,9 @@ async def test_socket_tcp_client_link(
                 await asyncio.wait_for(second_link_up.wait(), timeout=15.0)
             except TimeoutError:
                 pytest.fail("Link did not reconnect after the server dropped it")
+            assert second_echoed == [SECOND_PAYLOAD], (
+                "Second session echo wrong; stale bytes from the first session?"
+            )
     finally:
         server.close()
         await server.wait_closed()
diff --git a/tests/integration/test_tcp_uart_bridge.py b/tests/integration/test_tcp_uart_bridge.py
new file mode 100644
index 0000000000..fb22a26b55
--- /dev/null
+++ b/tests/integration/test_tcp_uart_bridge.py
@@ -0,0 +1,102 @@
+"""Integration test for the tcp_uart bridge on host.
+
+Pytest runs a real TCP server; a lambda echoes UART bytes back to the socket.
+Covers the UART read and write paths, flush results for a live and a dropped
+link, the offline drop warning and the automatic reconnect.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import contextlib
+
+import pytest
+
+from .log_utils import LineWaiter
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+GREETING = b"hi"
+RECONNECT_GREETING = b"yo"
+
+
+async def _wait(event: asyncio.Event, timeout: float, message: str) -> None:
+    try:
+        await asyncio.wait_for(event.wait(), timeout)
+    except TimeoutError:
+        pytest.fail(message)
+
+
+@pytest.mark.asyncio
+async def test_tcp_uart_bridge(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+    unused_tcp_port_factory,
+) -> None:
+    server_port = unused_tcp_port_factory()
+    yaml_config = yaml_config.replace("port: 18125", f"port: {server_port}")
+
+    lines = LineWaiter()
+    echo_ok = asyncio.Event()
+    service_byte_ok = asyncio.Event()
+    reconnect_echo_ok = asyncio.Event()
+    sessions = 0
+
+    async def handle(
+        reader: asyncio.StreamReader, writer: asyncio.StreamWriter
+    ) -> None:
+        nonlocal sessions
+        sessions += 1
+        if sessions == 1:
+            writer.write(GREETING)
+            await writer.drain()
+            with contextlib.suppress(TimeoutError, asyncio.IncompleteReadError):
+                if (
+                    await asyncio.wait_for(reader.readexactly(len(GREETING)), 10)
+                    == GREETING
+                ):
+                    echo_ok.set()
+                if await asyncio.wait_for(reader.readexactly(1), 10) == b"X":
+                    service_byte_ok.set()
+            writer.close()
+            return
+        writer.write(RECONNECT_GREETING)
+        await writer.drain()
+        with contextlib.suppress(TimeoutError, asyncio.IncompleteReadError):
+            if (
+                await asyncio.wait_for(reader.readexactly(len(RECONNECT_GREETING)), 10)
+                == RECONNECT_GREETING
+            ):
+                reconnect_echo_ok.set()
+
+    server = await asyncio.start_server(handle, "127.0.0.1", server_port)
+    try:
+        async with (
+            run_compiled(yaml_config, line_callback=lines.callback),
+            api_client_connected() as client,
+        ):
+            device_info = await client.device_info()
+            assert device_info is not None
+            assert device_info.name == "tcp-uart-bridge-test"
+            _, services = await client.list_entities_services()
+            send_byte = next(s for s in services if s.name == "send_byte")
+
+            await _wait(echo_ok, 15.0, "UART echo through the bridge never arrived")
+
+            await client.execute_service(send_byte, {})
+            await _wait(service_byte_ok, 10.0, "Service byte never reached the server")
+            await lines.wait_for("Flush result 0")
+
+            # The server closed session one; a write while down must warn and
+            # a flush on the down link must report FAILED (2).
+            await lines.wait_for("Connection lost")
+            await client.execute_service(send_byte, {})
+            await lines.wait_for("Not connected, dropped")
+            await lines.wait_for("Flush result 2")
+
+            await _wait(
+                reconnect_echo_ok, 15.0, "Bridge did not reconnect and echo again"
+            )
+    finally:
+        server.close()
+        await server.wait_closed()
diff --git a/tests/integration/test_tcp_uart_server.py b/tests/integration/test_tcp_uart_server.py
new file mode 100644
index 0000000000..9a69ec42fd
--- /dev/null
+++ b/tests/integration/test_tcp_uart_server.py
@@ -0,0 +1,56 @@
+"""Integration test for a tcp_uart server on host.
+
+Pytest connects as the TCP client. One server allows 127.0.0.1 and echoes.
+The other allows only 192.0.2.1, so the same client is closed.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import contextlib
+
+import pytest
+
+from .log_utils import LineWaiter
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+PAYLOAD = b"ping!"
+
+
+@pytest.mark.asyncio
+async def test_tcp_uart_server(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+    unused_tcp_port_factory,
+) -> None:
+    allowed_port = unused_tcp_port_factory()
+    denied_port = unused_tcp_port_factory()
+    yaml_config = yaml_config.replace("port: 18126", f"port: {allowed_port}")
+    yaml_config = yaml_config.replace("port: 18127", f"port: {denied_port}")
+
+    lines = LineWaiter()
+    async with (
+        run_compiled(yaml_config, line_callback=lines.callback),
+        api_client_connected() as client,
+    ):
+        device_info = await client.device_info()
+        assert device_info is not None
+        assert device_info.name == "tcp-uart-server-test"
+        await lines.wait_for(f"Listening on {allowed_port}")
+        await lines.wait_for(f"Listening on {denied_port}")
+
+        reader, writer = await asyncio.open_connection("127.0.0.1", allowed_port)
+        await lines.wait_for("Client connected from 127.0.0.1")
+        writer.write(PAYLOAD)
+        await writer.drain()
+        assert await asyncio.wait_for(reader.readexactly(len(PAYLOAD)), 10) == PAYLOAD
+        writer.close()
+
+        denied_reader, denied_writer = await asyncio.open_connection(
+            "127.0.0.1", denied_port
+        )
+        await lines.wait_for("Rejected 127.0.0.1")
+        with contextlib.suppress(ConnectionResetError):
+            assert await asyncio.wait_for(denied_reader.read(8), 10) == b""
+        denied_writer.close()
diff --git a/tests/integration/test_uart_tcp_bridge.py b/tests/integration/test_uart_tcp_bridge.py
new file mode 100644
index 0000000000..909df32410
--- /dev/null
+++ b/tests/integration/test_uart_tcp_bridge.py
@@ -0,0 +1,120 @@
+"""Integration test for the uart_tcp bridge on host.
+
+The UART bus is backed by a pty; pytest holds the controller side and connects
+as the TCP client. Covers both transfer directions, the stale-byte discard
+at every accept, and the drop plus client replacement path.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import os
+import pathlib
+
+import pytest
+
+from .log_utils import LineWaiter
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+
+@pytest.mark.asyncio
+async def test_uart_tcp_bridge(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+    unused_tcp_port_factory,
+) -> None:
+    server_port = unused_tcp_port_factory()
+    denied_port = unused_tcp_port_factory()
+    controller_fd, device_fd = os.openpty()
+    os.set_blocking(controller_fd, False)
+    # uart's validate_port wants a two segment device path; Linux ptys live at
+    # /dev/pts/N, so hand the config a /tmp symlink instead.
+    pty_link = f"/tmp/uart-tcp-pty-{os.getpid()}"
+    pathlib.Path(pty_link).symlink_to(os.ttyname(device_fd))
+    yaml_config = yaml_config.replace("port: 18126", f"port: {server_port}")
+    yaml_config = yaml_config.replace("port: 18127", f"port: {denied_port}")
+    yaml_config = yaml_config.replace("PTY_PATH", pty_link)
+
+    lines = LineWaiter()
+    loop = asyncio.get_running_loop()
+    uart_rx = bytearray()
+    uart_rx_event = asyncio.Event()
+
+    def on_controller_readable() -> None:
+        try:
+            chunk = os.read(controller_fd, 256)
+        except BlockingIOError:
+            return
+        if chunk:
+            uart_rx.extend(chunk)
+            uart_rx_event.set()
+
+    async def read_uart(count: int, timeout: float = 10.0) -> bytes:
+        while len(uart_rx) < count:
+            uart_rx_event.clear()
+            await asyncio.wait_for(uart_rx_event.wait(), timeout)
+        data = bytes(uart_rx[:count])
+        del uart_rx[:count]
+        return data
+
+    async def wait_log_count(needle: str, count: int, timeout: float = 15.0) -> None:
+        async with asyncio.timeout(timeout):
+            while sum(needle in line for line in lines.lines) < count:
+                await asyncio.sleep(0.05)
+
+    loop.add_reader(controller_fd, on_controller_readable)
+    try:
+        async with (
+            run_compiled(yaml_config, line_callback=lines.callback),
+            api_client_connected() as client,
+        ):
+            device_info = await client.device_info()
+            assert device_info is not None
+            assert device_info.name == "uart-tcp-bridge-test"
+            await lines.wait_for("Listening on")
+
+            # Bytes written before any client connects must never reach one.
+            os.write(controller_fd, b"STALE")
+            await asyncio.sleep(0.2)
+
+            reader, writer = await asyncio.open_connection("127.0.0.1", server_port)
+            await wait_log_count("Client connected", 1)
+            os.write(controller_fd, b"live!")
+            assert await asyncio.wait_for(reader.readexactly(5), 10) == b"live!", (
+                "First bytes to the client were not the live payload"
+            )
+            writer.write(b"down1")
+            await writer.drain()
+            assert await read_uart(5) == b"down1"
+
+            # Drop the client; bytes while no client is connected are discarded
+            # when the next one is accepted.
+            writer.close()
+            await lines.wait_for("Connection lost")
+            os.write(controller_fd, b"gap")
+            await asyncio.sleep(0.2)
+
+            reader, writer = await asyncio.open_connection("127.0.0.1", server_port)
+            await wait_log_count("Client connected", 2)
+            os.write(controller_fd, b"live2")
+            assert await asyncio.wait_for(reader.readexactly(5), 10) == b"live2", (
+                "Second client received stale bytes from the gap"
+            )
+            writer.write(b"down2")
+            await writer.drain()
+            assert await read_uart(5) == b"down2"
+            writer.close()
+
+            # A peer outside the allow list is rejected and closed.
+            denied_reader, denied_writer = await asyncio.open_connection(
+                "127.0.0.1", denied_port
+            )
+            await lines.wait_for("Rejected 127.0.0.1")
+            assert await asyncio.wait_for(denied_reader.read(8), 10) == b""
+            denied_writer.close()
+    finally:
+        loop.remove_reader(controller_fd)
+        os.close(controller_fd)
+        os.close(device_fd)
+        pathlib.Path(pty_link).unlink()
diff --git a/tests/unit_tests/components/nrf52/test_pch.py b/tests/unit_tests/components/nrf52/test_pch.py
index 0dcac3cad4..41635c3580 100644
--- a/tests/unit_tests/components/nrf52/test_pch.py
+++ b/tests/unit_tests/components/nrf52/test_pch.py
@@ -6,6 +6,7 @@ from unittest.mock import Mock, patch
 import pytest
 
 from esphome.components import nrf52
+from esphome.components.nrf52 import framework
 from esphome.components.zephyr.const import KEY_BOARD
 import esphome.config_validation as cv
 from esphome.const import KEY_CORE, KEY_FRAMEWORK_VERSION, Toolchain
@@ -105,6 +106,23 @@ def test_pch_checksum_waits_for_the_first_configure(tmp_path: Path) -> None:
     assert not build_dir.exists()
 
 
+def _fake_build_env(ccache: str | None) -> dict[str, str]:
+    """The real get_build_env with only the install path lookups stubbed."""
+    with (
+        patch.object(framework, "_get_version_str", return_value="v1"),
+        patch.object(framework, "_get_python_env_path", return_value=Path("/penv")),
+        patch.object(
+            framework,
+            "get_python_env_executable_path",
+            return_value=Path("/penv/bin/python"),
+        ),
+        patch.object(framework, "_get_framework_path", return_value=Path("/fw")),
+        patch.object(framework, "_get_toolchain_version", return_value="t1"),
+        patch.object(framework, "_get_toolchain_path", return_value=Path("/tc")),
+    ):
+        return framework.get_build_env(ccache)
+
+
 @pytest.fixture
 def run_cmd(tmp_path: Path) -> Mock:
     CORE.config_path = tmp_path / "test.yaml"
@@ -113,6 +131,7 @@ def run_cmd(tmp_path: Path) -> Mock:
     CORE.toolchain = Toolchain.SDK_NRF
     CORE.data[KEY_CORE] = {KEY_FRAMEWORK_VERSION: cv.Version(3, 2, 0)}
     with (
+        patch.dict("os.environ", {}, clear=True),
         patch.object(nrf52, "check_and_install"),
         patch.object(nrf52, "_generate_cmake_lists", return_value=False),
         patch.object(
@@ -120,30 +139,63 @@ def run_cmd(tmp_path: Path) -> Mock:
             "get_build_paths",
             return_value={"python_executable": "python3", "framework_path": tmp_path},
         ),
-        patch.object(nrf52, "get_build_env", return_value={}),
+        patch.object(nrf52, "get_build_env", side_effect=_fake_build_env),
+        patch.object(nrf52, "resolve_ccache_path", return_value="/usr/bin/ccache"),
         patch.object(nrf52, "zephyr_data", return_value={KEY_BOARD: "board"}),
         patch.object(nrf52, "run_command_ok", return_value=False) as run,
     ):
         yield run
 
 
-def test_ccache_pch_settings_reach_west(run_cmd: Mock) -> None:
-    # clear=True also drops ambient CCACHE_* overrides; the header is on
-    # explicitly since Windows hosts start with it off
+def test_shared_ccache_settings_reach_west(run_cmd: Mock, tmp_path: Path) -> None:
+    # The header is on explicitly since Windows hosts start with it off
     with (
-        patch.dict("os.environ", {"ESPHOME_PCH_ENABLE": "1"}, clear=True),
+        patch.dict("os.environ", {"ESPHOME_PCH_ENABLE": "1"}),
         pytest.raises(EsphomeError, match="nRF52 native build failed"),
     ):
         nrf52.run_compile(None, {})
     env = run_cmd.call_args.kwargs["env"]
     assert env["CCACHE_PCH_EXTSUM"] == "true"
     assert env["CCACHE_SLOPPINESS"] == "pch_defines,time_macros"
+    # Without depend mode a Kconfig flip reuses a stale .gch
+    assert env["CCACHE_DEPEND"] == "1"
+    # The full managed set, not a bespoke subset
+    assert env["CCACHE_DIR"].endswith("ccache")
+    assert env["CCACHE_NOHASHDIR"] == "true"
+    assert env["CCACHE_BASEDIR"] == str((tmp_path / "build").resolve())
+    assert "CCACHE_DISABLE" not in env
 
 
-def test_disabled_leaves_the_west_environment_alone(
-    run_cmd: Mock, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    monkeypatch.setenv("ESPHOME_PCH_ENABLE", "0")
-    with pytest.raises(EsphomeError, match="nRF52 native build failed"):
+def test_user_exported_ccache_values_win(run_cmd: Mock) -> None:
+    user = {"ESPHOME_PCH_ENABLE": "1", "CCACHE_DEPEND": "0", "CCACHE_DIR": "/mine"}
+    with (
+        patch.dict("os.environ", user),
+        pytest.raises(EsphomeError, match="nRF52 native build failed"),
+    ):
         nrf52.run_compile(None, {})
-    assert "CCACHE_PCH_EXTSUM" not in run_cmd.call_args.kwargs["env"]
+    env = run_cmd.call_args.kwargs["env"]
+    assert env["CCACHE_DEPEND"] == "0"
+    assert env["CCACHE_DIR"] == "/mine"
+
+
+def test_no_ccache_disables_the_zephyr_launcher(run_cmd: Mock) -> None:
+    """ESPHOME_CCACHE_ENABLE=0 must also stop Zephyr's self-enabled ccache."""
+    with (
+        patch.object(nrf52, "resolve_ccache_path", return_value=None),
+        pytest.raises(EsphomeError, match="nRF52 native build failed"),
+    ):
+        nrf52.run_compile(None, {})
+    env = run_cmd.call_args.kwargs["env"]
+    assert env["CCACHE_DISABLE"] == "1"
+    assert "CCACHE_DEPEND" not in env
+
+
+def test_disabled_pch_still_gets_the_shared_settings(run_cmd: Mock) -> None:
+    with (
+        patch.dict("os.environ", {"ESPHOME_PCH_ENABLE": "0"}),
+        pytest.raises(EsphomeError, match="nRF52 native build failed"),
+    ):
+        nrf52.run_compile(None, {})
+    env = run_cmd.call_args.kwargs["env"]
+    assert "CCACHE_PCH_EXTSUM" not in env
+    assert env["CCACHE_DEPEND"] == "1"
diff --git a/tests/unit_tests/components/socket/test_socket_ipv4_allow.py b/tests/unit_tests/components/socket/test_socket_ipv4_allow.py
new file mode 100644
index 0000000000..8a2f60a4b9
--- /dev/null
+++ b/tests/unit_tests/components/socket/test_socket_ipv4_allow.py
@@ -0,0 +1,52 @@
+"""Tests for the socket component's IPv4 allow list codegen helper."""
+
+from ipaddress import IPv4Address, IPv4Network
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from esphome.components import socket
+import esphome.config_validation as cv
+
+
+def test_network_order_swaps_to_sockaddr_value() -> None:
+    """The emitted uint32 must equal s_addr on the little endian targets."""
+    assert socket._network_order(IPv4Address("192.168.175.20")) == 0x14AFA8C0
+    assert socket._network_order(IPv4Address("255.255.255.0")) == 0x00FFFFFF
+    assert socket._network_order(IPv4Address("0.0.0.0")) == 0
+
+
+def test_add_ipv4_allow_emits_nothing_for_an_empty_list() -> None:
+    setter = MagicMock()
+    with (
+        patch.object(socket.cg, "add") as add,
+        patch.object(socket.cg, "add_define") as add_define,
+    ):
+        socket.add_ipv4_allow(setter, [], "bridge")
+    add.assert_not_called()
+    add_define.assert_not_called()
+    setter.assert_not_called()
+
+
+def test_add_ipv4_allow_wires_the_setter_with_cleared_host_bits() -> None:
+    setter = MagicMock()
+    networks = [IPv4Network("192.168.175.33/24", strict=False)]
+    with (
+        patch.object(socket.cg, "add") as add,
+        patch.object(socket.cg, "add_define") as add_define,
+        patch.object(socket.cg, "progmem_array") as array,
+    ):
+        socket.add_ipv4_allow(setter, networks, "bridge")
+    rendered = str(array.call_args.args[1])
+    assert str(socket._network_order(IPv4Address("192.168.175.0"))) in rendered
+    assert str(socket._network_order(IPv4Address("255.255.255.0"))) in rendered
+    setter.assert_called_once_with(array.return_value, 1)
+    add.assert_called_once()
+    add_define.assert_called_once_with("USE_SOCKET_IPV4_ALLOW")
+
+
+def test_schema_caps_the_list_length() -> None:
+    """The sanity cap rejects a list past 255 entries."""
+    assert len(socket.IPV4_ALLOW_SCHEMA([f"10.0.{i}.0/24" for i in range(255)])) == 255
+    with pytest.raises(cv.Invalid):
+        socket.IPV4_ALLOW_SCHEMA([f"10.0.{i}.0/24" for i in range(256)])
diff --git a/tests/unit_tests/components/socket/test_socket_source_filter.py b/tests/unit_tests/components/socket/test_socket_source_filter.py
index 3967c9568d..c46a3f1e8f 100644
--- a/tests/unit_tests/components/socket/test_socket_source_filter.py
+++ b/tests/unit_tests/components/socket/test_socket_source_filter.py
@@ -13,6 +13,7 @@ def test_helper_files_filtered_until_required() -> None:
         filtered = socket.FILTER_SOURCE_FILES()
         assert "ipv4_resolve.cpp" in filtered
         assert "tcp_client_link.cpp" in filtered
+        assert "tcp_listener.cpp" in filtered
 
         mock_core.defines = {Define("USE_SOCKET_IPV4_RESOLVE")}
         filtered = socket.FILTER_SOURCE_FILES()
@@ -22,10 +23,12 @@ def test_helper_files_filtered_until_required() -> None:
         mock_core.defines = {
             Define("USE_SOCKET_IPV4_RESOLVE"),
             Define("USE_SOCKET_TCP_CLIENT_LINK"),
+            Define("USE_SOCKET_TCP_LISTENER"),
         }
         filtered = socket.FILTER_SOURCE_FILES()
         assert "ipv4_resolve.cpp" not in filtered
         assert "tcp_client_link.cpp" not in filtered
+        assert "tcp_listener.cpp" not in filtered
 
 
 def test_require_tcp_client_link_pulls_in_the_resolver() -> None:
@@ -36,3 +39,13 @@ def test_require_tcp_client_link_pulls_in_the_resolver() -> None:
         "USE_SOCKET_IPV4_RESOLVE",
         "USE_SOCKET_TCP_CLIENT_LINK",
     }
+
+
+def test_require_tcp_listener_pulls_in_the_link() -> None:
+    with patch.object(socket.cg, "add_define") as add_define:
+        socket.require_tcp_listener()
+    assert {call.args[0] for call in add_define.call_args_list} == {
+        "USE_SOCKET_IPV4_RESOLVE",
+        "USE_SOCKET_TCP_CLIENT_LINK",
+        "USE_SOCKET_TCP_LISTENER",
+    }
diff --git a/tests/unit_tests/core/test_config.py b/tests/unit_tests/core/test_config.py
index 7fbc2d1b39..1a36fdc967 100644
--- a/tests/unit_tests/core/test_config.py
+++ b/tests/unit_tests/core/test_config.py
@@ -26,6 +26,7 @@ from esphome.const import (
 )
 from esphome.core import CORE, KEY_CONTROLLER_REGISTRY_CONTROLLERS, config
 from esphome.core.config import (
+    CONF_SUSPEND_LOOP,
     Area,
     make_app_name_cpp,
     preload_core_config,
@@ -248,6 +249,97 @@ def test_area_id_collision(
     assert "ID duplicate_id redefined! Check esphome->area->id." in captured.out
 
 
+@pytest.mark.parametrize(
+    ("fixture", "expected_platform"),
+    [
+        ("suspend_loop_host.yaml", "host"),
+        ("suspend_loop_rp2.yaml", "rp2"),
+    ],
+)
+def test_suspend_loop_fail(
+    yaml_file: Callable[[str], str],
+    capsys: pytest.CaptureFixture[str],
+    fixture: str,
+    expected_platform: str,
+) -> None:
+    """Test that suspend_loop fails."""
+    result = load_config_from_fixture(yaml_file, fixture, FIXTURES_DIR)
+    assert result is None
+
+    # Check for the specific error message in stdout
+    captured = capsys.readouterr()
+    assert (
+        f"Suspend loop is not available on {expected_platform} platform" in captured.out
+    )
+
+
+def test_loop_interval_warn_esp32(
+    yaml_file: Callable[[str], str],
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test that too high loop_interval prints warning."""
+    result = load_config_from_fixture(
+        yaml_file, "loop_interval_esp32.yaml", FIXTURES_DIR
+    )
+    assert result is not None
+
+    assert (
+        "loop_interval of 7s exceeds the 2400ms maximum sleep on this platform; the loop will still "
+        "wake every 2400ms. Raise esp32.watchdog_timeout to sleep longer."
+        in caplog.text
+    )
+
+
+@pytest.mark.parametrize(
+    ("fixture", "interval", "max_loop"),
+    [
+        ("loop_interval_bk72xx.yaml", "5000ms", "4000"),
+        ("loop_interval_nrf52.yaml", "700ms", "600"),
+    ],
+)
+def test_loop_interval_warn(
+    yaml_file: Callable[[str], str],
+    caplog: pytest.LogCaptureFixture,
+    fixture: str,
+    interval: str,
+    max_loop: str,
+) -> None:
+    """Test that too high loop_interval prints warning."""
+    result = load_config_from_fixture(yaml_file, fixture, FIXTURES_DIR)
+    assert result is not None
+
+    assert (
+        f"loop_interval of {interval} exceeds the {max_loop}ms maximum sleep on this platform; the loop will still "
+        f"wake every {max_loop}ms." in caplog.text
+    )
+
+
+@pytest.mark.asyncio
+@pytest.mark.filterwarnings("ignore::RuntimeWarning")
+async def test_suspend_loop_and_loop_interval(
+    yaml_file: Callable[[str], Path],
+) -> None:
+    """Test suspend_loop and loop_interval on esp32"""
+    result = load_config_from_fixture(
+        yaml_file, "suspend_loop_esp32.yaml", FIXTURES_DIR
+    )
+    assert result is not None
+
+    esphome_config = result["esphome"]
+    assert esphome_config.get(CONF_SUSPEND_LOOP)
+
+    with patch("esphome.core.config.cg") as mock_cg:
+        mock_cg.RawStatement.side_effect = lambda *args, **kwargs: MagicMock()
+        mock_cg.RawExpression.side_effect = lambda *args, **kwargs: MagicMock()
+        await config.to_code(result[CONF_ESPHOME])
+
+    mock_cg.add_define.assert_any_call("ESPHOME_SUSPEND_LOOP")
+    mock_cg.add_define.assert_any_call("ESPHOME_DEBUG_SCHEDULER")
+    mock_cg.App.set_loop_interval.assert_called_once_with(
+        cv.TimePeriodMilliseconds(milliseconds=50)
+    )
+
+
 def test_device_without_area(yaml_file: Callable[[str], str]) -> None:
     """Test that devices without area_id work correctly."""
     result = load_config_from_fixture(
diff --git a/tests/unit_tests/fixtures/core/config/loop_interval_bk72xx.yaml b/tests/unit_tests/fixtures/core/config/loop_interval_bk72xx.yaml
new file mode 100644
index 0000000000..a29a8e4c93
--- /dev/null
+++ b/tests/unit_tests/fixtures/core/config/loop_interval_bk72xx.yaml
@@ -0,0 +1,7 @@
+esphome:
+  name: test
+  suspend_loop: true
+  loop_interval: 5000ms
+
+bk72xx:
+  board: generic-bk7252
diff --git a/tests/unit_tests/fixtures/core/config/loop_interval_esp32.yaml b/tests/unit_tests/fixtures/core/config/loop_interval_esp32.yaml
new file mode 100644
index 0000000000..491b14d464
--- /dev/null
+++ b/tests/unit_tests/fixtures/core/config/loop_interval_esp32.yaml
@@ -0,0 +1,7 @@
+esphome:
+  name: test
+  loop_interval: 7s
+
+esp32:
+  board: esp32dev
+  watchdog_timeout: 6s
diff --git a/tests/unit_tests/fixtures/core/config/loop_interval_nrf52.yaml b/tests/unit_tests/fixtures/core/config/loop_interval_nrf52.yaml
new file mode 100644
index 0000000000..9dd38bf4da
--- /dev/null
+++ b/tests/unit_tests/fixtures/core/config/loop_interval_nrf52.yaml
@@ -0,0 +1,6 @@
+esphome:
+  name: test
+  loop_interval: 700ms
+
+nrf52:
+  board: adafruit_feather_nrf52840
diff --git a/tests/unit_tests/fixtures/core/config/suspend_loop_esp32.yaml b/tests/unit_tests/fixtures/core/config/suspend_loop_esp32.yaml
new file mode 100644
index 0000000000..ec18aa74b4
--- /dev/null
+++ b/tests/unit_tests/fixtures/core/config/suspend_loop_esp32.yaml
@@ -0,0 +1,9 @@
+esphome:
+  name: test
+  debug_scheduler: true
+  suspend_loop: true
+  loop_interval: 50ms
+
+esp32:
+  board: esp32dev
+  watchdog_timeout: 6s
diff --git a/tests/unit_tests/fixtures/core/config/suspend_loop_host.yaml b/tests/unit_tests/fixtures/core/config/suspend_loop_host.yaml
new file mode 100644
index 0000000000..c75f4f8b4d
--- /dev/null
+++ b/tests/unit_tests/fixtures/core/config/suspend_loop_host.yaml
@@ -0,0 +1,5 @@
+esphome:
+  name: test
+  suspend_loop: true
+
+host:
diff --git a/tests/unit_tests/fixtures/core/config/suspend_loop_rp2.yaml b/tests/unit_tests/fixtures/core/config/suspend_loop_rp2.yaml
new file mode 100644
index 0000000000..8a2af21996
--- /dev/null
+++ b/tests/unit_tests/fixtures/core/config/suspend_loop_rp2.yaml
@@ -0,0 +1,6 @@
+esphome:
+  name: test
+  suspend_loop: true
+
+rp2:
+  board: rpipicow
diff --git a/tests/unit_tests/test_nrf52_framework.py b/tests/unit_tests/test_nrf52_framework.py
index 17d583d139..d9cf2d37b3 100644
--- a/tests/unit_tests/test_nrf52_framework.py
+++ b/tests/unit_tests/test_nrf52_framework.py
@@ -1078,8 +1078,9 @@ def test_get_build_env(
     containerized non-root builds and was removed.
     """
     monkeypatch.setenv("SOME_PREEXISTING_VAR", "kept")
+    monkeypatch.delenv("CCACHE_DISABLE", raising=False)
 
-    env = get_build_env()
+    env = get_build_env(None)
 
     tools = get_sdk_nrf_tools_path()
     venv_bin_dir = get_python_env_executable_path(
@@ -1096,6 +1097,30 @@ def test_get_build_env(
     assert "Zephyr-sdk_DIR" not in env
     # The rest of the process environment is inherited
     assert env["SOME_PREEXISTING_VAR"] == "kept"
+    # No managed settings without a resolved binary; the self-enabled
+    # Zephyr ccache must not cache
+    assert "CCACHE_DIR" not in env or "CCACHE_DIR" in os.environ
+    assert env["CCACHE_DISABLE"] == "1"
+
+
+def test_get_build_env_with_ccache(
+    nrf52_dirs: SimpleNamespace, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    """A resolved ccache brings the shared managed settings."""
+    for key in (
+        "CCACHE_DIR",
+        "CCACHE_DEPEND",
+        "CCACHE_NOHASHDIR",
+        "CCACHE_BASEDIR",
+        "CCACHE_DISABLE",
+    ):
+        monkeypatch.delenv(key, raising=False)
+    CORE.build_path = tmp_path / "build"
+    env = get_build_env("/usr/bin/ccache")
+    assert env["CCACHE_DIR"] == str(get_sdk_nrf_tools_path() / "ccache")
+    assert env["CCACHE_DEPEND"] == "1"
+    assert env["CCACHE_BASEDIR"] == str((tmp_path / "build").resolve())
+    assert "CCACHE_DISABLE" not in env
 
 
 def test_get_build_env_sdk_3_4_0_uses_toolchain_root(
@@ -1104,7 +1129,7 @@ def test_get_build_env_sdk_3_4_0_uses_toolchain_root(
     """For NCS >= 3.4.0, ZEPHYR_SDK_INSTALL_DIR still points at the toolchain root."""
     CORE.data[KEY_CORE] = {KEY_FRAMEWORK_VERSION: Version.parse("3.4.0")}
 
-    env = get_build_env()
+    env = get_build_env(None)
 
     tools = get_sdk_nrf_tools_path()
     assert env["ZEPHYR_SDK_INSTALL_DIR"] == str(tools / "toolchains" / "1.0.1")