From d9359a70c1ef82ab907aba6adad45a27cd5d5fab Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 19 Aug 2026 17:29:10 -0500
Subject: [PATCH 001/155] [tests] Keep PlatformIO libdeps per xdist worker to
 stop a compile race (#18524)

---
 tests/integration/conftest.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index 1bf799b658..483d5392af 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -60,7 +60,11 @@ def _get_platformio_env(cache_dir: Path) -> dict[str, str]:
     env = os.environ.copy()
     env["PLATFORMIO_CORE_DIR"] = str(cache_dir)
     env["PLATFORMIO_CACHE_DIR"] = str(cache_dir / ".cache")
-    env["PLATFORMIO_LIBDEPS_DIR"] = str(cache_dir / "libdeps")
+    # libdeps is keyed only by env name (the device name), and fixtures share
+    # names; two xdist workers first-compiling the same name race pio pkg
+    # install in the same directory. Keep libdeps per worker.
+    worker = os.environ.get("PYTEST_XDIST_WORKER", "master")
+    env["PLATFORMIO_LIBDEPS_DIR"] = str(cache_dir / "libdeps" / worker)
     # Prevent cache cleaning during integration tests
     env["ESPHOME_SKIP_CLEAN_BUILD"] = "1"
     # Compile with THIS tree's esphome sources, not wherever the venv's editable

From 828eac90f36ffe9dd1fa714f41b27377fda2cafd Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 20 Aug 2026 11:51:59 +1200
Subject: [PATCH 002/155] Bump version to 2026.8.0

---
 Doxyfile         | 2 +-
 esphome/const.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index c83d95d0ef..ed0670621d 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -48,7 +48,7 @@ PROJECT_NAME           = ESPHome
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2026.8.0b6
+PROJECT_NUMBER         = 2026.8.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/esphome/const.py b/esphome/const.py
index 2296f8c0b7..17ff1e17d9 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -4,7 +4,7 @@ from enum import Enum
 
 from esphome.enum import StrEnum
 
-__version__ = "2026.8.0b6"
+__version__ = "2026.8.0"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

From ca97c86d6580746e12e071351bf3d219ef7de51f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 18 Aug 2026 19:06:55 -0500
Subject: [PATCH 003/155] [ci] Install requirements_dev.txt when the venv cache
 misses (#18502)

---
 .github/actions/restore-python/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/restore-python/action.yml b/.github/actions/restore-python/action.yml
index daf041819c..fab6dc6ffb 100644
--- a/.github/actions/restore-python/action.yml
+++ b/.github/actions/restore-python/action.yml
@@ -49,7 +49,7 @@ runs:
         python -m venv venv
         source venv/bin/activate
         python --version
-        uv pip install -r requirements.txt -r requirements_test.txt
+        uv pip install -r requirements.txt -r requirements_dev.txt -r requirements_test.txt
         uv pip install -e .
     - name: Create Python virtual environment
       if: steps.cache-venv.outputs.cache-hit != 'true' && runner.os == 'Windows'
@@ -58,5 +58,5 @@ runs:
         python -m venv venv
         source ./venv/Scripts/activate
         python --version
-        uv pip install -r requirements.txt -r requirements_test.txt
+        uv pip install -r requirements.txt -r requirements_dev.txt -r requirements_test.txt
         uv pip install -e .

From b7d0b676fc0cd5f93a772f6f11d398a157ae612d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20H=C3=A4ll?= <soundgoof@gmail.com>
Date: Thu, 20 Aug 2026 06:31:27 +0200
Subject: [PATCH 004/155] [wifi] Take the lwIP core lock around
 sntp_servermode_dhcp() (#18511)

---
 esphome/components/wifi/wifi_component_esp_idf.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/esphome/components/wifi/wifi_component_esp_idf.cpp b/esphome/components/wifi/wifi_component_esp_idf.cpp
index 245390b097..24cb060edb 100644
--- a/esphome/components/wifi/wifi_component_esp_idf.cpp
+++ b/esphome/components/wifi/wifi_component_esp_idf.cpp
@@ -580,7 +580,14 @@ bool WiFiComponent::wifi_sta_ip_config_(const optional<ManualIP> &manual_ip) {
     // lwIP starts the SNTP client if it gets an SNTP server from DHCP. We don't need the time, and more importantly,
     // the built-in SNTP client has a memory leak in certain situations. Disable this feature.
     // https://github.com/esphome/issues/issues/2299
-    sntp_servermode_dhcp(false);
+    {
+#if SNTP_GET_SERVERS_FROM_DHCP || SNTP_GET_SERVERS_FROM_DHCPV6
+      // sntp_servermode_dhcp() is an empty macro unless lwIP is built with
+      // DHCP-supplied NTP servers, so only that build needs the core lock.
+      LwIPLock lock;
+#endif
+      sntp_servermode_dhcp(false);
+    }
 
     // No manual IP is set; use DHCP client
     if (dhcp_status != ESP_NETIF_DHCP_STARTED) {

From 5e9de7c94bde17b782e643a1d12745f67e23f3d6 Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2026 00:00:44 -0500
Subject: [PATCH 005/155] Bump bundled esphome-device-builder to 1.12.1
 (#18541)

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 18f705b501..55aa0ac982 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN \
     -r /requirements.txt
 
 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.12.0
+RUN uv pip install --no-cache-dir esphome-device-builder==1.12.1
 
 RUN \
     platformio settings set enable_telemetry No \

From 132f494195869750e7ccf3ad2a66f58c0234da21 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 20 Aug 2026 06:59:57 -0500
Subject: [PATCH 006/155] [nrf52] Rebuild the Python env when its interpreter
 symlink dangles (#18540)

---
 esphome/components/nrf52/framework.py    | 26 ++++---
 tests/unit_tests/test_nrf52_framework.py | 90 +++++++++++++++++++++++-
 2 files changed, 107 insertions(+), 9 deletions(-)

diff --git a/esphome/components/nrf52/framework.py b/esphome/components/nrf52/framework.py
index 6b32fe1fea..d487820440 100644
--- a/esphome/components/nrf52/framework.py
+++ b/esphome/components/nrf52/framework.py
@@ -62,6 +62,22 @@ def get_sdk_nrf_tools_path() -> Path:
     return path.resolve()
 
 
+def _needs_venv_rebuild(
+    env_python_path: Path, sentinel: Path, requirements_hash: str
+) -> bool:
+    """True when a penv must be (re)built.
+
+    Rebuild when the interpreter is not a regular file, which covers a
+    dangling symlink (a cached venv outliving a host interpreter upgrade)
+    and a corrupt restore, or when the sentinel is missing or stale.
+    """
+    return (
+        not env_python_path.is_file()
+        or not sentinel.exists()
+        or sentinel.read_text(encoding="utf-8") != requirements_hash
+    )
+
+
 def _get_python_env_path(version: str) -> Path:
     return get_sdk_nrf_tools_path() / "penvs" / version
 
@@ -198,10 +214,7 @@ def setup_platformio_python_env() -> None:
         + "\n".join(_PLATFORMIO_PENV_REQUIREMENTS).encode()
         + f"python{sys.version_info.major}.{sys.version_info.minor}".encode()
     ).hexdigest()
-    if (
-        not sentinel.exists()
-        or sentinel.read_text(encoding="utf-8") != requirements_hash
-    ):
+    if _needs_venv_rebuild(env_python_path, sentinel, requirements_hash):
         rmdir(penv_path, msg="Clean up PlatformIO toolchain Python environment")
 
         create_venv(penv_path, msg="PlatformIO toolchain")
@@ -250,10 +263,7 @@ def check_and_install() -> None:
     env_python_path = get_python_env_executable_path(python_env_path, "python")
     sentinel = python_env_path / ".ready"
     requirements_hash = hashlib.sha256(_REQUIREMENTS.read_bytes()).hexdigest()
-    install_venv = (
-        not sentinel.exists()
-        or sentinel.read_text(encoding="utf-8") != requirements_hash
-    )
+    install_venv = _needs_venv_rebuild(env_python_path, sentinel, requirements_hash)
     if install_venv:
         rmdir(python_env_path, msg=f"Clean up {version} Python environment")
 
diff --git a/tests/unit_tests/test_nrf52_framework.py b/tests/unit_tests/test_nrf52_framework.py
index 0a6bddc280..c2ee0c2a75 100644
--- a/tests/unit_tests/test_nrf52_framework.py
+++ b/tests/unit_tests/test_nrf52_framework.py
@@ -16,6 +16,7 @@ from esphome.components.nrf52.framework import (
     _get_penv_site_packages,
     _get_platformio_penv_path,
     _get_toolchain_platform_info,
+    _needs_venv_rebuild,
     check_and_install,
     get_build_env,
     get_sdk_nrf_tools_path,
@@ -123,10 +124,19 @@ def mock_nrf52_ops():
 # ---------------------------------------------------------------------------
 
 
+def _touch_penv_python(penv: Path) -> None:
+    """Create the interpreter file so the rebuild gate sees a live venv."""
+    python = get_python_env_executable_path(penv, "python")
+    python.parent.mkdir(parents=True, exist_ok=True)
+    python.touch()
+
+
 def _mark_venv_ready(python_env: Path) -> None:
-    """Write the venv sentinel with the current requirements hash."""
+    """Write the venv sentinel with the current requirements hash and a
+    present interpreter so the rebuild gate passes."""
     requirements_hash = hashlib.sha256(_REQUIREMENTS.read_bytes()).hexdigest()
     (python_env / ".ready").write_text(requirements_hash, encoding="utf-8")
+    _touch_penv_python(python_env)
 
 
 class TestCheckAndInstall:
@@ -148,6 +158,23 @@ class TestCheckAndInstall:
         mock_nrf52_ops.download_from_mirrors.assert_not_called()
         mock_nrf52_ops.archive_extract_all.assert_not_called()
 
+    def test_missing_interpreter_rebuilds_venv(
+        self,
+        nrf52_dirs: SimpleNamespace,
+        mock_nrf52_ops: SimpleNamespace,
+    ) -> None:
+        """A valid sentinel must not mask a missing interpreter (a cached venv
+        restored after a host interpreter upgrade)."""
+        requirements_hash = hashlib.sha256(_REQUIREMENTS.read_bytes()).hexdigest()
+        (nrf52_dirs.python_env / ".ready").write_text(
+            requirements_hash, encoding="utf-8"
+        )
+        # no interpreter on disk
+
+        check_and_install()
+
+        mock_nrf52_ops.create_venv.assert_called_once()
+
     def test_fresh_install_runs_all_steps(
         self,
         nrf52_dirs: SimpleNamespace,
@@ -348,6 +375,7 @@ class TestSetupPlatformioPythonEnv:
         (platformio_penv_dir / ".ready").write_text(
             _platformio_requirements_hash(), encoding="utf-8"
         )
+        _touch_penv_python(platformio_penv_dir)
 
         with patch.dict(os.environ):
             setup_platformio_python_env()
@@ -392,6 +420,22 @@ class TestSetupPlatformioPythonEnv:
 
         assert not (platformio_penv_dir / ".ready").exists()
 
+    def test_missing_interpreter_reinstalls(
+        self,
+        platformio_penv_dir: Path,
+        mock_nrf52_ops: SimpleNamespace,
+    ) -> None:
+        """A valid sentinel must not mask a missing interpreter."""
+        (platformio_penv_dir / ".ready").write_text(
+            _platformio_requirements_hash(), encoding="utf-8"
+        )
+        # no interpreter on disk
+
+        with patch.dict(os.environ):
+            setup_platformio_python_env()
+
+        mock_nrf52_ops.create_venv.assert_called_once()
+
     def test_repeated_calls_do_not_duplicate_env_entries(
         self,
         platformio_penv_dir: Path,
@@ -401,6 +445,7 @@ class TestSetupPlatformioPythonEnv:
         (platformio_penv_dir / ".ready").write_text(
             _platformio_requirements_hash(), encoding="utf-8"
         )
+        _touch_penv_python(platformio_penv_dir)
         site_packages = str(_get_penv_site_packages(platformio_penv_dir))
         bin_dir = str(
             get_python_env_executable_path(platformio_penv_dir, "python").parent
@@ -422,6 +467,7 @@ class TestSetupPlatformioPythonEnv:
         (platformio_penv_dir / ".ready").write_text(
             _platformio_requirements_hash(), encoding="utf-8"
         )
+        _touch_penv_python(platformio_penv_dir)
         site_packages = str(_get_penv_site_packages(platformio_penv_dir))
 
         with patch.dict(os.environ, {"PYTHONPATH": "/existing/path"}):
@@ -531,3 +577,45 @@ def testget_tools_path_default_is_global_cache(
         Path(platformdirs.user_cache_dir("esphome", appauthor=False)) / "sdk-nrf"
     ).resolve()
     assert get_sdk_nrf_tools_path() == expected
+
+
+def test_needs_venv_rebuild_gates(tmp_path: Path) -> None:
+    """The shared penv gate rebuilds on any missing or stale piece."""
+    penv = tmp_path / "penv"
+    penv.mkdir()
+    python = penv / "python"
+    sentinel = penv / ".ready"
+    good_hash = "abc123"
+
+    # Nothing in place yet
+    assert _needs_venv_rebuild(python, sentinel, good_hash)
+
+    python.write_text("")
+    # Interpreter present but no sentinel
+    assert _needs_venv_rebuild(python, sentinel, good_hash)
+
+    sentinel.write_text(good_hash, encoding="utf-8")
+    # Everything in place
+    assert not _needs_venv_rebuild(python, sentinel, good_hash)
+
+    # Stale requirements hash
+    assert _needs_venv_rebuild(python, sentinel, "otherhash")
+
+
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="symlink creation needs privileges on Windows"
+)
+def test_needs_venv_rebuild_on_dangling_interpreter_symlink(tmp_path: Path) -> None:
+    """A cached venv restored after a host interpreter upgrade has a
+    bin/python symlink whose target is gone; the valid sentinel must not
+    mask it."""
+    penv = tmp_path / "penv"
+    penv.mkdir()
+    python = penv / "python"
+    sentinel = penv / ".ready"
+    sentinel.write_text("abc123", encoding="utf-8")
+    python.symlink_to(tmp_path / "hostedtoolcache" / "3.12.14" / "python3")
+    assert python.is_symlink()
+    assert not python.exists()
+
+    assert _needs_venv_rebuild(python, sentinel, "abc123")

From aafeca585920d39990457e46fec68faf8d4ae2d8 Mon Sep 17 00:00:00 2001
From: Alar Aun <alar.aun@gmail.com>
Date: Thu, 20 Aug 2026 16:54:28 +0300
Subject: [PATCH 007/155] [modbus_controller] Brace single-statement log bodies
 to fix -Wempty-body (#18543)

---
 esphome/components/modbus_controller/modbus_controller.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/esphome/components/modbus_controller/modbus_controller.cpp b/esphome/components/modbus_controller/modbus_controller.cpp
index 2c568938e4..515459f62a 100644
--- a/esphome/components/modbus_controller/modbus_controller.cpp
+++ b/esphome/components/modbus_controller/modbus_controller.cpp
@@ -200,8 +200,9 @@ void ModbusController::update_range_(ModbusCommandItem &cmd) {
     return;
   }
   // A refusal is already logged by the hub; note the affected range for controller-level diagnostics.
-  if (!cmd.send())
+  if (!cmd.send()) {
     ESP_LOGD(TAG, "Poll refused by hub for range 0x%X", cmd.register_address());
+  }
 }
 
 void ModbusController::update() {
@@ -214,8 +215,9 @@ void ModbusController::update() {
       ESP_LOGV(TAG, "Module offline - retrying");
       this->cmd_non_responses_ = 0;  // allow the probe through can_send()
       for (auto &cmd : this->polling_command_items_) {
-        if (!cmd.send())
+        if (!cmd.send()) {
           ESP_LOGD(TAG, "Probe refused by hub for range 0x%X", cmd.register_address());
+        }
       }
     } else {
       ESP_LOGV(TAG, "Module offline - skipping update");

From 3c47ab42d63b53026dcfa611baca05d08b79e3ea Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Aug 2026 01:55:15 +1200
Subject: [PATCH 008/155] [core] Add type annotations to component Python
 (1/11) (#18338)

---
 esphome/components/bl0906/sensor.py           | 12 +++++--
 esphome/components/datetime/__init__.py       | 36 +++++++++++++------
 esphome/components/esp32_ble/__init__.py      | 30 ++++++++++++----
 esphome/components/esp32_rmt/__init__.py      | 14 +++++---
 esphome/components/espnow/__init__.py         | 27 ++++++++------
 .../espnow/packet_transport/__init__.py       |  3 +-
 esphome/components/http_request/__init__.py   | 20 +++++++----
 .../components/http_request/ota/__init__.py   | 13 +++++--
 .../http_request/update/__init__.py           |  3 +-
 esphome/components/i2s_audio/__init__.py      | 13 +++----
 .../i2s_audio/microphone/__init__.py          | 13 +++----
 .../components/i2s_audio/speaker/__init__.py  | 13 +++----
 esphome/components/mcp23xxx_base/__init__.py  |  8 +++--
 esphome/components/mcp4461/__init__.py        |  3 +-
 esphome/components/mcp4461/output/__init__.py | 28 ++++++++++++---
 esphome/components/microphone/__init__.py     | 31 ++++++++++------
 esphome/components/pn532/__init__.py          | 14 ++++++--
 esphome/components/pn532/binary_sensor.py     |  7 ++--
 esphome/components/pn7150/__init__.py         | 26 +++++++++++---
 esphome/components/pn7160/__init__.py         | 26 +++++++++++---
 20 files changed, 245 insertions(+), 95 deletions(-)

diff --git a/esphome/components/bl0906/sensor.py b/esphome/components/bl0906/sensor.py
index 059e10e962..1a0c2287ab 100644
--- a/esphome/components/bl0906/sensor.py
+++ b/esphome/components/bl0906/sensor.py
@@ -32,6 +32,9 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 # Import ICONS not included in esphome's const.py, from the local components const.py
 from .const import ICON_ENERGY, ICON_FREQUENCY, ICON_VOLTAGE
@@ -145,13 +148,18 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
     ),
     synchronous=True,
 )
-async def reset_energy_to_code(config, action_id, template_arg, args):
+async def reset_energy_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/datetime/__init__.py b/esphome/components/datetime/__init__.py
index 87997daa3d..f8b6446006 100644
--- a/esphome/components/datetime/__init__.py
+++ b/esphome/components/datetime/__init__.py
@@ -21,13 +21,14 @@ from esphome.const import (
     CONF_WEB_SERVER,
     CONF_YEAR,
 )
-from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.core import CORE, ID, CoroPriority, coroutine_with_priority
 from esphome.core.entity_helpers import (
     entity_duplicate_validator,
     queue_entity_register,
     setup_entity,
 )
-from esphome.cpp_generator import MockObjClass
+from esphome.cpp_generator import MockObj, MockObjClass, TemplateArgsType
+from esphome.types import ConfigType, SafeExpType
 
 CODEOWNERS = ["@rfdarter", "@jesserockz"]
 
@@ -65,7 +66,7 @@ DATETIME_MODES = [
 ]
 
 
-def _validate_time_present(config):
+def _validate_time_present(config: ConfigType) -> ConfigType:
     config = config.copy()
     if CONF_ON_TIME in config and CONF_TIME_ID not in config:
         time_id = cv.use_id(time.RealTimeClock)(None)
@@ -139,7 +140,7 @@ def datetime_schema(class_: MockObjClass) -> cv.Schema:
 
 
 @setup_entity("datetime")
-async def setup_datetime_core_(var, config):
+async def setup_datetime_core_(var: MockObj, config: ConfigType) -> None:
     if (mqtt_id := config.get(CONF_MQTT_ID)) is not None:
         mqtt_ = cg.new_Pvariable(mqtt_id, var)
         await mqtt.register_mqtt_component(mqtt_, config)
@@ -160,7 +161,7 @@ async def setup_datetime_core_(var, config):
         await cg.register_parented(trigger, var)
 
 
-async def register_datetime(var, config):
+async def register_datetime(var: MockObj, config: ConfigType) -> None:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     entity_type = config[CONF_TYPE].lower()
@@ -169,14 +170,14 @@ async def register_datetime(var, config):
     await setup_datetime_core_(var, config)
 
 
-async def new_datetime(config, *args):
+async def new_datetime(config: ConfigType, *args: SafeExpType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID], *args)
     await register_datetime(var, config)
     return var
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(datetime_ns.using)
 
 
@@ -193,7 +194,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def datetime_date_set_to_code(config, action_id, template_arg, args):
+async def datetime_date_set_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     action_var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(action_var, config[CONF_ID])
 
@@ -226,7 +232,12 @@ async def datetime_date_set_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def datetime_time_set_to_code(config, action_id, template_arg, args):
+async def datetime_time_set_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     action_var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(action_var, config[CONF_ID])
 
@@ -259,7 +270,12 @@ async def datetime_time_set_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def datetime_datetime_set_to_code(config, action_id, template_arg, args):
+async def datetime_datetime_set_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     action_var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(action_var, config[CONF_ID])
 
diff --git a/esphome/components/esp32_ble/__init__.py b/esphome/components/esp32_ble/__init__.py
index f099c68e57..79747c6f31 100644
--- a/esphome/components/esp32_ble/__init__.py
+++ b/esphome/components/esp32_ble/__init__.py
@@ -31,7 +31,8 @@ from esphome.const import (
     CONF_NAME,
     CONF_NAME_ADD_MAC_SUFFIX,
 )
-from esphome.core import CORE, TimePeriod
+from esphome.core import CORE, ID, TimePeriod
+from esphome.cpp_generator import MockObj, TemplateArgsType
 import esphome.final_validate as fv
 from esphome.types import ConfigType
 
@@ -383,7 +384,7 @@ def _validate_key_sizes(config: ConfigType) -> ConfigType:
 CONFIG_SCHEMA = cv.All(CONFIG_SCHEMA, _validate_key_sizes)
 
 
-def validate_variant(_):
+def validate_variant(_: ConfigType) -> None:
     variant = get_esp32_variant()
     if variant in NO_BLUETOOTH_VARIANTS:
         raise cv.Invalid(f"{variant} does not support Bluetooth")
@@ -443,7 +444,7 @@ def validate_connection_slots(max_connections: int) -> None:
     )
 
 
-def final_validation(config) -> None:
+def final_validation(config: ConfigType) -> None:
     validate_variant(config)
     if (name := config.get(CONF_NAME)) is not None:
         full_config = fv.full_config.get()
@@ -518,7 +519,7 @@ def final_validation(config) -> None:
 FINAL_VALIDATE_SCHEMA = final_validation
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_enable_on_boot(config[CONF_ENABLE_ON_BOOT]))
     cg.add(var.set_io_capability(config[CONF_IO_CAPABILITY]))
@@ -605,19 +606,34 @@ async def to_code(config):
 
 
 @automation.register_condition("ble.enabled", BLEEnabledCondition, cv.Schema({}))
-async def ble_enabled_to_code(config, condition_id, template_arg, args):
+async def ble_enabled_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     return cg.new_Pvariable(condition_id, template_arg)
 
 
 @automation.register_action(
     "ble.enable", BLEEnableAction, cv.Schema({}), synchronous=True
 )
-async def ble_enable_to_code(config, action_id, template_arg, args):
+async def ble_enable_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     return cg.new_Pvariable(action_id, template_arg)
 
 
 @automation.register_action(
     "ble.disable", BLEDisableAction, cv.Schema({}), synchronous=True
 )
-async def ble_disable_to_code(config, action_id, template_arg, args):
+async def ble_disable_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     return cg.new_Pvariable(action_id, template_arg)
diff --git a/esphome/components/esp32_rmt/__init__.py b/esphome/components/esp32_rmt/__init__.py
index 1076bcabdc..a213a78778 100644
--- a/esphome/components/esp32_rmt/__init__.py
+++ b/esphome/components/esp32_rmt/__init__.py
@@ -1,17 +1,23 @@
+from collections.abc import Callable, Iterable
+from typing import Any
+
 from esphome.components import esp32
 import esphome.config_validation as cv
 from esphome.core import CORE
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 
 VARIANTS_NO_RMT = {esp32.VARIANT_ESP32C2, esp32.VARIANT_ESP32C61}
 
 
-def validate_rmt_not_supported(rmt_only_keys):
+def validate_rmt_not_supported(
+    rmt_only_keys: Iterable[str],
+) -> Callable[[ConfigType], ConfigType]:
     """Validate that RMT-only config keys are not used on variants without RMT hardware."""
     rmt_only_keys = set(rmt_only_keys)
 
-    def _validator(config):
+    def _validator(config: ConfigType) -> ConfigType:
         if CORE.is_esp32:
             variant = esp32.get_esp32_variant()
             if variant in VARIANTS_NO_RMT:
@@ -26,8 +32,8 @@ def validate_rmt_not_supported(rmt_only_keys):
     return _validator
 
 
-def validate_clock_resolution():
-    def _validator(value):
+def validate_clock_resolution() -> Callable[[Any], int]:
+    def _validator(value: Any) -> int:
         cv.only_on_esp32(value)
         value = cv.int_(value)
         variant = esp32.get_esp32_variant()
diff --git a/esphome/components/espnow/__init__.py b/esphome/components/espnow/__init__.py
index 373ef345d1..ee3732c406 100644
--- a/esphome/components/espnow/__init__.py
+++ b/esphome/components/espnow/__init__.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation, core
 import esphome.codegen as cg
 from esphome.components import wifi
@@ -14,6 +16,7 @@ from esphome.const import (
     CONF_WIFI,
 )
 from esphome.core import CORE, HexInt
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
@@ -78,7 +81,7 @@ CONF_CONTINUE_ON_ERROR = "continue_on_error"
 CONF_WAIT_FOR_SENT = "wait_for_sent"
 
 
-def _validate_max_payload_size(value: int) -> int:
+def _validate_max_payload_size(value: Any) -> int:
     if value > ESPNOW_PAYLOAD_V1:
         return cv.require_framework_version(
             esp_idf=cv.Version(5, 4, 0),
@@ -88,7 +91,7 @@ def _validate_max_payload_size(value: int) -> int:
     return value
 
 
-def validate_channel(value):
+def validate_channel(value: Any) -> int:
     if value is None:
         raise cv.Invalid("channel is required if wifi is not configured")
     return wifi.validate_channel(value)
@@ -129,7 +132,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def _trigger_to_code(config):
+async def _trigger_to_code(config: ConfigType) -> MockObj:
     if address := config.get(CONF_ADDRESS):
         address = address.parts
     trigger = cg.new_Pvariable(config[CONF_TRIGGER_ID], address)
@@ -145,7 +148,7 @@ async def _trigger_to_code(config):
     return trigger
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
@@ -180,13 +183,13 @@ async def to_code(config):
 # ========================================== A C T I O N S ================================================
 
 
-def validate_peer(value):
+def validate_peer(value: Any) -> Any:
     if isinstance(value, cv.Lambda):
         return cv.returning_lambda(value)
     return cv.mac_address(value)
 
 
-def _validate_raw_data(value):
+def _validate_raw_data(value: Any) -> str | list:
     if isinstance(value, str):
         if len(value) > MAX_ESPNOW_PACKET_SIZE:
             raise cv.Invalid(
@@ -204,7 +207,9 @@ def _validate_raw_data(value):
     )
 
 
-async def register_peer(var, config, args):
+async def register_peer(
+    var: MockObj, config: ConfigType, args: TemplateArgsType
+) -> None:
     peer = config[CONF_ADDRESS]
     if isinstance(peer, core.MACAddress):
         peer = [HexInt(p) for p in peer.parts]
@@ -231,7 +236,7 @@ SEND_SCHEMA = PEER_SCHEMA.extend(
 )
 
 
-def _validate_send_action(config):
+def _validate_send_action(config: ConfigType) -> ConfigType:
     if not config[CONF_WAIT_FOR_SENT] and not config[CONF_CONTINUE_ON_ERROR]:
         raise cv.Invalid(
             f"'{CONF_CONTINUE_ON_ERROR}' cannot be false if '{CONF_WAIT_FOR_SENT}' is false as the automation will not wait for the failed result.",
@@ -267,7 +272,7 @@ async def send_action(
     action_id: core.ID,
     template_arg: cg.TemplateArguments,
     args: list[tuple],
-):
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
 
@@ -316,7 +321,7 @@ async def peer_action(
     action_id: core.ID,
     template_arg: cg.TemplateArguments,
     args: list[tuple],
-):
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     await register_peer(var, config, args)
@@ -341,7 +346,7 @@ async def channel_action(
     action_id: core.ID,
     template_arg: cg.TemplateArguments,
     args: list[tuple],
-):
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_CHANNEL], args, cg.uint8)
diff --git a/esphome/components/espnow/packet_transport/__init__.py b/esphome/components/espnow/packet_transport/__init__.py
index e6d66440db..ee4706ca1c 100644
--- a/esphome/components/espnow/packet_transport/__init__.py
+++ b/esphome/components/espnow/packet_transport/__init__.py
@@ -9,6 +9,7 @@ from esphome.components.packet_transport import (
 import esphome.config_validation as cv
 from esphome.core import HexInt
 from esphome.cpp_types import PollingComponent
+from esphome.types import ConfigType
 
 from .. import ESPNowComponent, espnow_ns
 
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = transport_schema(ESPNowTransport).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     """Set up the ESP-NOW transport component."""
     var, _ = await new_packet_transport(config)
 
diff --git a/esphome/components/http_request/__init__.py b/esphome/components/http_request/__init__.py
index 54d7f5c77b..afc39e06a8 100644
--- a/esphome/components/http_request/__init__.py
+++ b/esphome/components/http_request/__init__.py
@@ -1,4 +1,5 @@
 from pathlib import Path
+from typing import Any
 
 from esphome import automation
 import esphome.codegen as cg
@@ -20,8 +21,10 @@ from esphome.const import (
     PlatformFramework,
     __version__,
 )
-from esphome.core import CORE, Lambda
+from esphome.core import CORE, ID, Lambda
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.helpers import IS_MACOS
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["network"]
 AUTO_LOAD = ["json", "watchdog"]
@@ -63,14 +66,14 @@ CONF_BODY = "body"
 CONF_JSON = "json"
 
 
-def validate_url(value):
+def validate_url(value: Any) -> str:
     value = cv.url(value)
     if value.startswith(("http://", "https://")):
         return value
     raise cv.Invalid("URL must start with 'http://' or 'https://'")
 
 
-def validate_ssl_verification(config):
+def validate_ssl_verification(config: ConfigType) -> ConfigType:
     error_message = ""
 
     if CORE.is_rp2 and config[CONF_VERIFY_SSL]:
@@ -91,7 +94,7 @@ def validate_ssl_verification(config):
     return config
 
 
-def _declare_request_class(value):
+def _declare_request_class(value: Any) -> ID:
     if CORE.is_host:
         return cv.declare_id(HttpRequestHost)(value)
     if CORE.is_esp32:
@@ -151,7 +154,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_timeout(config[CONF_TIMEOUT]))
     cg.add(var.set_useragent(config[CONF_USERAGENT]))
@@ -298,7 +301,12 @@ HTTP_REQUEST_SEND_ACTION_SCHEMA = HTTP_REQUEST_ACTION_SCHEMA.extend(
     HTTP_REQUEST_SEND_ACTION_SCHEMA,
     synchronous=True,
 )
-async def http_request_action_to_code(config, action_id, template_arg, args):
+async def http_request_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
diff --git a/esphome/components/http_request/ota/__init__.py b/esphome/components/http_request/ota/__init__.py
index b7026e0f55..784e4ee47a 100644
--- a/esphome/components/http_request/ota/__init__.py
+++ b/esphome/components/http_request/ota/__init__.py
@@ -3,8 +3,10 @@ import esphome.codegen as cg
 from esphome.components.ota import BASE_OTA_SCHEMA, OTAComponent, ota_to_code
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PASSWORD, CONF_URL, CONF_USERNAME
-from esphome.core import coroutine_with_priority
+from esphome.core import ID, coroutine_with_priority
 from esphome.coroutine import CoroPriority
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 from .. import CONF_HTTP_REQUEST_ID, HttpRequestComponent, http_request_ns
 
@@ -42,7 +44,7 @@ CONFIG_SCHEMA = cv.All(
 
 
 @coroutine_with_priority(CoroPriority.OTA_UPDATES)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ota_to_code(var, config)
     await cg.register_component(var, config)
@@ -72,7 +74,12 @@ OTA_HTTP_REQUEST_FLASH_ACTION_SCHEMA = cv.All(
     OTA_HTTP_REQUEST_FLASH_ACTION_SCHEMA,
     synchronous=True,
 )
-async def ota_http_request_action_to_code(config, action_id, template_arg, args):
+async def ota_http_request_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
diff --git a/esphome/components/http_request/update/__init__.py b/esphome/components/http_request/update/__init__.py
index d84d80109a..4bdc30e4cf 100644
--- a/esphome/components/http_request/update/__init__.py
+++ b/esphome/components/http_request/update/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ota, update
 import esphome.config_validation as cv
 from esphome.const import CONF_SOURCE
+from esphome.types import ConfigType
 
 from .. import CONF_HTTP_REQUEST_ID, HttpRequestComponent, http_request_ns
 from ..ota import OtaHttpRequestComponent
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await update.new_update(config)
     ota_parent = await cg.get_variable(config[CONF_OTA_ID])
     cg.add(var.set_ota_parent(ota_parent))
diff --git a/esphome/components/i2s_audio/__init__.py b/esphome/components/i2s_audio/__init__.py
index 4809bf5a92..c5e82beb46 100644
--- a/esphome/components/i2s_audio/__init__.py
+++ b/esphome/components/i2s_audio/__init__.py
@@ -21,8 +21,9 @@ from esphome.components.esp32.const import (
 import esphome.config_validation as cv
 from esphome.const import CONF_BITS_PER_SAMPLE, CONF_CHANNEL, CONF_ID, CONF_SAMPLE_RATE
 from esphome.core import CORE
-from esphome.cpp_generator import MockObjClass
+from esphome.cpp_generator import MockObj, MockObjClass
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["esp32"]
@@ -145,7 +146,7 @@ I2S_MCLK_MULTIPLE = {
 _validate_bits = cv.float_with_unit("bits", "bit")
 
 
-def validate_mclk_divisible_by_3(config):
+def validate_mclk_divisible_by_3(config: ConfigType) -> ConfigType:
     if config[CONF_BITS_PER_SAMPLE] == 24 and config[CONF_MCLK_MULTIPLE] % 3 != 0:
         raise cv.Invalid(
             f"{CONF_MCLK_MULTIPLE} must be divisible by 3 when bits per sample is 24"
@@ -159,7 +160,7 @@ def i2s_audio_component_schema(
     default_sample_rate: int,
     default_channel: str,
     default_bits_per_sample: str,
-):
+) -> cv.Schema:
     return cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(class_),
@@ -182,7 +183,7 @@ def i2s_audio_component_schema(
     )
 
 
-async def register_i2s_audio_component(var, config):
+async def register_i2s_audio_component(var: MockObj, config: ConfigType) -> None:
     await cg.register_parented(var, config[CONF_I2S_AUDIO_ID])
     cg.add(var.set_i2s_role(I2S_ROLE_OPTIONS[config[CONF_I2S_MODE]]))
     slot_mode = config[CONF_CHANNEL]
@@ -260,7 +261,7 @@ def _assign_ports() -> None:
             next_port += 1
 
 
-def _final_validate(_):
+def _final_validate(_: ConfigType) -> None:
     i2s_audio_configs = fv.full_config.get()[CONF_I2S_AUDIO]
     variant = get_esp32_variant()
     if variant not in I2S_PORTS:
@@ -275,7 +276,7 @@ def _final_validate(_):
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/i2s_audio/microphone/__init__.py b/esphome/components/i2s_audio/microphone/__init__.py
index 9c6228087c..c217317237 100644
--- a/esphome/components/i2s_audio/microphone/__init__.py
+++ b/esphome/components/i2s_audio/microphone/__init__.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_NUM_CHANNELS,
     CONF_SAMPLE_RATE,
 )
+from esphome.types import ConfigType
 
 from .. import (
     CONF_ADC_TYPE,
@@ -46,7 +47,7 @@ I2S_PDM_DSR = {
 }
 
 
-def _validate_esp32_variant(config):
+def _validate_esp32_variant(config: ConfigType) -> ConfigType:
     variant = esp32.get_esp32_variant()
     if config[CONF_ADC_TYPE] == "external":
         if config[CONF_PDM] and variant not in PDM_VARIANTS:
@@ -65,13 +66,13 @@ def _validate_esp32_variant(config):
     raise NotImplementedError
 
 
-def _validate_channel(config):
+def _validate_channel(config: ConfigType) -> ConfigType:
     if config[CONF_CHANNEL] == CONF_MONO:
         raise cv.Invalid(f"I2S microphone does not support {CONF_MONO}.")
     return config
 
 
-def _set_num_channels_from_config(config):
+def _set_num_channels_from_config(config: ConfigType) -> ConfigType:
     if config[CONF_CHANNEL] in (CONF_LEFT, CONF_RIGHT):
         config[CONF_NUM_CHANNELS] = 1
     else:
@@ -80,7 +81,7 @@ def _set_num_channels_from_config(config):
     return config
 
 
-def _set_stream_limits(config):
+def _set_stream_limits(config: ConfigType) -> ConfigType:
     audio.set_stream_limits(
         min_bits_per_sample=config.get(CONF_BITS_PER_SAMPLE),
         max_bits_per_sample=config.get(CONF_BITS_PER_SAMPLE),
@@ -134,7 +135,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate(config):
+def _final_validate(config: ConfigType) -> None:
     if config[CONF_ADC_TYPE] == "internal":
         raise cv.Invalid(
             "Internal ADC is no longer supported. Use an external I2S microphone instead."
@@ -144,7 +145,7 @@ def _final_validate(config):
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await register_i2s_audio_component(var, config)
diff --git a/esphome/components/i2s_audio/speaker/__init__.py b/esphome/components/i2s_audio/speaker/__init__.py
index 6d3c39c68e..1849c376aa 100644
--- a/esphome/components/i2s_audio/speaker/__init__.py
+++ b/esphome/components/i2s_audio/speaker/__init__.py
@@ -13,6 +13,7 @@ from esphome.const import (
     CONF_SAMPLE_RATE,
     CONF_TIMEOUT,
 )
+from esphome.types import ConfigType
 
 from .. import (
     CONF_I2S_DOUT_PIN,
@@ -78,7 +79,7 @@ I2C_COMM_FMT_OPTIONS = {
 INTERNAL_DAC_VARIANTS = [esp32.VARIANT_ESP32]
 
 
-def _set_num_channels_from_config(config):
+def _set_num_channels_from_config(config: ConfigType) -> ConfigType:
     if config[CONF_CHANNEL] in (CONF_MONO, CONF_LEFT, CONF_RIGHT):
         config[CONF_NUM_CHANNELS] = 1
     else:
@@ -87,7 +88,7 @@ def _set_num_channels_from_config(config):
     return config
 
 
-def _set_stream_limits(config):
+def _set_stream_limits(config: ConfigType) -> ConfigType:
     if config.get(CONF_SPDIF_MODE, False):
         # SPDIF mode: 16/24/32-bit audio and stereo at configured sample rate
         audio.set_stream_limits(
@@ -133,14 +134,14 @@ def _set_stream_limits(config):
     return config
 
 
-def _select_speaker_class(config):
+def _select_speaker_class(config: ConfigType) -> ConfigType:
     """Override ID type when SPDIF mode is enabled."""
     if config.get(CONF_SPDIF_MODE, False):
         config[CONF_ID].type = I2SAudioSpeakerSPDIF
     return config
 
 
-def _validate_esp32_variant(config):
+def _validate_esp32_variant(config: ConfigType) -> ConfigType:
     variant = esp32.get_esp32_variant()
     if config[CONF_DAC_TYPE] == "internal":
         if variant not in INTERNAL_DAC_VARIANTS:
@@ -207,7 +208,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate(config):
+def _final_validate(config: ConfigType) -> None:
     if config[CONF_DAC_TYPE] == "internal":
         raise cv.Invalid(
             "Internal DAC is no longer supported. Use an external I2S DAC instead."
@@ -238,7 +239,7 @@ def _final_validate(config):
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await register_i2s_audio_component(var, config)
diff --git a/esphome/components/mcp23xxx_base/__init__.py b/esphome/components/mcp23xxx_base/__init__.py
index d53499a78f..755d86e4ea 100644
--- a/esphome/components/mcp23xxx_base/__init__.py
+++ b/esphome/components/mcp23xxx_base/__init__.py
@@ -15,6 +15,8 @@ from esphome.const import (
     CONF_PULLUP,
 )
 from esphome.core import CORE, ID, coroutine
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["gpio_expander"]
 CODEOWNERS = ["@jesserockz"]
@@ -41,7 +43,7 @@ MCP23XXX_CONFIG_SCHEMA = cv.Schema(
 
 
 @coroutine
-async def register_mcp23xxx(config, num_pins):
+async def register_mcp23xxx(config: ConfigType, num_pins: int) -> MockObj:
     id: ID = config[CONF_ID]
     var = cg.new_Pvariable(id)
     await cg.register_component(var, config)
@@ -52,7 +54,7 @@ async def register_mcp23xxx(config, num_pins):
     return var
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -81,7 +83,7 @@ MCP23XXX_PIN_SCHEMA = pins.gpio_base_schema(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_MCP23XXX, MCP23XXX_PIN_SCHEMA)
-async def mcp23xxx_pin_to_code(config):
+async def mcp23xxx_pin_to_code(config: ConfigType) -> MockObj:
     parent_id: ID = config[CONF_MCP23XXX]
     parent = await cg.get_variable(parent_id)
 
diff --git a/esphome/components/mcp4461/__init__.py b/esphome/components/mcp4461/__init__.py
index f3ef6f4917..60cece67d7 100644
--- a/esphome/components/mcp4461/__init__.py
+++ b/esphome/components/mcp4461/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@p1ngb4ck"]
 DEPENDENCIES = ["i2c"]
@@ -30,7 +31,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(
         config[CONF_ID],
         config[CONF_DISABLE_WIPER_0],
diff --git a/esphome/components/mcp4461/output/__init__.py b/esphome/components/mcp4461/output/__init__.py
index 99d4988c90..db1a1e6a29 100644
--- a/esphome/components/mcp4461/output/__init__.py
+++ b/esphome/components/mcp4461/output/__init__.py
@@ -3,6 +3,9 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID, CONF_INITIAL_VALUE
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 from .. import CONF_MCP4461_ID, Mcp4461Component, mcp4461_ns
 
@@ -34,7 +37,7 @@ CONF_NONVOLATILE_WRITE_DELAY = "nonvolatile_write_delay"
 VOLATILE_CHANNELS = ("A", "B", "C", "D")
 
 
-def _validate_nonvolatile(config) -> None:
+def _validate_nonvolatile(config: ConfigType) -> None:
     channel = str(config[CONF_CHANNEL])
 
     # Channels E-H address the nonvolatile registers directly — the mirroring options only
@@ -89,7 +92,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 FINAL_VALIDATE_SCHEMA = _validate_nonvolatile
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_MCP4461_ID])
     var = cg.new_Pvariable(
         config[CONF_ID],
@@ -147,7 +150,12 @@ TERMINAL_ACTION_SCHEMA = cv.Schema(
 @automation.register_action(
     "mcp4461.wiper.decrease", WiperDecreaseAction, WIPER_ACTION_SCHEMA, synchronous=True
 )
-async def mcp4461_wiper_step_to_code(config, action_id, template_arg, args):
+async def mcp4461_wiper_step_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     wiper = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, wiper)
 
@@ -158,7 +166,12 @@ async def mcp4461_wiper_step_to_code(config, action_id, template_arg, args):
     WIPER_ACTION_SCHEMA,
     synchronous=True,
 )
-async def mcp4461_wiper_store_to_code(config, action_id, template_arg, args):
+async def mcp4461_wiper_store_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     wiper = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, wiper)
 
@@ -169,7 +182,12 @@ async def mcp4461_wiper_store_to_code(config, action_id, template_arg, args):
     TERMINAL_ACTION_SCHEMA,
     synchronous=True,
 )
-async def mcp4461_wiper_terminal_to_code(config, action_id, template_arg, args):
+async def mcp4461_wiper_terminal_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     wiper = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(
         action_id, template_arg, wiper, ord(config[CONF_TERMINAL]), config[CONF_ENABLE]
diff --git a/esphome/components/microphone/__init__.py b/esphome/components/microphone/__init__.py
index 6b5ee8c3e1..9a3f5b43e7 100644
--- a/esphome/components/microphone/__init__.py
+++ b/esphome/components/microphone/__init__.py
@@ -1,3 +1,5 @@
+from collections.abc import Callable
+
 from esphome import automation
 from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
@@ -12,8 +14,10 @@ from esphome.const import (
     CONF_ON_DATA,
     CONF_TRIGGER_ID,
 )
-from esphome.core import CORE
+from esphome.core import CORE, ID
 from esphome.coroutine import CoroPriority, coroutine_with_priority
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["audio"]
 CODEOWNERS = ["@jesserockz", "@kahrendt"]
@@ -50,7 +54,7 @@ IsCapturingCondition = microphone_ns.class_(
 IsMutedCondition = microphone_ns.class_("IsMutedCondition", automation.Condition)
 
 
-async def setup_microphone_core_(var, config):
+async def setup_microphone_core_(var: MockObj, config: ConfigType) -> None:
     for conf in config.get(CONF_ON_DATA, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(
@@ -60,7 +64,7 @@ async def setup_microphone_core_(var, config):
         )
 
 
-async def register_microphone(var, config):
+async def register_microphone(var: MockObj, config: ConfigType) -> None:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     await setup_microphone_core_(var, config)
@@ -85,7 +89,7 @@ def microphone_source_schema(
     max_bits_per_sample: int = 16,
     min_channels: int = 1,
     max_channels: int = 1,
-):
+) -> cv.All:
     """Schema for a microphone source
 
     Components requesting microphone data should use this schema instead of accessing a microphone directly.
@@ -97,7 +101,7 @@ def microphone_source_schema(
       max_channels (int, optional): Maximum number of channels the requesting component supports. Defaults to 1.
     """
 
-    def _validate_unique_channels(config):
+    def _validate_unique_channels(config: list[int]) -> list[int]:
         if len(config) != len(set(config)):
             raise cv.Invalid("Channels must be unique")
         return config
@@ -124,7 +128,7 @@ def microphone_source_schema(
 
 def final_validate_microphone_source_schema(
     component_name: str, sample_rate: int = cv.UNDEFINED
-):
+) -> Callable[[ConfigType], ConfigType]:
     """Validates that the microphone source can provide audio in the correct format. In particular it validates the sample rate and the enabled channels.
 
     Note that:
@@ -136,7 +140,7 @@ def final_validate_microphone_source_schema(
         sample_rate (int, optional): The sample rate the component requesting mic audio requires
     """
 
-    def _validate_audio_compatability(config):
+    def _validate_audio_compatability(config: ConfigType) -> ConfigType:
         if sample_rate is not cv.UNDEFINED:
             # Issues require changing the microphone configuration
             #  - Verifies sample rates match
@@ -161,7 +165,9 @@ def final_validate_microphone_source_schema(
     return _validate_audio_compatability
 
 
-async def microphone_source_to_code(config, passive=False):
+async def microphone_source_to_code(
+    config: ConfigType, passive: bool = False
+) -> MockObj:
     """Creates a MicrophoneSource variable for codegen.
 
     Setting passive to true makes the MicrophoneSource never start/stop the microphone, but only receives audio when another component has actively started the Microphone. If false, then the microphone needs to be explicitly started/stopped.
@@ -183,7 +189,12 @@ async def microphone_source_to_code(config, passive=False):
     return mic_source
 
 
-async def microphone_action(config, action_id, template_arg, args):
+async def microphone_action(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -219,6 +230,6 @@ automation.register_condition(
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(microphone_ns.using)
     cg.add_define("USE_MICROPHONE")
diff --git a/esphome/components/pn532/__init__.py b/esphome/components/pn532/__init__.py
index f34df21647..6258932312 100644
--- a/esphome/components/pn532/__init__.py
+++ b/esphome/components/pn532/__init__.py
@@ -9,6 +9,9 @@ from esphome.const import (
     CONF_ON_TAG_REMOVED,
     CONF_TRIGGER_ID,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@OttoWinter", "@jesserockz"]
 AUTO_LOAD = ["binary_sensor", "nfc"]
@@ -41,7 +44,7 @@ PN532_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("1s"))
 
 
-def CONFIG_SCHEMA(conf):
+def CONFIG_SCHEMA(conf: ConfigType) -> None:
     if conf:
         raise cv.Invalid(
             "This component has been moved in 1.16, please see the docs for updated "
@@ -56,7 +59,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def setup_pn532(var, config):
+async def setup_pn532(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
 
     for conf in config.get(CONF_ON_TAG, []):
@@ -85,7 +88,12 @@ async def setup_pn532(var, config):
         }
     ),
 )
-async def pn532_is_writing_to_code(config, condition_id, template_arg, args):
+async def pn532_is_writing_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(condition_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/pn532/binary_sensor.py b/esphome/components/pn532/binary_sensor.py
index b9c3103c65..8f490ba7d0 100644
--- a/esphome/components/pn532/binary_sensor.py
+++ b/esphome/components/pn532/binary_sensor.py
@@ -1,15 +1,18 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_UID
 from esphome.core import HexInt
+from esphome.types import ConfigType
 
 from . import CONF_PN532_ID, PN532, pn532_ns
 
 DEPENDENCIES = ["pn532"]
 
 
-def validate_uid(value):
+def validate_uid(value: Any) -> str:
     value = cv.string_strict(value)
     for x in value.split("-"):
         if len(x) != 2:
@@ -39,7 +42,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(PN532BinarySensor).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
 
     hub = await cg.get_variable(config[CONF_PN532_ID])
diff --git a/esphome/components/pn7150/__init__.py b/esphome/components/pn7150/__init__.py
index 9dd3e8c5b0..4638992abf 100644
--- a/esphome/components/pn7150/__init__.py
+++ b/esphome/components/pn7150/__init__.py
@@ -12,6 +12,9 @@ from esphome.const import (
     CONF_ON_TAG_REMOVED,
     CONF_TRIGGER_ID,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["binary_sensor", "nfc"]
 CODEOWNERS = ["@kbx81", "@jesserockz"]
@@ -107,7 +110,12 @@ PN7150_SCHEMA = cv.Schema(
     SET_MESSAGE_ACTION_SCHEMA,
     synchronous=True,
 )
-async def pn7150_set_message_to_code(config, action_id, template_arg, args):
+async def pn7150_set_message_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_MESSAGE], args, cg.std_string)
@@ -158,7 +166,12 @@ async def pn7150_set_message_to_code(config, action_id, template_arg, args):
     SIMPLE_ACTION_SCHEMA,
     synchronous=True,
 )
-async def pn7150_simple_action_to_code(config, action_id, template_arg, args):
+async def pn7150_simple_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -174,7 +187,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def setup_pn7150(var, config):
+async def setup_pn7150(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
 
     pin = await cg.gpio_pin_expression(config[CONF_IRQ_PIN])
@@ -216,7 +229,12 @@ async def setup_pn7150(var, config):
         }
     ),
 )
-async def pn7150_is_writing_to_code(config, condition_id, template_arg, args):
+async def pn7150_is_writing_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(condition_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/pn7160/__init__.py b/esphome/components/pn7160/__init__.py
index ef14a29099..7f9f9172a1 100644
--- a/esphome/components/pn7160/__init__.py
+++ b/esphome/components/pn7160/__init__.py
@@ -12,6 +12,9 @@ from esphome.const import (
     CONF_ON_TAG_REMOVED,
     CONF_TRIGGER_ID,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["binary_sensor", "nfc"]
 CODEOWNERS = ["@kbx81", "@jesserockz"]
@@ -111,7 +114,12 @@ PN7160_SCHEMA = cv.Schema(
     SET_MESSAGE_ACTION_SCHEMA,
     synchronous=True,
 )
-async def pn7160_set_message_to_code(config, action_id, template_arg, args):
+async def pn7160_set_message_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_MESSAGE], args, cg.std_string)
@@ -162,7 +170,12 @@ async def pn7160_set_message_to_code(config, action_id, template_arg, args):
     SIMPLE_ACTION_SCHEMA,
     synchronous=True,
 )
-async def pn7160_simple_action_to_code(config, action_id, template_arg, args):
+async def pn7160_simple_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -178,7 +191,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def setup_pn7160(var, config):
+async def setup_pn7160(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
 
     if dwl_req_pin_config := config.get(CONF_DWL_REQ_PIN):
@@ -228,7 +241,12 @@ async def setup_pn7160(var, config):
         }
     ),
 )
-async def pn7160_is_writing_to_code(config, condition_id, template_arg, args):
+async def pn7160_is_writing_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(condition_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var

From 8ef0f38f4efff4974bb1e96a210e128d99feb2fc Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 20 Aug 2026 08:59:30 -0500
Subject: [PATCH 009/155] [ethernet] Skip the custom W5500 SPI driver for other
 ethernet types (#18533)

---
 esphome/components/ethernet/__init__.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/esphome/components/ethernet/__init__.py b/esphome/components/ethernet/__init__.py
index 5eda0fc12c..7686b64cb4 100644
--- a/esphome/components/ethernet/__init__.py
+++ b/esphome/components/ethernet/__init__.py
@@ -811,6 +811,10 @@ _platform_filter = filter_source_files_from_platform(
             PlatformFramework.ESP32_IDF,
             PlatformFramework.ESP32_ARDUINO,
         },
+        "w5500_custom_spi.cpp": {
+            PlatformFramework.ESP32_IDF,
+            PlatformFramework.ESP32_ARDUINO,
+        },
     }
 )
 
@@ -830,6 +834,11 @@ def _filter_source_files() -> list[str]:
         # to avoid shadowing. Native IDF builds always need the custom driver.
         if cv.Version(5, 4, 2) <= idf_version() < cv.Version(6, 0, 0):
             excluded.append("esp_eth_phy_jl1101.c")
+    # The custom W5500 SPI driver is fully #ifdef'd on USE_ESP32 and
+    # USE_ETHERNET_W5500 (the platform filter map above handles non-ESP32);
+    # skip it entirely for the other ethernet types.
+    if eth_type != "W5500":
+        excluded.append("w5500_custom_spi.cpp")
     return excluded
 
 

From 2d62ea78d203727c0f20a824add2b78271f33d24 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 20 Aug 2026 09:00:11 -0500
Subject: [PATCH 010/155] [ota] Skip partition-access OTA sources when the
 feature is disabled (#18532)

---
 esphome/components/ota/__init__.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index 2d4de52e8f..1e2ee947c1 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -182,4 +182,11 @@ def FILTER_SOURCE_FILES() -> list[str]:
         for define in CORE.defines
     ):
         files.append("ota_signature_esp_idf.cpp")
+    # ota_bootloader_esp_idf.cpp and ota_partitions_esp_idf.cpp are fully
+    # #ifdef'd on USE_OTA_PARTITIONS (set by the esphome OTA platform when
+    # allow_partition_access is enabled). Filter them out otherwise for the
+    # same reason as above.
+    if not any(define.name == "USE_OTA_PARTITIONS" for define in CORE.defines):
+        files.append("ota_bootloader_esp_idf.cpp")
+        files.append("ota_partitions_esp_idf.cpp")
     return files

From a8e721abebdda3a42b1b6ecf391a90938b2187ac Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <154711427+swoboda1337@users.noreply.github.com>
Date: Thu, 20 Aug 2026 09:03:49 -0500
Subject: [PATCH 011/155] [esp32] Apply IDF component exclusions to native
 toolchain builds (#18531)

---
 esphome/build_gen/espidf.py               |  41 +++++++-
 esphome/components/esp32/__init__.py      |  19 ++--
 esphome/espidf/toolchain.py               |  24 ++++-
 tests/unit_tests/build_gen/test_espidf.py | 115 +++++++++++++++++++---
 tests/unit_tests/test_espidf_toolchain.py |  69 +++++++++++++
 5 files changed, 243 insertions(+), 25 deletions(-)

diff --git a/esphome/build_gen/espidf.py b/esphome/build_gen/espidf.py
index cf476555e7..b65ce23307 100644
--- a/esphome/build_gen/espidf.py
+++ b/esphome/build_gen/espidf.py
@@ -3,7 +3,12 @@
 import json
 from pathlib import Path
 
-from esphome.components.esp32 import get_esp32_variant, idf_version
+from esphome.components.esp32 import (
+    get_esp32_variant,
+    get_excluded_builtin_components,
+    get_managed_component_require_names,
+    idf_version,
+)
 import esphome.config_validation as cv
 from esphome.core import CORE
 from esphome.framework_helpers import (
@@ -119,24 +124,40 @@ def get_project_cmakelists(minimal: bool = False) -> str:
     # runs as a separate CMake script invocation that doesn't load the
     # project's top-level CMakeLists; without this, ${ESPHOME_PROJECT_
     # MANAGED_COMPONENTS} in a converted-lib REQUIRES expands to empty).
-    from esphome.components.esp32 import get_managed_component_require_names
-
     managed_components_property = "\n".join(
         f"idf_build_set_property(ESPHOME_PROJECT_MANAGED_COMPONENTS {name} APPEND)"
         for name in get_managed_component_require_names()
     )
 
+    # Components excluded from the build (DEFAULT_EXCLUDED_IDF_COMPONENTS
+    # minus per-component re-includes). project.cmake reads the plain
+    # EXCLUDE_COMPONENTS variable when seeding the component list, so this
+    # must be set before project(). Emitted on minimal writes too so the
+    # discovery reconfigure never registers the excluded components.
+    excluded_components = get_excluded_builtin_components()
+    exclude_components_var = (
+        f'set(EXCLUDE_COMPONENTS "{";".join(excluded_components)}")'
+        if excluded_components
+        else ""
+    )
+
     # Built-in IDF components exposed via our own property (not IDF's
     # __COMPONENT_REQUIRES_COMMON, which would append them to every
     # component's REQUIRES including real IDF components). Referenced by
     # src/CMakeLists and by each converted PIO lib's CMakeLists. Skipped
     # on minimal writes because project_description.json may be stale.
+    # Excluded components are dropped here as well: a stale
+    # project_description.json from a build without exclusions may still
+    # list them, and requiring an excluded component pulls it back into
+    # the build (IDF requirement expansion overrides EXCLUDE_COMPONENTS).
     builtin_components_property = (
         ""
         if minimal
         else "\n".join(
             f"idf_build_set_property(ESPHOME_PROJECT_BUILTIN_COMPONENTS {name} APPEND)"
-            for name in sorted(get_available_components() or [])
+            for name in sorted(
+                set(get_available_components() or []).difference(excluded_components)
+            )
         )
     )
 
@@ -165,6 +186,8 @@ set(EXTRA_COMPONENT_DIRS ${{CMAKE_SOURCE_DIR}}/src)
 
 include($ENV{{IDF_PATH}}/tools/cmake/project.cmake)
 
+{exclude_components_var}
+
 {cpp_standard_options}
 
 {cxx_compile_options}
@@ -264,3 +287,13 @@ def write_project(minimal: bool = False) -> None:
         CORE.relative_src_path("CMakeLists.txt"),
         get_component_cmakelists(),
     )
+
+    # Snapshot the exclusion set so has_outdated_files() can trigger a
+    # discovery reconfigure when it changes. Excluded components never
+    # register in project_description.json, so re-including one (e.g. a
+    # config gains mqtt) requires a fresh discovery pass before the
+    # ESPHOME_PROJECT_BUILTIN_COMPONENTS property can list it.
+    write_file_if_changed(
+        CORE.relative_build_path("exclude_components.esphomeinternal"),
+        ";".join(get_excluded_builtin_components()),
+    )
diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 3065cdadad..d6e0890751 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -738,6 +738,16 @@ def include_builtin_idf_component(name: str) -> None:
     CORE.data[KEY_ESP32][KEY_EXCLUDE_COMPONENTS].discard(name)
 
 
+def get_excluded_builtin_components() -> list[str]:
+    """Return the sorted built-in IDF components excluded from the build.
+
+    Single accessor for both build writers: the PlatformIO path passes it as
+    ``-DEXCLUDE_COMPONENTS`` and the native ESP-IDF path emits it into the
+    generated CMakeLists.
+    """
+    return sorted(CORE.data.get(KEY_ESP32, {}).get(KEY_EXCLUDE_COMPONENTS, ()))
+
+
 def _enable_arduino_library(name: str) -> None:
     """Enable an Arduino library that is disabled by default.
 
@@ -2122,13 +2132,10 @@ def _configure_lwip_max_sockets(conf: dict) -> None:
 @coroutine_with_priority(CoroPriority.FINAL)
 async def _write_exclude_components() -> None:
     """Write EXCLUDE_COMPONENTS cmake arg after all components have registered exclusions."""
-    if KEY_ESP32 not in CORE.data:
-        return
-    excluded = CORE.data[KEY_ESP32].get(KEY_EXCLUDE_COMPONENTS)
-    if excluded:
-        exclude_list = ";".join(sorted(excluded))
+    if excluded := get_excluded_builtin_components():
         cg.add_platformio_option(
-            "board_build.cmake_extra_args", f"-DEXCLUDE_COMPONENTS={exclude_list}"
+            "board_build.cmake_extra_args",
+            f"-DEXCLUDE_COMPONENTS={';'.join(excluded)}",
         )
 
 
diff --git a/esphome/espidf/toolchain.py b/esphome/espidf/toolchain.py
index bb6452acf2..07ba03e2cf 100644
--- a/esphome/espidf/toolchain.py
+++ b/esphome/espidf/toolchain.py
@@ -273,6 +273,11 @@ def has_outdated_files():
       happen without any sdkconfig impact, and ``_write_idf_component_yml``
       already deletes ``dependencies.lock`` on a change but that signal
       gets lost as soon as the lock is missing.
+    - ``exclude_components.esphomeinternal`` -- the resolved
+      EXCLUDE_COMPONENTS set. Excluded components never register in
+      ``project_description.json``, so re-including one needs a fresh
+      discovery pass before it can appear in the builtin-components
+      property that ``src`` REQUIRES.
 
     We deliberately don't watch:
     - The top-level/src ``CMakeLists.txt`` -- ESPHome owns those, and
@@ -291,6 +296,9 @@ def has_outdated_files():
         f"sdkconfig.{CORE.name}.esphomeinternal"
     )
     idf_component_yml_path = CORE.relative_build_path("src/idf_component.yml")
+    exclude_components_path = CORE.relative_build_path(
+        "exclude_components.esphomeinternal"
+    )
     dependency_lock_path = CORE.relative_build_path("dependencies.lock")
     build_ninja_path = CORE.relative_build_path("build/build.ninja")
 
@@ -309,7 +317,11 @@ def has_outdated_files():
     cmakecache_txt_mtime = cmakecache_txt_path.stat().st_mtime
     return any(
         f.stat().st_mtime > cmakecache_txt_mtime
-        for f in [sdkconfig_internal_path, idf_component_yml_path]
+        for f in [
+            sdkconfig_internal_path,
+            idf_component_yml_path,
+            exclude_components_path,
+        ]
         if f.exists()
     )
 
@@ -386,6 +398,16 @@ def run_compile(config, verbose: bool) -> int:
             return rc
         _LOGGER.info("Regenerating CMakeLists.txt with discovered components...")
         write_project(minimal=False)
+        # Restamp the reference file has_outdated_files() compares against.
+        # A reconfigure that only changes properties or plain variables
+        # (sdkconfig options, the exclusion set) does not rewrite
+        # CMakeCache.txt, so without this the watched inputs stay newer
+        # forever and every subsequent build repeats the discovery pass.
+        # Done after the full write so an interrupt cannot leave a minimal
+        # CMakeLists behind that is already marked fresh.
+        cmakecache = CORE.relative_build_path("build/CMakeCache.txt")
+        if cmakecache.is_file():
+            os.utime(cmakecache)
         if CORE.testing_mode:
             # Reconfigure again so cmake is up to date with the full
             # component list before the build's idf.py invocation runs --
diff --git a/tests/unit_tests/build_gen/test_espidf.py b/tests/unit_tests/build_gen/test_espidf.py
index f21549b48c..ec01000920 100644
--- a/tests/unit_tests/build_gen/test_espidf.py
+++ b/tests/unit_tests/build_gen/test_espidf.py
@@ -11,6 +11,7 @@ import pytest
 from esphome.components.esp32 import (
     KEY_COMPONENTS,
     KEY_ESP32,
+    KEY_EXCLUDE_COMPONENTS,
     KEY_IDF_VERSION,
     KEY_PATH,
     KEY_REF,
@@ -28,6 +29,7 @@ def _reset_core(tmp_path: Path) -> None:
     CORE.data.setdefault(KEY_CORE, {})
     CORE.data[KEY_ESP32] = {
         KEY_COMPONENTS: {},
+        KEY_EXCLUDE_COMPONENTS: set(),
         KEY_IDF_VERSION: cv.Version(5, 5, 4),
     }
 
@@ -47,6 +49,17 @@ def _write_project_description(tmp_path: Path, components: dict[str, str]) -> No
     )
 
 
+def _render(minimal: bool = False) -> str:
+    """Render the top-level CMakeLists with the standard variant/name patches."""
+    with (
+        patch("esphome.build_gen.espidf.get_esp32_variant", return_value="ESP32"),
+        patch.object(CORE, "name", "test"),
+    ):
+        from esphome.build_gen.espidf import get_project_cmakelists
+
+        return get_project_cmakelists(minimal=minimal)
+
+
 def test_get_available_components_returns_none_without_build_path() -> None:
     """No build_path set yet: must not raise on Path(None)."""
     CORE.build_path = None
@@ -88,13 +101,7 @@ def test_get_project_cmakelists_minimal_omits_builtin_components_property(
     first write before the discovery pass refreshes it)."""
     _write_project_description(tmp_path, {"esp_lcd": "/idf/components/esp_lcd"})
 
-    with (
-        patch("esphome.build_gen.espidf.get_esp32_variant", return_value="ESP32"),
-        patch.object(CORE, "name", "test"),
-    ):
-        from esphome.build_gen.espidf import get_project_cmakelists
-
-        content = get_project_cmakelists(minimal=True)
+    content = _render(minimal=True)
 
     assert "ESPHOME_PROJECT_BUILTIN_COMPONENTS" not in content
 
@@ -115,13 +122,7 @@ def test_get_project_cmakelists_full_emits_builtin_components_property(
         },
     )
 
-    with (
-        patch("esphome.build_gen.espidf.get_esp32_variant", return_value="ESP32"),
-        patch.object(CORE, "name", "test"),
-    ):
-        from esphome.build_gen.espidf import get_project_cmakelists
-
-        content = get_project_cmakelists(minimal=False)
+    content = _render()
 
     assert (
         "idf_build_set_property(ESPHOME_PROJECT_BUILTIN_COMPONENTS esp_lcd APPEND)"
@@ -136,6 +137,92 @@ def test_get_project_cmakelists_full_emits_builtin_components_property(
     assert "JPEGDEC APPEND" not in content
 
 
+def test_get_project_cmakelists_emits_exclude_components(tmp_path: Path) -> None:
+    """Excluded components are passed to IDF via EXCLUDE_COMPONENTS and are
+    dropped from ESPHOME_PROJECT_BUILTIN_COMPONENTS even when a stale
+    project_description.json still lists them (requiring an excluded
+    component would pull it back into the build)."""
+    _write_project_description(
+        tmp_path,
+        {
+            "esp_lcd": "/idf/components/esp_lcd",
+            "freertos": "/idf/components/freertos",
+            "unity": "/idf/components/unity",
+        },
+    )
+    CORE.data[KEY_ESP32][KEY_EXCLUDE_COMPONENTS] = {"unity", "esp_lcd"}
+
+    content = _render()
+
+    assert 'set(EXCLUDE_COMPONENTS "esp_lcd;unity")' in content
+    # Must be set before project() so project.cmake sees it.
+    assert content.index("set(EXCLUDE_COMPONENTS") < content.index("project(test)")
+    assert (
+        "idf_build_set_property(ESPHOME_PROJECT_BUILTIN_COMPONENTS freertos APPEND)"
+        in content
+    )
+    assert "ESPHOME_PROJECT_BUILTIN_COMPONENTS unity" not in content
+    assert "ESPHOME_PROJECT_BUILTIN_COMPONENTS esp_lcd" not in content
+
+
+def test_get_project_cmakelists_minimal_emits_exclude_components() -> None:
+    """The discovery (minimal) write also excludes components so they never
+    register in project_description.json."""
+    CORE.data[KEY_ESP32][KEY_EXCLUDE_COMPONENTS] = {"unity"}
+
+    content = _render(minimal=True)
+
+    assert 'set(EXCLUDE_COMPONENTS "unity")' in content
+
+
+def test_get_project_cmakelists_no_exclude_components_line_when_empty() -> None:
+    """No EXCLUDE_COMPONENTS line at all when nothing is excluded."""
+    content = _render()
+
+    assert "EXCLUDE_COMPONENTS" not in content
+
+
+def test_include_builtin_idf_component_removes_exclusion() -> None:
+    """include_builtin_idf_component() drops a name from the exclusion set so
+    a component a config actually uses is not passed to EXCLUDE_COMPONENTS."""
+    from esphome.components.esp32 import (
+        exclude_builtin_idf_component,
+        get_excluded_builtin_components,
+        include_builtin_idf_component,
+    )
+
+    exclude_builtin_idf_component("esp_eth")
+    exclude_builtin_idf_component("unity")
+    include_builtin_idf_component("esp_eth")
+
+    assert get_excluded_builtin_components() == ["unity"]
+
+    content = _render()
+
+    assert 'set(EXCLUDE_COMPONENTS "unity")' in content
+    assert "esp_eth" not in content
+
+
+def test_write_project_writes_exclude_components_stamp(tmp_path: Path) -> None:
+    """write_project() snapshots the exclusion set; the toolchain watches the
+    stamp to trigger a discovery reconfigure when the set changes (excluded
+    components never register in project_description.json)."""
+    CORE.build_flags = set()
+    CORE.build_path = tmp_path
+    CORE.data[KEY_ESP32][KEY_EXCLUDE_COMPONENTS] = {"unity", "esp_lcd"}
+
+    with (
+        patch("esphome.build_gen.espidf.get_esp32_variant", return_value="ESP32"),
+        patch.object(CORE, "name", "test"),
+    ):
+        from esphome.build_gen.espidf import write_project
+
+        write_project()
+
+    stamp = tmp_path / "exclude_components.esphomeinternal"
+    assert stamp.read_text() == "esp_lcd;unity"
+
+
 def test_get_component_cmakelists_no_link_flags() -> None:
     """With no -Wl, flags the target_link_options block is emitted with an empty body."""
     CORE.build_flags = set()
diff --git a/tests/unit_tests/test_espidf_toolchain.py b/tests/unit_tests/test_espidf_toolchain.py
index 26d812af8b..2556397aef 100644
--- a/tests/unit_tests/test_espidf_toolchain.py
+++ b/tests/unit_tests/test_espidf_toolchain.py
@@ -100,6 +100,33 @@ def _setup_build(setup_core: Path) -> tuple[Path, Path]:
     return compile_commands, cache
 
 
+def test_has_outdated_files_detects_exclusion_change(setup_core: Path) -> None:
+    """A newer exclude_components.esphomeinternal stamp forces a reconfigure
+    so components that leave the exclusion set get rediscovered."""
+    CORE.build_path = setup_core
+    build = setup_core / "build"
+    (build / "config").mkdir(parents=True)
+    (build / "config" / "sdkconfig.h").write_text("")
+    cmakecache = build / "CMakeCache.txt"
+    cmakecache.write_text("")
+    (build / "build.ninja").write_text("")
+
+    with patch.object(CORE, "name", "test"):
+        assert not toolchain.has_outdated_files()
+
+        stamp = setup_core / "exclude_components.esphomeinternal"
+        stamp.write_text("unity")
+        os.utime(stamp, (cmakecache.stat().st_mtime + 10,) * 2)
+
+        assert toolchain.has_outdated_files()
+
+        # The flag must clear once the reference file is restamped (as
+        # run_compile does after a successful discovery reconfigure);
+        # otherwise every later build would repeat the discovery pass.
+        os.utime(cmakecache, (stamp.stat().st_mtime + 10,) * 2)
+        assert not toolchain.has_outdated_files()
+
+
 def test_get_idedata_returns_none_without_compile_commands(setup_core: Path) -> None:
     """No compile DB yet -> None (rather than an error)."""
     _setup_build(setup_core)
@@ -373,6 +400,48 @@ def test_run_idf_py_jobs_sets_build_jobs_env(setup_core: Path) -> None:
         assert "IDF_PY_BUILD_JOBS" not in env
 
 
+def test_run_compile_restamps_cmakecache_after_discovery(setup_core: Path) -> None:
+    """After a successful discovery reconfigure the reference CMakeCache.txt
+    is restamped; cmake does not rewrite it when only properties or plain
+    variables change, so the staleness flag would otherwise never clear."""
+    _setup_build(setup_core)
+    config = {CONF_ESPHOME: {}}
+    cmakecache = CORE.relative_build_path("build/CMakeCache.txt")
+    cmakecache.parent.mkdir(parents=True, exist_ok=True)
+    cmakecache.write_text("")
+    old = cmakecache.stat().st_mtime - 100
+    os.utime(cmakecache, (old, old))
+
+    with (
+        patch.object(toolchain, "need_reconfigure", return_value=True),
+        patch("esphome.build_gen.espidf.write_project"),
+        patch.object(toolchain, "run_reconfigure", return_value=0),
+        patch.object(toolchain, "run_idf_py", return_value=0),
+        patch.object(toolchain, "print_summary"),
+    ):
+        assert toolchain.run_compile(config, verbose=False) == 0
+
+    assert cmakecache.stat().st_mtime > old
+
+
+def test_run_compile_discovery_without_cmakecache(setup_core: Path) -> None:
+    """A discovery pass that produced no CMakeCache.txt (nothing to restamp)
+    still completes normally."""
+    _setup_build(setup_core)
+    config = {CONF_ESPHOME: {}}
+
+    with (
+        patch.object(toolchain, "need_reconfigure", return_value=True),
+        patch("esphome.build_gen.espidf.write_project"),
+        patch.object(toolchain, "run_reconfigure", return_value=0),
+        patch.object(toolchain, "run_idf_py", return_value=0),
+        patch.object(toolchain, "print_summary"),
+    ):
+        assert toolchain.run_compile(config, verbose=False) == 0
+
+    assert not CORE.relative_build_path("build/CMakeCache.txt").exists()
+
+
 def test_run_compile_passes_compile_process_limit(setup_core: Path) -> None:
     """compile_process_limit is forwarded to run_idf_py as the job limit."""
     _setup_build(setup_core)

From 347a6155f8783342d1bb7da05ad4a1254fe47f45 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 20 Aug 2026 09:07:17 -0500
Subject: [PATCH 012/155] [uptime] Skip the timestamp sensor source when no
 time component is configured (#18535)

---
 esphome/components/uptime/sensor/__init__.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/esphome/components/uptime/sensor/__init__.py b/esphome/components/uptime/sensor/__init__.py
index e2a7aee1a2..debeb41444 100644
--- a/esphome/components/uptime/sensor/__init__.py
+++ b/esphome/components/uptime/sensor/__init__.py
@@ -10,6 +10,7 @@ from esphome.const import (
     STATE_CLASS_TOTAL_INCREASING,
     UNIT_SECOND,
 )
+from esphome.core import CORE
 
 uptime_ns = cg.esphome_ns.namespace("uptime")
 UptimeSecondsSensor = uptime_ns.class_(
@@ -59,3 +60,11 @@ async def to_code(config):
     if time_id_config := config.get(CONF_TIME_ID):
         time_id = await cg.get_variable(time_id_config)
         cg.add(var.set_time(time_id))
+
+
+def FILTER_SOURCE_FILES() -> list[str]:
+    # uptime_timestamp_sensor.cpp is fully #ifdef'd on USE_TIME; skip it
+    # when no time component is configured.
+    if not any(define.name == "USE_TIME" for define in CORE.defines):
+        return ["uptime_timestamp_sensor.cpp"]
+    return []

From ecca240eef2b79baa85d3eca6665a333e11c0e62 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Aug 2026 02:26:16 +1200
Subject: [PATCH 013/155] [core] Add type annotations to component Python
 (2/11) (#18339)

Co-authored-by: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
---
 esphome/components/cm1106/sensor.py           | 12 +++++--
 esphome/components/esp_ldo/__init__.py        | 22 +++++++++----
 esphome/components/ili9xxx/display.py         | 13 ++++----
 esphome/components/it8951/display.py          | 32 +++++++++++++------
 esphome/components/mapping/__init__.py        | 17 ++++++----
 esphome/components/mipi_dsi/display.py        |  9 +++---
 esphome/components/mipi_rgb/display.py        | 14 ++++----
 esphome/components/mipi_rgb/models/st7701s.py |  2 +-
 esphome/components/mipi_spi/display.py        | 15 +++++----
 esphome/components/online_image/image.py      | 10 ++++--
 .../components/packet_transport/__init__.py   | 27 +++++++++-------
 .../packet_transport/binary_sensor.py         |  5 +--
 esphome/components/packet_transport/sensor.py |  3 +-
 esphome/components/pca9554/__init__.py        | 12 ++++---
 esphome/components/qspi_dbi/display.py        | 16 ++++++----
 esphome/components/qspi_dbi/models.py         | 10 +++---
 esphome/components/rpi_dpi_rgb/display.py     |  9 ++++--
 esphome/components/sdl/binary_sensor.py       |  3 +-
 esphome/components/sdl/display.py             |  9 ++++--
 .../components/sdl/touchscreen/__init__.py    |  3 +-
 esphome/components/seeed_mr24hpc1/__init__.py |  3 +-
 .../seeed_mr24hpc1/binary_sensor.py           |  3 +-
 .../seeed_mr24hpc1/button/__init__.py         |  3 +-
 .../seeed_mr24hpc1/number/__init__.py         |  3 +-
 .../seeed_mr24hpc1/select/__init__.py         |  3 +-
 esphome/components/seeed_mr24hpc1/sensor.py   |  3 +-
 .../seeed_mr24hpc1/switch/__init__.py         |  3 +-
 .../components/seeed_mr24hpc1/text_sensor.py  |  3 +-
 esphome/components/seeed_mr60bha2/__init__.py |  3 +-
 .../seeed_mr60bha2/binary_sensor.py           |  3 +-
 esphome/components/seeed_mr60bha2/sensor.py   |  3 +-
 esphome/components/seeed_mr60fda2/__init__.py |  3 +-
 .../seeed_mr60fda2/binary_sensor.py           |  3 +-
 .../seeed_mr60fda2/button/__init__.py         |  3 +-
 .../seeed_mr60fda2/select/__init__.py         |  3 +-
 esphome/components/st7701s/display.py         | 11 ++++---
 esphome/components/st7701s/init_sequences.py  |  2 +-
 esphome/components/udp/__init__.py            | 22 +++++++++----
 .../udp/packet_transport/__init__.py          |  3 +-
 esphome/components/usb_uart/__init__.py       | 19 +++++------
 40 files changed, 220 insertions(+), 125 deletions(-)

diff --git a/esphome/components/cm1106/sensor.py b/esphome/components/cm1106/sensor.py
index 3c82fac977..936c5fc673 100644
--- a/esphome/components/cm1106/sensor.py
+++ b/esphome/components/cm1106/sensor.py
@@ -13,6 +13,9 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 CODEOWNERS = ["@andrewjswan"]
@@ -44,7 +47,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config) -> None:
+async def to_code(config: ConfigType) -> None:
     """Code generation entry point."""
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
@@ -67,7 +70,12 @@ CALIBRATION_ACTION_SCHEMA = maybe_simple_id(
     CALIBRATION_ACTION_SCHEMA,
     synchronous=True,
 )
-async def cm1106_calibration_to_code(config, action_id, template_arg, args) -> None:
+async def cm1106_calibration_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     """Service code generation entry point."""
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
diff --git a/esphome/components/esp_ldo/__init__.py b/esphome/components/esp_ldo/__init__.py
index a489651b59..46810d422d 100644
--- a/esphome/components/esp_ldo/__init__.py
+++ b/esphome/components/esp_ldo/__init__.py
@@ -1,9 +1,14 @@
+from typing import Any
+
 from esphome.automation import Action, register_action
 import esphome.codegen as cg
 from esphome.components.esp32 import VARIANT_ESP32P4, only_on_variant
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID, CONF_VOLTAGE
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.final_validate import full_config
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@clydebarrow"]
 
@@ -22,7 +27,7 @@ CONF_PASSTHROUGH = "passthrough"
 adjusted_ids = set()
 
 
-def validate_ldo_voltage(value):
+def validate_ldo_voltage(value: Any) -> str | float:
     if isinstance(value, str) and value.lower() == CONF_PASSTHROUGH:
         return CONF_PASSTHROUGH
     value = cv.voltage(value)
@@ -33,7 +38,7 @@ def validate_ldo_voltage(value):
     )
 
 
-def validate_ldo_config(config):
+def validate_ldo_config(config: ConfigType) -> ConfigType:
     channel = config[CONF_CHANNEL]
     allow_internal = config[CONF_ALLOW_INTERNAL_CHANNEL]
     if allow_internal and channel not in CHANNELS_INTERNAL:
@@ -77,7 +82,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(configs):
+async def to_code(configs: list[ConfigType]) -> None:
     for config in configs:
         var = cg.new_Pvariable(config[CONF_ID], config[CONF_CHANNEL])
         await cg.register_component(var, config)
@@ -89,7 +94,7 @@ async def to_code(configs):
         cg.add(var.set_adjustable(config[CONF_ADJUSTABLE]))
 
 
-def final_validate(configs):
+def final_validate(configs: list[ConfigType]) -> None:
     for channel in CHANNELS:
         used = [config for config in configs if config[CONF_CHANNEL] == channel]
         if len(used) > 1:
@@ -112,7 +117,7 @@ def final_validate(configs):
 FINAL_VALIDATE_SCHEMA = final_validate
 
 
-def adjusted_ldo_id(value):
+def adjusted_ldo_id(value: Any) -> ID:
     value = cv.use_id(EspLdo)(value)
     adjusted_ids.add(value)
     return value
@@ -131,7 +136,12 @@ def adjusted_ldo_id(value):
     ),
     synchronous=True,
 )
-async def ldo_voltage_adjust_to_code(config, action_id, template_arg, args):
+async def ldo_voltage_adjust_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     parent = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, parent)
     template_ = await cg.templatable(config[CONF_VOLTAGE], args, cg.float_)
diff --git a/esphome/components/ili9xxx/display.py b/esphome/components/ili9xxx/display.py
index b1d332c1e5..64f87c167c 100644
--- a/esphome/components/ili9xxx/display.py
+++ b/esphome/components/ili9xxx/display.py
@@ -31,6 +31,7 @@ from esphome.const import (
 )
 from esphome.core import CORE, HexInt
 from esphome.final_validate import full_config
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
 
@@ -91,7 +92,7 @@ CONF_INVERT_DISPLAY = "invert_display"
 CONF_PIXEL_MODE = "pixel_mode"
 
 
-def cmd(c, *args):
+def cmd(c: int, *args: int) -> list[int]:
     """
     Create a command sequence
     :param c: The command (8 bit)
@@ -101,7 +102,7 @@ def cmd(c, *args):
     return [c, len(args)] + list(args)
 
 
-def map_sequence(value):
+def map_sequence(value: list[int]) -> list[int]:
     """
     An initialisation sequence is a literal array of data bytes.
     The format is a repeated sequence of [CMD, <data>]
@@ -111,7 +112,7 @@ def map_sequence(value):
     return cmd(*value)
 
 
-def _validate(config):
+def _validate(config: ConfigType) -> ConfigType:
     if (
         config.get(CONF_COLOR_PALETTE) == "IMAGE_ADAPTIVE"
         and CONF_COLOR_PALETTE_IMAGES not in config
@@ -196,7 +197,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def final_validate(config):
+def final_validate(config: ConfigType) -> None:
     global_config = full_config.get()
     # Ideally would calculate buffer size here, but that info is not available on the Python side
     needs_buffer = (
@@ -218,7 +219,7 @@ def final_validate(config):
 FINAL_VALIDATE_SCHEMA = final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LOGGER.warning(
         "The 'ili9xxx' component is deprecated, it is recommended to use 'mipi_spi' instead."
     )
@@ -278,7 +279,7 @@ async def to_code(config):
         cg.add(var.set_buffer_color_mode(ILI9XXXColorMode.BITS_8_INDEXED))
         from PIL import Image
 
-        def load_image(filename):
+        def load_image(filename: str) -> Image.Image:
             path = CORE.relative_config_path(filename)
             try:
                 return Image.open(path)
diff --git a/esphome/components/it8951/display.py b/esphome/components/it8951/display.py
index bdc68b5257..57bf86c4c6 100644
--- a/esphome/components/it8951/display.py
+++ b/esphome/components/it8951/display.py
@@ -2,6 +2,9 @@
 ESPHome configuration for the IT8951 e-paper controller.
 """
 
+from collections.abc import Callable
+from typing import Any
+
 from esphome import automation, core, pins
 import esphome.codegen as cg
 from esphome.components import display, spi
@@ -33,8 +36,10 @@ from esphome.const import (
     CONF_UPDATE_INTERVAL,
     CONF_WIDTH,
 )
-from esphome.cpp_generator import RawExpression
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, RawExpression, TemplateArgsType
 from esphome.final_validate import full_config
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["split_buffer"]
 DEPENDENCIES = ["spi"]
@@ -97,16 +102,16 @@ class IT8951Model:
 
     models: dict[str, "IT8951Model"] = {}
 
-    def __init__(self, name: str, **defaults):
+    def __init__(self, name: str, **defaults: Any) -> None:
         name = name.upper()
         self.name = name
         self.defaults = defaults
         IT8951Model.models[name] = self
 
-    def get_default(self, key, fallback=None):
+    def get_default(self, key: str, fallback: Any = None) -> Any:
         return self.defaults.get(key, fallback)
 
-    def get_dimensions(self, config) -> tuple[int, int]:
+    def get_dimensions(self, config: ConfigType) -> tuple[int, int]:
         # If dimensions are in config, use them; otherwise fall back to model defaults.
         if CONF_DIMENSIONS in config:
             dimensions = config[CONF_DIMENSIONS]
@@ -181,14 +186,16 @@ DIMENSION_SCHEMA = cv.Schema(
 )
 
 
-def _model_pin_option(model, key, schema):
+def _model_pin_option(
+    model: IT8951Model, key: str, schema: Callable[[Any], Any]
+) -> tuple[cv.Optional | cv.Required, Callable[[Any], Any]]:
     default = model.get_default(key)
     if default is None:
         return cv.Required(key), schema
     return cv.Optional(key, default=default), schema
 
 
-def _model_schema(config):
+def _model_schema(config: ConfigType) -> cv.Schema:
     model = IT8951Model.models[config[CONF_MODEL]]
     has_default_dimensions = (
         model.get_default(CONF_WIDTH) is not None
@@ -293,7 +300,7 @@ def _model_schema(config):
     return schema.extend(pin_extra)
 
 
-def _customise_schema(config):
+def _customise_schema(config: ConfigType) -> ConfigType:
     config = cv.Schema(
         {
             cv.Required(CONF_MODEL): cv.one_of(
@@ -336,7 +343,7 @@ def _customise_schema(config):
 CONFIG_SCHEMA = _customise_schema
 
 
-def _final_validate(config) -> None:
+def _final_validate(config: ConfigType) -> None:
     # IT8951 reads from SPI (DevInfo, VCOM, register reads) so MISO is required.
     spi.final_validate_device_schema("it8951", require_miso=True, require_mosi=True)(
         config
@@ -356,7 +363,7 @@ def _final_validate(config) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     model = IT8951Model.models[config[CONF_MODEL]]
     width, height = model.get_dimensions(config)
 
@@ -423,7 +430,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def it8951_update_action_to_code(config, action_id, template_arg, args):
+async def it8951_update_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     display_var = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, display_var)
     if mode := config.get(CONF_MODE):
diff --git a/esphome/components/mapping/__init__.py b/esphome/components/mapping/__init__.py
index 3c7d78a27b..cd846877ae 100644
--- a/esphome/components/mapping/__init__.py
+++ b/esphome/components/mapping/__init__.py
@@ -1,5 +1,6 @@
 from collections.abc import Callable
 import difflib
+from typing import Any
 
 import esphome.codegen as cg
 from esphome.components.const import KEY_METADATA
@@ -13,6 +14,7 @@ from esphome.cpp_generator import (
     add_global,
 )
 from esphome.loader import get_component
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@clydebarrow"]
 MULTI_CONF = True
@@ -32,13 +34,16 @@ class IndexType:
     """
 
     def __init__(
-        self, validator: Callable, data_type: MockObj, conversion: Callable = None
+        self,
+        validator: Callable,
+        data_type: MockObj,
+        conversion: Callable | None = None,
     ) -> None:
         self.validator = validator
         self.data_type = data_type
         self.conversion = conversion
 
-    async def convert_value(self, value):
+    async def convert_value(self, value: Any) -> Any:
         if self.conversion:
             return self.conversion(value)
         return await cg.get_variable(value)
@@ -60,7 +65,7 @@ class MappingMetaData:
         self.to_ = to_
 
 
-def to_schema(value):
+def to_schema(value: Any) -> str:
     """
     Generate a schema for the 'to' field of a map. This can be either one of the index types or a class name.
     :param value:
@@ -82,7 +87,7 @@ BASE_SCHEMA = cv.Schema(
 )
 
 
-def get_object_type(to_) -> MockObjClass | None:
+def get_object_type(to_: str) -> MockObjClass | None:
     """
     Get the object type from a string. Possible formats:
        xxx The name of a component which defines INSTANCE_TYPE
@@ -121,7 +126,7 @@ def add_metadata(
     get_all_mapping_metadata()[mapping_id.id] = MappingMetaData(from_, to_)
 
 
-def map_schema(config):
+def map_schema(config: ConfigType) -> ConfigType:
     config = BASE_SCHEMA(config)
     if CONF_ENTRIES not in config or not isinstance(config[CONF_ENTRIES], dict):
         raise cv.Invalid("an entries dictionary is required for a mapping")
@@ -163,7 +168,7 @@ def map_schema(config):
 CONFIG_SCHEMA = map_schema
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> MockObj:
     varid = config[CONF_ID]
     metadata = get_mapping_metadata(varid.id)
     entries = {
diff --git a/esphome/components/mipi_dsi/display.py b/esphome/components/mipi_dsi/display.py
index 8c125a9606..b23982655a 100644
--- a/esphome/components/mipi_dsi/display.py
+++ b/esphome/components/mipi_dsi/display.py
@@ -53,6 +53,7 @@ from esphome.const import (
     CONF_WIDTH,
 )
 from esphome.final_validate import full_config
+from esphome.types import ConfigType
 
 from . import mipi_dsi_ns, models
 from .models import DsiDriverChip
@@ -85,7 +86,7 @@ COLOR_DEPTHS = {
 }
 
 
-def model_schema(config):
+def model_schema(config: ConfigType) -> cv.All:
     model = MODELS[config[CONF_MODEL].upper()]
     transform = model.transform_schema()
     # CUSTOM model will need to provide a custom init sequence
@@ -148,7 +149,7 @@ def model_schema(config):
 
 
 @model_schema_extractor(MODELS, model_schema)
-def _config_schema(config):
+def _config_schema(config: ConfigType) -> ConfigType:
     config = cv.Schema(
         {
             cv.Required(CONF_MODEL): cv.one_of(*MODELS, upper=True),
@@ -175,7 +176,7 @@ def _config_schema(config):
     return config
 
 
-def _final_validate(config) -> None:
+def _final_validate(config: ConfigType) -> None:
     global_config = full_config.get()
 
     from esphome.components.lvgl import DOMAIN as LVGL_DOMAIN
@@ -189,7 +190,7 @@ CONFIG_SCHEMA = _config_schema
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     model = MODELS[config[CONF_MODEL].upper()]
     color_depth = COLOR_DEPTHS[get_color_depth(config)]
     pixel_mode = int(config[CONF_PIXEL_MODE].removesuffix("bit"))
diff --git a/esphome/components/mipi_rgb/display.py b/esphome/components/mipi_rgb/display.py
index 897088a257..e23e19a000 100644
--- a/esphome/components/mipi_rgb/display.py
+++ b/esphome/components/mipi_rgb/display.py
@@ -1,5 +1,6 @@
 import importlib
 import pkgutil
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -72,6 +73,7 @@ from esphome.const import (
     CONF_WIDTH,
 )
 from esphome.final_validate import full_config
+from esphome.types import ConfigType
 
 from . import models
 from .models import RgbDriverChip
@@ -97,7 +99,7 @@ for module_info in pkgutil.iter_modules(models.__path__):
 MODELS = DriverChip.get_models()
 
 
-def data_pin_validate(value):
+def data_pin_validate(value: Any) -> ConfigType:
     """
     It is safe to use strapping pins as RGB output data bits, as they are outputs only,
     and not initialised until after boot.
@@ -112,14 +114,14 @@ def data_pin_validate(value):
     return DATA_PIN_SCHEMA(value)
 
 
-def data_pin_set(length):
+def data_pin_set(length: int) -> cv.All:
     return cv.All(
         [data_pin_validate],
         cv.Length(min=length, max=length, msg=f"Exactly {length} data pins required"),
     )
 
 
-def model_schema(config):
+def model_schema(config: ConfigType) -> cv.Schema:
     model = MODELS[config[CONF_MODEL].upper()]
     transform = model.transform_schema()
     # RPI model does not use an init sequence, indicates with empty list
@@ -213,7 +215,7 @@ def model_schema(config):
 
 
 @model_schema_extractor(MODELS, model_schema)
-def _config_schema(config):
+def _config_schema(config: ConfigType) -> ConfigType:
     config = cv.Schema(
         {
             cv.Required(CONF_MODEL): cv.one_of(*MODELS, upper=True),
@@ -248,7 +250,7 @@ def _config_schema(config):
 CONFIG_SCHEMA = _config_schema
 
 
-def _final_validate(config) -> None:
+def _final_validate(config: ConfigType) -> None:
     global_config = full_config.get()
 
     from esphome.components.lvgl import DOMAIN as LVGL_DOMAIN
@@ -265,7 +267,7 @@ def _final_validate(config) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     model = MODELS[config[CONF_MODEL].upper()]
     width, height, _offset_width, _offset_height, _pad_width, _pad_height = (
         model.get_dimensions(config)
diff --git a/esphome/components/mipi_rgb/models/st7701s.py b/esphome/components/mipi_rgb/models/st7701s.py
index a20e9d1c01..cad5dc8e20 100644
--- a/esphome/components/mipi_rgb/models/st7701s.py
+++ b/esphome/components/mipi_rgb/models/st7701s.py
@@ -8,7 +8,7 @@ SDIR_CMD = 0xC7
 
 class ST7701S(RgbDriverChip):
     # The ST7701s does not use the standard MADCTL bits for x/y mirroring
-    def add_madctl(self, sequence: list, config: dict):
+    def add_madctl(self, sequence: list, config: dict) -> int:
         transform = self.get_transform(config)
         madctl = 0x00
         if config[CONF_COLOR_ORDER] == MODE_BGR:
diff --git a/esphome/components/mipi_spi/display.py b/esphome/components/mipi_spi/display.py
index 246db237b1..e8b54da5c7 100644
--- a/esphome/components/mipi_spi/display.py
+++ b/esphome/components/mipi_spi/display.py
@@ -53,8 +53,9 @@ from esphome.const import (
     CONF_TRANSFORM,
     CONF_WIDTH,
 )
-from esphome.cpp_generator import TemplateArguments
+from esphome.cpp_generator import MockObjClass, TemplateArguments
 from esphome.final_validate import full_config
+from esphome.types import ConfigType
 
 from . import CONF_BUS_MODE, CONF_SPI_16, DOMAIN, models
 
@@ -110,7 +111,7 @@ DISPLAY_PIXEL_MODES = {
 }
 
 
-def denominator(config):
+def denominator(config: ConfigType) -> int:
     """
     Calculate the best denominator for a buffer size fraction.
     The denominator should be a number between 2 and 16 that divides the display height evenly,
@@ -132,7 +133,7 @@ def denominator(config):
         return next(x for x in range(2, 17) if frac >= 1 / x)
 
 
-def model_schema(config):
+def model_schema(config: ConfigType) -> cv.All | cv.Schema:
     model = MODELS[config[CONF_MODEL]]
     bus_mode = config[CONF_BUS_MODE]
     transform = model.transform_schema()
@@ -238,7 +239,7 @@ def model_schema(config):
 
 
 @model_schema_extractor(MODELS, model_schema, extra={CONF_BUS_MODE: TYPE_SINGLE})
-def customise_schema(config):
+def customise_schema(config: ConfigType) -> ConfigType:
     """
     Create a customised config schema for a specific model and validate the configuration.
     :param config: The configuration dictionary to validate
@@ -305,7 +306,7 @@ def customise_schema(config):
 CONFIG_SCHEMA = customise_schema
 
 
-def _final_validate(config):
+def _final_validate(config: ConfigType) -> None:
     global_config = full_config.get()
     model = MODELS[config[CONF_MODEL]]
 
@@ -341,7 +342,7 @@ def _final_validate(config):
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-def get_instance(config):
+def get_instance(config: ConfigType) -> tuple[MockObjClass, list]:
     """
     Get the type of MipiSpi instance to create based on the configuration,
     and the template arguments.
@@ -394,7 +395,7 @@ def get_instance(config):
     return MipiSpi, templateargs
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     model = MODELS[config[CONF_MODEL]]
     var_id = config[CONF_ID]
     init_sequence = model.get_sequence(config, add_madctl=False, add_reset=True)
diff --git a/esphome/components/online_image/image.py b/esphome/components/online_image/image.py
index cb86f93e29..ae785d17f9 100644
--- a/esphome/components/online_image/image.py
+++ b/esphome/components/online_image/image.py
@@ -6,7 +6,8 @@ from esphome.components.http_request import CONF_HTTP_REQUEST_ID, HttpRequestCom
 from esphome.components.image import CONF_TRANSPARENCY, add_metadata
 import esphome.config_validation as cv
 from esphome.const import CONF_BUFFER_SIZE, CONF_ID, CONF_ON_ERROR, CONF_TYPE, CONF_URL
-from esphome.core import Lambda
+from esphome.core import ID, Lambda
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 AUTO_LOAD = ["runtime_image"]
@@ -89,7 +90,12 @@ RELEASE_IMAGE_SCHEMA = automation.maybe_simple_id(
     RELEASE_IMAGE_SCHEMA,
     synchronous=True,
 )
-async def online_image_action_to_code(config, action_id, template_arg, args):
+async def online_image_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
diff --git a/esphome/components/packet_transport/__init__.py b/esphome/components/packet_transport/__init__.py
index 7beb13ca31..c36d421a35 100644
--- a/esphome/components/packet_transport/__init__.py
+++ b/esphome/components/packet_transport/__init__.py
@@ -1,7 +1,9 @@
 """ESPHome packet transport component."""
 
+from collections.abc import Callable, Iterator
 import hashlib
 import logging
+from typing import Any
 
 import esphome.codegen as cg
 from esphome.components.binary_sensor import BinarySensor
@@ -17,8 +19,9 @@ from esphome.const import (
     CONF_PLATFORM,
     CONF_SENSORS,
 )
-from esphome.core import CORE
-from esphome.cpp_generator import MockObjClass
+from esphome.core import CORE, ID
+from esphome.cpp_generator import MockObj, MockObjClass
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@clydebarrow"]
 AUTO_LOAD = ["xxtea"]
@@ -43,7 +46,7 @@ CONF_TRANSPORT_ID = "transport_id"
 _LOGGER = logging.getLogger(__name__)
 
 
-def sensor_validation(cls: MockObjClass):
+def sensor_validation(cls: MockObjClass) -> Callable[[Any], Any]:
     return cv.maybe_simple_value(
         cv.Schema(
             {
@@ -55,7 +58,7 @@ def sensor_validation(cls: MockObjClass):
     )
 
 
-def provider_name_validate(value):
+def provider_name_validate(value: Any) -> str:
     value = cv.valid_name(value)
     if "_" in value:
         _LOGGER.warning(
@@ -83,7 +86,7 @@ PROVIDER_SCHEMA = cv.Schema(
 ).extend(ENCRYPTION_SCHEMA)
 
 
-def validate_(config):
+def validate_(config: ConfigType) -> ConfigType:
     if CONF_ENCRYPTION in config:
         if CONF_SENSORS not in config and CONF_BINARY_SENSORS not in config:
             raise cv.Invalid("No sensors or binary sensors to encrypt")
@@ -117,11 +120,11 @@ TRANSPORT_SCHEMA = (
 )
 
 
-def transport_schema(cls):
+def transport_schema(cls: MockObjClass) -> cv.Schema:
     return TRANSPORT_SCHEMA.extend({cv.GenerateID(): cv.declare_id(cls)})
 
 
-def get_sensors(transport_id):
+def get_sensors(transport_id: ID) -> Iterator[ConfigType]:
     """Return the list of sensors for this platform."""
     return (
         sensor
@@ -130,7 +133,7 @@ def get_sensors(transport_id):
     )
 
 
-def validate_packet_transport_sensor(config):
+def validate_packet_transport_sensor(config: ConfigType) -> ConfigType:
     if CONF_NAME in config and CONF_INTERNAL not in config:
         raise cv.Invalid("Must provide internal: config when using name:")
     conf_sensors = CORE.data.setdefault(DOMAIN, {}).setdefault(CONF_SENSORS, [])
@@ -138,7 +141,7 @@ def validate_packet_transport_sensor(config):
     return config
 
 
-def packet_transport_sensor_schema(base_schema):
+def packet_transport_sensor_schema(base_schema: cv.Schema) -> cv.Schema:
     return cv.All(
         base_schema.extend(
             {
@@ -152,11 +155,11 @@ def packet_transport_sensor_schema(base_schema):
     )
 
 
-def hash_encryption_key(config: dict):
+def hash_encryption_key(config: dict) -> list[int]:
     return list(hashlib.sha256(config[CONF_KEY].encode()).digest())
 
 
-async def register_packet_transport(var, config):
+async def register_packet_transport(var: MockObj, config: ConfigType) -> set[str]:
     var = await cg.register_component(var, config)
     cg.add(var.set_rolling_code_enable(config[CONF_ROLLING_CODE_ENABLE]))
     cg.add(var.set_ping_pong_enable(config[CONF_PING_PONG_ENABLE]))
@@ -203,7 +206,7 @@ async def register_packet_transport(var, config):
     return providers
 
 
-async def new_packet_transport(config):
+async def new_packet_transport(config: ConfigType) -> tuple[MockObj, set[str]]:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_platform_name(config[CONF_PLATFORM]))
     providers = await register_packet_transport(var, config)
diff --git a/esphome/components/packet_transport/binary_sensor.py b/esphome/components/packet_transport/binary_sensor.py
index 3291ff2c59..37c4688242 100644
--- a/esphome/components/packet_transport/binary_sensor.py
+++ b/esphome/components/packet_transport/binary_sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     ENTITY_CATEGORY_DIAGNOSTIC,
 )
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 from . import (
     CONF_ENCRYPTION,
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = cv.typed_schema(
 )
 
 
-def _final_validate(config) -> None:
+def _final_validate(config: ConfigType) -> None:
     if config[CONF_TYPE] != CONF_STATUS:
         # Only run this validation if a status sensor is being configured
         return
@@ -65,7 +66,7 @@ def _final_validate(config) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     comp = await cg.get_variable(config[CONF_TRANSPORT_ID])
     if config[CONF_TYPE] == CONF_STATUS:
diff --git a/esphome/components/packet_transport/sensor.py b/esphome/components/packet_transport/sensor.py
index 15c0e33b30..018f1c3a9b 100644
--- a/esphome/components/packet_transport/sensor.py
+++ b/esphome/components/packet_transport/sensor.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components.sensor import new_sensor, sensor_schema
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 from . import (
     CONF_PROVIDER,
@@ -12,7 +13,7 @@ from . import (
 CONFIG_SCHEMA = packet_transport_sensor_schema(sensor_schema())
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await new_sensor(config)
     comp = await cg.get_variable(config[CONF_TRANSPORT_ID])
     remote_id = str(config.get(CONF_REMOTE_ID) or config.get(CONF_ID))
diff --git a/esphome/components/pca9554/__init__.py b/esphome/components/pca9554/__init__.py
index f49a68bc3f..5272df2b55 100644
--- a/esphome/components/pca9554/__init__.py
+++ b/esphome/components/pca9554/__init__.py
@@ -11,6 +11,8 @@ from esphome.const import (
     CONF_NUMBER,
     CONF_OUTPUT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@hwstar", "@clydebarrow", "@bdraco"]
 AUTO_LOAD = ["gpio_expander"]
@@ -40,7 +42,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_pin_count(config[CONF_PIN_COUNT]))
     await cg.register_component(var, config)
@@ -49,7 +51,7 @@ async def to_code(config):
         cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -69,7 +71,9 @@ PCA9554_PIN_SCHEMA = pins.gpio_base_schema(
 )
 
 
-def pca9554_pin_final_validate(pin_config, parent_config):
+def pca9554_pin_final_validate(
+    pin_config: ConfigType, parent_config: ConfigType
+) -> None:
     count = parent_config[CONF_PIN_COUNT]
     if pin_config[CONF_NUMBER] >= count:
         raise cv.Invalid(f"Pin number must be in range 0-{count - 1}")
@@ -78,7 +82,7 @@ def pca9554_pin_final_validate(pin_config, parent_config):
 @pins.PIN_SCHEMA_REGISTRY.register(
     CONF_PCA9554, PCA9554_PIN_SCHEMA, pca9554_pin_final_validate
 )
-async def pca9554_pin_to_code(config):
+async def pca9554_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_PCA9554])
 
diff --git a/esphome/components/qspi_dbi/display.py b/esphome/components/qspi_dbi/display.py
index 48cd72ecdf..dce1a95687 100644
--- a/esphome/components/qspi_dbi/display.py
+++ b/esphome/components/qspi_dbi/display.py
@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -26,6 +27,7 @@ from esphome.const import (
     CONF_WIDTH,
 )
 from esphome.core import TimePeriod
+from esphome.types import ConfigType
 
 from . import CONF_DRAW_FROM_ORIGIN
 from .models import DriverChip
@@ -49,14 +51,14 @@ DATA_PIN_SCHEMA = pins.internal_gpio_output_pin_schema
 DELAY_FLAG = 0xFF
 
 
-def validate_dimension(value):
+def validate_dimension(value: Any) -> int:
     value = cv.positive_int(value)
     if value % 2 != 0:
         raise cv.Invalid("Width/height/offset must be divisible by 2")
     return value
 
 
-def map_sequence(value):
+def map_sequence(value: Any) -> list[int]:
     """
     The format is a repeated sequence of [CMD, <data>] where <data> is s a sequence of bytes. The length is inferred
     from the length of the sequence and should not be explicit.
@@ -74,14 +76,14 @@ def map_sequence(value):
     return [value[0], len(params)] + list(params)
 
 
-def _validate(config):
+def _validate(config: ConfigType) -> ConfigType:
     chip = DriverChip.chips[config[CONF_MODEL]]
     if not chip.initsequence and CONF_INIT_SEQUENCE not in config:
         raise cv.Invalid(f"{chip.name} model requires init_sequence")
     return config
 
 
-def power_of_two(value):
+def power_of_two(value: Any) -> int:
     value = cv.int_range(1, 128)(value)
     if value & (value - 1) != 0:
         raise cv.Invalid("value must be a power of two")
@@ -122,11 +124,11 @@ BASE_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend(
 )
 
 
-def model_property(name, defaults, fallback):
+def model_property(name: str, defaults: dict[str, Any], fallback: Any) -> cv.Optional:
     return cv.Optional(name, default=defaults.get(name, fallback))
 
 
-def model_schema(defaults):
+def model_schema(defaults: dict[str, Any]) -> cv.Schema:
     transform = cv.Schema(
         {
             cv.Optional(CONF_MIRROR_X, default=False): cv.boolean,
@@ -162,7 +164,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LOGGER.warning(
         "The 'qspi_dbi' component is deprecated, it is recommended to use 'mipi_spi' instead."
     )
diff --git a/esphome/components/qspi_dbi/models.py b/esphome/components/qspi_dbi/models.py
index 8ce592e0cf..7611279509 100644
--- a/esphome/components/qspi_dbi/models.py
+++ b/esphome/components/qspi_dbi/models.py
@@ -1,4 +1,6 @@
 # Commands
+from typing import Any
+
 from esphome.components.const import CONF_DRAW_ROUNDING
 from esphome.const import CONF_INVERT_COLORS, CONF_SWAP_XY
 
@@ -26,16 +28,16 @@ PAGESEL = 0xFE
 
 
 class DriverChip:
-    chips = {}
+    chips: dict[str, "DriverChip"] = {}
 
-    def __init__(self, name: str, defaults=None):
+    def __init__(self, name: str, defaults: dict[str, Any] | None = None) -> None:
         name = name.upper()
         self.name = name
         self.chips[name] = self
         self.initsequence = []
         self.defaults = defaults or {}
 
-    def cmd(self, c, *args):
+    def cmd(self, c: int, *args: int) -> None:
         """
         Add a command sequence to the init sequence
         :param c: The command (8 bit)
@@ -43,7 +45,7 @@ class DriverChip:
         """
         self.initsequence.extend([c, len(args)] + list(args))
 
-    def delay(self, ms):
+    def delay(self, ms: int) -> None:
         self.initsequence.extend([ms, 0xFF])
 
 
diff --git a/esphome/components/rpi_dpi_rgb/display.py b/esphome/components/rpi_dpi_rgb/display.py
index 314852832c..1ca29a3259 100644
--- a/esphome/components/rpi_dpi_rgb/display.py
+++ b/esphome/components/rpi_dpi_rgb/display.py
@@ -1,4 +1,6 @@
+from collections.abc import Callable
 import logging
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -38,6 +40,7 @@ from esphome.const import (
     CONF_VSYNC_PIN,
     CONF_WIDTH,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["esp32"]
 LOGGER = logging.getLogger(__name__)
@@ -53,7 +56,7 @@ COLOR_ORDERS = {
 DATA_PIN_SCHEMA = pins.internal_gpio_output_pin_schema
 
 
-def data_pin_validate(value):
+def data_pin_validate(value: Any) -> ConfigType:
     """
     It is safe to use strapping pins as RGB output data bits, as they are outputs only,
     and not initialised until after boot.
@@ -68,7 +71,7 @@ def data_pin_validate(value):
     return DATA_PIN_SCHEMA(value)
 
 
-def data_pin_set(length):
+def data_pin_set(length: int) -> Callable[[Any], Any]:
     return cv.All(
         [data_pin_validate],
         cv.Length(min=length, max=length, msg=f"Exactly {length} data pins required"),
@@ -128,7 +131,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LOGGER.warning(
         "The 'rpi_dpi_rgb' component is deprecated, it is recommended to use 'mipi_rgb' instead."
     )
diff --git a/esphome/components/sdl/binary_sensor.py b/esphome/components/sdl/binary_sensor.py
index e19a488800..0fdda25ed3 100644
--- a/esphome/components/sdl/binary_sensor.py
+++ b/esphome/components/sdl/binary_sensor.py
@@ -5,6 +5,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_KEY
 from esphome.core import Lambda
 from esphome.cpp_generator import ExpressionStatement, RawExpression
+from esphome.types import ConfigType
 
 from .display import CONF_SDL_ID, Sdl
 
@@ -275,7 +276,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     parent = await cg.get_variable(config[CONF_SDL_ID])
     listener = Lambda(
diff --git a/esphome/components/sdl/display.py b/esphome/components/sdl/display.py
index 57266f33e2..5ced2edf5a 100644
--- a/esphome/components/sdl/display.py
+++ b/esphome/components/sdl/display.py
@@ -1,4 +1,6 @@
+from collections.abc import Callable
 import subprocess
+from typing import Any
 
 import esphome.codegen as cg
 from esphome.components import display
@@ -14,6 +16,7 @@ from esphome.const import (
     CONF_Y,
     PLATFORM_HOST,
 )
+from esphome.types import ConfigType
 
 sdl_ns = cg.esphome_ns.namespace("sdl")
 Sdl = sdl_ns.class_("Sdl", display.Display, cg.Component)
@@ -35,7 +38,7 @@ WINDOW_OPTIONS = (
 SDL_WINDOWPOS_CENTERED_MASK = 0x2FFF0000
 
 
-def get_sdl_options(value):
+def get_sdl_options(value: str) -> str:
     if value != "":
         return value
     try:
@@ -46,7 +49,7 @@ def get_sdl_options(value):
         raise cv.Invalid("Unable to run sdl2-config - have you installed sdl2?") from e
 
 
-def get_window_options():
+def get_window_options() -> dict[cv.Optional, Callable[[Any], Any]]:
     return {cv.Optional(option, default=False): cv.boolean for option in WINDOW_OPTIONS}
 
 
@@ -100,7 +103,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     for option in config[CONF_SDL_OPTIONS].split():
         cg.add_build_flag(option)
     cg.add_build_flag("-DSDL_BYTEORDER=4321")
diff --git a/esphome/components/sdl/touchscreen/__init__.py b/esphome/components/sdl/touchscreen/__init__.py
index 9f84f91c72..d7af8da403 100644
--- a/esphome/components/sdl/touchscreen/__init__.py
+++ b/esphome/components/sdl/touchscreen/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 from ..display import CONF_SDL_ID, Sdl, sdl_ns
 
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_SDL_ID])
     await touchscreen.register_touchscreen(var, config)
diff --git a/esphome/components/seeed_mr24hpc1/__init__.py b/esphome/components/seeed_mr24hpc1/__init__.py
index f71239d18c..56630f18f4 100644
--- a/esphome/components/seeed_mr24hpc1/__init__.py
+++ b/esphome/components/seeed_mr24hpc1/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 # is the code owner of the relevant code base
@@ -43,7 +44,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 
 # The async def keyword is used to define a concurrent function.
 # Concurrent functions are special functions designed to work with Python's asyncio library to support asynchronous I/O operations.
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # This line of code creates a new Pvariable (a Python object representing a C++ variable) with the variable's ID taken from the configuration.
     var = cg.new_Pvariable(config[CONF_ID])
     # This line of code registers the newly created Pvariable as a component so that ESPHome can manage it at runtime.
diff --git a/esphome/components/seeed_mr24hpc1/binary_sensor.py b/esphome/components/seeed_mr24hpc1/binary_sensor.py
index 26de1e4ac1..121eb2b4b3 100644
--- a/esphome/components/seeed_mr24hpc1/binary_sensor.py
+++ b/esphome/components/seeed_mr24hpc1/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_HAS_TARGET, DEVICE_CLASS_OCCUPANCY
+from esphome.types import ConfigType
 
 from . import CONF_MR24HPC1_ID, MR24HPC1Component
 
@@ -13,7 +14,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr24hpc1_component = await cg.get_variable(config[CONF_MR24HPC1_ID])
     if has_target_config := config.get(CONF_HAS_TARGET):
         sens = await binary_sensor.new_binary_sensor(has_target_config)
diff --git a/esphome/components/seeed_mr24hpc1/button/__init__.py b/esphome/components/seeed_mr24hpc1/button/__init__.py
index 1e68d7e071..3386118bcf 100644
--- a/esphome/components/seeed_mr24hpc1/button/__init__.py
+++ b/esphome/components/seeed_mr24hpc1/button/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import (
     ENTITY_CATEGORY_CONFIG,
     ICON_RESTART_ALERT,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_MR24HPC1_ID, MR24HPC1Component, mr24hpc1_ns
 
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr24hpc1_component = await cg.get_variable(config[CONF_MR24HPC1_ID])
     if restart_config := config.get(CONF_RESTART):
         b = await button.new_button(restart_config)
diff --git a/esphome/components/seeed_mr24hpc1/number/__init__.py b/esphome/components/seeed_mr24hpc1/number/__init__.py
index 4de3654e39..d01618b0e6 100644
--- a/esphome/components/seeed_mr24hpc1/number/__init__.py
+++ b/esphome/components/seeed_mr24hpc1/number/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import number
 import esphome.config_validation as cv
 from esphome.const import CONF_SENSITIVITY, ENTITY_CATEGORY_CONFIG
+from esphome.types import ConfigType
 
 from .. import CONF_MR24HPC1_ID, MR24HPC1Component, mr24hpc1_ns
 
@@ -63,7 +64,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr24hpc1_component = await cg.get_variable(config[CONF_MR24HPC1_ID])
     if sensitivity_config := config.get(CONF_SENSITIVITY):
         n = await number.new_number(
diff --git a/esphome/components/seeed_mr24hpc1/select/__init__.py b/esphome/components/seeed_mr24hpc1/select/__init__.py
index 14854f0795..9d46dee6f6 100644
--- a/esphome/components/seeed_mr24hpc1/select/__init__.py
+++ b/esphome/components/seeed_mr24hpc1/select/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import select
 import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_CONFIG
+from esphome.types import ConfigType
 
 from .. import CONF_MR24HPC1_ID, MR24HPC1Component, mr24hpc1_ns
 
@@ -38,7 +39,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr24hpc1_component = await cg.get_variable(config[CONF_MR24HPC1_ID])
     if scenemode_config := config.get(CONF_SCENE_MODE):
         s = await select.new_select(
diff --git a/esphome/components/seeed_mr24hpc1/sensor.py b/esphome/components/seeed_mr24hpc1/sensor.py
index ca15fd5be6..36ee2c0087 100644
--- a/esphome/components/seeed_mr24hpc1/sensor.py
+++ b/esphome/components/seeed_mr24hpc1/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_METER,
 )
+from esphome.types import ConfigType
 
 from . import CONF_MR24HPC1_ID, MR24HPC1Component
 
@@ -60,7 +61,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr24hpc1_component = await cg.get_variable(config[CONF_MR24HPC1_ID])
     if custompresenceofdetection_config := config.get(
         CONF_CUSTOM_PRESENCE_OF_DETECTION
diff --git a/esphome/components/seeed_mr24hpc1/switch/__init__.py b/esphome/components/seeed_mr24hpc1/switch/__init__.py
index 741e7de3ca..f9588d783e 100644
--- a/esphome/components/seeed_mr24hpc1/switch/__init__.py
+++ b/esphome/components/seeed_mr24hpc1/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_SWITCH, ENTITY_CATEGORY_CONFIG
+from esphome.types import ConfigType
 
 from .. import CONF_MR24HPC1_ID, MR24HPC1Component, mr24hpc1_ns
 
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr24hpc1_component = await cg.get_variable(config[CONF_MR24HPC1_ID])
     if underlying_open_function_config := config.get(CONF_UNDERLYING_OPEN_FUNCTION):
         s = await switch.new_switch(underlying_open_function_config)
diff --git a/esphome/components/seeed_mr24hpc1/text_sensor.py b/esphome/components/seeed_mr24hpc1/text_sensor.py
index fadd9c6dbc..8f284cb20a 100644
--- a/esphome/components/seeed_mr24hpc1/text_sensor.py
+++ b/esphome/components/seeed_mr24hpc1/text_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_DIAGNOSTIC
+from esphome.types import ConfigType
 
 from . import CONF_MR24HPC1_ID, MR24HPC1Component
 
@@ -47,7 +48,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr24hpc1_component = await cg.get_variable(config[CONF_MR24HPC1_ID])
     if heartbeat_config := config.get(CONF_HEART_BEAT):
         sens = await text_sensor.new_text_sensor(heartbeat_config)
diff --git a/esphome/components/seeed_mr60bha2/__init__.py b/esphome/components/seeed_mr60bha2/__init__.py
index 87bdbbd003..6bf8657af9 100644
--- a/esphome/components/seeed_mr60bha2/__init__.py
+++ b/esphome/components/seeed_mr60bha2/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@limengdu"]
 DEPENDENCIES = ["uart"]
@@ -35,7 +36,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/seeed_mr60bha2/binary_sensor.py b/esphome/components/seeed_mr60bha2/binary_sensor.py
index 99940ebf6d..4130bac224 100644
--- a/esphome/components/seeed_mr60bha2/binary_sensor.py
+++ b/esphome/components/seeed_mr60bha2/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_HAS_TARGET, DEVICE_CLASS_OCCUPANCY
+from esphome.types import ConfigType
 
 from . import CONF_MR60BHA2_ID, MR60BHA2Component
 
@@ -15,7 +16,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr60bha2_component = await cg.get_variable(config[CONF_MR60BHA2_ID])
 
     if has_target_config := config.get(CONF_HAS_TARGET):
diff --git a/esphome/components/seeed_mr60bha2/sensor.py b/esphome/components/seeed_mr60bha2/sensor.py
index d7f667d862..a2f41a90a8 100644
--- a/esphome/components/seeed_mr60bha2/sensor.py
+++ b/esphome/components/seeed_mr60bha2/sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     UNIT_BEATS_PER_MINUTE,
     UNIT_CENTIMETER,
 )
+from esphome.types import ConfigType
 
 from . import CONF_MR60BHA2_ID, MR60BHA2Component
 
@@ -49,7 +50,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr60bha2_component = await cg.get_variable(config[CONF_MR60BHA2_ID])
     if breath_rate_config := config.get(CONF_BREATH_RATE):
         sens = await sensor.new_sensor(breath_rate_config)
diff --git a/esphome/components/seeed_mr60fda2/__init__.py b/esphome/components/seeed_mr60fda2/__init__.py
index e79134deec..de6e8ad57b 100644
--- a/esphome/components/seeed_mr60fda2/__init__.py
+++ b/esphome/components/seeed_mr60fda2/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@limengdu"]
 DEPENDENCIES = ["uart"]
@@ -35,7 +36,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/seeed_mr60fda2/binary_sensor.py b/esphome/components/seeed_mr60fda2/binary_sensor.py
index 2860ac0100..63bd02acd0 100644
--- a/esphome/components/seeed_mr60fda2/binary_sensor.py
+++ b/esphome/components/seeed_mr60fda2/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_OCCUPANCY, DEVICE_CLASS_SAFETY
+from esphome.types import ConfigType
 
 from . import CONF_MR60FDA2_ID, MR60FDA2Component
 
@@ -21,7 +22,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr60fda2_component = await cg.get_variable(config[CONF_MR60FDA2_ID])
 
     if people_exist_config := config.get(CONF_PEOPLE_EXIST):
diff --git a/esphome/components/seeed_mr60fda2/button/__init__.py b/esphome/components/seeed_mr60fda2/button/__init__.py
index 8236248b8c..82f0fc9aea 100644
--- a/esphome/components/seeed_mr60fda2/button/__init__.py
+++ b/esphome/components/seeed_mr60fda2/button/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     ENTITY_CATEGORY_DIAGNOSTIC,
     ENTITY_CATEGORY_NONE,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_MR60FDA2_ID, MR60FDA2Component, mr60fda2_ns
 
@@ -33,7 +34,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr60fda2_component = await cg.get_variable(config[CONF_MR60FDA2_ID])
     if get_radar_parameters_config := config.get(CONF_GET_RADAR_PARAMETERS):
         b = await button.new_button(get_radar_parameters_config)
diff --git a/esphome/components/seeed_mr60fda2/select/__init__.py b/esphome/components/seeed_mr60fda2/select/__init__.py
index 2fea150cd2..6d8864455f 100644
--- a/esphome/components/seeed_mr60fda2/select/__init__.py
+++ b/esphome/components/seeed_mr60fda2/select/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import select
 import esphome.config_validation as cv
 from esphome.const import CONF_SENSITIVITY, ENTITY_CATEGORY_CONFIG, ICON_ACCELERATION_Z
+from esphome.types import ConfigType
 
 from .. import CONF_MR60FDA2_ID, MR60FDA2Component, mr60fda2_ns
 
@@ -33,7 +34,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mr60fda2_component = await cg.get_variable(config[CONF_MR60FDA2_ID])
     if install_height_config := config.get(CONF_INSTALL_HEIGHT):
         s = await select.new_select(
diff --git a/esphome/components/st7701s/display.py b/esphome/components/st7701s/display.py
index 7f6492812f..16d7ef8e86 100644
--- a/esphome/components/st7701s/display.py
+++ b/esphome/components/st7701s/display.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components import display, spi
@@ -41,6 +43,7 @@ from esphome.const import (
     CONF_WIDTH,
 )
 from esphome.core import TimePeriod
+from esphome.types import ConfigType
 
 from .init_sequences import ST7701S_INITS, cmd
 
@@ -58,7 +61,7 @@ COLOR_ORDERS = {
 DATA_PIN_SCHEMA = pins.internal_gpio_output_pin_schema
 
 
-def data_pin_validate(value):
+def data_pin_validate(value: Any) -> ConfigType:
     """
     It is safe to use strapping pins as RGB output data bits, as they are outputs only,
     and not initialised until after boot.
@@ -73,14 +76,14 @@ def data_pin_validate(value):
     return DATA_PIN_SCHEMA(value)
 
 
-def data_pin_set(length):
+def data_pin_set(length: int) -> cv.Schema:
     return cv.All(
         [data_pin_validate],
         cv.Length(min=length, max=length, msg=f"Exactly {length} data pins required"),
     )
 
 
-def map_sequence(value):
+def map_sequence(value: Any) -> list:
     """
     An initialisation sequence can be selected from one of the pre-defined sequences in init_sequences.py,
     or can be a literal array of data bytes.
@@ -170,7 +173,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await display.register_display(var, config)
     await spi.register_spi_device(var, config, write_only=True)
diff --git a/esphome/components/st7701s/init_sequences.py b/esphome/components/st7701s/init_sequences.py
index 4786731c78..a67f3f63fb 100644
--- a/esphome/components/st7701s/init_sequences.py
+++ b/esphome/components/st7701s/init_sequences.py
@@ -1,7 +1,7 @@
 # These are initialisation sequences for ST7701S displays. The contents are somewhat arcane.
 
 
-def cmd(c, *args):
+def cmd(c: int, *args: int) -> list[int]:
     """
     Create a command sequence
     :param c: The command (8 bit)
diff --git a/esphome/components/udp/__init__.py b/esphome/components/udp/__init__.py
index 5dfd188f0f..a782d875b9 100644
--- a/esphome/components/udp/__init__.py
+++ b/esphome/components/udp/__init__.py
@@ -1,3 +1,6 @@
+from collections.abc import Callable
+from typing import Any, NoReturn
+
 from esphome import automation
 from esphome.automation import Trigger
 import esphome.codegen as cg
@@ -13,7 +16,7 @@ from esphome.components.packet_transport import (
 import esphome.config_validation as cv
 from esphome.const import CONF_DATA, CONF_ID, CONF_PORT, CONF_TRIGGER_ID
 from esphome.core import ID
-from esphome.cpp_generator import MockObj
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@clydebarrow"]
@@ -45,8 +48,8 @@ UDP_SCHEMA = cv.Schema(
 )
 
 
-def is_relocated(option):
-    def validator(value):
+def is_relocated(option: str) -> Callable[[Any], NoReturn]:
+    def validator(value: Any) -> NoReturn:
         raise cv.Invalid(
             f"The '{option}' option should now be configured in the 'packet_transport' component"
         )
@@ -109,13 +112,13 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def register_udp_client(var, config):
+async def register_udp_client(var: MockObj, config: ConfigType) -> MockObj:
     udp_var = await cg.get_variable(config[CONF_UDP_ID])
     cg.add(var.set_parent(udp_var))
     return udp_var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_UDP")
     cg.add_global(udp_ns.using)
     var = cg.new_Pvariable(config[CONF_ID])
@@ -147,7 +150,7 @@ async def to_code(config):
         cg.add(var.set_should_listen())
 
 
-def validate_raw_data(value):
+def validate_raw_data(value: Any) -> bytes | list[int]:
     if isinstance(value, str):
         return value.encode("utf-8")
     if isinstance(value, str):
@@ -171,7 +174,12 @@ def validate_raw_data(value):
     ),
     synchronous=True,
 )
-async def udp_write_to_code(config, action_id, template_arg, args):
+async def udp_write_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     udp_var = await cg.get_variable(config[CONF_ID])
     await cg.register_parented(var, udp_var)
diff --git a/esphome/components/udp/packet_transport/__init__.py b/esphome/components/udp/packet_transport/__init__.py
index e725276717..f2c15289a9 100644
--- a/esphome/components/udp/packet_transport/__init__.py
+++ b/esphome/components/udp/packet_transport/__init__.py
@@ -7,6 +7,7 @@ from esphome.components.packet_transport import (
 )
 from esphome.const import CONF_BINARY_SENSORS, CONF_ENCRYPTION, CONF_SENSORS
 from esphome.cpp_types import PollingComponent
+from esphome.types import ConfigType
 
 from .. import UDP_SCHEMA, register_udp_client, udp_ns
 
@@ -15,7 +16,7 @@ UDPTransport = udp_ns.class_("UDPTransport", PacketTransport, PollingComponent)
 CONFIG_SCHEMA = transport_schema(UDPTransport).extend(UDP_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var, providers = await new_packet_transport(config)
     udp_var = await register_udp_client(var, config)
     if CONF_ENCRYPTION in config or providers:
diff --git a/esphome/components/usb_uart/__init__.py b/esphome/components/usb_uart/__init__.py
index a921b6fbf0..edbf75f70f 100644
--- a/esphome/components/usb_uart/__init__.py
+++ b/esphome/components/usb_uart/__init__.py
@@ -18,6 +18,7 @@ from esphome.const import (
 )
 from esphome.core import CORE
 from esphome.cpp_types import Component
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["uart", "usb_host", "bytebuffer"]
 CODEOWNERS = ["@clydebarrow"]
@@ -48,14 +49,14 @@ DEFAULT_BAUD_RATE = 9600
 class Type:
     def __init__(
         self,
-        name,
-        vid,
-        pid,
-        cls,
-        max_channels=1,
-        baud_rate_required=True,
-        max_baud=1_000_000,
-    ):
+        name: str,
+        vid: int,
+        pid: int,
+        cls: str | None,
+        max_channels: int = 1,
+        baud_rate_required: bool = True,
+        max_baud: int = 1_000_000,
+    ) -> None:
         self.name = name
         cls = cls or name
         self.vid = vid
@@ -156,7 +157,7 @@ CONFIG_SCHEMA = cv.ensure_list(
 )
 
 
-async def to_code(config):
+async def to_code(config: list[ConfigType]) -> None:
     # The output chunk pool/queue are compile-time-sized templates shared by all
     # USBUartChannel instances, so use the largest buffer_size across every channel
     # of every device. Add one extra slot because LockFreeQueue<T,N> is a ring

From fbe4b39a165d7e2bd54a448c020f4640d2809dbe Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Aug 2026 02:58:58 +1200
Subject: [PATCH 014/155] [core] Add type annotations to component Python
 (3/11) (#18340)

---
 .../components/copy/binary_sensor/__init__.py |  3 +-
 esphome/components/copy/button/__init__.py    |  3 +-
 esphome/components/copy/cover/__init__.py     |  3 +-
 esphome/components/copy/fan/__init__.py       |  3 +-
 esphome/components/copy/lock/__init__.py      |  3 +-
 esphome/components/copy/number/__init__.py    |  3 +-
 esphome/components/copy/select/__init__.py    |  3 +-
 esphome/components/copy/sensor/__init__.py    |  3 +-
 esphome/components/copy/switch/__init__.py    |  3 +-
 esphome/components/copy/text/__init__.py      |  3 +-
 .../components/copy/text_sensor/__init__.py   |  3 +-
 esphome/components/integration/sensor.py      | 23 +++++++++---
 esphome/components/key_collector/__init__.py  | 19 +++++++---
 .../key_collector/text_sensor/__init__.py     |  4 +--
 esphome/components/ledc/output.py             | 20 ++++++++---
 esphome/components/matrix_keypad/__init__.py  |  5 +--
 .../matrix_keypad/binary_sensor/__init__.py   |  5 +--
 esphome/components/pid/climate.py             | 26 +++++++++++---
 esphome/components/pid/sensor/__init__.py     |  3 +-
 esphome/components/rp2/__init__.py            | 15 ++++----
 esphome/components/rp2/generate_boards.py     |  2 +-
 esphome/components/rp2/gpio.py                | 16 +++++----
 esphome/components/rp2040_pwm/output.py       | 12 +++++--
 esphome/components/sn74hc165/__init__.py      | 12 ++++---
 esphome/components/sun/__init__.py            | 24 ++++++++++---
 esphome/components/sun/sensor/__init__.py     |  3 +-
 .../components/sun/text_sensor/__init__.py    |  5 +--
 esphome/components/touchscreen/__init__.py    | 22 ++++++++----
 .../touchscreen/binary_sensor/__init__.py     |  5 +--
 esphome/components/update/__init__.py         | 34 ++++++++++++------
 esphome/components/vbus/__init__.py           |  3 +-
 .../components/vbus/binary_sensor/__init__.py |  3 +-
 esphome/components/vbus/sensor/__init__.py    |  3 +-
 .../components/voice_assistant/__init__.py    | 35 +++++++++++++++----
 .../components/xiaomi_rtcgq02lm/__init__.py   |  3 +-
 .../xiaomi_rtcgq02lm/binary_sensor.py         |  3 +-
 esphome/components/xiaomi_rtcgq02lm/sensor.py |  3 +-
 37 files changed, 246 insertions(+), 95 deletions(-)

diff --git a/esphome/components/copy/binary_sensor/__init__.py b/esphome/components/copy/binary_sensor/__init__.py
index 840200409f..cc8492f21e 100644
--- a/esphome/components/copy/binary_sensor/__init__.py
+++ b/esphome/components/copy/binary_sensor/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_SOURCE_ID,
 )
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -33,7 +34,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/copy/button/__init__.py b/esphome/components/copy/button/__init__.py
index 8028d6a217..768131bbe5 100644
--- a/esphome/components/copy/button/__init__.py
+++ b/esphome/components/copy/button/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_SOURCE_ID,
 )
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -32,7 +33,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await button.register_button(var, config)
     await cg.register_component(var, config)
diff --git a/esphome/components/copy/cover/__init__.py b/esphome/components/copy/cover/__init__.py
index ff5bef5668..d23602fa74 100644
--- a/esphome/components/copy/cover/__init__.py
+++ b/esphome/components/copy/cover/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_SOURCE_ID,
 )
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -31,7 +32,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await cover.new_cover(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/copy/fan/__init__.py b/esphome/components/copy/fan/__init__.py
index a208e5f80a..ffa414c5f2 100644
--- a/esphome/components/copy/fan/__init__.py
+++ b/esphome/components/copy/fan/__init__.py
@@ -3,6 +3,7 @@ from esphome.components import fan
 import esphome.config_validation as cv
 from esphome.const import CONF_ENTITY_CATEGORY, CONF_ICON, CONF_SOURCE_ID
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -25,7 +26,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await fan.new_fan(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/copy/lock/__init__.py b/esphome/components/copy/lock/__init__.py
index 46bc08273e..8d9c4b6eca 100644
--- a/esphome/components/copy/lock/__init__.py
+++ b/esphome/components/copy/lock/__init__.py
@@ -3,6 +3,7 @@ from esphome.components import lock
 import esphome.config_validation as cv
 from esphome.const import CONF_ENTITY_CATEGORY, CONF_ICON, CONF_SOURCE_ID
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -25,7 +26,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await lock.new_lock(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/copy/number/__init__.py b/esphome/components/copy/number/__init__.py
index 3e2bbf2aae..9659a605f9 100644
--- a/esphome/components/copy/number/__init__.py
+++ b/esphome/components/copy/number/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_UNIT_OF_MEASUREMENT,
 )
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -33,7 +34,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await number.new_number(config, min_value=0, max_value=0, step=0)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/copy/select/__init__.py b/esphome/components/copy/select/__init__.py
index d7ddc52c44..97776b1edd 100644
--- a/esphome/components/copy/select/__init__.py
+++ b/esphome/components/copy/select/__init__.py
@@ -3,6 +3,7 @@ from esphome.components import select
 import esphome.config_validation as cv
 from esphome.const import CONF_ENTITY_CATEGORY, CONF_ICON, CONF_ID, CONF_SOURCE_ID
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -25,7 +26,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await select.register_select(var, config, options=[])
     await cg.register_component(var, config)
diff --git a/esphome/components/copy/sensor/__init__.py b/esphome/components/copy/sensor/__init__.py
index 57ca06aca7..5468798047 100644
--- a/esphome/components/copy/sensor/__init__.py
+++ b/esphome/components/copy/sensor/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_UNIT_OF_MEASUREMENT,
 )
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -37,7 +38,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/copy/switch/__init__.py b/esphome/components/copy/switch/__init__.py
index ee27e38c5f..0e714540f9 100644
--- a/esphome/components/copy/switch/__init__.py
+++ b/esphome/components/copy/switch/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_SOURCE_ID,
 )
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -31,7 +32,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await switch.new_switch(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/copy/text/__init__.py b/esphome/components/copy/text/__init__.py
index f1ca404b7b..59fdce6c96 100644
--- a/esphome/components/copy/text/__init__.py
+++ b/esphome/components/copy/text/__init__.py
@@ -3,6 +3,7 @@ from esphome.components import text
 import esphome.config_validation as cv
 from esphome.const import CONF_ENTITY_CATEGORY, CONF_ICON, CONF_MODE, CONF_SOURCE_ID
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -26,7 +27,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await text.new_text(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/copy/text_sensor/__init__.py b/esphome/components/copy/text_sensor/__init__.py
index 7b38ff1a64..146beae5ea 100644
--- a/esphome/components/copy/text_sensor/__init__.py
+++ b/esphome/components/copy/text_sensor/__init__.py
@@ -3,6 +3,7 @@ from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ENTITY_CATEGORY, CONF_ICON, CONF_SOURCE_ID
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 from .. import copy_ns
 
@@ -25,7 +26,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await text_sensor.new_text_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/integration/sensor.py b/esphome/components/integration/sensor.py
index 8d784df672..82e8ba8df8 100644
--- a/esphome/components/integration/sensor.py
+++ b/esphome/components/integration/sensor.py
@@ -11,7 +11,10 @@ from esphome.const import (
     CONF_UNIT_OF_MEASUREMENT,
     CONF_VALUE,
 )
+from esphome.core import ID
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 integration_ns = cg.esphome_ns.namespace("integration")
 IntegrationSensor = integration_ns.class_(
@@ -39,14 +42,14 @@ CONF_TIME_UNIT = "time_unit"
 CONF_INTEGRATION_METHOD = "integration_method"
 
 
-def inherit_unit_of_measurement(uom, config):
+def inherit_unit_of_measurement(uom: str, config: ConfigType) -> str:
     suffix = config[CONF_TIME_UNIT]
     if uom.endswith("/" + suffix):
         return uom[0 : -len("/" + suffix)]
     return uom + suffix
 
 
-def inherit_accuracy_decimals(decimals, config):
+def inherit_accuracy_decimals(decimals: int, config: ConfigType) -> int:
     return decimals + 2
 
 
@@ -90,7 +93,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
 
     await cg.register_component(var, config)
@@ -113,7 +116,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def sensor_integration_reset_to_code(config, action_id, template_arg, args):
+async def sensor_integration_reset_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -130,7 +138,12 @@ async def sensor_integration_reset_to_code(config, action_id, template_arg, args
     ),
     synchronous=True,
 )
-async def sensor_integration_set_value_to_code(config, action_id, template_arg, args):
+async def sensor_integration_set_value_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_VALUE], args, cg.float_)
diff --git a/esphome/components/key_collector/__init__.py b/esphome/components/key_collector/__init__.py
index 1f4519df2d..bf47b6df88 100644
--- a/esphome/components/key_collector/__init__.py
+++ b/esphome/components/key_collector/__init__.py
@@ -15,8 +15,9 @@ from esphome.const import (
     CONF_TIMEOUT,
     CONF_TRIGGER_ID,
 )
+from esphome.core import ID
 from esphome.cpp_generator import MockObj, literal
-from esphome.types import TemplateArgsType
+from esphome.types import ConfigType, TemplateArgsType
 
 CODEOWNERS = ["@ssieb"]
 
@@ -90,7 +91,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     for source_conf in config.get(CONF_SOURCE_ID, ()):
@@ -144,7 +145,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def enable_to_code(config, action_id, template_arg, args):
+async def enable_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -160,7 +166,12 @@ async def enable_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def disable_to_code(config, action_id, template_arg, args):
+async def disable_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/key_collector/text_sensor/__init__.py b/esphome/components/key_collector/text_sensor/__init__.py
index 1676cf7bdf..e32d15df2e 100644
--- a/esphome/components/key_collector/text_sensor/__init__.py
+++ b/esphome/components/key_collector/text_sensor/__init__.py
@@ -4,7 +4,7 @@ from esphome.components.text_sensor import TextSensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
 from esphome.cpp_generator import literal
-from esphome.types import TemplateArgsType
+from esphome.types import ConfigType, TemplateArgsType
 
 from .. import CONF_ON_RESULT, CONF_SOURCE_ID, TRIGGER_TYPES, KeyCollector
 
@@ -15,7 +15,7 @@ CONFIG_SCHEMA = text_sensor.text_sensor_schema(TextSensor).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_SOURCE_ID])
     var = cg.new_Pvariable(config[CONF_ID])
     await text_sensor.register_text_sensor(var, config)
diff --git a/esphome/components/ledc/output.py b/esphome/components/ledc/output.py
index 95df1fba23..637e607b6d 100644
--- a/esphome/components/ledc/output.py
+++ b/esphome/components/ledc/output.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation, pins
 import esphome.codegen as cg
 from esphome.components import output
@@ -9,20 +11,23 @@ from esphome.const import (
     CONF_PHASE_ANGLE,
     CONF_PIN,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["esp32"]
 
 
-def calc_max_frequency(bit_depth):
+def calc_max_frequency(bit_depth: int) -> float:
     return 80e6 / (2**bit_depth)
 
 
-def calc_min_frequency(bit_depth):
+def calc_min_frequency(bit_depth: int) -> float:
     max_div_num = ((2**20) - 1) / 256.0
     return 80e6 / (max_div_num * (2**bit_depth))
 
 
-def validate_frequency(value):
+def validate_frequency(value: Any) -> float:
     value = cv.frequency(value)
     min_freq = calc_min_frequency(20)
     max_freq = calc_max_frequency(1)
@@ -56,7 +61,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     gpio = await cg.gpio_pin_expression(config[CONF_PIN])
     var = cg.new_Pvariable(config[CONF_ID], gpio)
     await cg.register_component(var, config)
@@ -79,7 +84,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def ledc_set_frequency_to_code(config, action_id, template_arg, args):
+async def ledc_set_frequency_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_FREQUENCY], args, cg.float_)
diff --git a/esphome/components/matrix_keypad/__init__.py b/esphome/components/matrix_keypad/__init__.py
index 868b149211..47cf4793b1 100644
--- a/esphome/components/matrix_keypad/__init__.py
+++ b/esphome/components/matrix_keypad/__init__.py
@@ -4,6 +4,7 @@ from esphome.components import key_provider
 from esphome.components.const import CONF_ROWS
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_ON_KEY, CONF_PIN, CONF_TRIGGER_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ssieb"]
 
@@ -27,7 +28,7 @@ CONF_HAS_DIODES = "has_diodes"
 CONF_HAS_PULLDOWNS = "has_pulldowns"
 
 
-def check_keys(obj):
+def check_keys(obj: ConfigType) -> ConfigType:
     if CONF_KEYS in obj and len(obj[CONF_KEYS]) != len(obj[CONF_ROWS]) * len(
         obj[CONF_COLUMNS]
     ):
@@ -62,7 +63,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     row_pins = []
diff --git a/esphome/components/matrix_keypad/binary_sensor/__init__.py b/esphome/components/matrix_keypad/binary_sensor/__init__.py
index 8e63ed43ce..6c6e0aad73 100644
--- a/esphome/components/matrix_keypad/binary_sensor/__init__.py
+++ b/esphome/components/matrix_keypad/binary_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_COL, CONF_ID, CONF_KEY, CONF_ROW
+from esphome.types import ConfigType
 
 from .. import CONF_KEYPAD_ID, MatrixKeypad, matrix_keypad_ns
 
@@ -12,7 +13,7 @@ MatrixKeypadBinarySensor = matrix_keypad_ns.class_(
 )
 
 
-def check_button(obj):
+def check_button(obj: ConfigType) -> ConfigType:
     if CONF_ROW in obj or CONF_COL in obj:
         if CONF_KEY in obj:
             raise cv.Invalid("You can't provide both a key and a position")
@@ -40,7 +41,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if CONF_KEY in config:
         var = cg.new_Pvariable(config[CONF_ID], config[CONF_KEY][0])
     else:
diff --git a/esphome/components/pid/climate.py b/esphome/components/pid/climate.py
index 3e4ff754c9..4945547f2e 100644
--- a/esphome/components/pid/climate.py
+++ b/esphome/components/pid/climate.py
@@ -3,6 +3,9 @@ import esphome.codegen as cg
 from esphome.components import climate, output, sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_HUMIDITY_SENSOR, CONF_ID, CONF_SENSOR
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 pid_ns = cg.esphome_ns.namespace("pid")
 PIDClimate = pid_ns.class_("PIDClimate", climate.Climate, cg.Component)
@@ -82,7 +85,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate.new_climate(config)
     await cg.register_component(var, config)
 
@@ -141,7 +144,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def pid_reset_integral_term(config, action_id, template_arg, args):
+async def pid_reset_integral_term(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -163,7 +171,12 @@ async def pid_reset_integral_term(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def esp8266_set_frequency_to_code(config, action_id, template_arg, args):
+async def esp8266_set_frequency_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     cg.add(var.set_noiseband(config[CONF_NOISEBAND]))
@@ -185,7 +198,12 @@ async def esp8266_set_frequency_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def set_control_parameters(config, action_id, template_arg, args):
+async def set_control_parameters(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
diff --git a/esphome/components/pid/sensor/__init__.py b/esphome/components/pid/sensor/__init__.py
index d26e88e38a..94d641de47 100644
--- a/esphome/components/pid/sensor/__init__.py
+++ b/esphome/components/pid/sensor/__init__.py
@@ -3,6 +3,7 @@ from esphome.components import sensor
 from esphome.components.const import CONF_CLIMATE_ID
 import esphome.config_validation as cv
 from esphome.const import CONF_TYPE, ICON_GAUGE, STATE_CLASS_MEASUREMENT, UNIT_PERCENT
+from esphome.types import ConfigType
 
 from ..climate import PIDClimate, pid_ns
 
@@ -40,7 +41,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_CLIMATE_ID])
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
diff --git a/esphome/components/rp2/__init__.py b/esphome/components/rp2/__init__.py
index 60fcd4f8b0..ed975ec01a 100644
--- a/esphome/components/rp2/__init__.py
+++ b/esphome/components/rp2/__init__.py
@@ -34,6 +34,7 @@ from esphome.core import (
 from esphome.core.config import BOARD_MAX_LENGTH
 from esphome.helpers import copy_file_if_changed, read_file, write_file_if_changed
 from esphome.platformio.toolchain import copy_ccache_script
+from esphome.storage_json import StorageJSON
 from esphome.types import ConfigType
 
 from . import boards
@@ -145,7 +146,7 @@ def only_on_variant(
     return validator_
 
 
-def get_download_types(storage_json):
+def get_download_types(storage_json: StorageJSON) -> list[dict[str, str]]:
     """Binary-download entries for a built RP2040 firmware.
 
     Used by device-builder (esphome/device-builder), via
@@ -181,7 +182,7 @@ def _format_framework_arduino_version(ver: cv.Version) -> str:
     return f"https://github.com/earlephilhower/arduino-pico/releases/download/{ver}/rp2040-{ver}.zip"
 
 
-def _parse_platform_version(value):
+def _parse_platform_version(value: Any) -> str:
     value = cv.string(value)
     if value.startswith("http"):
         return value
@@ -205,7 +206,7 @@ RECOMMENDED_ARDUINO_FRAMEWORK_VERSION = cv.Version(6, 0, 0)
 RECOMMENDED_ARDUINO_PLATFORM_VERSION = "9c167c6b8aac4f4cfa6d55a0c4e5b848795150c0"
 
 
-def _arduino_check_versions(value):
+def _arduino_check_versions(value: ConfigType) -> ConfigType:
     value = value.copy()
     lookups = {
         "dev": (cv.Version(6, 0, 0), "https://github.com/earlephilhower/arduino-pico"),
@@ -316,7 +317,7 @@ CONFIG_SCHEMA = cv.All(
 
 
 @coroutine_with_priority(CoroPriority.PLATFORM)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add(rp2_ns.setup_preferences())
 
     # Allow LDF to properly discover dependency including those in preprocessor
@@ -588,7 +589,7 @@ def _generate_lwipopts_h() -> None:
     write_file_if_changed(lwip_dir / "lwipopts.h", content)
 
 
-def add_pio_file(component: str, key: str, data: str):
+def add_pio_file(component: str, key: str, data: str) -> None:
     try:
         cv.validate_id_name(key)
     except cv.Invalid as e:
@@ -629,7 +630,7 @@ def generate_pio_files() -> bool:
 
 
 # Called by writer.py
-def copy_files():
+def copy_files() -> None:
     dir = Path(__file__).parent
     post_build_file = dir / "post_build.py.script"
     copy_file_if_changed(
@@ -670,7 +671,7 @@ def _addr2line(tool: str, elf: Path, addr: str) -> str:
         return f"{addr} (decode failed)"
 
 
-def process_stacktrace(config, line: str, backtrace_state: bool) -> bool:
+def process_stacktrace(config: ConfigType, line: str, backtrace_state: bool) -> bool:
     """Decode RP2040 crash handler output using addr2line."""
     if _CRASH_RE.search(line):
         _LOGGER.error("RP2040 crash detected - decoding addresses")
diff --git a/esphome/components/rp2/generate_boards.py b/esphome/components/rp2/generate_boards.py
index cd3f50182c..4066ef6b34 100644
--- a/esphome/components/rp2/generate_boards.py
+++ b/esphome/components/rp2/generate_boards.py
@@ -256,7 +256,7 @@ def generate(arduino_pico_path: Path) -> str:
     return result.stdout.decode()
 
 
-def main():
+def main() -> None:
     if len(sys.argv) < 2:
         print(f"Usage: {sys.argv[0]} <arduino-pico-path>", file=sys.stderr)
         sys.exit(1)
diff --git a/esphome/components/rp2/gpio.py b/esphome/components/rp2/gpio.py
index e4db6a831c..d325131178 100644
--- a/esphome/components/rp2/gpio.py
+++ b/esphome/components/rp2/gpio.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
@@ -14,6 +16,8 @@ from esphome.const import (
     CONF_PULLUP,
 )
 from esphome.core import CORE
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import boards
 from .const import KEY_BOARD, KEY_RP2, rp2_ns
@@ -21,7 +25,7 @@ from .const import KEY_BOARD, KEY_RP2, rp2_ns
 RP2GPIOPin = rp2_ns.class_("RP2GPIOPin", cg.InternalGPIOPin)
 
 
-def _lookup_pin(value):
+def _lookup_pin(value: str) -> int:
     board = CORE.data[KEY_RP2][KEY_BOARD]
     board_pins = boards.RP2_BOARD_PINS.get(board, {})
 
@@ -35,7 +39,7 @@ def _lookup_pin(value):
     raise cv.Invalid(f"Cannot resolve pin name '{value}' for board {board}.")
 
 
-def _translate_pin(value):
+def _translate_pin(value: Any) -> int:
     if isinstance(value, dict) or value is None:
         raise cv.Invalid(
             "This variable only supports pin numbers, not full pin schemas "
@@ -54,12 +58,12 @@ def _translate_pin(value):
     return _lookup_pin(value)
 
 
-def _board_max_virtual_pin(board):
+def _board_max_virtual_pin(board: str) -> int | None:
     """Get the max CYW43 virtual pin for this board, or None if no virtual pins."""
     return boards.BOARDS.get(board, {}).get("max_virtual_pin")
 
 
-def validate_gpio_pin(value):
+def validate_gpio_pin(value: Any) -> int:
     value = _translate_pin(value)
     board = CORE.data[KEY_RP2][KEY_BOARD]
     max_virtual = _board_max_virtual_pin(board)
@@ -71,7 +75,7 @@ def validate_gpio_pin(value):
     return value
 
 
-def validate_supports(value):
+def validate_supports(value: ConfigType) -> ConfigType:
     board = CORE.data[KEY_RP2][KEY_BOARD]
     if (
         _board_max_virtual_pin(board) is None
@@ -100,7 +104,7 @@ RP2_PIN_SCHEMA = cv.All(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register("rp2", RP2_PIN_SCHEMA)
-async def rp2_pin_to_code(config):
+async def rp2_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     num = config[CONF_NUMBER]
     cg.add(var.set_pin(num))
diff --git a/esphome/components/rp2040_pwm/output.py b/esphome/components/rp2040_pwm/output.py
index a2fda58c9e..a0344e8054 100644
--- a/esphome/components/rp2040_pwm/output.py
+++ b/esphome/components/rp2040_pwm/output.py
@@ -3,6 +3,9 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_PIN
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["rp2"]
@@ -22,7 +25,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await output.register_output(var, config)
@@ -44,7 +47,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def rp2040_set_frequency_to_code(config, action_id, template_arg, args):
+async def rp2040_set_frequency_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_FREQUENCY], args, cg.float_)
diff --git a/esphome/components/sn74hc165/__init__.py b/esphome/components/sn74hc165/__init__.py
index f2ba5fedd1..4f21312fec 100644
--- a/esphome/components/sn74hc165/__init__.py
+++ b/esphome/components/sn74hc165/__init__.py
@@ -10,6 +10,8 @@ from esphome.const import (
     CONF_MODE,
     CONF_NUMBER,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = []
@@ -38,7 +40,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     data_pin = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
@@ -54,7 +56,7 @@ async def to_code(config):
     cg.add(var.set_sr_count(config[CONF_SR_COUNT]))
 
 
-def _validate_input_mode(value):
+def _validate_input_mode(value: bool) -> bool:
     if value is not True:
         raise cv.Invalid("Only input mode is supported")
     return value
@@ -77,7 +79,9 @@ SN74HC165_PIN_SCHEMA = cv.All(
 )
 
 
-def sn74hc165_pin_final_validate(pin_config, parent_config):
+def sn74hc165_pin_final_validate(
+    pin_config: ConfigType, parent_config: ConfigType
+) -> None:
     max_pins = parent_config[CONF_SR_COUNT] * 8
     if pin_config[CONF_NUMBER] >= max_pins:
         raise cv.Invalid(f"Pin number must be less than {max_pins}")
@@ -86,7 +90,7 @@ def sn74hc165_pin_final_validate(pin_config, parent_config):
 @pins.PIN_SCHEMA_REGISTRY.register(
     CONF_SN74HC165, SN74HC165_PIN_SCHEMA, sn74hc165_pin_final_validate
 )
-async def sn74hc165_pin_to_code(config):
+async def sn74hc165_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_SN74HC165])
 
diff --git a/esphome/components/sun/__init__.py b/esphome/components/sun/__init__.py
index c065a82958..33a5c677bd 100644
--- a/esphome/components/sun/__init__.py
+++ b/esphome/components/sun/__init__.py
@@ -1,5 +1,6 @@
 import contextlib
 import re
+from typing import Any
 
 from esphome import automation
 import esphome.codegen as cg
@@ -12,6 +13,9 @@ from esphome.const import (
     CONF_TIME_ID,
     CONF_TRIGGER_ID,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@OttoWinter"]
 sun_ns = cg.esphome_ns.namespace("sun")
@@ -40,7 +44,7 @@ ELEVATION_MAP = {
 }
 
 
-def elevation(value):
+def elevation(value: Any) -> float:
     if isinstance(value, str):
         with contextlib.suppress(cv.Invalid):
             value = ELEVATION_MAP[
@@ -60,7 +64,7 @@ LAT_LON_REGEX = re.compile(
 )
 
 
-def parse_latlon(value):
+def parse_latlon(value: Any) -> float:
     if isinstance(value, str) and value.endswith("°"):
         # strip trailing degree character
         value = value[:-1]
@@ -114,7 +118,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     time_ = await cg.get_variable(config[CONF_TIME_ID])
     cg.add(var.set_time(time_))
@@ -150,7 +154,12 @@ async def to_code(config):
         }
     ),
 )
-async def sun_above_horizon_to_code(config, condition_id, template_arg, args):
+async def sun_above_horizon_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(condition_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     templ = await cg.templatable(config[CONF_ELEVATION], args, cg.double)
@@ -171,7 +180,12 @@ async def sun_above_horizon_to_code(config, condition_id, template_arg, args):
         }
     ),
 )
-async def sun_below_horizon_to_code(config, condition_id, template_arg, args):
+async def sun_below_horizon_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(condition_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     templ = await cg.templatable(config[CONF_ELEVATION], args, cg.double)
diff --git a/esphome/components/sun/sensor/__init__.py b/esphome/components/sun/sensor/__init__.py
index a1ced8ff5b..d2e9fa750d 100644
--- a/esphome/components/sun/sensor/__init__.py
+++ b/esphome/components/sun/sensor/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_DEGREES,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_SUN_ID, Sun, sun_ns
 
@@ -37,7 +38,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/sun/text_sensor/__init__.py b/esphome/components/sun/text_sensor/__init__.py
index fc733d3435..523471bd41 100644
--- a/esphome/components/sun/text_sensor/__init__.py
+++ b/esphome/components/sun/text_sensor/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     ICON_WEATHER_SUNSET_DOWN,
     ICON_WEATHER_SUNSET_UP,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_ELEVATION, CONF_SUN_ID, DEFAULT_ELEVATION, Sun, elevation, sun_ns
 
@@ -22,7 +23,7 @@ SUN_TYPES = {
 }
 
 
-def validate_optional_icon(config):
+def validate_optional_icon(config: ConfigType) -> ConfigType:
     if CONF_ICON not in config:
         config = config.copy()
         config[CONF_ICON] = {
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await text_sensor.new_text_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/touchscreen/__init__.py b/esphome/components/touchscreen/__init__.py
index cf0c5fca19..c8b918007b 100644
--- a/esphome/components/touchscreen/__init__.py
+++ b/esphome/components/touchscreen/__init__.py
@@ -1,3 +1,7 @@
+from typing import Any
+
+import voluptuous as vol
+
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import display
@@ -14,6 +18,8 @@ from esphome.const import (
     CONF_TRANSFORM,
 )
 from esphome.core import CoroPriority, coroutine_with_priority
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz", "@nielsnl68"]
 DEPENDENCIES = ["display"]
@@ -40,7 +46,7 @@ CONF_Y_MIN = "y_min"
 CONF_Y_MAX = "y_max"
 
 
-def validate_calibration(calibration_config):
+def validate_calibration(calibration_config: ConfigType) -> ConfigType:
     x_min = calibration_config[CONF_X_MIN]
     x_max = calibration_config[CONF_X_MAX]
     y_min = calibration_config[CONF_Y_MIN]
@@ -60,7 +66,9 @@ def validate_calibration(calibration_config):
     return calibration_config
 
 
-def option_with_default(option: str, defaults: dict, required: bool = False):
+def option_with_default(
+    option: str, defaults: dict, required: bool = False
+) -> vol.Marker:
     if option in defaults or not required:
         return cv.Optional(option, default=defaults.get(option, cv.UNDEFINED))
     return cv.Required(option)
@@ -119,9 +127,9 @@ def _transform_schema(defaults: dict) -> dict:
 
 
 def touchscreen_schema(
-    default_touch_timeout=cv.UNDEFINED,
-    calibration_required=False,
-    defaults: dict = None,
+    default_touch_timeout: Any = cv.UNDEFINED,
+    calibration_required: bool = False,
+    defaults: dict | None = None,
 ) -> cv.Schema:
     defaults = defaults or {}
     return cv.Schema(
@@ -143,7 +151,7 @@ def touchscreen_schema(
 TOUCHSCREEN_SCHEMA = touchscreen_schema(cv.UNDEFINED)
 
 
-async def register_touchscreen(var, config):
+async def register_touchscreen(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
 
     disp = await cg.get_variable(config[CONF_DISPLAY])
@@ -192,6 +200,6 @@ async def register_touchscreen(var, config):
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(touchscreen_ns.using)
     cg.add_define("USE_TOUCHSCREEN")
diff --git a/esphome/components/touchscreen/binary_sensor/__init__.py b/esphome/components/touchscreen/binary_sensor/__init__.py
index 5ce0defb31..6a66d00ea6 100644
--- a/esphome/components/touchscreen/binary_sensor/__init__.py
+++ b/esphome/components/touchscreen/binary_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor, display
 import esphome.config_validation as cv
 from esphome.const import CONF_PAGE_ID, CONF_PAGES
+from esphome.types import ConfigType
 
 from .. import CONF_TOUCHSCREEN_ID, TouchListener, Touchscreen, touchscreen_ns
 
@@ -22,7 +23,7 @@ CONF_Y_MAX = "y_max"
 CONF_USE_RAW = "use_raw"
 
 
-def _validate_coords(config):
+def _validate_coords(config: ConfigType) -> ConfigType:
     if (
         config[CONF_X_MAX] < config[CONF_X_MIN]
         or config[CONF_Y_MAX] < config[CONF_Y_MIN]
@@ -66,7 +67,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await cg.register_parented(var, config[CONF_TOUCHSCREEN_ID])
diff --git a/esphome/components/update/__init__.py b/esphome/components/update/__init__.py
index 18d333a5ef..5ebe58881d 100644
--- a/esphome/components/update/__init__.py
+++ b/esphome/components/update/__init__.py
@@ -14,14 +14,15 @@ from esphome.const import (
     DEVICE_CLASS_FIRMWARE,
     ENTITY_CATEGORY_CONFIG,
 )
-from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.core import CORE, ID, CoroPriority, coroutine_with_priority
 from esphome.core.entity_helpers import (
     entity_duplicate_validator,
     queue_entity_register,
     setup_device_class,
     setup_entity,
 )
-from esphome.cpp_generator import MockObjClass
+from esphome.cpp_generator import MockObj, MockObjClass, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 IS_PLATFORM_COMPONENT = True
@@ -95,7 +96,7 @@ def update_schema(
 
 
 @setup_entity("update")
-async def setup_update_core_(var, config):
+async def setup_update_core_(var: MockObj, config: ConfigType) -> None:
     setup_device_class(config)
 
     if on_update_available := config.get(CONF_ON_UPDATE_AVAILABLE):
@@ -113,7 +114,7 @@ async def setup_update_core_(var, config):
         await web_server.add_entity_config(var, web_server_config)
 
 
-async def register_update(var, config):
+async def register_update(var: MockObj, config: ConfigType) -> None:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     queue_entity_register("update", config)
@@ -121,14 +122,14 @@ async def register_update(var, config):
     await setup_update_core_(var, config)
 
 
-async def new_update(config):
+async def new_update(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await register_update(var, config)
     return var
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(update_ns.using)
 
 
@@ -145,7 +146,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def update_perform_action_to_code(config, action_id, template_arg, args):
+async def update_perform_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
 
@@ -164,7 +170,12 @@ async def update_perform_action_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def update_check_action_to_code(config, action_id, template_arg, args):
+async def update_check_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -180,8 +191,11 @@ async def update_check_action_to_code(config, action_id, template_arg, args):
     ),
 )
 async def update_is_available_condition_to_code(
-    config, condition_id, template_arg, args
-):
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(condition_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/vbus/__init__.py b/esphome/components/vbus/__init__.py
index 2663496456..94857050f2 100644
--- a/esphome/components/vbus/__init__.py
+++ b/esphome/components/vbus/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ssieb"]
 
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = uart.UART_DEVICE_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/vbus/binary_sensor/__init__.py b/esphome/components/vbus/binary_sensor/__init__.py
index 85f1172166..5c09a025f8 100644
--- a/esphome/components/vbus/binary_sensor/__init__.py
+++ b/esphome/components/vbus/binary_sensor/__init__.py
@@ -13,6 +13,7 @@ from esphome.const import (
     DEVICE_CLASS_PROBLEM,
     ENTITY_CATEGORY_DIAGNOSTIC,
 )
+from esphome.types import ConfigType
 
 from .. import (
     CONF_DELTASOL_BS2,
@@ -256,7 +257,7 @@ CONFIG_SCHEMA = cv.typed_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/vbus/sensor/__init__.py b/esphome/components/vbus/sensor/__init__.py
index 9c3665eb1c..e8a6ea7bfa 100644
--- a/esphome/components/vbus/sensor/__init__.py
+++ b/esphome/components/vbus/sensor/__init__.py
@@ -29,6 +29,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_WATT_HOURS,
 )
+from esphome.types import ConfigType
 
 from .. import (
     CONF_DELTASOL_BS2,
@@ -650,7 +651,7 @@ CONFIG_SCHEMA = cv.typed_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/voice_assistant/__init__.py b/esphome/components/voice_assistant/__init__.py
index f41adfd8de..d30eaf4768 100644
--- a/esphome/components/voice_assistant/__init__.py
+++ b/esphome/components/voice_assistant/__init__.py
@@ -14,6 +14,9 @@ from esphome.const import (
     CONF_ON_START,
     CONF_SPEAKER,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["audio", "ring_buffer", "socket"]
 DEPENDENCIES = ["api", "microphone"]
@@ -78,7 +81,7 @@ ConnectedCondition = voice_assistant_ns.class_(
 Timer = voice_assistant_ns.struct("Timer")
 
 
-def tts_stream_validate(config):
+def tts_stream_validate(config: ConfigType) -> ConfigType:
     if CONF_SPEAKER not in config and (
         CONF_ON_TTS_STREAM_START in config or CONF_ON_TTS_STREAM_END in config
     ):
@@ -199,7 +202,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
@@ -420,7 +423,12 @@ VOICE_ASSISTANT_ACTION_SCHEMA = cv.Schema({cv.GenerateID(): cv.use_id(VoiceAssis
     ),
     synchronous=True,
 )
-async def voice_assistant_listen_to_code(config, action_id, template_arg, args):
+async def voice_assistant_listen_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     if CONF_SILENCE_DETECTION in config:
@@ -434,7 +442,12 @@ async def voice_assistant_listen_to_code(config, action_id, template_arg, args):
 @register_action(
     "voice_assistant.stop", StopAction, VOICE_ASSISTANT_ACTION_SCHEMA, synchronous=True
 )
-async def voice_assistant_stop_to_code(config, action_id, template_arg, args):
+async def voice_assistant_stop_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -443,7 +456,12 @@ async def voice_assistant_stop_to_code(config, action_id, template_arg, args):
 @register_condition(
     "voice_assistant.is_running", IsRunningCondition, VOICE_ASSISTANT_ACTION_SCHEMA
 )
-async def voice_assistant_is_running_to_code(config, condition_id, template_arg, args):
+async def voice_assistant_is_running_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(condition_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -452,7 +470,12 @@ async def voice_assistant_is_running_to_code(config, condition_id, template_arg,
 @register_condition(
     "voice_assistant.connected", ConnectedCondition, VOICE_ASSISTANT_ACTION_SCHEMA
 )
-async def voice_assistant_connected_to_code(config, condition_id, template_arg, args):
+async def voice_assistant_connected_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(condition_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/xiaomi_rtcgq02lm/__init__.py b/esphome/components/xiaomi_rtcgq02lm/__init__.py
index 3e235d985f..7b289a8ee3 100644
--- a/esphome/components/xiaomi_rtcgq02lm/__init__.py
+++ b/esphome/components/xiaomi_rtcgq02lm/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ble_device_base
 import esphome.config_validation as cv
 from esphome.const import CONF_BINDKEY, CONF_ID, CONF_MAC_ADDRESS
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 CODEOWNERS = ["@jesserockz"]
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_rtcgq02lm/binary_sensor.py b/esphome/components/xiaomi_rtcgq02lm/binary_sensor.py
index 8d0508b59b..57420125cb 100644
--- a/esphome/components/xiaomi_rtcgq02lm/binary_sensor.py
+++ b/esphome/components/xiaomi_rtcgq02lm/binary_sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     DEVICE_CLASS_MOTION,
 )
 from esphome.core import TimePeriod
+from esphome.types import ConfigType
 
 from . import XiaomiRTCGQ02LM
 
@@ -45,7 +46,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_ID])
 
     if CONF_MOTION in config:
diff --git a/esphome/components/xiaomi_rtcgq02lm/sensor.py b/esphome/components/xiaomi_rtcgq02lm/sensor.py
index e49f1c960b..e0e4b4640b 100644
--- a/esphome/components/xiaomi_rtcgq02lm/sensor.py
+++ b/esphome/components/xiaomi_rtcgq02lm/sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 from . import XiaomiRTCGQ02LM
 
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_ID])
 
     if CONF_BATTERY_LEVEL in config:

From b6a9761dae4b015a30d9dd2492c408ff3ea424b1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Aug 2026 02:59:51 +1200
Subject: [PATCH 015/155] [core] Add type annotations to component Python
 (4/11) (#18341)

---
 esphome/components/aic3204/audio_dac.py       | 12 +++++-
 esphome/components/audio_adc/__init__.py      | 13 ++++--
 esphome/components/audio_dac/__init__.py      | 20 ++++++++--
 esphome/components/bme68x_bsec2/__init__.py   |  7 ++--
 esphome/components/bme68x_bsec2/sensor.py     |  6 ++-
 .../components/bme68x_bsec2/text_sensor.py    |  6 ++-
 .../components/dfrobot_sen0395/__init__.py    | 23 +++++++++--
 .../dfrobot_sen0395/binary_sensor.py          |  3 +-
 .../dfrobot_sen0395/switch/__init__.py        |  3 +-
 esphome/components/dlms_meter/__init__.py     | 14 ++++---
 .../dlms_meter/binary_sensor/__init__.py      |  3 +-
 .../components/dlms_meter/sensor/__init__.py  |  5 ++-
 .../dlms_meter/text_sensor/__init__.py        |  5 ++-
 esphome/components/ina2xx_base/__init__.py    | 11 +++--
 esphome/components/logger/__init__.py         | 30 +++++++++-----
 esphome/components/logger/select/__init__.py  |  3 +-
 esphome/components/ltr501/sensor.py           | 13 +++---
 esphome/components/ltr_als_ps/sensor.py       | 11 +++--
 esphome/components/msa3xx/__init__.py         |  3 +-
 esphome/components/msa3xx/binary_sensor.py    |  3 +-
 esphome/components/msa3xx/sensor.py           |  3 +-
 esphome/components/msa3xx/text_sensor.py      |  6 ++-
 esphome/components/ota/__init__.py            | 10 +++--
 esphome/components/safe_mode/__init__.py      | 16 +++++---
 .../components/safe_mode/button/__init__.py   |  3 +-
 .../components/safe_mode/switch/__init__.py   |  3 +-
 esphome/components/spi/__init__.py            | 40 ++++++++++---------
 esphome/components/st7789v/display.py         | 10 +++--
 esphome/components/substitutions/jinja.py     | 12 +++---
 esphome/components/thermostat/climate.py      | 18 ++++++---
 .../waveshare_io_ch32v003/__init__.py         |  8 ++--
 .../waveshare_io_ch32v003/output/__init__.py  |  5 ++-
 .../waveshare_io_ch32v003/sensor/__init__.py  |  3 +-
 esphome/components/web_server/__init__.py     | 12 +++---
 esphome/components/web_server/ota/__init__.py |  2 +-
 35 files changed, 229 insertions(+), 116 deletions(-)

diff --git a/esphome/components/aic3204/audio_dac.py b/esphome/components/aic3204/audio_dac.py
index b478b573a3..50e2f81f1b 100644
--- a/esphome/components/aic3204/audio_dac.py
+++ b/esphome/components/aic3204/audio_dac.py
@@ -4,6 +4,9 @@ from esphome.components import i2c
 from esphome.components.audio_dac import AudioDac
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MODE
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 DEPENDENCIES = ["i2c"]
@@ -39,7 +42,12 @@ SET_AUTO_MUTE_ACTION_SCHEMA = cv.maybe_simple_value(
     SET_AUTO_MUTE_ACTION_SCHEMA,
     synchronous=True,
 )
-async def aic3204_set_volume_to_code(config, action_id, template_arg, args):
+async def aic3204_set_volume_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -49,7 +57,7 @@ async def aic3204_set_volume_to_code(config, action_id, template_arg, args):
     return var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/audio_adc/__init__.py b/esphome/components/audio_adc/__init__.py
index 3c3a4988b5..c2bdfb6cb0 100644
--- a/esphome/components/audio_adc/__init__.py
+++ b/esphome/components/audio_adc/__init__.py
@@ -2,7 +2,9 @@ from esphome import automation
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MIC_GAIN
-from esphome.core import CoroPriority, coroutine_with_priority
+from esphome.core import ID, CoroPriority, coroutine_with_priority
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 IS_PLATFORM_COMPONENT = True
@@ -28,7 +30,12 @@ SET_MIC_GAIN_ACTION_SCHEMA = cv.maybe_simple_value(
     SET_MIC_GAIN_ACTION_SCHEMA,
     synchronous=True,
 )
-async def audio_adc_set_mic_gain_to_code(config, action_id, template_arg, args):
+async def audio_adc_set_mic_gain_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -39,6 +46,6 @@ async def audio_adc_set_mic_gain_to_code(config, action_id, template_arg, args):
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_AUDIO_ADC")
     cg.add_global(audio_adc_ns.using)
diff --git a/esphome/components/audio_dac/__init__.py b/esphome/components/audio_dac/__init__.py
index 46c277ce51..1351793afd 100644
--- a/esphome/components/audio_dac/__init__.py
+++ b/esphome/components/audio_dac/__init__.py
@@ -3,7 +3,9 @@ from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_VOLUME
-from esphome.core import CoroPriority, coroutine_with_priority
+from esphome.core import ID, CoroPriority, coroutine_with_priority
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 IS_PLATFORM_COMPONENT = True
@@ -37,7 +39,12 @@ SET_VOLUME_ACTION_SCHEMA = cv.maybe_simple_value(
 @automation.register_action(
     "audio_dac.mute_on", MuteOnAction, MUTE_ACTION_SCHEMA, synchronous=True
 )
-async def audio_dac_mute_action_to_code(config, action_id, template_arg, args):
+async def audio_dac_mute_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -48,7 +55,12 @@ async def audio_dac_mute_action_to_code(config, action_id, template_arg, args):
     SET_VOLUME_ACTION_SCHEMA,
     synchronous=True,
 )
-async def audio_dac_set_volume_to_code(config, action_id, template_arg, args):
+async def audio_dac_set_volume_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -59,6 +71,6 @@ async def audio_dac_set_volume_to_code(config, action_id, template_arg, args):
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_AUDIO_DAC")
     cg.add_global(audio_dac_ns.using)
diff --git a/esphome/components/bme68x_bsec2/__init__.py b/esphome/components/bme68x_bsec2/__init__.py
index c12eb39d2d..8208672b6a 100644
--- a/esphome/components/bme68x_bsec2/__init__.py
+++ b/esphome/components/bme68x_bsec2/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_SAMPLE_RATE,
     CONF_TEMPERATURE_OFFSET,
 )
+from esphome.cpp_generator import MockObj
 from esphome.external_files import RemoteFile
 from esphome.types import ConfigType
 
@@ -94,7 +95,7 @@ def _compute_url(config: dict) -> str:
     return f"https://raw.githubusercontent.com/boschsensortec/Bosch-BSEC2-Library/{BSEC2_LIBRARY_VERSION}/src/config/{model}/{model}_{algo}_{volts}_{sample_rate}_{operating_age}/{filename}.txt"
 
 
-def download_bme68x_blob(config):
+def download_bme68x_blob(config: ConfigType) -> ConfigType:
     url = _compute_url(config)
     path = _compute_local_file_path(url)
     external_files.download_content(url, path)
@@ -138,7 +139,7 @@ def _extract_blob_ref(entry: ConfigType) -> RemoteFile | None:
 PREFETCH_FILES = external_files.single_stage_prefetch(_extract_blob_ref)
 
 
-def validate_bme68x(config):
+def validate_bme68x(config: ConfigType) -> ConfigType:
     if CONF_ALGORITHM_OUTPUT not in config:
         return config
 
@@ -178,7 +179,7 @@ CONFIG_SCHEMA_BASE = (
 )
 
 
-async def to_code_base(config):
+async def to_code_base(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/bme68x_bsec2/sensor.py b/esphome/components/bme68x_bsec2/sensor.py
index 52587dba99..863cd9d601 100644
--- a/esphome/components/bme68x_bsec2/sensor.py
+++ b/esphome/components/bme68x_bsec2/sensor.py
@@ -29,6 +29,8 @@ from esphome.const import (
     UNIT_PARTS_PER_MILLION,
     UNIT_PERCENT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_BME68X_BSEC2_ID, SAMPLE_RATE_OPTIONS, BME68xBSEC2Component
 
@@ -119,7 +121,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def setup_conf(config, key, hub):
+async def setup_conf(config: ConfigType, key: str, hub: MockObj) -> None:
     if conf := config.get(key):
         sens = await sensor.new_sensor(conf)
         cg.add(getattr(hub, f"set_{key}_sensor")(sens))
@@ -127,7 +129,7 @@ async def setup_conf(config, key, hub):
             cg.add(getattr(hub, f"set_{key}_sample_rate")(sample_rate))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_BME68X_BSEC2_ID])
     for key in TYPES:
         await setup_conf(config, key, hub)
diff --git a/esphome/components/bme68x_bsec2/text_sensor.py b/esphome/components/bme68x_bsec2/text_sensor.py
index fce00afe34..5c6f9f696c 100644
--- a/esphome/components/bme68x_bsec2/text_sensor.py
+++ b/esphome/components/bme68x_bsec2/text_sensor.py
@@ -2,6 +2,8 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_IAQ_ACCURACY
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_BME68X_BSEC2_ID, BME68xBSEC2Component
 
@@ -21,13 +23,13 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def setup_conf(config, key, hub):
+async def setup_conf(config: ConfigType, key: str, hub: MockObj) -> None:
     if conf := config.get(key):
         sens = await text_sensor.new_text_sensor(conf)
         cg.add(getattr(hub, f"set_{key}_text_sensor")(sens))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_BME68X_BSEC2_ID])
     for key in TYPES:
         await setup_conf(config, key, hub)
diff --git a/esphome/components/dfrobot_sen0395/__init__.py b/esphome/components/dfrobot_sen0395/__init__.py
index 943c510279..51562f923c 100644
--- a/esphome/components/dfrobot_sen0395/__init__.py
+++ b/esphome/components/dfrobot_sen0395/__init__.py
@@ -1,9 +1,14 @@
+from typing import Any
+
 from esphome import automation
 from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_FACTORY_RESET, CONF_ID, CONF_SENSITIVITY
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@niklasweber"]
 DEPENDENCIES = ["uart"]
@@ -38,7 +43,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+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)
@@ -54,14 +59,19 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def dfrobot_sen0395_reset_to_code(config, action_id, template_arg, args):
+async def dfrobot_sen0395_reset_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
 
     return var
 
 
-def range_segment_list(input):
+def range_segment_list(input: Any) -> list:
     """Validate input is a list of ranges which can be used to configure the dfrobot mmwave radar
 
     A list of segments should be provided. A minimum of one segment is required and a maximum of
@@ -154,7 +164,12 @@ MMWAVE_SETTINGS_SCHEMA = cv.Schema(
     MMWAVE_SETTINGS_SCHEMA,
     synchronous=True,
 )
-async def dfrobot_sen0395_settings_to_code(config, action_id, template_arg, args):
+async def dfrobot_sen0395_settings_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
 
diff --git a/esphome/components/dfrobot_sen0395/binary_sensor.py b/esphome/components/dfrobot_sen0395/binary_sensor.py
index 193ef925a4..e299c35a42 100644
--- a/esphome/components/dfrobot_sen0395/binary_sensor.py
+++ b/esphome/components/dfrobot_sen0395/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_MOTION
+from esphome.types import ConfigType
 
 from . import CONF_DFROBOT_SEN0395_ID, DfrobotSen0395Component
 
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_DFROBOT_SEN0395_ID])
     binary_sens = await binary_sensor.new_binary_sensor(config)
 
diff --git a/esphome/components/dfrobot_sen0395/switch/__init__.py b/esphome/components/dfrobot_sen0395/switch/__init__.py
index 8e492080de..22aaa1640c 100644
--- a/esphome/components/dfrobot_sen0395/switch/__init__.py
+++ b/esphome/components/dfrobot_sen0395/switch/__init__.py
@@ -3,6 +3,7 @@ from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import CONF_TYPE, ENTITY_CATEGORY_CONFIG
 from esphome.cpp_generator import MockObjClass
+from esphome.types import ConfigType
 
 from .. import CONF_DFROBOT_SEN0395_ID, DfrobotSen0395Component
 
@@ -55,7 +56,7 @@ CONFIG_SCHEMA = cv.typed_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_DFROBOT_SEN0395_ID])
     var = await switch.new_switch(config)
     await cg.register_component(var, config)
diff --git a/esphome/components/dlms_meter/__init__.py b/esphome/components/dlms_meter/__init__.py
index b747f73a14..00a1694cc3 100644
--- a/esphome/components/dlms_meter/__init__.py
+++ b/esphome/components/dlms_meter/__init__.py
@@ -1,5 +1,6 @@
 import logging
 import re
+from typing import Any
 
 import esphome.codegen as cg
 from esphome.components import esp32, uart
@@ -12,6 +13,7 @@ from esphome.const import (
     CONF_RECEIVE_TIMEOUT,
 )
 from esphome.core import CORE
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -33,13 +35,13 @@ DlmsMeterComponent = dlms_meter_component_ns.class_(
 )
 
 
-def obis_code(value):
+def obis_code(value: Any) -> str:
     # Normalize the OBIS code to the strict A.B.C.D.E.F format
     bytes_list = parse_obis_code_bytes(value)
     return ".".join(str(b) for b in bytes_list)
 
 
-def parse_obis_code_bytes(value):
+def parse_obis_code_bytes(value: Any) -> list[int]:
     value = cv.string(value)
     normalized = re.sub(r"[\-\:\*]", ".", value)
     parts = normalized.split(".")
@@ -57,19 +59,19 @@ def parse_obis_code_bytes(value):
     return bytes_list
 
 
-def custom_pattern_dict(value):
+def custom_pattern_dict(value: Any) -> ConfigType:
     if isinstance(value, str):
         return {CONF_PATTERN: value}
     return value
 
 
-def validate_custom_pattern(value):
+def validate_custom_pattern(value: ConfigType) -> ConfigType:
     if CONF_DEFAULT_OBIS in value and CONF_NAME not in value:
         raise cv.Invalid(f"'{CONF_DEFAULT_OBIS}' requires '{CONF_NAME}' to be set")
     return value
 
 
-def validate_provider_deprecation(config):
+def validate_provider_deprecation(config: ConfigType) -> ConfigType:
     if CONF_PROVIDER in config:
         provider = str(config[CONF_PROVIDER]).lower()
         if provider == "netznoe":
@@ -154,7 +156,7 @@ CONFIG_SCHEMA = cv.All(
 FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema("dlms_meter", require_rx=True)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     dec_key_expr = cg.RawExpression("std::nullopt")
     if dec_key := config.get(CONF_DECRYPTION_KEY):
         key_bytes = [str(int(dec_key[i : i + 2], 16)) for i in range(0, 32, 2)]
diff --git a/esphome/components/dlms_meter/binary_sensor/__init__.py b/esphome/components/dlms_meter/binary_sensor/__init__.py
index f9bc1d9df7..a15e58b957 100644
--- a/esphome/components/dlms_meter/binary_sensor/__init__.py
+++ b/esphome/components/dlms_meter/binary_sensor/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import CONF_DLMS_METER_ID, CONF_OBIS_CODE, DlmsMeterComponent, obis_code
 
@@ -14,7 +15,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema().extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_DLMS_METER_ID])
     var = await binary_sensor.new_binary_sensor(config)
     cg.add(hub.register_binary_sensor(config[CONF_OBIS_CODE], var))
diff --git a/esphome/components/dlms_meter/sensor/__init__.py b/esphome/components/dlms_meter/sensor/__init__.py
index ec4639351d..8ded150cd0 100644
--- a/esphome/components/dlms_meter/sensor/__init__.py
+++ b/esphome/components/dlms_meter/sensor/__init__.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_WATT,
     UNIT_WATT_HOURS,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_DLMS_METER_ID, CONF_OBIS_CODE, DlmsMeterComponent, obis_code
 
@@ -47,7 +48,7 @@ DYNAMIC_SCHEMA = sensor.sensor_schema().extend(
 )
 
 
-def deprecation_warning(config):
+def deprecation_warning(config: ConfigType) -> ConfigType:
     _LOGGER.warning(
         "The dlms_meter sensor schema using predefined keys (e.g., 'voltage_l1') is deprecated and will be removed in 2026.11.0. "
         "Please update your configuration to use the new schema with 'obis_code'."
@@ -145,7 +146,7 @@ OLD_SCHEMA = cv.All(
 CONFIG_SCHEMA = cv.Any(DYNAMIC_SCHEMA, OLD_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_DLMS_METER_ID])
 
     if obis := config.get(CONF_OBIS_CODE):
diff --git a/esphome/components/dlms_meter/text_sensor/__init__.py b/esphome/components/dlms_meter/text_sensor/__init__.py
index 0bfb43a285..c2ff0779ee 100644
--- a/esphome/components/dlms_meter/text_sensor/__init__.py
+++ b/esphome/components/dlms_meter/text_sensor/__init__.py
@@ -3,6 +3,7 @@ import logging
 import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import CONF_DLMS_METER_ID, CONF_OBIS_CODE, DlmsMeterComponent, obis_code
 
@@ -23,7 +24,7 @@ DYNAMIC_SCHEMA = text_sensor.text_sensor_schema().extend(
 )
 
 
-def deprecation_warning(config):
+def deprecation_warning(config: ConfigType) -> ConfigType:
     _LOGGER.warning(
         "The dlms_meter text_sensor schema using predefined keys (e.g., 'timestamp') is deprecated and will be removed in 2026.11.0. "
         "Please update your configuration to use the new schema with 'obis_code'."
@@ -46,7 +47,7 @@ OLD_SCHEMA = cv.All(
 CONFIG_SCHEMA = cv.Any(DYNAMIC_SCHEMA, OLD_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_DLMS_METER_ID])
 
     if obis := config.get(CONF_OBIS_CODE):
diff --git a/esphome/components/ina2xx_base/__init__.py b/esphome/components/ina2xx_base/__init__.py
index 15e2faba07..7bb589f0b1 100644
--- a/esphome/components/ina2xx_base/__init__.py
+++ b/esphome/components/ina2xx_base/__init__.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import sensor
 from esphome.components.const import UNIT_AMPERE_HOUR
@@ -26,6 +28,9 @@ from esphome.const import (
     UNIT_WATT,
     UNIT_WATT_HOURS,
 )
+from esphome.core import EnumValue
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@latonita"]
 
@@ -76,7 +81,7 @@ SENSOR_MODEL_OPTIONS = {
 }
 
 
-def validate_model_config(config):
+def validate_model_config(config: ConfigType) -> ConfigType:
     model = config[CONF_MODEL]
 
     for key in config:
@@ -92,7 +97,7 @@ def validate_model_config(config):
     return config
 
 
-def validate_adc_time(value):
+def validate_adc_time(value: Any) -> EnumValue:
     value = cv.positive_time_period_microseconds(value).total_microseconds
     return cv.enum(ADC_TIMES, int=True)(value)
 
@@ -198,7 +203,7 @@ INA2XX_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def setup_ina2xx(var, config):
+async def setup_ina2xx(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
 
     cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/esphome/components/logger/__init__.py b/esphome/components/logger/__init__.py
index f307f5d5d1..07b8b03084 100644
--- a/esphome/components/logger/__init__.py
+++ b/esphome/components/logger/__init__.py
@@ -1,4 +1,5 @@
 import re
+from typing import Any
 
 from esphome import automation
 from esphome.automation import LambdaAction, StatelessLambdaAction
@@ -58,7 +59,8 @@ from esphome.const import (
     PLATFORM_RTL87XX,
     PlatformFramework,
 )
-from esphome.core import CORE, CoroPriority, Lambda, coroutine_with_priority
+from esphome.core import CORE, ID, CoroPriority, Lambda, coroutine_with_priority
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
@@ -164,7 +166,7 @@ HARDWARE_UART_TO_SERIAL = {
 is_log_level = cv.one_of(*LOG_LEVELS, upper=True)
 
 
-def uart_selection(value):
+def uart_selection(value: Any) -> str:
     if CORE.is_esp32:
         variant = get_esp32_variant()
         if variant in UART_SELECTION_ESP32:
@@ -187,7 +189,7 @@ def uart_selection(value):
     raise NotImplementedError
 
 
-def validate_local_no_higher_than_global(config):
+def validate_local_no_higher_than_global(config: ConfigType) -> ConfigType:
     global_level = config[CONF_LEVEL]
     global_level_index = LOG_LEVEL_SEVERITY.index(global_level)
     errs = []
@@ -204,7 +206,7 @@ def validate_local_no_higher_than_global(config):
     return config
 
 
-def validate_initial_no_higher_than_global(config):
+def validate_initial_no_higher_than_global(config: ConfigType) -> ConfigType:
     if initial_level := config.get(CONF_INITIAL_LEVEL):
         global_level = config[CONF_LEVEL]
         if LOG_LEVEL_SEVERITY.index(initial_level) > LOG_LEVEL_SEVERITY.index(
@@ -217,7 +219,7 @@ def validate_initial_no_higher_than_global(config):
     return config
 
 
-def validate_wait_for_cdc(config):
+def validate_wait_for_cdc(config: ConfigType) -> ConfigType:
     if config.get(CONF_WAIT_FOR_CDC) and config.get(CONF_HARDWARE_UART) != USB_CDC:
         raise cv.Invalid("wait_for_cdc requires hardware_uart: USB_CDC")
     return config
@@ -518,7 +520,7 @@ async def _late_logger_init(config: ConfigType) -> None:
     CORE.add_job(final_step)
 
 
-def validate_printf(value):
+def validate_printf(value: ConfigType) -> ConfigType:
     # https://stackoverflow.com/questions/30011379/how-can-i-parse-a-c-format-string-in-python
     cfmt = r"""
     (                                   # start of capture group 1
@@ -559,7 +561,12 @@ LOGGER_LOG_ACTION_SCHEMA = cv.All(
 @automation.register_action(
     CONF_LOGGER_LOG, LambdaAction, LOGGER_LOG_ACTION_SCHEMA, synchronous=True
 )
-async def logger_log_action_to_code(config, action_id, template_arg, args):
+async def logger_log_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     esp_log = LOG_LEVEL_TO_ESP_LOG[config[CONF_LEVEL]]
     args_ = [cg.RawExpression(str(x)) for x in config[CONF_ARGS]]
 
@@ -584,7 +591,12 @@ async def logger_log_action_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def logger_set_level_to_code(config, action_id, template_arg, args):
+async def logger_set_level_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     level = LOG_LEVELS[config[CONF_LEVEL]]
     logger = await cg.get_variable(config[CONF_LOGGER_ID])
     if tag := config.get(CONF_TAG):
@@ -656,7 +668,7 @@ def request_log_listener() -> None:
 
 
 @coroutine_with_priority(CoroPriority.FINAL)
-async def final_step():
+async def final_step() -> None:
     """Final code generation step to configure optional logger features."""
     domain_data = CORE.data.get(DOMAIN, {})
     if domain_data.get(KEY_LEVEL_LISTENERS, False):
diff --git a/esphome/components/logger/select/__init__.py b/esphome/components/logger/select/__init__.py
index 6ce663978e..00f67422f3 100644
--- a/esphome/components/logger/select/__init__.py
+++ b/esphome/components/logger/select/__init__.py
@@ -4,6 +4,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_LEVEL, CONF_LOGGER, ENTITY_CATEGORY_CONFIG, ICON_BUG
 from esphome.core import CORE
 from esphome.cpp_helpers import register_component, register_parented
+from esphome.types import ConfigType
 
 from .. import (
     CONF_LOGGER_ID,
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = select.select_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     request_logger_level_listeners()
     parent = await cg.get_variable(config[CONF_LOGGER_ID])
     levels = list(LOG_LEVELS)
diff --git a/esphome/components/ltr501/sensor.py b/esphome/components/ltr501/sensor.py
index c1fa9009b3..c2091a6336 100644
--- a/esphome/components/ltr501/sensor.py
+++ b/esphome/components/ltr501/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import i2c, sensor
@@ -24,6 +26,7 @@ from esphome.const import (
     UNIT_LUX,
     UNIT_MILLISECOND,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@latonita"]
 DEPENDENCIES = ["i2c"]
@@ -87,17 +90,17 @@ PS_GAINS = {
 }
 
 
-def validate_integration_time(value):
+def validate_integration_time(value: Any) -> Any:
     value = cv.positive_time_period_milliseconds(value).total_milliseconds
     return cv.enum(INTEGRATION_TIMES, int=True)(value)
 
 
-def validate_repeat_rate(value):
+def validate_repeat_rate(value: Any) -> Any:
     value = cv.positive_time_period_milliseconds(value).total_milliseconds
     return cv.enum(MEASUREMENT_REPEAT_RATES, int=True)(value)
 
 
-def validate_time_and_repeat_rate(config):
+def validate_time_and_repeat_rate(config: ConfigType) -> ConfigType:
     integraton_time = config[CONF_INTEGRATION_TIME]
     repeat_rate = config[CONF_REPEAT]
     if integraton_time > repeat_rate:
@@ -107,7 +110,7 @@ def validate_time_and_repeat_rate(config):
     return config
 
 
-def validate_als_gain_and_integration_time(config):
+def validate_als_gain_and_integration_time(config: ConfigType) -> ConfigType:
     integraton_time = config[CONF_INTEGRATION_TIME]
     if config[CONF_GAIN] == "1X" and integraton_time > 100:
         raise cv.Invalid(
@@ -221,7 +224,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ltr_als_ps/sensor.py b/esphome/components/ltr_als_ps/sensor.py
index 893415f028..af09282e2d 100644
--- a/esphome/components/ltr_als_ps/sensor.py
+++ b/esphome/components/ltr_als_ps/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import i2c, sensor
@@ -23,6 +25,7 @@ from esphome.const import (
     UNIT_LUX,
     UNIT_MILLISECOND,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@latonita"]
 DEPENDENCIES = ["i2c"]
@@ -93,17 +96,17 @@ PS_GAINS = {
 }
 
 
-def validate_integration_time(value):
+def validate_integration_time(value: Any) -> Any:
     value = cv.positive_time_period_milliseconds(value).total_milliseconds
     return cv.enum(INTEGRATION_TIMES, int=True)(value)
 
 
-def validate_repeat_rate(value):
+def validate_repeat_rate(value: Any) -> Any:
     value = cv.positive_time_period_milliseconds(value).total_milliseconds
     return cv.enum(MEASUREMENT_REPEAT_RATES, int=True)(value)
 
 
-def validate_time_and_repeat_rate(config):
+def validate_time_and_repeat_rate(config: ConfigType) -> ConfigType:
     integraton_time = config[CONF_INTEGRATION_TIME]
     repeat_rate = config[CONF_REPEAT]
     if integraton_time > repeat_rate:
@@ -211,7 +214,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/msa3xx/__init__.py b/esphome/components/msa3xx/__init__.py
index 04514b584f..0beece6710 100644
--- a/esphome/components/msa3xx/__init__.py
+++ b/esphome/components/msa3xx/__init__.py
@@ -16,6 +16,7 @@ from esphome.const import (
     CONF_TRANSFORM,
     CONF_TYPE,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@latonita"]
 DEPENDENCIES = ["i2c"]
@@ -123,7 +124,7 @@ MSA_SENSOR_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/msa3xx/binary_sensor.py b/esphome/components/msa3xx/binary_sensor.py
index 732a0ed291..ef27c98e66 100644
--- a/esphome/components/msa3xx/binary_sensor.py
+++ b/esphome/components/msa3xx/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ACTIVE, CONF_NAME, DEVICE_CLASS_VIBRATION, ICON_VIBRATE
+from esphome.types import ConfigType
 
 from . import CONF_MSA3XX_ID, MSA_SENSOR_SCHEMA
 
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = MSA_SENSOR_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_MSA3XX_ID])
 
     for sensor in EVENT_SENSORS:
diff --git a/esphome/components/msa3xx/sensor.py b/esphome/components/msa3xx/sensor.py
index 63f050fa05..22bcb94025 100644
--- a/esphome/components/msa3xx/sensor.py
+++ b/esphome/components/msa3xx/sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_METER_PER_SECOND_SQUARED,
 )
+from esphome.types import ConfigType
 
 from . import CONF_MSA3XX_ID, MSA_SENSOR_SCHEMA
 
@@ -34,7 +35,7 @@ CONFIG_SCHEMA = MSA_SENSOR_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_MSA3XX_ID])
     for accel_key in ACCELERATION_SENSORS:
         if accel_key in config:
diff --git a/esphome/components/msa3xx/text_sensor.py b/esphome/components/msa3xx/text_sensor.py
index c53a4aa139..6693ec8542 100644
--- a/esphome/components/msa3xx/text_sensor.py
+++ b/esphome/components/msa3xx/text_sensor.py
@@ -2,6 +2,8 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_NAME
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_MSA3XX_ID, MSA_SENSOR_SCHEMA
 
@@ -25,13 +27,13 @@ CONFIG_SCHEMA = MSA_SENSOR_SCHEMA.extend(
 )
 
 
-async def setup_conf(config, key, hub):
+async def setup_conf(config: ConfigType, key: str, hub: MockObj) -> None:
     if sensor_config := config.get(key):
         var = await text_sensor.new_text_sensor(sensor_config)
         cg.add(getattr(hub, f"set_{key}_text_sensor")(var))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_MSA3XX_ID])
 
     for key in ORIENTATION_SENSORS:
diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index 1e2ee947c1..5240db9e8f 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -12,6 +12,8 @@ from esphome.const import (
 )
 from esphome.core import CORE, coroutine_with_priority
 from esphome.coroutine import CoroPriority
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 OTA_STATE_LISTENER_KEY = "ota_state_listener"
 
@@ -49,7 +51,7 @@ OTAStateChangeTrigger = ota_ns.class_(
 )
 
 
-def _ota_final_validate(config):
+def _ota_final_validate(config: ConfigType) -> None:
     if len(config) < 1:
         raise cv.Invalid(
             f"At least one platform must be specified for '{CONF_OTA}'; add '{CONF_PLATFORM}: {CONF_ESPHOME}' for original OTA functionality"
@@ -95,7 +97,7 @@ BASE_OTA_SCHEMA = cv.Schema(
 
 
 @coroutine_with_priority(CoroPriority.OTA_UPDATES)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_OTA")
     CORE.add_job(final_step)
 
@@ -103,7 +105,7 @@ async def to_code(config):
         cg.add_library("Updater", None)
 
 
-async def ota_to_code(var, config):
+async def ota_to_code(var: MockObj, config: ConfigType) -> None:
     await cg.past_safe_mode()
     use_state_callback = False
     for conf in config.get(CONF_ON_STATE_CHANGE, []):
@@ -145,7 +147,7 @@ def request_ota_state_listeners() -> None:
 
 
 @coroutine_with_priority(CoroPriority.FINAL)
-async def final_step():
+async def final_step() -> None:
     """Final code generation step to configure optional OTA features."""
     if CORE.data.get(OTA_STATE_LISTENER_KEY, False):
         cg.add_define("USE_OTA_STATE_LISTENER")
diff --git a/esphome/components/safe_mode/__init__.py b/esphome/components/safe_mode/__init__.py
index 70096a56bc..9bc8a263c8 100644
--- a/esphome/components/safe_mode/__init__.py
+++ b/esphome/components/safe_mode/__init__.py
@@ -10,8 +10,9 @@ from esphome.const import (
     CONF_STORAGE,
     KEY_PAST_SAFE_MODE,
 )
-from esphome.core import CORE, CoroPriority, coroutine_with_priority
-from esphome.cpp_generator import RawExpression
+from esphome.core import CORE, ID, CoroPriority, coroutine_with_priority
+from esphome.cpp_generator import MockObj, RawExpression, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@paulmonigatti", "@jsuanet", "@kbx81"]
 
@@ -24,7 +25,7 @@ SafeModeComponent = safe_mode_ns.class_("SafeModeComponent", cg.Component)
 MarkSuccessfulAction = safe_mode_ns.class_("MarkSuccessfulAction", automation.Action)
 
 
-def _remove_id_if_disabled(value):
+def _remove_id_if_disabled(value: ConfigType) -> ConfigType:
     value = value.copy()
     if value[CONF_DISABLED]:
         value.pop(CONF_ID)
@@ -62,7 +63,12 @@ CONFIG_SCHEMA = cv.All(
     ),
     synchronous=True,
 )
-async def safe_mode_mark_successful_to_code(config, action_id, template_arg, args):
+async def safe_mode_mark_successful_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     parent = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg)
     cg.add(var.set_parent(parent))
@@ -75,7 +81,7 @@ _CALLBACK_AUTOMATIONS = (
 
 
 @coroutine_with_priority(CoroPriority.APPLICATION)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if not config[CONF_DISABLED]:
         var = cg.new_Pvariable(config[CONF_ID])
         await cg.register_component(var, config)
diff --git a/esphome/components/safe_mode/button/__init__.py b/esphome/components/safe_mode/button/__init__.py
index 0731ca50f5..89e2475799 100644
--- a/esphome/components/safe_mode/button/__init__.py
+++ b/esphome/components/safe_mode/button/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import (
     ENTITY_CATEGORY_CONFIG,
     ICON_RESTART_ALERT,
 )
+from esphome.types import ConfigType
 
 from .. import SafeModeComponent, safe_mode_ns
 
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await button.new_button(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/safe_mode/switch/__init__.py b/esphome/components/safe_mode/switch/__init__.py
index d656eee84a..529b023d68 100644
--- a/esphome/components/safe_mode/switch/__init__.py
+++ b/esphome/components/safe_mode/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import CONF_SAFE_MODE, ENTITY_CATEGORY_CONFIG, ICON_RESTART_ALERT
+from esphome.types import ConfigType
 
 from .. import SafeModeComponent, safe_mode_ns
 
@@ -21,7 +22,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await switch.new_switch(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/spi/__init__.py b/esphome/components/spi/__init__.py
index 608adc7514..d7b85ee20d 100644
--- a/esphome/components/spi/__init__.py
+++ b/esphome/components/spi/__init__.py
@@ -83,7 +83,7 @@ def _render_hz(value: float) -> str:
     return formatted + unit
 
 
-def _frequency_validator(value):
+def _frequency_validator(value: Any) -> float:
     platform = get_target_platform()
     frequency = PLATFORM_SPI_CLOCKS[platform]
     value = cv.frequency(value)
@@ -153,17 +153,17 @@ RP_SPI_PINSETS = [
 ]
 
 
-def get_target_platform():
+def get_target_platform() -> str:
     return CORE.data[KEY_CORE][KEY_TARGET_PLATFORM]
 
 
-def get_target_variant():
+def get_target_variant() -> str:
     return CORE.data[KEY_ESP32].get(KEY_VARIANT, "")
 
 
 # Get a list of available hardware interfaces based on target and variant.
 # The returned value is a list of lists of names
-def get_hw_interface_list():
+def get_hw_interface_list() -> list[list[str]]:
     target_platform = get_target_platform()
     if target_platform == PLATFORM_ESP8266:
         return [["spi", "hspi"]]
@@ -196,7 +196,7 @@ def one_of_interface_validator(additional_values: list[str] | None = None) -> An
     if additional_values is None:
         additional_values = []
 
-    def validator(value: str) -> str:
+    def validator(value: Any) -> str:
         return cv.one_of(
             *sum(get_hw_interface_list(), additional_values),
             lower=True,
@@ -206,7 +206,7 @@ def one_of_interface_validator(additional_values: list[str] | None = None) -> An
 
 
 # Given an SPI name, return the index of it in the available list
-def get_spi_index(name):
+def get_spi_index(name: str) -> int:
     for i, ilist in enumerate(get_hw_interface_list()):
         if name in ilist:
             return i
@@ -218,7 +218,7 @@ def get_spi_index(name):
 # \param spi the config data for the spi instance
 # \param index the selected hw interface number, -1 if not yet known
 # TODO verify that the pins are internal
-def validate_hw_pins(spi, index=-1):
+def validate_hw_pins(spi: ConfigType, index: int = -1) -> bool:
     clk_pin = spi[CONF_CLK_PIN]
     if clk_pin[CONF_INVERTED]:
         return False
@@ -265,7 +265,7 @@ def validate_hw_pins(spi, index=-1):
     return False
 
 
-def get_hw_spi(config, available):
+def get_hw_spi(config: ConfigType, available: list[int]) -> int | None:
     """Get an available hardware spi interface suitable for this config"""
     matching = list(filter(lambda idx: validate_hw_pins(config, idx), available))
     if len(matching) != 0:
@@ -273,7 +273,7 @@ def get_hw_spi(config, available):
     return None
 
 
-def validate_spi_config(config):
+def validate_spi_config(config: list[ConfigType]) -> list[ConfigType]:
     available = list(range(len(get_hw_interface_list())))
     for spi in config:
         interface = spi[CONF_INTERFACE]
@@ -317,7 +317,7 @@ def validate_spi_config(config):
 
 
 # Given an SPI index, convert to a string that represents the C++ object for it.
-def get_spi_interface(index):
+def get_spi_interface(index: int) -> str:
     platform = get_target_platform()
     if platform == PLATFORM_ESP32:
         # ESP32 uses ESP-IDF SPI driver for both Arduino and IDF frameworks
@@ -353,7 +353,7 @@ SPI_SINGLE_SCHEMA = cv.All(
 )
 
 
-def spi_mode_schema(mode):
+def spi_mode_schema(mode: str) -> cv.Schema:
     if mode == TYPE_SINGLE:
         return SPI_SINGLE_SCHEMA
     pin_count = 4 if mode == TYPE_QUAD else 8
@@ -400,7 +400,7 @@ CONFIG_SCHEMA = cv.All(
 
 
 @coroutine_with_priority(CoroPriority.BUS)
-async def to_code(configs):
+async def to_code(configs: list[ConfigType]) -> None:
     cg.add_define("USE_SPI")
     cg.add_global(spi_ns.using)
     if CORE.using_arduino and not CORE.is_esp32:
@@ -427,11 +427,11 @@ async def to_code(configs):
 
 
 def spi_device_schema(
-    cs_pin_required=True,
-    default_data_rate=cv.UNDEFINED,
-    default_mode=cv.UNDEFINED,
-    mode=TYPE_SINGLE,
-):
+    cs_pin_required: bool = True,
+    default_data_rate: Any = cv.UNDEFINED,
+    default_mode: Any = cv.UNDEFINED,
+    mode: str = TYPE_SINGLE,
+) -> cv.Schema:
     """Create a schema for an SPI device.
     :param cs_pin_required: If true, make the CS_PIN required in the config.
     :param default_data_rate: Optional data_rate to use as default
@@ -456,7 +456,7 @@ def spi_device_schema(
 
 
 async def register_spi_device(
-    var: cg.Pvariable, config: ConfigType, write_only: bool = False
+    var: cg.MockObj, config: ConfigType, write_only: bool = False
 ) -> None:
     parent = await cg.get_variable(config[CONF_SPI_ID])
     cg.add(var.set_spi_parent(parent))
@@ -473,7 +473,9 @@ async def register_spi_device(
         cg.add(var.set_release_device(release_device))
 
 
-def final_validate_device_schema(name: str, *, require_mosi: bool, require_miso: bool):
+def final_validate_device_schema(
+    name: str, *, require_mosi: bool, require_miso: bool
+) -> cv.Schema:
     hub_schema = {}
     if require_miso:
         hub_schema[
diff --git a/esphome/components/st7789v/display.py b/esphome/components/st7789v/display.py
index 3b4d6d99ea..fa72c7c328 100644
--- a/esphome/components/st7789v/display.py
+++ b/esphome/components/st7789v/display.py
@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -19,6 +20,7 @@ from esphome.const import (
     CONF_ROTATION,
     CONF_WIDTH,
 )
+from esphome.types import ConfigType
 
 from . import st7789v_ns
 
@@ -38,7 +40,9 @@ MODEL_PRESETS = "model_presets"
 REQUIRE_PS = "require_ps"
 
 
-def model_spec(require_ps=False, presets=None):
+def model_spec(
+    require_ps: bool = False, presets: dict[str, Any] | None = None
+) -> dict[str, Any]:
     if presets is None:
         presets = {}
     return {MODEL_PRESETS: presets, REQUIRE_PS: require_ps}
@@ -119,7 +123,7 @@ MODELS = {
 }
 
 
-def validate_st7789v(config):
+def validate_st7789v(config: ConfigType) -> ConfigType:
     model_data = MODELS[config[CONF_MODEL]]
     presets = model_data[MODEL_PRESETS]
     for key, value in presets.items():
@@ -178,7 +182,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LOGGER.warning(
         "The 'st7789v' component is deprecated, it is recommended to use 'mipi_spi' instead."
     )
diff --git a/esphome/components/substitutions/jinja.py b/esphome/components/substitutions/jinja.py
index 36a7425a69..230ad09df9 100644
--- a/esphome/components/substitutions/jinja.py
+++ b/esphome/components/substitutions/jinja.py
@@ -43,23 +43,23 @@ SAFE_GLOBALS = {
 
 
 class JinjaError(Exception):
-    def __init__(self, context_trace: dict, expr: str):
+    def __init__(self, context_trace: dict, expr: str) -> None:
         self.context_trace = context_trace
         self.eval_stack = [expr]
 
-    def parent(self):
+    def parent(self) -> BaseException | None:
         return self.__context__
 
-    def error_name(self):
+    def error_name(self) -> str:
         return type(self.parent()).__name__
 
-    def context_trace_str(self):
+    def context_trace_str(self) -> str:
         return "\n".join(
             f"  {k} = {repr(v)} ({type(v).__name__})"
             for k, v in self.context_trace.items()
         )
 
-    def stack_trace_str(self):
+    def stack_trace_str(self) -> str:
         return "\n".join(
             f" {len(self.eval_stack) - i}: {expr}{i == 0 and ' <-- ' + self.error_name() or ''}"
             for i, expr in enumerate(self.eval_stack)
@@ -67,7 +67,7 @@ class JinjaError(Exception):
 
 
 class TrackerContext(jinja.runtime.Context):
-    def resolve_or_missing(self, key):
+    def resolve_or_missing(self, key: str) -> Any:
         val = super().resolve_or_missing(key)
         if val is Missing:
             # Variable not in the template context — check if a resolver callback
diff --git a/esphome/components/thermostat/climate.py b/esphome/components/thermostat/climate.py
index d609e22ac2..3cc4dc7009 100644
--- a/esphome/components/thermostat/climate.py
+++ b/esphome/components/thermostat/climate.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import climate, sensor
@@ -70,6 +72,7 @@ from esphome.const import (
     CONF_TARGET_TEMPERATURE_CHANGE_ACTION,
     CONF_VISUAL,
 )
+from esphome.types import ConfigType
 
 CONF_DEFAULT_PRESET = "default_preset"
 CONF_HUMIDITY_CONTROL_DEHUMIDIFY_ACTION = "humidity_control_dehumidify_action"
@@ -124,7 +127,12 @@ PRESET_CONFIG_SCHEMA = cv.Schema(
 )
 
 
-def validate_temperature_preset(preset, root_config, name, requirements):
+def validate_temperature_preset(
+    preset: ConfigType,
+    root_config: ConfigType,
+    name: str,
+    requirements: dict[str, list[str]],
+) -> None:
     # verify temperature settings for the provided preset / default / away configuration
     for config_temp, req_actions in requirements.items():
         for req_action in req_actions:
@@ -140,7 +148,7 @@ def validate_temperature_preset(preset, root_config, name, requirements):
                 )
 
 
-def generate_comparable_preset(config, name):
+def generate_comparable_preset(config: ConfigType, name: str) -> str:
     comparable_preset = f"{CONF_PRESET}:\n  -  {CONF_NAME}: {name}\n"
 
     if CONF_DEFAULT_TARGET_TEMPERATURE_LOW in config:
@@ -151,7 +159,7 @@ def generate_comparable_preset(config, name):
     return comparable_preset
 
 
-def validate_heat_cool_mode(value) -> list:
+def validate_heat_cool_mode(value: Any) -> list:
     """Validate heat_cool_mode - accepts either True or an automation."""
     if value is True:
         # Convert True to empty automation list
@@ -164,7 +172,7 @@ def validate_heat_cool_mode(value) -> list:
     return automation.validate_automation(single=True)(value)
 
 
-def validate_thermostat(config):
+def validate_thermostat(config: ConfigType) -> ConfigType:
     # verify corresponding action(s) exist(s) for any defined climate mode or action
     requirements = {
         CONF_HEAT_COOL_MODE: [
@@ -681,7 +689,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate.new_climate(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/waveshare_io_ch32v003/__init__.py b/esphome/components/waveshare_io_ch32v003/__init__.py
index b692b858a3..29a939c523 100644
--- a/esphome/components/waveshare_io_ch32v003/__init__.py
+++ b/esphome/components/waveshare_io_ch32v003/__init__.py
@@ -10,6 +10,8 @@ from esphome.const import (
     CONF_NUMBER,
     CONF_OUTPUT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@latonita"]
 
@@ -41,13 +43,13 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -71,7 +73,7 @@ WAVESHARE_IO_PIN_SCHEMA = pins.gpio_base_schema(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_WAVESHARE_IO_CH32V003, WAVESHARE_IO_PIN_SCHEMA)
-async def waveshare_io_pin_to_code(config):
+async def waveshare_io_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_WAVESHARE_IO_CH32V003])
 
diff --git a/esphome/components/waveshare_io_ch32v003/output/__init__.py b/esphome/components/waveshare_io_ch32v003/output/__init__.py
index 9af9ce7e4b..7438769928 100644
--- a/esphome/components/waveshare_io_ch32v003/output/__init__.py
+++ b/esphome/components/waveshare_io_ch32v003/output/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MAX_VALUE, CONF_MIN_VALUE
+from esphome.types import ConfigType
 
 from .. import (
     CONF_WAVESHARE_IO_CH32V003_ID,
@@ -23,7 +24,7 @@ DUTY_DEFAULT_MIN = 1
 DUTY_DEFAULT_MAX = 247
 
 
-def validate_pwm_limits(config):
+def validate_pwm_limits(config: ConfigType) -> ConfigType:
     """Validate that safe_pwm_levels.min_value <= safe_pwm_levels.max_value."""
 
     min_val = config.get(CONF_SAFE_PWM_LEVELS, {}).get(CONF_MIN_VALUE, DUTY_DEFAULT_MIN)
@@ -61,7 +62,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
     await cg.register_parented(var, config[CONF_WAVESHARE_IO_CH32V003_ID])
diff --git a/esphome/components/waveshare_io_ch32v003/sensor/__init__.py b/esphome/components/waveshare_io_ch32v003/sensor/__init__.py
index 1e060bdfe4..8ec2702da6 100644
--- a/esphome/components/waveshare_io_ch32v003/sensor/__init__.py
+++ b/esphome/components/waveshare_io_ch32v003/sensor/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 from .. import (
     CONF_WAVESHARE_IO_CH32V003_ID,
@@ -46,7 +47,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_WAVESHARE_IO_CH32V003_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py
index b2c0ea14ad..a50c14a2f7 100644
--- a/esphome/components/web_server/__init__.py
+++ b/esphome/components/web_server/__init__.py
@@ -4,6 +4,7 @@ import base64
 import gzip
 import logging
 import re
+from typing import Any
 
 import esphome.codegen as cg
 from esphome.components import web_server_base
@@ -39,6 +40,7 @@ from esphome.const import (
     PLATFORM_RTL87XX,
 )
 from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.cpp_generator import MockObj
 import esphome.final_validate as fv
 from esphome.types import ConfigType
 
@@ -128,7 +130,7 @@ def validate_ota(config: ConfigType) -> ConfigType:
 _ORIGIN_RE = re.compile(r"^[a-zA-Z][a-zA-Z0-9+.-]*://[^/\s]+$")
 
 
-def validate_origin(value: str) -> str:
+def validate_origin(value: Any) -> str:
     # "*" is the wildcard that allows any origin.
     if value == "*":
         return value
@@ -306,7 +308,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def add_sorting_groups(web_server_var, config):
+def add_sorting_groups(web_server_var: MockObj, config: list[ConfigType]) -> None:
     for group in config:
         sorting_groups[group[CONF_ID]] = group[CONF_NAME]
         group_sorting_weight = group.get(CONF_SORTING_WEIGHT, 50)
@@ -317,7 +319,7 @@ def add_sorting_groups(web_server_var, config):
         )
 
 
-async def add_entity_config(entity, config):
+async def add_entity_config(entity: MockObj, config: ConfigType) -> None:
     web_server = await cg.get_variable(config[CONF_WEB_SERVER_ID])
     sorting_weight = config.get(CONF_SORTING_WEIGHT, 50)
     sorting_group_hash = hash(config.get(CONF_SORTING_GROUP_ID))
@@ -332,7 +334,7 @@ async def add_entity_config(entity, config):
     )
 
 
-def build_index_html(config) -> str:
+def build_index_html(config: ConfigType) -> str:
     html = "<!DOCTYPE html><html><head><meta charset=UTF-8><link rel=icon href=data:>"
     css_include = config.get(CONF_CSS_INCLUDE)
     js_include = config.get(CONF_JS_INCLUDE)
@@ -366,7 +368,7 @@ def add_resource_as_progmem(
 
 
 @coroutine_with_priority(CoroPriority.WEB)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_WEB_SERVER_BASE_ID])
 
     var = cg.new_Pvariable(config[CONF_ID], paren)
diff --git a/esphome/components/web_server/ota/__init__.py b/esphome/components/web_server/ota/__init__.py
index 260e6aea6d..03a5c2ca9b 100644
--- a/esphome/components/web_server/ota/__init__.py
+++ b/esphome/components/web_server/ota/__init__.py
@@ -80,7 +80,7 @@ FINAL_VALIDATE_SCHEMA = _web_server_ota_final_validate
 
 
 @coroutine_with_priority(CoroPriority.WEB_SERVER_OTA)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ota_to_code(var, config)
     await cg.register_component(var, config)

From e83439eaaeed12653926473ff9fbfcbc168254f2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Aug 2026 04:07:10 +1200
Subject: [PATCH 016/155] [core] Add type annotations to component Python
 (7/11) (#18344)

---
 esphome/components/as5600/__init__.py         | 24 ++++++-----
 esphome/components/as5600/sensor/__init__.py  |  3 +-
 esphome/components/audio/__init__.py          | 17 ++++----
 esphome/components/duty_time/sensor.py        | 40 ++++++++++++++++---
 esphome/components/esp32_hosted/__init__.py   | 10 ++---
 esphome/components/mixer/speaker/__init__.py  | 16 ++++++--
 esphome/components/rc522/__init__.py          |  4 +-
 esphome/components/rc522/binary_sensor.py     |  7 +++-
 .../components/resampler/speaker/__init__.py  | 11 +++--
 esphome/components/rtttl/__init__.py          | 28 ++++++++++---
 esphome/components/scd4x/sensor.py            | 19 +++++++--
 esphome/components/sen5x/sensor.py            | 13 +++++-
 esphome/components/sendspin/__init__.py       |  6 +--
 .../components/sendspin/sensor/__init__.py    |  4 +-
 esphome/components/sound_level/sensor.py      | 12 +++++-
 esphome/components/sps30/sensor.py            | 12 +++++-
 esphome/components/sx127x/__init__.py         | 24 ++++++++---
 .../sx127x/packet_transport/__init__.py       |  3 +-
 esphome/components/tm1651/__init__.py         | 40 ++++++++++++++++---
 esphome/components/ufire_ec/sensor.py         | 19 +++++++--
 esphome/components/ufire_ise/sensor.py        | 26 ++++++++++--
 21 files changed, 261 insertions(+), 77 deletions(-)

diff --git a/esphome/components/as5600/__init__.py b/esphome/components/as5600/__init__.py
index c05e556376..780712c3bd 100644
--- a/esphome/components/as5600/__init__.py
+++ b/esphome/components/as5600/__init__.py
@@ -1,3 +1,6 @@
+from collections.abc import Callable
+from typing import Any
+
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components import i2c
@@ -11,6 +14,7 @@ from esphome.const import (
     CONF_RANGE,
     CONF_WATCHDOG,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ammmze"]
 DEPENDENCIES = ["i2c"]
@@ -72,13 +76,13 @@ POSITION_TO_ANGLE = 360 / RESOLUTION
 MIN_RANGE = round(18 * ANGLE_TO_POSITION)
 
 
-def angle(min=-360, max=360):
+def angle(min: float = -360, max: float = 360) -> Callable[[Any], Any]:
     return cv.All(
         cv.float_with_unit("angle", "(°|deg)"), cv.float_range(min=min, max=max)
     )
 
 
-def angle_to_position(value, min=-360, max=360):
+def angle_to_position(value: Any, min: float = -360, max: float = 360) -> int:
     try:
         value = angle(min=min, max=max)(value)
         return (RESOLUTION + round(value * ANGLE_TO_POSITION)) % RESOLUTION
@@ -86,17 +90,17 @@ def angle_to_position(value, min=-360, max=360):
         raise cv.Invalid(f"When using angle, {e.error_message}") from e
 
 
-def percent_to_position(value):
+def percent_to_position(value: Any) -> int:
     value = cv.possibly_negative_percentage(value)
     return (RESOLUTION + round(value * RESOLUTION)) % RESOLUTION
 
 
-def position(min=-MAX_POSITION, max=MAX_POSITION):
+def position(min: int = -MAX_POSITION, max: int = MAX_POSITION) -> Callable[[Any], Any]:
     """Validate that the config option is a position.
     Accepts integers, degrees, or percentage (of 360 degrees).
     """
 
-    def validator(value):
+    def validator(value: Any) -> int:
         if isinstance(value, str) and value.endswith("%"):
             value = percent_to_position(value)
 
@@ -112,7 +116,7 @@ def position(min=-MAX_POSITION, max=MAX_POSITION):
     return validator
 
 
-def position_range():
+def position_range() -> Callable[[Any], Any]:
     """Validate that value given is a valid range for the device.
     A valid range is one of the following:
     - a value of 0 (meaning full range)
@@ -129,7 +133,7 @@ def position_range():
         zero_validator,
     )
 
-    def validator(value):
+    def validator(value: Any) -> Any:
         is_negative_str = isinstance(value, str) and value.startswith("-")
         is_negative_num = isinstance(value, (float, int)) and value < 0
         if is_negative_str or is_negative_num:
@@ -139,13 +143,13 @@ def position_range():
     return validator
 
 
-def has_valid_range_config():
+def has_valid_range_config() -> Callable[[ConfigType], ConfigType]:
     """Validate that that the config start + end position results in a valid
     positional range, which must be >= 18degrees
     """
     range_validator = position_range()
 
-    def validator(config):
+    def validator(config: ConfigType) -> ConfigType:
         # if we don't have an end position, then there is nothing to do
         if CONF_END_POSITION not in config:
             return config
@@ -203,7 +207,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/as5600/sensor/__init__.py b/esphome/components/as5600/sensor/__init__.py
index cf67a3f203..847b89f121 100644
--- a/esphome/components/as5600/sensor/__init__.py
+++ b/esphome/components/as5600/sensor/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     ICON_ROTATE_RIGHT,
     STATE_CLASS_MEASUREMENT,
 )
+from esphome.types import ConfigType
 
 from .. import AS5600Component, as5600_ns
 
@@ -77,7 +78,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_AS5600_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/audio/__init__.py b/esphome/components/audio/__init__.py
index 1c522cbb5d..277df0506a 100644
--- a/esphome/components/audio/__init__.py
+++ b/esphome/components/audio/__init__.py
@@ -1,4 +1,6 @@
+from collections.abc import Callable
 from dataclasses import dataclass, field
+from typing import Any
 
 import esphome.codegen as cg
 from esphome.components.esp32 import (
@@ -15,6 +17,7 @@ from esphome.const import (
 )
 from esphome.core import CORE
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ring_buffer"]
 CODEOWNERS = ["@kahrendt"]
@@ -125,10 +128,10 @@ CONF_THREADSAFE = "threadsafe"
 _MEMORY_LOCATION_VALIDATOR = cv.one_of(*MEMORY_LOCATIONS, lower=True)
 
 
-def _maybe_empty_codec(schema):
+def _maybe_empty_codec(schema: cv.Schema) -> Callable[[Any], Any]:
     """Wrap a codec dict schema so that a bare key (None value) is treated as an empty dict."""
 
-    def validator(value):
+    def validator(value: Any) -> Any:
         if value is None:
             value = {}
         return schema(value)
@@ -200,14 +203,14 @@ def set_stream_limits(
     max_channels: int = cv.UNDEFINED,
     min_sample_rate: int = cv.UNDEFINED,
     max_sample_rate: int = cv.UNDEFINED,
-):
+) -> Callable[[ConfigType], None]:
     """Sets the limits for the audio stream that audio component can handle
 
     When the component sinks audio (e.g., a speaker), these indicate the limits to the audio it can receive.
     When the component sources audio (e.g., a microphone), these indicate the limits to the audio it can send.
     """
 
-    def set_limits_in_config(config):
+    def set_limits_in_config(config: ConfigType) -> None:
         if min_bits_per_sample is not cv.UNDEFINED:
             config[CONF_MIN_BITS_PER_SAMPLE] = min_bits_per_sample
         if max_bits_per_sample is not cv.UNDEFINED:
@@ -233,7 +236,7 @@ def final_validate_audio_schema(
     sample_rate: int = cv.UNDEFINED,
     enabled_channels: list[int] = cv.UNDEFINED,
     audio_device_issue: bool = False,
-):
+) -> cv.Schema:
     """Validates audio compatibility when passed between different components.
 
     The component derived from ``AUDIO_COMPONENT_SCHEMA`` should call ``set_stream_limits`` in a validator to specify its compatible settings
@@ -251,7 +254,7 @@ def final_validate_audio_schema(
         audio_device_issue (bool, optional): Format the error message to indicate the problem is in the configuration for the ``audio_device`` component. Defaults to False.
     """
 
-    def validate_audio_compatiblity(audio_config):
+    def validate_audio_compatiblity(audio_config: ConfigType) -> ConfigType:
         audio_schema = {}
 
         if bits_per_sample is not cv.UNDEFINED:
@@ -329,7 +332,7 @@ def _emit_memory_pair(value: str | None, psram_key: str, internal_key: str) -> N
         add_idf_sdkconfig_option(internal_key, True)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # Re-enable ESP-IDF's HTTP client (excluded by default to save compile time)
     include_builtin_idf_component("esp_http_client")
 
diff --git a/esphome/components/duty_time/sensor.py b/esphome/components/duty_time/sensor.py
index 456859f8e4..6d878a80a5 100644
--- a/esphome/components/duty_time/sensor.py
+++ b/esphome/components/duty_time/sensor.py
@@ -19,6 +19,9 @@ from esphome.const import (
     STATE_CLASS_TOTAL_INCREASING,
     UNIT_SECOND,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CONF_LAST_TIME = "last_time"
 
@@ -66,7 +69,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     cg.add(var.set_restore(config[CONF_RESTORE]))
@@ -93,7 +96,12 @@ DUTY_TIME_ID_SCHEMA = maybe_simple_id(
 @register_action(
     "sensor.duty_time.start", StartAction, DUTY_TIME_ID_SCHEMA, synchronous=True
 )
-async def sensor_runtime_start_to_code(config, action_id, template_arg, args):
+async def sensor_runtime_start_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -102,7 +110,12 @@ async def sensor_runtime_start_to_code(config, action_id, template_arg, args):
 @register_action(
     "sensor.duty_time.stop", StopAction, DUTY_TIME_ID_SCHEMA, synchronous=True
 )
-async def sensor_runtime_stop_to_code(config, action_id, template_arg, args):
+async def sensor_runtime_stop_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -111,7 +124,12 @@ async def sensor_runtime_stop_to_code(config, action_id, template_arg, args):
 @register_action(
     "sensor.duty_time.reset", ResetAction, DUTY_TIME_ID_SCHEMA, synchronous=True
 )
-async def sensor_runtime_reset_to_code(config, action_id, template_arg, args):
+async def sensor_runtime_reset_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -120,7 +138,12 @@ async def sensor_runtime_reset_to_code(config, action_id, template_arg, args):
 @register_condition(
     "sensor.duty_time.is_running", RunningCondition, DUTY_TIME_ID_SCHEMA
 )
-async def duty_time_is_running_to_code(config, condition_id, template_arg, args):
+async def duty_time_is_running_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(condition_id, template_arg, paren, True)
 
@@ -128,6 +151,11 @@ async def duty_time_is_running_to_code(config, condition_id, template_arg, args)
 @register_condition(
     "sensor.duty_time.is_not_running", RunningCondition, DUTY_TIME_ID_SCHEMA
 )
-async def duty_time_is_not_running_to_code(config, condition_id, template_arg, args):
+async def duty_time_is_not_running_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(condition_id, template_arg, paren, False)
diff --git a/esphome/components/esp32_hosted/__init__.py b/esphome/components/esp32_hosted/__init__.py
index 7dc61ce382..ab9455250c 100644
--- a/esphome/components/esp32_hosted/__init__.py
+++ b/esphome/components/esp32_hosted/__init__.py
@@ -64,7 +64,7 @@ SDIO_SCHEMA = BASE_SCHEMA.extend(
 )
 
 
-def _validate_sdio(config):
+def _validate_sdio(config: ConfigType) -> ConfigType:
     if config[CONF_BUS_WIDTH] == 4:
         for pin in (CONF_D1_PIN, CONF_D2_PIN, CONF_D3_PIN):
             if pin not in config:
@@ -98,7 +98,7 @@ SPI_SCHEMA = BASE_SCHEMA.extend(
 )
 
 
-def _validate_spi(config):
+def _validate_spi(config: ConfigType) -> ConfigType:
     variant = config[CONF_VARIANT]
     defaults = _SPI_VARIANT_DEFAULTS.get(variant, _SPI_DEFAULT)
 
@@ -141,7 +141,7 @@ def _final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-def _configure_sdio(config):
+def _configure_sdio(config: ConfigType) -> None:
     slot = config[CONF_SLOT]
     esp32.add_idf_sdkconfig_option(
         f"CONFIG_ESP_HOSTED_SDIO_SLOT_{slot}",
@@ -183,7 +183,7 @@ def _configure_sdio(config):
     )
 
 
-def _configure_spi(config):
+def _configure_spi(config: ConfigType) -> None:
     esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_SPI_HOST_INTERFACE", True)
     # SPI mode is set via per-variant choice options
     variant = config[CONF_VARIANT]
@@ -231,7 +231,7 @@ def _configure_spi(config):
         esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_DR_ACTIVE_LOW", True)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     add_define("USE_ESP32_HOSTED")
     transport = config[CONF_TYPE]
     transport_prefix = "SDIO" if transport == "sdio" else "SPI"
diff --git a/esphome/components/mixer/speaker/__init__.py b/esphome/components/mixer/speaker/__init__.py
index 47164a9997..a3746c019a 100644
--- a/esphome/components/mixer/speaker/__init__.py
+++ b/esphome/components/mixer/speaker/__init__.py
@@ -15,8 +15,11 @@ from esphome.const import (
     CONF_TIMEOUT,
     PLATFORM_ESP32,
 )
+from esphome.core import ID
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.cpp_generator import MockObj, TemplateArgsType
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["audio"]
 CODEOWNERS = ["@kahrendt"]
@@ -48,7 +51,7 @@ SOURCE_SPEAKER_SCHEMA = speaker.SPEAKER_SCHEMA.extend(
 )
 
 
-def _validate_source_speaker(config):
+def _validate_source_speaker(config: ConfigType) -> ConfigType:
     fconf = fv.full_config.get()
 
     # Get ID for the output speaker and add it to the source speakers config to easily inherit properties
@@ -70,7 +73,7 @@ def _validate_source_speaker(config):
     return config
 
 
-def _validate_output_speaker(config):
+def _validate_output_speaker(config: ConfigType) -> ConfigType:
     audio.final_validate_audio_schema(
         "mixer",
         audio_device=CONF_OUTPUT_SPEAKER,
@@ -112,7 +115,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
@@ -161,7 +164,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def ducking_set_to_code(config, action_id, template_arg, args):
+async def ducking_set_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     decibel_reduction = await cg.templatable(
diff --git a/esphome/components/rc522/__init__.py b/esphome/components/rc522/__init__.py
index ce0d408c04..e9e8dd7b73 100644
--- a/esphome/components/rc522/__init__.py
+++ b/esphome/components/rc522/__init__.py
@@ -8,6 +8,8 @@ from esphome.const import (
     CONF_RESET_PIN,
     CONF_TRIGGER_ID,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@glmnet"]
 AUTO_LOAD = ["binary_sensor"]
@@ -38,7 +40,7 @@ RC522_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def setup_rc522(var, config):
+async def setup_rc522(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
 
     if CONF_RESET_PIN in config:
diff --git a/esphome/components/rc522/binary_sensor.py b/esphome/components/rc522/binary_sensor.py
index 87f81c2223..f295b75df7 100644
--- a/esphome/components/rc522/binary_sensor.py
+++ b/esphome/components/rc522/binary_sensor.py
@@ -1,15 +1,18 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_UID
 from esphome.core import HexInt
+from esphome.types import ConfigType
 
 from . import CONF_RC522_ID, RC522, rc522_ns
 
 DEPENDENCIES = ["rc522"]
 
 
-def validate_uid(value):
+def validate_uid(value: Any) -> str:
     value = cv.string_strict(value)
     for x in value.split("-"):
         if len(x) != 2:
@@ -39,7 +42,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(RC522BinarySensor).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
 
     hub = await cg.get_variable(config[CONF_RC522_ID])
diff --git a/esphome/components/resampler/speaker/__init__.py b/esphome/components/resampler/speaker/__init__.py
index ea080adc6b..7de468cb50 100644
--- a/esphome/components/resampler/speaker/__init__.py
+++ b/esphome/components/resampler/speaker/__init__.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import audio, psram, speaker
 import esphome.config_validation as cv
@@ -13,6 +15,7 @@ from esphome.const import (
     PLATFORM_ESP32,
 )
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["audio"]
 CODEOWNERS = ["@kahrendt"]
@@ -27,7 +30,7 @@ CONF_TAPS = "taps"
 PASSTHROUGH = "passthrough"
 
 
-def _set_stream_limits(config):
+def _set_stream_limits(config: ConfigType) -> ConfigType:
     audio.set_stream_limits(
         min_bits_per_sample=16,
         max_bits_per_sample=32,
@@ -36,7 +39,7 @@ def _set_stream_limits(config):
     return config
 
 
-def _validate_audio_compatibility(config):
+def _validate_audio_compatibility(config: ConfigType) -> None:
     inherit_property_from(CONF_NUM_CHANNELS, CONF_OUTPUT_SPEAKER)(config)
     inherit_property_from(CONF_SAMPLE_RATE, CONF_OUTPUT_SPEAKER)(config)
 
@@ -57,7 +60,7 @@ def _validate_audio_compatibility(config):
     )(config)
 
 
-def _validate_taps(taps):
+def _validate_taps(taps: Any) -> int:
     value = cv.int_range(min=16, max=128)(taps)
     if value % 4 != 0:
         raise cv.Invalid("Number of taps must be divisible by 4")
@@ -88,7 +91,7 @@ CONFIG_SCHEMA = cv.All(
 FINAL_VALIDATE_SCHEMA = _validate_audio_compatibility
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await speaker.register_speaker(var, config)
diff --git a/esphome/components/rtttl/__init__.py b/esphome/components/rtttl/__init__.py
index 4880f9ac41..b6c4183586 100644
--- a/esphome/components/rtttl/__init__.py
+++ b/esphome/components/rtttl/__init__.py
@@ -6,7 +6,10 @@ from esphome.components.output import FloatOutput
 from esphome.components.speaker import Speaker
 import esphome.config_validation as cv
 from esphome.const import CONF_GAIN, CONF_ID, CONF_OUTPUT, CONF_PLATFORM, CONF_SPEAKER
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -37,7 +40,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def validate_parent_output_config(value):
+def validate_parent_output_config(value: ConfigType) -> None:
     platform = value.get(CONF_PLATFORM)
     PWM_GOOD = ["esp8266_pwm", "ledc"]
     PWM_BAD = [
@@ -78,7 +81,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
@@ -110,7 +113,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def rtttl_play_to_code(config, action_id, template_arg, args):
+async def rtttl_play_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_RTTTL], args, cg.std_string)
@@ -128,7 +136,12 @@ async def rtttl_play_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def rtttl_stop_to_code(config, action_id, template_arg, args):
+async def rtttl_stop_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -143,7 +156,12 @@ async def rtttl_stop_to_code(config, action_id, template_arg, args):
         }
     ),
 )
-async def rtttl_is_playing_to_code(config, condition_id, template_arg, args):
+async def rtttl_is_playing_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(condition_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/scd4x/sensor.py b/esphome/components/scd4x/sensor.py
index 6f14118660..af3ff3a7af 100644
--- a/esphome/components/scd4x/sensor.py
+++ b/esphome/components/scd4x/sensor.py
@@ -26,6 +26,9 @@ from esphome.const import (
     UNIT_PARTS_PER_MILLION,
     UNIT_PERCENT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@sjtrny", "@martgras"]
 DEPENDENCIES = ["i2c"]
@@ -108,7 +111,7 @@ SETTING_MAP = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -143,7 +146,12 @@ SCD4X_ACTION_SCHEMA = maybe_simple_id(
     SCD4X_ACTION_SCHEMA,
     synchronous=True,
 )
-async def scd4x_frc_to_code(config, action_id, template_arg, args):
+async def scd4x_frc_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_VALUE], args, cg.uint16)
@@ -164,7 +172,12 @@ SCD4X_RESET_ACTION_SCHEMA = maybe_simple_id(
     SCD4X_RESET_ACTION_SCHEMA,
     synchronous=True,
 )
-async def scd4x_reset_to_code(config, action_id, template_arg, args):
+async def scd4x_reset_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/sen5x/sensor.py b/esphome/components/sen5x/sensor.py
index 761a1885ea..e86c8bf899 100644
--- a/esphome/components/sen5x/sensor.py
+++ b/esphome/components/sen5x/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation
 from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
@@ -41,6 +43,8 @@ from esphome.const import (
     UNIT_MICROGRAMS_PER_CUBIC_METER,
     UNIT_PERCENT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@martgras"]
@@ -115,7 +119,7 @@ def _gas_sensor(
     )
 
 
-def float_previously_pct(value):
+def float_previously_pct(value: Any) -> Any:
     if isinstance(value, str) and "%" in value:
         raise cv.Invalid(
             f"The value '{value}' is a percentage. Suggested value: {float(value.strip('%')) / 100}"
@@ -284,6 +288,11 @@ SEN5X_ACTION_SCHEMA = maybe_simple_id(
     SEN5X_ACTION_SCHEMA,
     synchronous=True,
 )
-async def sen54_fan_to_code(config, action_id, template_arg, args):
+async def sen54_fan_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
diff --git a/esphome/components/sendspin/__init__.py b/esphome/components/sendspin/__init__.py
index 082639374f..570fd3fadd 100644
--- a/esphome/components/sendspin/__init__.py
+++ b/esphome/components/sendspin/__init__.py
@@ -15,7 +15,7 @@ from esphome.const import (
     CONF_WIDTH,
 )
 from esphome.core import CORE, ID
-from esphome.cpp_generator import TemplateArgsType
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 # mdns for autodiscovery
@@ -219,7 +219,7 @@ async def sendspin_switch_to_code(
     action_id: ID,
     template_arg: cg.TemplateArguments,
     args: TemplateArgsType,
-):
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -297,7 +297,7 @@ async def to_code(config: ConfigType) -> None:
             codecs.append(CODEC_FORMAT_OPUS)
         codecs.append(CODEC_FORMAT_PCM)
 
-        def _audio_format(codec, channels):
+        def _audio_format(codec: MockObj, channels: int) -> cg.StructInitializer:
             return cg.StructInitializer(
                 AudioSupportedFormatObject,
                 ("codec", codec),
diff --git a/esphome/components/sendspin/sensor/__init__.py b/esphome/components/sendspin/sensor/__init__.py
index dc9b86c2a3..d6016ed91d 100644
--- a/esphome/components/sendspin/sensor/__init__.py
+++ b/esphome/components/sendspin/sensor/__init__.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import sensor
 import esphome.config_validation as cv
@@ -50,7 +52,7 @@ def _request_roles(config: ConfigType) -> ConfigType:
 _HUB_ID_SCHEMA = cv.Schema({cv.GenerateID(CONF_SENDSPIN_ID): cv.use_id(SendspinHub)})
 
 
-def _metadata_schema(**sensor_kwargs):
+def _metadata_schema(**sensor_kwargs: Any) -> cv.Schema:
     """Schema for event-driven numeric metadata sensors (duration/year/track)."""
     return (
         sensor.sensor_schema(
diff --git a/esphome/components/sound_level/sensor.py b/esphome/components/sound_level/sensor.py
index 44f31979b4..d217534041 100644
--- a/esphome/components/sound_level/sensor.py
+++ b/esphome/components/sound_level/sensor.py
@@ -11,6 +11,9 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_DECIBEL,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["audio"]
 CODEOWNERS = ["@kahrendt"]
@@ -63,7 +66,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
@@ -95,7 +98,12 @@ SOUND_LEVEL_ACTION_SCHEMA = automation.maybe_simple_id(
 @automation.register_action(
     "sound_level.stop", StopAction, SOUND_LEVEL_ACTION_SCHEMA, synchronous=True
 )
-async def sound_level_action_to_code(config, action_id, template_arg, args):
+async def sound_level_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/sps30/sensor.py b/esphome/components/sps30/sensor.py
index 40557f2cbd..681166cd3c 100644
--- a/esphome/components/sps30/sensor.py
+++ b/esphome/components/sps30/sensor.py
@@ -26,6 +26,9 @@ from esphome.const import (
     UNIT_MICROGRAMS_PER_CUBIC_METER,
     UNIT_MICROMETER,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@martgras"]
 DEPENDENCIES = ["i2c"]
@@ -120,7 +123,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -197,7 +200,12 @@ SPS30_ACTION_SCHEMA = maybe_simple_id(
     SPS30_ACTION_SCHEMA,
     synchronous=True,
 )
-async def sps30_action_to_code(config, action_id, template_arg, args):
+async def sps30_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/sx127x/__init__.py b/esphome/components/sx127x/__init__.py
index 8fa7247192..34f2d4122f 100644
--- a/esphome/components/sx127x/__init__.py
+++ b/esphome/components/sx127x/__init__.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation, pins
 import esphome.codegen as cg
 from esphome.components import spi
@@ -5,6 +7,8 @@ from esphome.components.const import CONF_CRC_ENABLE, CONF_ON_PACKET
 import esphome.config_validation as cv
 from esphome.const import CONF_DATA, CONF_FREQUENCY, CONF_ID
 from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 MULTI_CONF = True
 CODEOWNERS = ["@swoboda1337"]
@@ -136,7 +140,7 @@ SetModeStandbyAction = sx127x_ns.class_(
 )
 
 
-def validate_raw_data(value):
+def validate_raw_data(value: Any) -> bytes | list[int]:
     if isinstance(value, str):
         return value.encode("utf-8")
     if isinstance(value, list):
@@ -146,7 +150,7 @@ def validate_raw_data(value):
     )
 
 
-def validate_config(config):
+def validate_config(config: ConfigType) -> ConfigType:
     if config[CONF_MODULATION] == "LORA":
         bws = [
             "7_8kHz",
@@ -230,7 +234,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
@@ -312,7 +316,12 @@ NO_ARGS_ACTION_SCHEMA = automation.maybe_simple_id(
     NO_ARGS_ACTION_SCHEMA,
     synchronous=True,
 )
-async def no_args_action_to_code(config, action_id, template_arg, args):
+async def no_args_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -333,7 +342,12 @@ SEND_PACKET_ACTION_SCHEMA = cv.maybe_simple_value(
     SEND_PACKET_ACTION_SCHEMA,
     synchronous=True,
 )
-async def send_packet_action_to_code(config, action_id, template_arg, args):
+async def send_packet_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     data = config[CONF_DATA]
diff --git a/esphome/components/sx127x/packet_transport/__init__.py b/esphome/components/sx127x/packet_transport/__init__.py
index 2f3a0f6e2b..33204a7d83 100644
--- a/esphome/components/sx127x/packet_transport/__init__.py
+++ b/esphome/components/sx127x/packet_transport/__init__.py
@@ -6,6 +6,7 @@ from esphome.components.packet_transport import (
 )
 import esphome.config_validation as cv
 from esphome.cpp_types import PollingComponent
+from esphome.types import ConfigType
 
 from .. import CONF_SX127X_ID, SX127x, SX127xListener, sx127x_ns
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = transport_schema(SX127xTransport).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var, _ = await new_packet_transport(config)
     sx127x = await cg.get_variable(config[CONF_SX127X_ID])
     cg.add(var.set_parent(sx127x))
diff --git a/esphome/components/tm1651/__init__.py b/esphome/components/tm1651/__init__.py
index 7d957df3be..c0cc6f1d2c 100644
--- a/esphome/components/tm1651/__init__.py
+++ b/esphome/components/tm1651/__init__.py
@@ -9,6 +9,9 @@ from esphome.const import (
     CONF_ID,
     CONF_LEVEL,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@mrtoy-me"]
 
@@ -43,7 +46,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     clk_pin = await cg.gpio_pin_expression(config[CONF_CLK_PIN])
@@ -75,7 +78,12 @@ BINARY_OUTPUT_ACTION_SCHEMA = maybe_simple_id(
     ),
     synchronous=True,
 )
-async def tm1651_set_brightness_to_code(config, action_id, template_arg, args):
+async def tm1651_set_brightness_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_BRIGHTNESS], args, cg.uint8)
@@ -95,7 +103,12 @@ async def tm1651_set_brightness_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def tm1651_set_level_to_code(config, action_id, template_arg, args):
+async def tm1651_set_level_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_LEVEL], args, cg.uint8)
@@ -115,7 +128,12 @@ async def tm1651_set_level_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def tm1651_set_level_percent_to_code(config, action_id, template_arg, args):
+async def tm1651_set_level_percent_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_LEVEL_PERCENT], args, cg.uint8)
@@ -129,7 +147,12 @@ async def tm1651_set_level_percent_to_code(config, action_id, template_arg, args
     BINARY_OUTPUT_ACTION_SCHEMA,
     synchronous=True,
 )
-async def output_turn_off_to_code(config, action_id, template_arg, args):
+async def output_turn_off_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -138,7 +161,12 @@ async def output_turn_off_to_code(config, action_id, template_arg, args):
 @automation.register_action(
     "tm1651.turn_on", TurnOnAction, BINARY_OUTPUT_ACTION_SCHEMA, synchronous=True
 )
-async def output_turn_on_to_code(config, action_id, template_arg, args):
+async def output_turn_on_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/ufire_ec/sensor.py b/esphome/components/ufire_ec/sensor.py
index 1d8775ccf0..9d989ad4e6 100644
--- a/esphome/components/ufire_ec/sensor.py
+++ b/esphome/components/ufire_ec/sensor.py
@@ -14,6 +14,9 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_MILLISIEMENS_PER_CENTIMETER,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -63,7 +66,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     cg.add(var.set_temperature_compensation(config[CONF_TEMPERATURE_COMPENSATION]))
@@ -99,7 +102,12 @@ UFIRE_EC_CALIBRATE_PROBE_SCHEMA = cv.Schema(
     UFIRE_EC_CALIBRATE_PROBE_SCHEMA,
     synchronous=True,
 )
-async def ufire_ec_calibrate_probe_to_code(config, action_id, template_arg, args):
+async def ufire_ec_calibrate_probe_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     solution_ = await cg.templatable(config[CONF_SOLUTION], args, cg.float_)
@@ -122,6 +130,11 @@ UFIRE_EC_RESET_SCHEMA = cv.Schema(
     UFIRE_EC_RESET_SCHEMA,
     synchronous=True,
 )
-async def ufire_ec_reset_to_code(config, action_id, template_arg, args):
+async def ufire_ec_reset_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
diff --git a/esphome/components/ufire_ise/sensor.py b/esphome/components/ufire_ise/sensor.py
index 23254b2f47..c7e3b6f28d 100644
--- a/esphome/components/ufire_ise/sensor.py
+++ b/esphome/components/ufire_ise/sensor.py
@@ -13,6 +13,9 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PH,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -60,7 +63,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
@@ -93,7 +96,12 @@ UFIRE_ISE_CALIBRATE_PROBE_SCHEMA = cv.Schema(
     UFIRE_ISE_CALIBRATE_PROBE_SCHEMA,
     synchronous=True,
 )
-async def ufire_ise_calibrate_probe_low_to_code(config, action_id, template_arg, args):
+async def ufire_ise_calibrate_probe_low_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_SOLUTION], args, cg.float_)
@@ -107,7 +115,12 @@ async def ufire_ise_calibrate_probe_low_to_code(config, action_id, template_arg,
     UFIRE_ISE_CALIBRATE_PROBE_SCHEMA,
     synchronous=True,
 )
-async def ufire_ise_calibrate_probe_high_to_code(config, action_id, template_arg, args):
+async def ufire_ise_calibrate_probe_high_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_SOLUTION], args, cg.float_)
@@ -124,6 +137,11 @@ UFIRE_ISE_RESET_SCHEMA = cv.Schema({cv.GenerateID(): cv.use_id(UFireISEComponent
     UFIRE_ISE_RESET_SCHEMA,
     synchronous=True,
 )
-async def ufire_ise_reset_to_code(config, action_id, template_arg, args):
+async def ufire_ise_reset_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)

From 545f762568609fa7f57e841852308e6c9f2d7dd4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Aug 2026 04:08:26 +1200
Subject: [PATCH 017/155] [core] Add type annotations to component Python
 (8/11) (#18345)

---
 .../components/atm90e32/button/__init__.py    |  3 +-
 .../components/atm90e32/number/__init__.py    |  3 +-
 esphome/components/atm90e32/sensor.py         |  3 +-
 .../atm90e32/text_sensor/__init__.py          |  3 +-
 esphome/components/bl0940/button/__init__.py  |  3 +-
 esphome/components/bl0940/number/__init__.py  |  5 +--
 esphome/components/bl0940/sensor.py           | 19 ++++++-----
 esphome/components/bm8563/time.py             | 26 ++++++++++++---
 esphome/components/event/__init__.py          | 24 ++++++++++----
 esphome/components/ld2410/__init__.py         | 12 +++++--
 esphome/components/ld2410/binary_sensor.py    |  3 +-
 esphome/components/ld2410/button/__init__.py  |  3 +-
 esphome/components/ld2410/number/__init__.py  |  3 +-
 esphome/components/ld2410/select/__init__.py  |  3 +-
 esphome/components/ld2410/sensor.py           |  3 +-
 esphome/components/ld2410/switch/__init__.py  |  3 +-
 esphome/components/ld2410/text_sensor.py      |  3 +-
 esphome/components/ld2412/__init__.py         |  3 +-
 esphome/components/ld2412/binary_sensor.py    |  3 +-
 esphome/components/ld2412/button/__init__.py  |  3 +-
 esphome/components/ld2412/number/__init__.py  |  3 +-
 esphome/components/ld2412/select/__init__.py  |  3 +-
 esphome/components/ld2412/sensor.py           |  3 +-
 esphome/components/ld2412/switch/__init__.py  |  3 +-
 esphome/components/ld2412/text_sensor.py      |  3 +-
 esphome/components/ld2420/__init__.py         |  3 +-
 .../ld2420/binary_sensor/__init__.py          |  3 +-
 esphome/components/ld2420/button/__init__.py  |  3 +-
 esphome/components/ld2420/number/__init__.py  |  3 +-
 esphome/components/ld2420/select/__init__.py  |  3 +-
 esphome/components/ld2420/sensor/__init__.py  |  3 +-
 .../components/ld2420/text_sensor/__init__.py |  3 +-
 esphome/components/ld2450/__init__.py         |  3 +-
 esphome/components/ld2450/binary_sensor.py    |  3 +-
 esphome/components/ld2450/button/__init__.py  |  3 +-
 esphome/components/ld2450/number/__init__.py  |  3 +-
 esphome/components/ld2450/select/__init__.py  |  3 +-
 esphome/components/ld2450/sensor.py           |  3 +-
 esphome/components/ld2450/switch/__init__.py  |  3 +-
 esphome/components/ld2450/text_sensor.py      |  3 +-
 esphome/components/max6956/__init__.py        | 23 ++++++++++---
 esphome/components/max6956/output/__init__.py |  3 +-
 esphome/components/max7219digit/display.py    | 33 ++++++++++++++++---
 esphome/components/micronova/__init__.py      | 10 ++++--
 .../components/micronova/button/__init__.py   |  3 +-
 .../components/micronova/number/__init__.py   |  3 +-
 .../components/micronova/sensor/__init__.py   |  3 +-
 .../components/micronova/switch/__init__.py   |  3 +-
 .../micronova/text_sensor/__init__.py         |  3 +-
 esphome/components/pipsolar/__init__.py       |  3 +-
 .../pipsolar/binary_sensor/__init__.py        |  3 +-
 .../components/pipsolar/output/__init__.py    | 12 +++++--
 .../components/pipsolar/sensor/__init__.py    |  3 +-
 .../components/pipsolar/switch/__init__.py    |  3 +-
 .../pipsolar/text_sensor/__init__.py          |  3 +-
 esphome/components/text/__init__.py           | 30 ++++++++++-------
 .../components/text/text_sensor/__init__.py   |  3 +-
 57 files changed, 238 insertions(+), 97 deletions(-)

diff --git a/esphome/components/atm90e32/button/__init__.py b/esphome/components/atm90e32/button/__init__.py
index 19f62ccfbd..274cce6adb 100644
--- a/esphome/components/atm90e32/button/__init__.py
+++ b/esphome/components/atm90e32/button/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import button
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, ENTITY_CATEGORY_CONFIG, ICON_SCALE
+from esphome.types import ConfigType
 
 from .. import atm90e32_ns
 from ..sensor import ATM90E32Component
@@ -67,7 +68,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_ID])
 
     if run_gain := config.get(CONF_RUN_GAIN_CALIBRATION):
diff --git a/esphome/components/atm90e32/number/__init__.py b/esphome/components/atm90e32/number/__init__.py
index 848680b875..9c2865dde3 100644
--- a/esphome/components/atm90e32/number/__init__.py
+++ b/esphome/components/atm90e32/number/__init__.py
@@ -15,6 +15,7 @@ from esphome.const import (
     UNIT_AMPERE,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 from .. import atm90e32_ns
 from ..sensor import ATM90E32Component
@@ -90,7 +91,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_ID])
 
     if voltage_cfg := config.get(CONF_REFERENCE_VOLTAGE):
diff --git a/esphome/components/atm90e32/sensor.py b/esphome/components/atm90e32/sensor.py
index dc46138add..38b24c7cf6 100644
--- a/esphome/components/atm90e32/sensor.py
+++ b/esphome/components/atm90e32/sensor.py
@@ -41,6 +41,7 @@ from esphome.const import (
     UNIT_WATT,
     UNIT_WATT_HOURS,
 )
+from esphome.types import ConfigType
 
 from . import atm90e32_ns
 
@@ -191,7 +192,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_instance_id(str(config[CONF_ID])))
     await cg.register_component(var, config)
diff --git a/esphome/components/atm90e32/text_sensor/__init__.py b/esphome/components/atm90e32/text_sensor/__init__.py
index ab96f6c207..30585cb873 100644
--- a/esphome/components/atm90e32/text_sensor/__init__.py
+++ b/esphome/components/atm90e32/text_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PHASE_A, CONF_PHASE_B, CONF_PHASE_C
+from esphome.types import ConfigType
 
 from ..sensor import ATM90E32Component
 
@@ -34,7 +35,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_ID])
 
     if phase_cfg := config.get(CONF_PHASE_STATUS):
diff --git a/esphome/components/bl0940/button/__init__.py b/esphome/components/bl0940/button/__init__.py
index 04d11e6e30..e87a647392 100644
--- a/esphome/components/bl0940/button/__init__.py
+++ b/esphome/components/bl0940/button/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import button
 import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_CONFIG, ICON_RESTART
+from esphome.types import ConfigType
 
 from .. import CONF_BL0940_ID, bl0940_ns
 from ..sensor import BL0940
@@ -21,7 +22,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await button.new_button(config)
     await cg.register_component(var, config)
     await cg.register_parented(var, config[CONF_BL0940_ID])
diff --git a/esphome/components/bl0940/number/__init__.py b/esphome/components/bl0940/number/__init__.py
index 92ab2837b3..b5a66e682a 100644
--- a/esphome/components/bl0940/number/__init__.py
+++ b/esphome/components/bl0940/number/__init__.py
@@ -10,6 +10,7 @@ from esphome.const import (
     ENTITY_CATEGORY_CONFIG,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_BL0940_ID, bl0940_ns
 from ..sensor import BL0940
@@ -27,7 +28,7 @@ CalibrationNumber = bl0940_ns.class_(
 )
 
 
-def validate_min_max(config):
+def validate_min_max(config: ConfigType) -> ConfigType:
     if config[CONF_MAX_VALUE] <= config[CONF_MIN_VALUE]:
         raise cv.Invalid("max_value must be greater than min_value")
     return config
@@ -69,7 +70,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # Get the BL0940 component instance
     bl0940 = await cg.get_variable(config[CONF_BL0940_ID])
 
diff --git a/esphome/components/bl0940/sensor.py b/esphome/components/bl0940/sensor.py
index 96445d5c38..7e6403c3bc 100644
--- a/esphome/components/bl0940/sensor.py
+++ b/esphome/components/bl0940/sensor.py
@@ -23,6 +23,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 from . import bl0940_ns
 
@@ -69,27 +70,29 @@ DEFAULT_BL0940_LEGACY_EREF = 3.6e6 / 297
 
 
 # methods to calculate voltage and current reference values
-def calculate_voltage_reference(vref, r_one, r_two):
+def calculate_voltage_reference(vref: float, r_one: float, r_two: float) -> float:
     # formula: 79931 / Vref * (R1 * 1000) / (R1 + R2)
     return 79931 / vref * (r_one * 1000) / (r_one + r_two)
 
 
-def calculate_current_reference(vref, r_shunt):
+def calculate_current_reference(vref: float, r_shunt: float) -> float:
     # formula: 324004 * RL / Vref
     return 324004 * r_shunt / vref
 
 
-def calculate_power_reference(voltage_reference, current_reference):
+def calculate_power_reference(
+    voltage_reference: float, current_reference: float
+) -> float:
     # calculate power reference based on voltage and current reference
     return voltage_reference * current_reference * 4046 / 324004 / 79931
 
 
-def calculate_energy_reference(power_reference):
+def calculate_energy_reference(power_reference: float) -> float:
     # formula: power_reference * 3600000 / (1638.4 * 256)
     return power_reference * 3600000 / (1638.4 * 256)
 
 
-def validate_legacy_mode(config):
+def validate_legacy_mode(config: ConfigType) -> ConfigType:
     # Only allow schematic calibration options if legacy_mode is False
     if config.get(CONF_LEGACY_MODE, True):
         forbidden = [
@@ -106,7 +109,7 @@ def validate_legacy_mode(config):
     return config
 
 
-def set_command_defaults(config):
+def set_command_defaults(config: ConfigType) -> ConfigType:
     # Set defaults for read_command and write_command based on legacy_mode
     legacy = config.get(CONF_LEGACY_MODE, True)
     if legacy:
@@ -118,7 +121,7 @@ def set_command_defaults(config):
     return config
 
 
-def set_reference_values(config):
+def set_reference_values(config: ConfigType) -> ConfigType:
     # Set default reference values based on legacy_mode
     if config.get(CONF_LEGACY_MODE, True):
         config.setdefault(CONF_VOLTAGE_REFERENCE, DEFAULT_BL0940_LEGACY_UREF)
@@ -223,7 +226,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/bm8563/time.py b/esphome/components/bm8563/time.py
index ba264f00bf..5ef162bb7c 100644
--- a/esphome/components/bm8563/time.py
+++ b/esphome/components/bm8563/time.py
@@ -3,6 +3,9 @@ import esphome.codegen as cg
 from esphome.components import i2c, time
 import esphome.config_validation as cv
 from esphome.const import CONF_DURATION, CONF_ID
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -35,7 +38,12 @@ CONFIG_SCHEMA = (
     ),
     synchronous=True,
 )
-async def bm8563_write_time_to_code(config, action_id, template_arg, args):
+async def bm8563_write_time_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -52,7 +60,12 @@ async def bm8563_write_time_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def bm8563_start_timer_to_code(config, action_id, template_arg, args):
+async def bm8563_start_timer_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_DURATION], args, cg.uint32)
@@ -70,13 +83,18 @@ async def bm8563_start_timer_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def bm8563_read_time_to_code(config, action_id, template_arg, args):
+async def bm8563_read_time_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/event/__init__.py b/esphome/components/event/__init__.py
index e205e4b910..881107b713 100644
--- a/esphome/components/event/__init__.py
+++ b/esphome/components/event/__init__.py
@@ -16,14 +16,15 @@ from esphome.const import (
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_MOTION,
 )
-from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.core import CORE, ID, CoroPriority, coroutine_with_priority
 from esphome.core.entity_helpers import (
     entity_duplicate_validator,
     queue_entity_register,
     setup_device_class,
     setup_entity,
 )
-from esphome.cpp_generator import MockObjClass
+from esphome.cpp_generator import MockObj, MockObjClass, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@nohat"]
 IS_PLATFORM_COMPONENT = True
@@ -93,7 +94,9 @@ _CALLBACK_AUTOMATIONS = (
 
 
 @setup_entity("event")
-async def setup_event_core_(var, config, *, event_types: list[str]):
+async def setup_event_core_(
+    var: MockObj, config: ConfigType, *, event_types: list[str]
+) -> None:
     await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)
 
     cg.add(var.set_event_types(event_types))
@@ -108,7 +111,9 @@ async def setup_event_core_(var, config, *, event_types: list[str]):
         await web_server.add_entity_config(var, web_server_config)
 
 
-async def register_event(var, config, *, event_types: list[str]):
+async def register_event(
+    var: MockObj, config: ConfigType, *, event_types: list[str]
+) -> None:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     queue_entity_register("event", config)
@@ -116,7 +121,7 @@ async def register_event(var, config, *, event_types: list[str]):
     await setup_event_core_(var, config, event_types=event_types)
 
 
-async def new_event(config, *, event_types: list[str]):
+async def new_event(config: ConfigType, *, event_types: list[str]) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await register_event(var, config, event_types=event_types)
     return var
@@ -133,7 +138,12 @@ TRIGGER_EVENT_SCHEMA = cv.Schema(
 @automation.register_action(
     "event.trigger", TriggerEventAction, TRIGGER_EVENT_SCHEMA, synchronous=True
 )
-async def event_fire_to_code(config, action_id, template_arg, args):
+async def event_fire_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     templ = await cg.templatable(config[CONF_EVENT_TYPE], args, cg.std_string)
@@ -142,5 +152,5 @@ async def event_fire_to_code(config, action_id, template_arg, args):
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(event_ns.using)
diff --git a/esphome/components/ld2410/__init__.py b/esphome/components/ld2410/__init__.py
index 360e56330a..19786f38d3 100644
--- a/esphome/components/ld2410/__init__.py
+++ b/esphome/components/ld2410/__init__.py
@@ -4,6 +4,9 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PASSWORD, CONF_THROTTLE, CONF_TIMEOUT
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ld24xx"]
 DEPENDENCIES = ["uart"]
@@ -69,7 +72,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
@@ -102,7 +105,12 @@ BLUETOOTH_PASSWORD_SET_SCHEMA = cv.Schema(
     BLUETOOTH_PASSWORD_SET_SCHEMA,
     synchronous=True,
 )
-async def bluetooth_password_set_to_code(config, action_id, template_arg, args):
+async def bluetooth_password_set_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_PASSWORD], args, cg.std_string)
diff --git a/esphome/components/ld2410/binary_sensor.py b/esphome/components/ld2410/binary_sensor.py
index fb5b5cabff..2b68733532 100644
--- a/esphome/components/ld2410/binary_sensor.py
+++ b/esphome/components/ld2410/binary_sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     ICON_ACCOUNT,
     ICON_MOTION_SENSOR,
 )
+from esphome.types import ConfigType
 
 from . import CONF_LD2410_ID, LD2410Component
 
@@ -46,7 +47,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2410_component = await cg.get_variable(config[CONF_LD2410_ID])
     if has_target_config := config.get(CONF_HAS_TARGET):
         sens = await binary_sensor.new_binary_sensor(has_target_config)
diff --git a/esphome/components/ld2410/button/__init__.py b/esphome/components/ld2410/button/__init__.py
index fa6f31ee25..59a9558331 100644
--- a/esphome/components/ld2410/button/__init__.py
+++ b/esphome/components/ld2410/button/__init__.py
@@ -12,6 +12,7 @@ from esphome.const import (
     ICON_RESTART,
     ICON_RESTART_ALERT,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2410_ID, LD2410Component, ld2410_ns
 
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2410_component = await cg.get_variable(config[CONF_LD2410_ID])
     if factory_reset_config := config.get(CONF_FACTORY_RESET):
         b = await button.new_button(factory_reset_config)
diff --git a/esphome/components/ld2410/number/__init__.py b/esphome/components/ld2410/number/__init__.py
index 01dbcc785d..3500d704a1 100644
--- a/esphome/components/ld2410/number/__init__.py
+++ b/esphome/components/ld2410/number/__init__.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_SECOND,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2410_ID, LD2410Component, ld2410_ns
 
@@ -85,7 +86,7 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2410_component = await cg.get_variable(config[CONF_LD2410_ID])
     if timeout_config := config.get(CONF_TIMEOUT):
         n = await number.new_number(
diff --git a/esphome/components/ld2410/select/__init__.py b/esphome/components/ld2410/select/__init__.py
index 9c4f654aa1..e89e3d5997 100644
--- a/esphome/components/ld2410/select/__init__.py
+++ b/esphome/components/ld2410/select/__init__.py
@@ -10,6 +10,7 @@ from esphome.const import (
     ICON_SCALE,
     ICON_THERMOMETER,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2410_ID, LD2410Component, ld2410_ns
 
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2410_component = await cg.get_variable(config[CONF_LD2410_ID])
     if distance_resolution_config := config.get(CONF_DISTANCE_RESOLUTION):
         s = await select.new_select(
diff --git a/esphome/components/ld2410/sensor.py b/esphome/components/ld2410/sensor.py
index 459018e263..ca42b3a1d3 100644
--- a/esphome/components/ld2410/sensor.py
+++ b/esphome/components/ld2410/sensor.py
@@ -15,6 +15,7 @@ from esphome.const import (
     UNIT_CENTIMETER,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 from . import CONF_LD2410_ID, LD2410Component
 
@@ -155,7 +156,7 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2410_component = await cg.get_variable(config[CONF_LD2410_ID])
     if moving_distance_config := config.get(CONF_MOVING_DISTANCE):
         sens = await sensor.new_sensor(moving_distance_config)
diff --git a/esphome/components/ld2410/switch/__init__.py b/esphome/components/ld2410/switch/__init__.py
index 4276b28a71..6d8053ddd6 100644
--- a/esphome/components/ld2410/switch/__init__.py
+++ b/esphome/components/ld2410/switch/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     ICON_BLUETOOTH,
     ICON_PULSE,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2410_ID, LD2410Component, ld2410_ns
 
@@ -35,7 +36,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2410_component = await cg.get_variable(config[CONF_LD2410_ID])
     if engineering_mode_config := config.get(CONF_ENGINEERING_MODE):
         s = await switch.new_switch(engineering_mode_config)
diff --git a/esphome/components/ld2410/text_sensor.py b/esphome/components/ld2410/text_sensor.py
index a34c8ec0d2..25c61a4825 100644
--- a/esphome/components/ld2410/text_sensor.py
+++ b/esphome/components/ld2410/text_sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     ICON_BLUETOOTH,
     ICON_CHIP,
 )
+from esphome.types import ConfigType
 
 from . import CONF_LD2410_ID, LD2410Component
 
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2410_component = await cg.get_variable(config[CONF_LD2410_ID])
     if version_config := config.get(CONF_VERSION):
         sens = await text_sensor.new_text_sensor(version_config)
diff --git a/esphome/components/ld2412/__init__.py b/esphome/components/ld2412/__init__.py
index e701d0bda9..82db319861 100644
--- a/esphome/components/ld2412/__init__.py
+++ b/esphome/components/ld2412/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_THROTTLE
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ld24xx"]
 CODEOWNERS = ["@Rihan9"]
@@ -40,7 +41,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/ld2412/binary_sensor.py b/esphome/components/ld2412/binary_sensor.py
index 98fa5965cd..80cff014c0 100644
--- a/esphome/components/ld2412/binary_sensor.py
+++ b/esphome/components/ld2412/binary_sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     ICON_ACCOUNT,
     ICON_MOTION_SENSOR,
 )
+from esphome.types import ConfigType
 
 from . import CONF_LD2412_ID, LD2412Component
 
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LD2412_component = await cg.get_variable(config[CONF_LD2412_ID])
     if dynamic_background_correction_status_config := config.get(
         CONF_DYNAMIC_BACKGROUND_CORRECTION_STATUS
diff --git a/esphome/components/ld2412/button/__init__.py b/esphome/components/ld2412/button/__init__.py
index e0ca285265..5a1ea2e6a5 100644
--- a/esphome/components/ld2412/button/__init__.py
+++ b/esphome/components/ld2412/button/__init__.py
@@ -13,6 +13,7 @@ from esphome.const import (
     ICON_RESTART,
     ICON_RESTART_ALERT,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2412_ID, LD2412_ns, LD2412Component
 
@@ -54,7 +55,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LD2412_component = await cg.get_variable(config[CONF_LD2412_ID])
     if factory_reset_config := config.get(CONF_FACTORY_RESET):
         b = await button.new_button(factory_reset_config)
diff --git a/esphome/components/ld2412/number/__init__.py b/esphome/components/ld2412/number/__init__.py
index b6e1c8d039..1a81c330ad 100644
--- a/esphome/components/ld2412/number/__init__.py
+++ b/esphome/components/ld2412/number/__init__.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_SECOND,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2412_ID, LD2412_ns, LD2412Component
 
@@ -85,7 +86,7 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LD2412_component = await cg.get_variable(config[CONF_LD2412_ID])
     if light_threshold_config := config.get(CONF_LIGHT_THRESHOLD):
         n = await number.new_number(
diff --git a/esphome/components/ld2412/select/__init__.py b/esphome/components/ld2412/select/__init__.py
index a54cd700ed..02ecf2c30f 100644
--- a/esphome/components/ld2412/select/__init__.py
+++ b/esphome/components/ld2412/select/__init__.py
@@ -10,6 +10,7 @@ from esphome.const import (
     ICON_SCALE,
     ICON_THERMOMETER,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2412_ID, LD2412_ns, LD2412Component
 
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LD2412_component = await cg.get_variable(config[CONF_LD2412_ID])
     if baud_rate_config := config.get(CONF_BAUD_RATE):
         s = await select.new_select(
diff --git a/esphome/components/ld2412/sensor.py b/esphome/components/ld2412/sensor.py
index f562afe0ee..0b6e676931 100644
--- a/esphome/components/ld2412/sensor.py
+++ b/esphome/components/ld2412/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_EMPTY,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 from . import CONF_LD2412_ID, LD2412Component
 
@@ -156,7 +157,7 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LD2412_component = await cg.get_variable(config[CONF_LD2412_ID])
     if detection_distance_config := config.get(CONF_DETECTION_DISTANCE):
         sens = await sensor.new_sensor(detection_distance_config)
diff --git a/esphome/components/ld2412/switch/__init__.py b/esphome/components/ld2412/switch/__init__.py
index 7a87e9e483..e7f71222fd 100644
--- a/esphome/components/ld2412/switch/__init__.py
+++ b/esphome/components/ld2412/switch/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     ICON_BLUETOOTH,
     ICON_PULSE,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2412_ID, LD2412_ns, LD2412Component
 
@@ -35,7 +36,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LD2412_component = await cg.get_variable(config[CONF_LD2412_ID])
     if bluetooth_config := config.get(CONF_BLUETOOTH):
         s = await switch.new_switch(bluetooth_config)
diff --git a/esphome/components/ld2412/text_sensor.py b/esphome/components/ld2412/text_sensor.py
index 22fba5193e..c8e9f42ef3 100644
--- a/esphome/components/ld2412/text_sensor.py
+++ b/esphome/components/ld2412/text_sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     ICON_BLUETOOTH,
     ICON_CHIP,
 )
+from esphome.types import ConfigType
 
 from . import CONF_LD2412_ID, LD2412Component
 
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LD2412_component = await cg.get_variable(config[CONF_LD2412_ID])
     if version_config := config.get(CONF_VERSION):
         sens = await text_sensor.new_text_sensor(version_config)
diff --git a/esphome/components/ld2420/__init__.py b/esphome/components/ld2420/__init__.py
index 71a5fa13e4..5a5aabeba0 100644
--- a/esphome/components/ld2420/__init__.py
+++ b/esphome/components/ld2420/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@descipher"]
 
@@ -33,7 +34,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/ld2420/binary_sensor/__init__.py b/esphome/components/ld2420/binary_sensor/__init__.py
index 5ebc4a9f63..76b42c0362 100644
--- a/esphome/components/ld2420/binary_sensor/__init__.py
+++ b/esphome/components/ld2420/binary_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_HAS_TARGET, CONF_ID, DEVICE_CLASS_OCCUPANCY
+from esphome.types import ConfigType
 
 from .. import CONF_LD2420_ID, LD2420Component, ld2420_ns
 
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     if CONF_HAS_TARGET in config:
diff --git a/esphome/components/ld2420/button/__init__.py b/esphome/components/ld2420/button/__init__.py
index dfeb121c91..cfcffd0922 100644
--- a/esphome/components/ld2420/button/__init__.py
+++ b/esphome/components/ld2420/button/__init__.py
@@ -10,6 +10,7 @@ from esphome.const import (
     ICON_RESTART,
     ICON_RESTART_ALERT,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2420_ID, LD2420Component, ld2420_ns
 
@@ -50,7 +51,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2420_component = await cg.get_variable(config[CONF_LD2420_ID])
     if apply_config := config.get(CONF_APPLY_CONFIG):
         b = await button.new_button(apply_config)
diff --git a/esphome/components/ld2420/number/__init__.py b/esphome/components/ld2420/number/__init__.py
index a2637b7b06..448639c911 100644
--- a/esphome/components/ld2420/number/__init__.py
+++ b/esphome/components/ld2420/number/__init__.py
@@ -12,6 +12,7 @@ from esphome.const import (
     ICON_TIMELAPSE,
     UNIT_SECOND,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2420_ID, LD2420Component, ld2420_ns
 
@@ -113,7 +114,7 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LD2420_component = await cg.get_variable(config[CONF_LD2420_ID])
     if gate_timeout_config := config.get(CONF_PRESENCE_TIMEOUT):
         n = await number.new_number(
diff --git a/esphome/components/ld2420/select/__init__.py b/esphome/components/ld2420/select/__init__.py
index b9059c120f..cd66064e47 100644
--- a/esphome/components/ld2420/select/__init__.py
+++ b/esphome/components/ld2420/select/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import select
 import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_CONFIG
+from esphome.types import ConfigType
 
 from .. import CONF_LD2420_ID, LD2420Component, ld2420_ns
 
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LD2420_component = await cg.get_variable(config[CONF_LD2420_ID])
     if operating_mode_config := config.get(CONF_OPERATING_MODE):
         sel = await select.new_select(
diff --git a/esphome/components/ld2420/sensor/__init__.py b/esphome/components/ld2420/sensor/__init__.py
index 97acdabd7b..f98d63585b 100644
--- a/esphome/components/ld2420/sensor/__init__.py
+++ b/esphome/components/ld2420/sensor/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CENTIMETER,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2420_ID, LD2420Component, ld2420_ns
 
@@ -30,7 +31,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     if CONF_MOVING_DISTANCE in config:
diff --git a/esphome/components/ld2420/text_sensor/__init__.py b/esphome/components/ld2420/text_sensor/__init__.py
index 14d982e5fb..cee8f25c1f 100644
--- a/esphome/components/ld2420/text_sensor/__init__.py
+++ b/esphome/components/ld2420/text_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, ENTITY_CATEGORY_DIAGNOSTIC, ICON_CHIP
+from esphome.types import ConfigType
 
 from .. import CONF_LD2420_ID, LD2420Component, ld2420_ns
 
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     if CONF_FW_VERSION in config:
diff --git a/esphome/components/ld2450/__init__.py b/esphome/components/ld2450/__init__.py
index 585c9f7bf5..4c37f4fcd1 100644
--- a/esphome/components/ld2450/__init__.py
+++ b/esphome/components/ld2450/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_ON_DATA, CONF_THROTTLE
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ld24xx"]
 DEPENDENCIES = ["uart"]
@@ -49,7 +50,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/ld2450/binary_sensor.py b/esphome/components/ld2450/binary_sensor.py
index 89e629253a..779d151fd9 100644
--- a/esphome/components/ld2450/binary_sensor.py
+++ b/esphome/components/ld2450/binary_sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     DEVICE_CLASS_MOTION,
     DEVICE_CLASS_OCCUPANCY,
 )
+from esphome.types import ConfigType
 
 from . import CONF_LD2450_ID, LD2450Component
 
@@ -39,7 +40,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
     if has_target_config := config.get(CONF_HAS_TARGET):
         sens = await binary_sensor.new_binary_sensor(has_target_config)
diff --git a/esphome/components/ld2450/button/__init__.py b/esphome/components/ld2450/button/__init__.py
index 682487d750..42cadd2052 100644
--- a/esphome/components/ld2450/button/__init__.py
+++ b/esphome/components/ld2450/button/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     ICON_RESTART,
     ICON_RESTART_ALERT,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2450_ID, LD2450Component, ld2450_ns
 
@@ -35,7 +36,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
     if factory_reset_config := config.get(CONF_FACTORY_RESET):
         b = await button.new_button(factory_reset_config)
diff --git a/esphome/components/ld2450/number/__init__.py b/esphome/components/ld2450/number/__init__.py
index 799c0703f2..4f242076d6 100644
--- a/esphome/components/ld2450/number/__init__.py
+++ b/esphome/components/ld2450/number/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     UNIT_MILLIMETER,
     UNIT_SECOND,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2450_ID, LD2450Component, ld2450_ns
 
@@ -78,7 +79,7 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
     if presence_timeout_config := config.get(CONF_PRESENCE_TIMEOUT):
         n = await number.new_number(
diff --git a/esphome/components/ld2450/select/__init__.py b/esphome/components/ld2450/select/__init__.py
index 4f237dc94f..d91b42426a 100644
--- a/esphome/components/ld2450/select/__init__.py
+++ b/esphome/components/ld2450/select/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import (
     ENTITY_CATEGORY_CONFIG,
     ICON_THERMOMETER,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2450_ID, LD2450Component, ld2450_ns
 
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
     if baud_rate_config := config.get(CONF_BAUD_RATE):
         s = await select.new_select(
diff --git a/esphome/components/ld2450/sensor.py b/esphome/components/ld2450/sensor.py
index ae13900e7a..40462e202d 100644
--- a/esphome/components/ld2450/sensor.py
+++ b/esphome/components/ld2450/sensor.py
@@ -15,6 +15,7 @@ from esphome.const import (
     UNIT_DEGREES,
     UNIT_MILLIMETER,
 )
+from esphome.types import ConfigType
 
 from . import CONF_LD2450_ID, LD2450Component
 
@@ -226,7 +227,7 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
 
     if target_count_config := config.get(CONF_TARGET_COUNT):
diff --git a/esphome/components/ld2450/switch/__init__.py b/esphome/components/ld2450/switch/__init__.py
index 0c0c92377b..084f79ee1b 100644
--- a/esphome/components/ld2450/switch/__init__.py
+++ b/esphome/components/ld2450/switch/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     ICON_BLUETOOTH,
     ICON_PULSE,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_LD2450_ID, LD2450Component, ld2450_ns
 
@@ -35,7 +36,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
     if bluetooth_config := config.get(CONF_BLUETOOTH):
         s = await switch.new_switch(bluetooth_config)
diff --git a/esphome/components/ld2450/text_sensor.py b/esphome/components/ld2450/text_sensor.py
index 4e5d7d419b..a8b978ef48 100644
--- a/esphome/components/ld2450/text_sensor.py
+++ b/esphome/components/ld2450/text_sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     ICON_CHIP,
     ICON_SIGN_DIRECTION,
 )
+from esphome.types import ConfigType
 
 from . import CONF_LD2450_ID, LD2450Component
 
@@ -49,7 +50,7 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
     if version_config := config.get(CONF_VERSION):
         sens = await text_sensor.new_text_sensor(version_config)
diff --git a/esphome/components/max6956/__init__.py b/esphome/components/max6956/__init__.py
index e9fae4cceb..5e45d71899 100644
--- a/esphome/components/max6956/__init__.py
+++ b/esphome/components/max6956/__init__.py
@@ -11,6 +11,9 @@ from esphome.const import (
     CONF_OUTPUT,
     CONF_PULLUP,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@looping40"]
 
@@ -54,7 +57,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -62,7 +65,7 @@ async def to_code(config):
     cg.add(var.set_brightness_global(config[CONF_BRIGHTNESS_GLOBAL]))
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -87,7 +90,7 @@ MAX6956_PIN_SCHEMA = pins.gpio_base_schema(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_MAX6956, MAX6956_PIN_SCHEMA)
-async def max6956_pin_to_code(config):
+async def max6956_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_MAX6956])
 
@@ -114,7 +117,12 @@ async def max6956_pin_to_code(config):
     ),
     synchronous=True,
 )
-async def max6956_set_brightness_global_to_code(config, action_id, template_arg, args):
+async def max6956_set_brightness_global_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_BRIGHTNESS_GLOBAL], args, cg.uint8)
@@ -136,7 +144,12 @@ async def max6956_set_brightness_global_to_code(config, action_id, template_arg,
     ),
     synchronous=True,
 )
-async def max6956_set_brightness_mode_to_code(config, action_id, template_arg, args):
+async def max6956_set_brightness_mode_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(
diff --git a/esphome/components/max6956/output/__init__.py b/esphome/components/max6956/output/__init__.py
index 352ba04a95..f92bbb762a 100644
--- a/esphome/components/max6956/output/__init__.py
+++ b/esphome/components/max6956/output/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PIN
+from esphome.types import ConfigType
 
 from .. import CONF_MAX6956, MAX6956, max6956_ns
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_MAX6956])
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/max7219digit/display.py b/esphome/components/max7219digit/display.py
index df2423b0d0..54711263dd 100644
--- a/esphome/components/max7219digit/display.py
+++ b/esphome/components/max7219digit/display.py
@@ -10,6 +10,9 @@ from esphome.const import (
     CONF_NUM_CHIPS,
     CONF_STATE,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@rspaargaren"]
 DEPENDENCIES = ["spi"]
@@ -84,7 +87,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await spi.register_spi_device(var, config, write_only=True)
     await display.register_display(var, config)
@@ -144,7 +147,12 @@ MAX7219_ON_ACTION_SCHEMA = automation.maybe_simple_id(
     MAX7219_ON_ACTION_SCHEMA,
     synchronous=True,
 )
-async def max7219digit_invert_to_code(config, action_id, template_arg, args):
+async def max7219digit_invert_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_STATE], args, cg.bool_)
@@ -164,7 +172,12 @@ async def max7219digit_invert_to_code(config, action_id, template_arg, args):
     MAX7219_ON_ACTION_SCHEMA,
     synchronous=True,
 )
-async def max7219digit_visible_to_code(config, action_id, template_arg, args):
+async def max7219digit_visible_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_STATE], args, cg.bool_)
@@ -184,7 +197,12 @@ async def max7219digit_visible_to_code(config, action_id, template_arg, args):
     MAX7219_ON_ACTION_SCHEMA,
     synchronous=True,
 )
-async def max7219digit_reverse_to_code(config, action_id, template_arg, args):
+async def max7219digit_reverse_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_STATE], args, cg.bool_)
@@ -209,7 +227,12 @@ MAX7219_INTENSITY_SCHEMA = cv.maybe_simple_value(
     MAX7219_INTENSITY_SCHEMA,
     synchronous=True,
 )
-async def max7219digit_intensity_to_code(config, action_id, template_arg, args):
+async def max7219digit_intensity_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_INTENSITY], args, cg.uint8)
diff --git a/esphome/components/micronova/__init__.py b/esphome/components/micronova/__init__.py
index b462352229..ff06d0b913 100644
--- a/esphome/components/micronova/__init__.py
+++ b/esphome/components/micronova/__init__.py
@@ -7,6 +7,8 @@ import esphome.config_validation as cv
 from esphome.const import CONF_ID
 from esphome.core import CORE, coroutine_with_priority
 from esphome.coroutine import CoroPriority
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jorre05", "@edenhaus"]
 
@@ -63,7 +65,7 @@ def MICRONOVA_ADDRESS_SCHEMA(
     default_memory_location: int | None = None,
     default_memory_address: int | None = None,
     is_polling_component: bool,
-):
+) -> cv.Schema:
     location_key = (
         cv.Optional(CONF_MEMORY_LOCATION, default=default_memory_location)
         if default_memory_location is not None
@@ -91,7 +93,9 @@ def register_micronova_writer() -> None:
     _get_data().has_writer = True
 
 
-async def to_code_micronova_listener(mv, var, config):
+async def to_code_micronova_listener(
+    mv: MockObj, var: MockObj, config: ConfigType
+) -> None:
     _get_data().listener_count += 1
     await cg.register_component(var, config)
     cg.add(var.set_memory_location(config[CONF_MEMORY_LOCATION]))
@@ -100,7 +104,7 @@ async def to_code_micronova_listener(mv, var, config):
     cg.add(mv.register_micronova_listener(var))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     enable_rx_pin = await cg.gpio_pin_expression(config[CONF_ENABLE_RX_PIN])
     var = cg.new_Pvariable(config[CONF_ID], enable_rx_pin)
     await cg.register_component(var, config)
diff --git a/esphome/components/micronova/button/__init__.py b/esphome/components/micronova/button/__init__.py
index 63b127e63d..68b5b9aca6 100644
--- a/esphome/components/micronova/button/__init__.py
+++ b/esphome/components/micronova/button/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import button
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import (
     CONF_MEMORY_ADDRESS,
@@ -33,7 +34,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mv = await cg.get_variable(config[CONF_MICRONOVA_ID])
 
     if custom_button_config := config.get(CONF_CUSTOM_BUTTON):
diff --git a/esphome/components/micronova/number/__init__.py b/esphome/components/micronova/number/__init__.py
index bcc972c5a9..d33bb150ce 100644
--- a/esphome/components/micronova/number/__init__.py
+++ b/esphome/components/micronova/number/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import number
 import esphome.config_validation as cv
 from esphome.const import CONF_STEP, DEVICE_CLASS_TEMPERATURE, UNIT_CELSIUS
+from esphome.types import ConfigType
 
 from .. import (
     CONF_MICRONOVA_ID,
@@ -56,7 +57,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mv = await cg.get_variable(config[CONF_MICRONOVA_ID])
 
     if thermostat_temperature_config := config.get(CONF_THERMOSTAT_TEMPERATURE):
diff --git a/esphome/components/micronova/sensor/__init__.py b/esphome/components/micronova/sensor/__init__.py
index e53c49aca5..6091718d65 100644
--- a/esphome/components/micronova/sensor/__init__.py
+++ b/esphome/components/micronova/sensor/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_REVOLUTIONS_PER_MINUTE,
 )
+from esphome.types import ConfigType
 
 from .. import (
     CONF_MICRONOVA_ID,
@@ -125,7 +126,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mv = await cg.get_variable(config[CONF_MICRONOVA_ID])
 
     for key, divisor in {
diff --git a/esphome/components/micronova/switch/__init__.py b/esphome/components/micronova/switch/__init__.py
index e149ee3ce3..1f57497ad7 100644
--- a/esphome/components/micronova/switch/__init__.py
+++ b/esphome/components/micronova/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import ICON_POWER
+from esphome.types import ConfigType
 
 from .. import (
     CONF_MICRONOVA_ID,
@@ -49,7 +50,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mv = await cg.get_variable(config[CONF_MICRONOVA_ID])
 
     if stove_config := config.get(CONF_STOVE):
diff --git a/esphome/components/micronova/text_sensor/__init__.py b/esphome/components/micronova/text_sensor/__init__.py
index 33d0779eae..d6b94c437f 100644
--- a/esphome/components/micronova/text_sensor/__init__.py
+++ b/esphome/components/micronova/text_sensor/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import (
     CONF_MICRONOVA_ID,
@@ -33,7 +34,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     mv = await cg.get_variable(config[CONF_MICRONOVA_ID])
 
     if stove_state_config := config.get(CONF_STOVE_STATE):
diff --git a/esphome/components/pipsolar/__init__.py b/esphome/components/pipsolar/__init__.py
index e3966aa2cc..b404409145 100644
--- a/esphome/components/pipsolar/__init__.py
+++ b/esphome/components/pipsolar/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 CODEOWNERS = ["@andreashergert1984"]
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/pipsolar/binary_sensor/__init__.py b/esphome/components/pipsolar/binary_sensor/__init__.py
index 5bcf1f75ee..62c0ed8538 100644
--- a/esphome/components/pipsolar/binary_sensor/__init__.py
+++ b/esphome/components/pipsolar/binary_sensor/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import CONF_PIPSOLAR_ID, PIPSOLAR_COMPONENT_SCHEMA
 
@@ -132,7 +133,7 @@ CONFIG_SCHEMA = PIPSOLAR_COMPONENT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_PIPSOLAR_ID])
     for type in TYPES:
         if type in config:
diff --git a/esphome/components/pipsolar/output/__init__.py b/esphome/components/pipsolar/output/__init__.py
index d1ea981589..62e6d0f113 100644
--- a/esphome/components/pipsolar/output/__init__.py
+++ b/esphome/components/pipsolar/output/__init__.py
@@ -3,6 +3,9 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_VALUE
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 from .. import CONF_PIPSOLAR_ID, PIPSOLAR_COMPONENT_SCHEMA, pipsolar_ns
 
@@ -75,7 +78,7 @@ CONFIG_SCHEMA = PIPSOLAR_COMPONENT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_PIPSOLAR_ID])
 
     for type, (_, command) in TYPES.items():
@@ -100,7 +103,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def output_pipsolar_set_level_to_code(config, action_id, template_arg, args):
+async def output_pipsolar_set_level_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_VALUE], args, cg.float_)
diff --git a/esphome/components/pipsolar/sensor/__init__.py b/esphome/components/pipsolar/sensor/__init__.py
index 88c6566d63..5a697157b7 100644
--- a/esphome/components/pipsolar/sensor/__init__.py
+++ b/esphome/components/pipsolar/sensor/__init__.py
@@ -25,6 +25,7 @@ from esphome.const import (
     UNIT_VOLT_AMPS,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_PIPSOLAR_ID, PIPSOLAR_COMPONENT_SCHEMA
 
@@ -325,7 +326,7 @@ CONFIG_SCHEMA = PIPSOLAR_COMPONENT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_PIPSOLAR_ID])
 
     for type in TYPES:
diff --git a/esphome/components/pipsolar/switch/__init__.py b/esphome/components/pipsolar/switch/__init__.py
index 11dbc91110..2b493eac95 100644
--- a/esphome/components/pipsolar/switch/__init__.py
+++ b/esphome/components/pipsolar/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import ICON_POWER
+from esphome.types import ConfigType
 
 from .. import CONF_PIPSOLAR_ID, PIPSOLAR_COMPONENT_SCHEMA, pipsolar_ns
 
@@ -36,7 +37,7 @@ CONFIG_SCHEMA = PIPSOLAR_COMPONENT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_PIPSOLAR_ID])
 
     for type, (on, off) in TYPES.items():
diff --git a/esphome/components/pipsolar/text_sensor/__init__.py b/esphome/components/pipsolar/text_sensor/__init__.py
index 90ce3a7e55..cc7477395b 100644
--- a/esphome/components/pipsolar/text_sensor/__init__.py
+++ b/esphome/components/pipsolar/text_sensor/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import CONF_PIPSOLAR_ID, PIPSOLAR_COMPONENT_SCHEMA
 
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = PIPSOLAR_COMPONENT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_PIPSOLAR_ID])
 
     for type in TYPES:
diff --git a/esphome/components/text/__init__.py b/esphome/components/text/__init__.py
index 06b5a10892..e010e2c292 100644
--- a/esphome/components/text/__init__.py
+++ b/esphome/components/text/__init__.py
@@ -13,13 +13,14 @@ from esphome.const import (
     CONF_VALUE,
     CONF_WEB_SERVER,
 )
-from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.core import CORE, ID, CoroPriority, coroutine_with_priority
 from esphome.core.entity_helpers import (
     entity_duplicate_validator,
     queue_entity_register,
     setup_entity,
 )
-from esphome.cpp_generator import MockObjClass
+from esphome.cpp_generator import MockObj, MockObjClass, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@mauritskorse"]
 IS_PLATFORM_COMPONENT = True
@@ -90,13 +91,13 @@ def text_schema(
 
 @setup_entity("text")
 async def setup_text_core_(
-    var,
-    config,
+    var: MockObj,
+    config: ConfigType,
     *,
     min_length: int | None,
     max_length: int | None,
     pattern: str | None,
-):
+) -> None:
     cg.add(var.traits.set_min_length(min_length))
     cg.add(var.traits.set_max_length(max_length))
     if pattern is not None:
@@ -117,13 +118,13 @@ async def setup_text_core_(
 
 
 async def register_text(
-    var,
-    config,
+    var: MockObj,
+    config: ConfigType,
     *,
     min_length: int | None = 0,
     max_length: int | None = 255,
     pattern: str | None = None,
-):
+) -> None:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     queue_entity_register("text", config)
@@ -134,12 +135,12 @@ async def register_text(
 
 
 async def new_text(
-    config,
+    config: ConfigType,
     *,
     min_length: int | None = 0,
     max_length: int | None = 255,
     pattern: str | None = None,
-):
+) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await register_text(
         var, config, min_length=min_length, max_length=max_length, pattern=pattern
@@ -148,7 +149,7 @@ async def new_text(
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(text_ns.using)
 
 
@@ -169,7 +170,12 @@ OPERATION_BASE_SCHEMA = cv.Schema(
     ),
     synchronous=True,
 )
-async def text_set_to_code(config, action_id, template_arg, args):
+async def text_set_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_VALUE], args, cg.std_string)
diff --git a/esphome/components/text/text_sensor/__init__.py b/esphome/components/text/text_sensor/__init__.py
index 5e45f10193..ab0e9bdcdc 100644
--- a/esphome/components/text/text_sensor/__init__.py
+++ b/esphome/components/text/text_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_SOURCE_ID
+from esphome.types import ConfigType
 
 from .. import Text, text_ns
 
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     source = await cg.get_variable(config[CONF_SOURCE_ID])
     var = await text_sensor.new_text_sensor(config, source)
     await cg.register_component(var, config)

From 7fe4399b945e242cf07ac8f7aa830976d1c850d1 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 20 Aug 2026 11:11:53 -0500
Subject: [PATCH 018/155] [esp32] Grow the default IDF component exclusion list
 (#18536)

---
 esphome/components/ac_dimmer/output.py        |  6 ++
 esphome/components/esp32/__init__.py          | 25 ++++++++-
 esphome/components/http_request/__init__.py   |  5 +-
 esphome/components/i2c/__init__.py            |  5 ++
 esphome/components/ledc/output.py             |  4 ++
 esphome/components/mqtt/__init__.py           |  2 +
 esphome/components/nextion/display.py         |  2 +
 esphome/components/web_server_idf/__init__.py |  8 ++-
 .../esp32/config/exclusion_reincludes.yaml    | 20 +++++++
 .../exclusion_reincludes_http_request.yaml    | 14 +++++
 .../config/exclusion_reincludes_mqtt.yaml     | 14 +++++
 .../config/exclusion_reincludes_nextion.yaml  | 20 +++++++
 .../exclusion_reincludes_web_server.yaml      | 14 +++++
 tests/component_tests/esp32/test_esp32.py     | 56 +++++++++++++++++++
 14 files changed, 190 insertions(+), 5 deletions(-)
 create mode 100644 tests/component_tests/esp32/config/exclusion_reincludes.yaml
 create mode 100644 tests/component_tests/esp32/config/exclusion_reincludes_http_request.yaml
 create mode 100644 tests/component_tests/esp32/config/exclusion_reincludes_mqtt.yaml
 create mode 100644 tests/component_tests/esp32/config/exclusion_reincludes_nextion.yaml
 create mode 100644 tests/component_tests/esp32/config/exclusion_reincludes_web_server.yaml

diff --git a/esphome/components/ac_dimmer/output.py b/esphome/components/ac_dimmer/output.py
index 1f35095e0e..48bef2c317 100644
--- a/esphome/components/ac_dimmer/output.py
+++ b/esphome/components/ac_dimmer/output.py
@@ -49,6 +49,12 @@ CONFIG_SCHEMA = cv.All(
 
 
 async def to_code(config):
+    if CORE.is_esp32:
+        from esphome.components.esp32 import include_builtin_idf_component
+
+        # Re-enable the gptimer driver (excluded by default to save compile time)
+        include_builtin_idf_component("esp_driver_gptimer")
+
     if CORE.is_esp8266:
         # ac_dimmer uses setTimer1Callback which requires the waveform generator
         from esphome.components.esp8266.const import require_waveform
diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index d6e0890751..f1f039922a 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -204,18 +204,32 @@ COMPILER_OPTIMIZATIONS = {
 # ESP-IDF components excluded by default to reduce compile time.
 # Components can be re-enabled by calling include_builtin_idf_component() in to_code().
 #
-# Cannot be excluded (dependencies of required components):
-# - "console": espressif/mdns unconditionally depends on it
-# - "sdmmc": driver -> esp_driver_sdmmc -> sdmmc dependency chain
+# Note: excluding a component only removes it from the initial build set.
+# ESP-IDF's requirement expansion adds an excluded component back when any
+# component still in the build REQUIRES it (e.g. espressif/mdns pulls
+# "console" back in, esp_http_client pulls "tcp_transport" back in), so
+# exclusions here are safe for such components and simply become no-ops in
+# builds that need them.
 DEFAULT_EXCLUDED_IDF_COMPONENTS = (
+    "app_trace",  # CPU trace/SystemView support - unused by ESPHome
     "cmock",  # Unit testing mock framework - ESPHome doesn't use IDF's testing
+    "console",  # Console REPL - unused by ESPHome; espressif/mdns pulls it back when configured
     "driver",  # Legacy driver shim - only needed by esp32_touch, esp32_can for legacy headers
+    "esp-tls",  # TLS wrapper - re-included by http_request, mqtt, web_server_idf
     "esp_adc",  # ADC driver - only needed by adc component
+    "esp_driver_cam",  # Camera driver - the esp32-camera managed component pulls it back
     "esp_driver_dac",  # DAC driver - only needed by esp32_dac component
+    "esp_driver_gptimer",  # General purpose timer - re-included by ac_dimmer, opentherm, Arduino BLE libs
+    "esp_driver_i2c",  # I2C driver - re-included by i2c; esp32-camera pulls it back itself
     "esp_driver_i2s",  # I2S driver - only needed by i2s_audio component
+    "esp_driver_ledc",  # LEDC PWM driver - re-included by ledc; esp32-camera pulls it back itself
     "esp_driver_mcpwm",  # MCPWM driver - ESPHome doesn't use motor control PWM
     "esp_driver_pcnt",  # PCNT driver - only needed by pulse_counter, hlw8012 components
     "esp_driver_rmt",  # RMT driver - only needed by remote_transmitter/receiver, neopixelbus
+    "esp_driver_sdio",  # SDIO device-mode driver - unused by ESPHome
+    "esp_driver_sdm",  # Sigma-delta modulation driver - unused by ESPHome
+    "esp_driver_sdmmc",  # SD/MMC host driver - unused by ESPHome
+    "esp_driver_sdspi",  # SD-over-SPI driver - unused by ESPHome
     "esp_driver_touch_sens",  # Touch sensor driver - only needed by esp32_touch
     "esp_driver_twai",  # TWAI/CAN driver - only needed by esp32_can component
     "esp_eth",  # Ethernet driver - only needed by ethernet component
@@ -227,11 +241,16 @@ DEFAULT_EXCLUDED_IDF_COMPONENTS = (
     "esp_local_ctrl",  # Local control over HTTPS/BLE - ESPHome has native API
     "espcoredump",  # Core dump support - ESPHome has its own debug component
     "fatfs",  # FAT filesystem - ESPHome doesn't use filesystem storage
+    "json",  # cJSON library - ESPHome uses ArduinoJson instead
     "mqtt",  # ESP-IDF MQTT library - ESPHome has its own MQTT implementation
     "openthread",  # Thread protocol - only needed by openthread component
     "perfmon",  # Xtensa performance monitor - ESPHome has its own debug component
+    "protobuf-c",  # Protobuf runtime - only used by provisioning components (also excluded)
     "protocomm",  # Protocol communication for provisioning - unused by ESPHome
+    "rt",  # POSIX realtime extensions - unused by ESPHome
+    "sdmmc",  # SD/MMC protocol layer - only used by SD drivers and fatfs (also excluded)
     "spiffs",  # SPIFFS filesystem - ESPHome doesn't use filesystem storage (IDF only)
+    "tcp_transport",  # Transport layer - esp_http_client/mqtt pull it back when re-included
     "ulp",  # ULP coprocessor - not currently used by any ESPHome component
     "unity",  # Unit testing framework - ESPHome doesn't use IDF's testing
     "wear_levelling",  # Flash wear levelling for fatfs - unused since fatfs unused
diff --git a/esphome/components/http_request/__init__.py b/esphome/components/http_request/__init__.py
index afc39e06a8..8a5aae022a 100644
--- a/esphome/components/http_request/__init__.py
+++ b/esphome/components/http_request/__init__.py
@@ -170,8 +170,11 @@ async def to_code(config: ConfigType) -> None:
         cg.add(var.set_watchdog_timeout(timeout_ms))
 
     if CORE.is_esp32:
-        # Re-enable ESP-IDF's HTTP client (excluded by default to save compile time)
+        # Re-enable ESP-IDF's HTTP client (excluded by default to save compile time).
+        # esp-tls is re-enabled too because http_request includes <esp_tls.h>
+        # directly and esp_http_client only pulls it in as a private dependency.
         esp32.include_builtin_idf_component("esp_http_client")
+        esp32.include_builtin_idf_component("esp-tls")
 
         cg.add(var.set_buffer_size_rx(config[CONF_BUFFER_SIZE_RX]))
         cg.add(var.set_buffer_size_tx(config[CONF_BUFFER_SIZE_TX]))
diff --git a/esphome/components/i2c/__init__.py b/esphome/components/i2c/__init__.py
index 7b163d065e..94aad4d019 100644
--- a/esphome/components/i2c/__init__.py
+++ b/esphome/components/i2c/__init__.py
@@ -284,6 +284,11 @@ FINAL_VALIDATE_SCHEMA = _final_validate
 async def to_code(config):
     cg.add_global(i2c_ns.using)
     cg.add_define("USE_I2C")
+    if CORE.is_esp32:
+        from esphome.components.esp32 import include_builtin_idf_component
+
+        # Re-enable the I2C driver (excluded by default to save compile time)
+        include_builtin_idf_component("esp_driver_i2c")
     if CORE.is_host:
         var = cg.new_Pvariable(config[CONF_ID])
         await cg.register_component(var, config)
diff --git a/esphome/components/ledc/output.py b/esphome/components/ledc/output.py
index 637e607b6d..e5e7c3dcbe 100644
--- a/esphome/components/ledc/output.py
+++ b/esphome/components/ledc/output.py
@@ -3,6 +3,7 @@ from typing import Any
 from esphome import automation, pins
 import esphome.codegen as cg
 from esphome.components import output
+from esphome.components.esp32 import include_builtin_idf_component
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_CHANNEL,
@@ -62,6 +63,9 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 
 
 async def to_code(config: ConfigType) -> None:
+    # Re-enable the LEDC driver (excluded by default to save compile time)
+    include_builtin_idf_component("esp_driver_ledc")
+
     gpio = await cg.gpio_pin_expression(config[CONF_PIN])
     var = cg.new_Pvariable(config[CONF_ID], gpio)
     await cg.register_component(var, config)
diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index 98ca23b60b..9178bc79e5 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -361,6 +361,8 @@ async def to_code(config):
             add_idf_component(name="espressif/mqtt", ref="1.0.0")
         else:
             include_builtin_idf_component("mqtt")
+        # mqtt_client.h drags in esp_tls types; esp-tls is excluded by default
+        include_builtin_idf_component("esp-tls")
 
     cg.add_define("USE_MQTT")
     cg.add_global(mqtt_ns.using)
diff --git a/esphome/components/nextion/display.py b/esphome/components/nextion/display.py
index 4ab123c354..3f5ba94b40 100644
--- a/esphome/components/nextion/display.py
+++ b/esphome/components/nextion/display.py
@@ -290,7 +290,9 @@ async def to_code(config):
 
         if CORE.is_esp32:
             # Re-enable ESP-IDF's HTTP client (excluded by default to save compile time)
+            # and esp-tls, whose sdkconfig options below need the component present
             esp32.include_builtin_idf_component("esp_http_client")
+            esp32.include_builtin_idf_component("esp-tls")
             esp32.add_idf_sdkconfig_option("CONFIG_ESP_TLS_INSECURE", True)
             esp32.add_idf_sdkconfig_option(
                 "CONFIG_ESP_TLS_SKIP_SERVER_CERT_VERIFY", True
diff --git a/esphome/components/web_server_idf/__init__.py b/esphome/components/web_server_idf/__init__.py
index 74a9d657a6..adf21ddc49 100644
--- a/esphome/components/web_server_idf/__init__.py
+++ b/esphome/components/web_server_idf/__init__.py
@@ -1,4 +1,7 @@
-from esphome.components.esp32 import add_idf_sdkconfig_option
+from esphome.components.esp32 import (
+    add_idf_sdkconfig_option,
+    include_builtin_idf_component,
+)
 import esphome.config_validation as cv
 
 CODEOWNERS = ["@dentra"]
@@ -12,3 +15,6 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
     # Increase the maximum supported size of headers section in HTTP request packet to be processed by the server
     add_idf_sdkconfig_option("CONFIG_HTTPD_MAX_REQ_HDR_LEN", 1024)
+    # Re-enable esp-tls (excluded by default to save compile time);
+    # web_server_idf.cpp includes <esp_tls_crypto.h> for digest auth
+    include_builtin_idf_component("esp-tls")
diff --git a/tests/component_tests/esp32/config/exclusion_reincludes.yaml b/tests/component_tests/esp32/config/exclusion_reincludes.yaml
new file mode 100644
index 0000000000..ba5bf17688
--- /dev/null
+++ b/tests/component_tests/esp32/config/exclusion_reincludes.yaml
@@ -0,0 +1,20 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+i2c:
+  sda: 21
+  scl: 22
+
+output:
+  - platform: ledc
+    id: ledc_out
+    pin: 25
+  - platform: ac_dimmer
+    id: dimmer_out
+    gate_pin: 26
+    zero_cross_pin: 27
diff --git a/tests/component_tests/esp32/config/exclusion_reincludes_http_request.yaml b/tests/component_tests/esp32/config/exclusion_reincludes_http_request.yaml
new file mode 100644
index 0000000000..5adfd66b00
--- /dev/null
+++ b/tests/component_tests/esp32/config/exclusion_reincludes_http_request.yaml
@@ -0,0 +1,14 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: "test_ssid"
+  password: "test_password"
+
+http_request:
+  verify_ssl: false
diff --git a/tests/component_tests/esp32/config/exclusion_reincludes_mqtt.yaml b/tests/component_tests/esp32/config/exclusion_reincludes_mqtt.yaml
new file mode 100644
index 0000000000..c509942635
--- /dev/null
+++ b/tests/component_tests/esp32/config/exclusion_reincludes_mqtt.yaml
@@ -0,0 +1,14 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: "test_ssid"
+  password: "test_password"
+
+mqtt:
+  broker: "10.0.0.1"
diff --git a/tests/component_tests/esp32/config/exclusion_reincludes_nextion.yaml b/tests/component_tests/esp32/config/exclusion_reincludes_nextion.yaml
new file mode 100644
index 0000000000..3c6e527b09
--- /dev/null
+++ b/tests/component_tests/esp32/config/exclusion_reincludes_nextion.yaml
@@ -0,0 +1,20 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: "test_ssid"
+  password: "test_password"
+
+uart:
+  tx_pin: 17
+  rx_pin: 16
+  baud_rate: 115200
+
+display:
+  - platform: nextion
+    tft_url: "http://10.0.0.1/display.tft"
diff --git a/tests/component_tests/esp32/config/exclusion_reincludes_web_server.yaml b/tests/component_tests/esp32/config/exclusion_reincludes_web_server.yaml
new file mode 100644
index 0000000000..6041bffee6
--- /dev/null
+++ b/tests/component_tests/esp32/config/exclusion_reincludes_web_server.yaml
@@ -0,0 +1,14 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: "test_ssid"
+  password: "test_password"
+
+web_server:
+  version: 3
diff --git a/tests/component_tests/esp32/test_esp32.py b/tests/component_tests/esp32/test_esp32.py
index 1fd835076d..7208318d3a 100644
--- a/tests/component_tests/esp32/test_esp32.py
+++ b/tests/component_tests/esp32/test_esp32.py
@@ -236,6 +236,62 @@ def test_esp32_configuration_errors(
         FINAL_VALIDATE_SCHEMA(CONFIG_SCHEMA(config))
 
 
+@pytest.mark.parametrize(
+    ("config_file", "reincluded"),
+    [
+        pytest.param(
+            "exclusion_reincludes.yaml",
+            ("esp_driver_i2c", "esp_driver_ledc", "esp_driver_gptimer"),
+            id="i2c_ledc_ac_dimmer",
+        ),
+        # esp-tls has three owners; a per-owner config makes a dropped
+        # re-include from any single one fail the test.
+        pytest.param(
+            "exclusion_reincludes_http_request.yaml",
+            ("esp-tls", "esp_http_client"),
+            id="http_request",
+        ),
+        pytest.param(
+            # "mqtt" itself is deliberately not asserted: on IDF >= 6.0 it
+            # is a managed component and never leaves the exclusion set.
+            "exclusion_reincludes_mqtt.yaml",
+            ("esp-tls",),
+            id="mqtt",
+        ),
+        pytest.param(
+            "exclusion_reincludes_web_server.yaml",
+            ("esp-tls",),
+            id="web_server_idf",
+        ),
+        pytest.param(
+            "exclusion_reincludes_nextion.yaml",
+            ("esp-tls", "esp_http_client"),
+            id="nextion",
+        ),
+    ],
+)
+def test_default_exclusions_reincluded_by_owning_components(
+    generate_main: Callable[[str | Path], str],
+    component_config_path: Callable[[str], Path],
+    config_file: str,
+    reincluded: tuple[str, ...],
+) -> None:
+    """Components whose IDF driver is excluded by default must re-include it
+    during codegen; a dropped include_builtin_idf_component() call would only
+    surface as a missing-header failure in a full compile job."""
+    from esphome.components.esp32.const import KEY_EXCLUDE_COMPONENTS
+
+    generate_main(component_config_path(config_file))
+    excluded = CORE.data[KEY_ESP32][KEY_EXCLUDE_COMPONENTS]
+
+    for name in reincluded:
+        assert name not in excluded, f"{name} should have been re-included"
+
+    # Components no part of this config touches stay excluded.
+    assert "unity" in excluded
+    assert "fatfs" in excluded
+
+
 def test_execute_from_psram_s3_sdkconfig(
     generate_main: Callable[[str | Path], str],
     component_config_path: Callable[[str], Path],

From a3ea77c2f1206939c0f59aa90870485270998b3e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 20 Aug 2026 11:32:15 -0500
Subject: [PATCH 019/155] [core] Keep templated !include filenames as strings
 so Windows path normalization cannot corrupt them (#18549)

---
 esphome/components/substitutions/__init__.py |  5 +-
 esphome/yaml_util.py                         | 28 ++++++----
 tests/unit_tests/test_bundle.py              | 56 +++++++++++++++++++-
 tests/unit_tests/test_substitutions.py       | 19 +++++++
 tests/unit_tests/test_yaml_util.py           | 27 +++++++++-
 5 files changed, 120 insertions(+), 15 deletions(-)

diff --git a/esphome/components/substitutions/__init__.py b/esphome/components/substitutions/__init__.py
index b4fcf36c9e..5ef7a699eb 100644
--- a/esphome/components/substitutions/__init__.py
+++ b/esphome/components/substitutions/__init__.py
@@ -363,13 +363,12 @@ def resolve_include(
     an explicit non-goal here.
     """
     original = include.file
-    original_str = str(original)
     filename = str(
         _expand_substitutions(
-            original_str, path + ["file"], context_vars, strict_undefined, errors
+            original, path + ["file"], context_vars, strict_undefined, errors
         )
     )
-    substituted = filename != original_str
+    substituted = filename != original
     if substituted:
         include = include.with_file(filename)
     try:
diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index d3c6caf60b..c280e550c9 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -231,18 +231,22 @@ class IncludeFile:
     def __init__(
         self,
         parent_file: Path,
-        file: Path | str,
+        file: str,
         vars: dict[str, Any] | None,
         yaml_loader: Callable[[Path], Any],
     ) -> None:
         self.parent_file = parent_file
-        self.file = Path(file)
+        # The raw include text may be a substitution/Jinja expression, so it
+        # must never round-trip through Path(): on Windows, WindowsPath str()
+        # rewrites "/" to "\", which Jinja then decodes as escapes like
+        # "\b" -> backspace (issue #18545).
+        self.file = file
         self.vars = vars
         self.yaml_loader = yaml_loader
         self._content: Any = _UNSET
 
     def __repr__(self) -> str:
-        return f"IncludeFile({self.file.as_posix()})"
+        return f"IncludeFile({self.file})"
 
     def load(self) -> Any:
         """Load and cache the included file content.
@@ -258,15 +262,15 @@ class IncludeFile:
             raise Invalid(
                 f"Cannot load include with unresolved substitutions: {self.file}"
             )
-        self._content = self.yaml_loader(Path(self.parent_file.parent / self.file))
+        self._content = self.yaml_loader(self.parent_file.parent / self.file)
         self._content = add_context(self._content, self.vars)
         return self._content
 
     def has_unresolved_expressions(self) -> bool:
         """Check if the filename contains substitution variables or Jinja expressions."""
-        return has_substitution_or_expression(str(self.file))
+        return has_substitution_or_expression(self.file)
 
-    def with_file(self, file: Path | str) -> IncludeFile:
+    def with_file(self, file: str) -> IncludeFile:
         """Clone this include with *file* as the filename."""
         return IncludeFile(self.parent_file, file, self.vars, self.yaml_loader)
 
@@ -313,7 +317,7 @@ def _candidate_include_paths(include: IncludeFile) -> list[Path]:
     parent_dir = include.parent_file.parent
     parent_resolved = include.parent_file.resolve()
     candidates: list[Path] = []
-    for pattern in include_candidate_patterns(str(include.file)):
+    for pattern in include_candidate_patterns(include.file):
         if "*" in pattern:
             matches = sorted(_glob_include_candidates(parent_dir, pattern))
         else:
@@ -362,7 +366,7 @@ def _load_include_candidates(
             continue
         expanded_paths.add(candidate)
         try:
-            loaded = include.with_file(candidate).load()
+            loaded = include.with_file(candidate.as_posix()).load()
         except (EsphomeError, Invalid) as err:
             # Unlike an unresolved pattern (expected during the discovery
             # re-parse), a matched on-disk candidate that fails to load is a
@@ -794,6 +798,10 @@ class ESPHomeLoaderMixin:
             file = fields.get("file")
             if file is None:
                 raise yaml.MarkedYAMLError("Must include 'file'", node.start_mark)
+            if not isinstance(file, str):
+                raise yaml.MarkedYAMLError(
+                    "Include 'file' must be a string", node.start_mark
+                )
             vars = fields.get(CONF_VARS)
             return file, vars
 
@@ -1333,11 +1341,11 @@ class ESPHomeDumper(yaml.SafeDumper):
 
     def represent_include_file(self, value):
         if value.vars:
-            mapping = {"file": value.file.as_posix(), "vars": value.vars}
+            mapping = {"file": value.file, "vars": value.vars}
             return self.represent_mapping(
                 tag="!include", mapping=mapping, flow_style=False
             )
-        return self.represent_scalar(tag="!include", value=value.file.as_posix())
+        return self.represent_scalar(tag="!include", value=value.file)
 
     def represent_id(self, value):
         if is_secret(value.id):
diff --git a/tests/unit_tests/test_bundle.py b/tests/unit_tests/test_bundle.py
index 29e917fe44..1abc7a3ab8 100644
--- a/tests/unit_tests/test_bundle.py
+++ b/tests/unit_tests/test_bundle.py
@@ -29,8 +29,9 @@ from esphome.bundle import (
     read_bundle_manifest,
     remap_bundle_path,
 )
+from esphome.components.substitutions import do_substitution_pass
 from esphome.core import CORE, EsphomeError
-from esphome.yaml_util import force_load_include_files
+from esphome.yaml_util import force_load_include_files, load_yaml
 
 # ---------------------------------------------------------------------------
 # Helpers
@@ -1277,6 +1278,59 @@ def test_discover_files_bundles_all_include_candidates(tmp_path: Path) -> None:
     assert "includes/empty.yaml" in paths
 
 
+@pytest.mark.parametrize("enable_proxy", [True, False])
+def test_bundle_roundtrip_templated_include_with_path_separator(
+    tmp_path: Path, enable_proxy: bool
+) -> None:
+    r"""The issue-18545 flow: a Jinja !include whose branches contain "/" still
+    resolves after the bundle is extracted on the build server.
+
+    Windows is the leg that regresses: the raw expression text must survive
+    verbatim, or its separators get rewritten to "\" and Jinja decodes
+    sequences like "\b" as string escapes.
+    """
+    config_dir = _setup_config_dir(
+        tmp_path,
+        files={
+            "includes/boards/board.yaml": (
+                "packages:\n"
+                '  - !include ${ "bluetooth/bluetooth_proxy_single_core.yaml"'
+                ' if enable_bluetooth_proxy else "../empty.yaml" }\n'
+            ),
+            "includes/boards/bluetooth/bluetooth_proxy_single_core.yaml": (
+                "bluetooth_proxy:\n  active: true\n"
+            ),
+            "includes/empty.yaml": "{}\n",
+        },
+    )
+    (config_dir / "test.yaml").write_text(
+        "substitutions:\n"
+        f"  enable_bluetooth_proxy: {str(enable_proxy).lower()}\n"
+        "esphome:\n  name: test\n"
+        "packages:\n  - !include includes/boards/board.yaml\n"
+    )
+
+    result = ConfigBundleCreator({}).create_bundle()
+    bundle_path = tmp_path / "device.esphomebundle.tar.gz"
+    bundle_path.write_bytes(result.data)
+
+    # Both conditional branches must ship in the bundle.
+    paths = [f.path for f in result.files]
+    assert "includes/boards/bluetooth/bluetooth_proxy_single_core.yaml" in paths
+    assert "includes/empty.yaml" in paths
+
+    # Extract to a fresh directory and resolve the config from there, as a
+    # remote build server would.
+    extracted_config = extract_bundle(bundle_path, tmp_path / "remote")
+    config = do_substitution_pass(load_yaml(extracted_config))
+
+    board_pkg = config["packages"][0]["packages"][0]
+    if enable_proxy:
+        assert board_pkg == {"bluetooth_proxy": {"active": True}}
+    else:
+        assert board_pkg == {}
+
+
 def test_discover_files_candidate_outside_config_dir_skipped(
     tmp_path: Path, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/unit_tests/test_substitutions.py b/tests/unit_tests/test_substitutions.py
index f4063237b1..73c6e496a9 100644
--- a/tests/unit_tests/test_substitutions.py
+++ b/tests/unit_tests/test_substitutions.py
@@ -744,6 +744,25 @@ def test_include_filename_substitution_undefined_var(tmp_path: Path) -> None:
         substitutions.do_substitution_pass(config)
 
 
+def test_include_filename_jinja_expression_with_path_separator(
+    tmp_path: Path,
+) -> None:
+    """A jinja !include whose string literals contain "/" resolves correctly (issue #18545)."""
+    main_file = tmp_path / "main.yaml"
+    main_file.write_text(
+        "substitutions:\n"
+        "  enable_bluetooth_proxy: true\n"
+        "result: !include "
+        '${ "bluetooth/proxy.yaml" if enable_bluetooth_proxy else "../empty.yaml" }\n'
+    )
+    (tmp_path / "bluetooth").mkdir()
+    (tmp_path / "bluetooth" / "proxy.yaml").write_text("value: 42\n")
+
+    config = yaml_util.load_yaml(main_file)
+    config = substitutions.do_substitution_pass(config)
+    assert config["result"] == {"value": 42}
+
+
 def test_raise_first_undefined_logs_extras_at_debug(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
diff --git a/tests/unit_tests/test_yaml_util.py b/tests/unit_tests/test_yaml_util.py
index e0a81652e3..3bdbd04396 100644
--- a/tests/unit_tests/test_yaml_util.py
+++ b/tests/unit_tests/test_yaml_util.py
@@ -701,6 +701,31 @@ def test_include_file_has_unresolved_expressions(
     assert include.has_unresolved_expressions() == expected
 
 
+def test_mapping_include_non_string_file_rejected(tmp_path: Path) -> None:
+    """The mapping !include form rejects a non-string 'file' with a clear error."""
+    entry = tmp_path / "entry.yaml"
+    entry.write_text("wifi: !include\n  file: [not, a, string]\n")
+    with pytest.raises(EsphomeError, match="Include 'file' must be a string"):
+        yaml_util.load_yaml(entry)
+
+
+def test_include_file_templated_filename_stays_raw_string(tmp_path: Path) -> None:
+    """A templated filename keeps its verbatim text (issue #18545)."""
+    parent = tmp_path / "main.yaml"
+    expr = '${ "bluetooth/proxy.yaml" if enable_bluetooth_proxy else "../empty.yaml" }'
+    include = yaml_util.IncludeFile(parent, expr, None, lambda _: {})
+    assert include.file == expr
+    assert include.has_unresolved_expressions()
+    assert repr(include) == f"IncludeFile({expr})"
+
+
+def test_represent_include_file_templated() -> None:
+    """Dumping a templated IncludeFile emits the raw expression unchanged."""
+    expr = '${ "a/b.yaml" if flag else "../c.yaml" }'
+    include = yaml_util.IncludeFile(Path("/fake/main.yaml"), expr, None, lambda _: {})
+    assert yaml_util.dump({"key": include}) == f"key: !include '{expr}'\n"
+
+
 def test_include_in_list_context() -> None:
     """!include of a file returning a list is handled correctly,
     including when that list itself contains a nested IncludeFile."""
@@ -1051,7 +1076,7 @@ class _StubInclude:
     ) -> None:
         # Default parent lives in a nonexistent directory so unresolved
         # stubs never glob real files during candidate expansion.
-        self.file = Path(file)
+        self.file = file
         self.parent_file = parent_file or Path("/nonexistent/parent.yaml")
         self._unresolved = unresolved
         self._load_result = load_result if load_result is not None else {}

From 2ab09e1a77227718e1d9318319e8745bcfab01ac Mon Sep 17 00:00:00 2001
From: David van 't Wout <github@yoctobyte.nl>
Date: Thu, 20 Aug 2026 19:30:33 +0200
Subject: [PATCH 020/155] [core] Add add_cmake_arg (#18498)

---
 esphome/build_gen/espidf.py                   | 38 +++++++++-------
 esphome/build_gen/platformio.py               | 11 +++++
 esphome/codegen.py                            |  1 +
 esphome/components/esp32/__init__.py          | 19 ++++----
 esphome/core/__init__.py                      | 35 ++++++++++++++-
 esphome/cpp_generator.py                      |  5 +++
 tests/unit_tests/build_gen/test_espidf.py     | 27 ++++++++++++
 tests/unit_tests/build_gen/test_platformio.py | 44 +++++++++++++++++++
 tests/unit_tests/test_core.py                 | 32 ++++++++++++++
 9 files changed, 187 insertions(+), 25 deletions(-)

diff --git a/esphome/build_gen/espidf.py b/esphome/build_gen/espidf.py
index b65ce23307..5d4e6b8401 100644
--- a/esphome/build_gen/espidf.py
+++ b/esphome/build_gen/espidf.py
@@ -72,6 +72,13 @@ def has_discovered_components() -> bool:
     return get_available_components() is not None
 
 
+def _cmake_quote(value: str) -> str:
+    """Quote a cmake arg value for a set() line. add_cmake_arg rejects
+    whitespace, quotes, and '$', so only backslashes need escaping."""
+    escaped = value.replace("\\", "\\\\")
+    return f'"{escaped}"'
+
+
 def get_project_cmakelists(minimal: bool = False) -> str:
     """Generate the top-level CMakeLists.txt for ESP-IDF project.
 
@@ -114,6 +121,15 @@ def get_project_cmakelists(minimal: bool = False) -> str:
         else ""
     )
 
+    # CMake variables registered via cg.add_cmake_arg(). Emitted before
+    # include(project.cmake) so values like EXCLUDE_COMPONENTS are already
+    # set when project.cmake seeds the component list, and on minimal
+    # (discovery) writes too so excluded components never register.
+    cmake_args = "\n".join(
+        f"set({name} {_cmake_quote(value)})"
+        for name, value in sorted(CORE.cmake_args.items())
+    )
+
     # Per-project list exposed as a CMake variable so converted PIO libs
     # can reference ${ESPHOME_PROJECT_MANAGED_COMPONENTS} without baking
     # project-specific names into their cached CMakeLists.
@@ -129,18 +145,6 @@ def get_project_cmakelists(minimal: bool = False) -> str:
         for name in get_managed_component_require_names()
     )
 
-    # Components excluded from the build (DEFAULT_EXCLUDED_IDF_COMPONENTS
-    # minus per-component re-includes). project.cmake reads the plain
-    # EXCLUDE_COMPONENTS variable when seeding the component list, so this
-    # must be set before project(). Emitted on minimal writes too so the
-    # discovery reconfigure never registers the excluded components.
-    excluded_components = get_excluded_builtin_components()
-    exclude_components_var = (
-        f'set(EXCLUDE_COMPONENTS "{";".join(excluded_components)}")'
-        if excluded_components
-        else ""
-    )
-
     # Built-in IDF components exposed via our own property (not IDF's
     # __COMPONENT_REQUIRES_COMMON, which would append them to every
     # component's REQUIRES including real IDF components). Referenced by
@@ -150,13 +154,17 @@ def get_project_cmakelists(minimal: bool = False) -> str:
     # project_description.json from a build without exclusions may still
     # list them, and requiring an excluded component pulls it back into
     # the build (IDF requirement expansion overrides EXCLUDE_COMPONENTS).
+    # Derived from the EXCLUDE_COMPONENTS cmake arg emitted above so the
+    # two can never disagree within one generated file.
     builtin_components_property = (
         ""
         if minimal
         else "\n".join(
             f"idf_build_set_property(ESPHOME_PROJECT_BUILTIN_COMPONENTS {name} APPEND)"
             for name in sorted(
-                set(get_available_components() or []).difference(excluded_components)
+                set(get_available_components() or []).difference(
+                    CORE.cmake_args.get("EXCLUDE_COMPONENTS", "").split(";")
+                )
             )
         )
     )
@@ -184,9 +192,9 @@ set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
 set(IDF_TARGET {idf_target})
 set(EXTRA_COMPONENT_DIRS ${{CMAKE_SOURCE_DIR}}/src)
 
-include($ENV{{IDF_PATH}}/tools/cmake/project.cmake)
+{cmake_args}
 
-{exclude_components_var}
+include($ENV{{IDF_PATH}}/tools/cmake/project.cmake)
 
 {cpp_standard_options}
 
diff --git a/esphome/build_gen/platformio.py b/esphome/build_gen/platformio.py
index b63c4b733d..0a12d344a0 100644
--- a/esphome/build_gen/platformio.py
+++ b/esphome/build_gen/platformio.py
@@ -63,6 +63,17 @@ def get_ini_content():
     # Add extra script for C++ flags
     CORE.add_platformio_option("extra_scripts", [f"pre:{CXX_FLAGS_FILE_NAME}"])
 
+    # Add CMake args. A user-supplied value (str or list) is deliberately
+    # replaced; this option was always overwritten at FINAL priority.
+    if CORE.cmake_args:
+        CORE.add_platformio_option(
+            "board_build.cmake_extra_args",
+            " ".join(
+                f"-D{name}={value}" for name, value in sorted(CORE.cmake_args.items())
+            ),
+            replace=True,
+        )
+
     content = "[platformio]\n"
     content += f"description = ESPHome {__version__}\n"
 
diff --git a/esphome/codegen.py b/esphome/codegen.py
index 2430f17f3a..2aa6a70abd 100644
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -25,6 +25,7 @@ from esphome.cpp_generator import (  # noqa: F401
     add,
     add_build_flag,
     add_build_unflag,
+    add_cmake_arg,
     add_cxx_build_flag,
     add_define,
     add_global,
diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index f1f039922a..d6ed6d9399 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -760,9 +760,10 @@ def include_builtin_idf_component(name: str) -> None:
 def get_excluded_builtin_components() -> list[str]:
     """Return the sorted built-in IDF components excluded from the build.
 
-    Single accessor for both build writers: the PlatformIO path passes it as
-    ``-DEXCLUDE_COMPONENTS`` and the native ESP-IDF path emits it into the
-    generated CMakeLists.
+    The set reaches both build writers as the ``EXCLUDE_COMPONENTS`` CMake
+    arg (registered via ``cg.add_cmake_arg`` at FINAL priority); the native
+    ESP-IDF writer also reads it directly to filter the built-in component
+    list.
     """
     return sorted(CORE.data.get(KEY_ESP32, {}).get(KEY_EXCLUDE_COMPONENTS, ()))
 
@@ -2148,14 +2149,16 @@ def _configure_lwip_max_sockets(conf: dict) -> None:
     add_idf_sdkconfig_option("CONFIG_LWIP_MAX_SOCKETS", max_sockets)
 
 
+def register_exclude_components_cmake_arg() -> None:
+    """Register the current exclusion set as the EXCLUDE_COMPONENTS cmake arg."""
+    if excluded := get_excluded_builtin_components():
+        cg.add_cmake_arg("EXCLUDE_COMPONENTS", ";".join(excluded))
+
+
 @coroutine_with_priority(CoroPriority.FINAL)
 async def _write_exclude_components() -> None:
     """Write EXCLUDE_COMPONENTS cmake arg after all components have registered exclusions."""
-    if excluded := get_excluded_builtin_components():
-        cg.add_platformio_option(
-            "board_build.cmake_extra_args",
-            f"-DEXCLUDE_COMPONENTS={';'.join(excluded)}",
-        )
+    register_exclude_components_cmake_arg()
 
 
 @coroutine_with_priority(CoroPriority.FINAL)
diff --git a/esphome/core/__init__.py b/esphome/core/__init__.py
index 534b740a5d..0f1ac9213e 100644
--- a/esphome/core/__init__.py
+++ b/esphome/core/__init__.py
@@ -641,6 +641,8 @@ class EsphomeCore:
         self.platformio_libraries: dict[str, Library] = {}
         # A set of build flags to set in the platformio project
         self.build_flags: set[str] = set()
+        # A map of CMake args to apply to build systems that use CMake.
+        self.cmake_args: dict[str, str] = {}
         # A set of build flags that apply to C++ compiles only (CXXFLAGS /
         # CXX_COMPILE_OPTIONS), for flags GCC rejects or warns about on C
         self.cxx_build_flags: set[str] = set()
@@ -704,6 +706,7 @@ class EsphomeCore:
         self.global_statements = []
         self.platformio_libraries = {}
         self.build_flags = set()
+        self.cmake_args = {}
         self.cxx_build_flags = set()
         self.build_unflags = set()
         self.cpp_standard = None
@@ -1062,6 +1065,30 @@ class EsphomeCore:
         _LOGGER.debug("Adding build flag: %s", build_flag)
         return build_flag
 
+    def add_cmake_arg(self, name: str, value: str) -> None:
+        """Register a CMake variable for CMake-based toolchains.
+
+        The value must not contain whitespace or quotes (the PlatformIO
+        backend passes all args to CMake as a single space-joined string
+        of ``-DNAME=VALUE`` pairs) or ``$`` (expanded by CMake on the
+        ESP-IDF path but interpolated differently or passed through by
+        PlatformIO).
+        """
+        if not re.fullmatch(r"[A-Za-z_][A-Za-z0-9_]*", name):
+            raise ValueError(f"Invalid CMake arg name: {name!r}")
+        if re.search(r"[\s\"'$]", value):
+            raise ValueError(
+                f"CMake arg {name} value {value!r} must not contain "
+                "whitespace, quotes, or '$'"
+            )
+        old = self.cmake_args.get(name)
+        if old is not None and old != value:
+            _LOGGER.warning(
+                "CMake arg %s already set to %s; overwriting with %s", name, old, value
+            )
+        self.cmake_args[name] = value
+        _LOGGER.debug("Adding CMake arg: %s=%s", name, value)
+
     def add_cxx_build_flag(self, build_flag: str) -> str:
         self.cxx_build_flags.add(build_flag)
         _LOGGER.debug("Adding C++ build flag: %s", build_flag)
@@ -1091,10 +1118,14 @@ class EsphomeCore:
         _LOGGER.debug("Adding define: %s", define)
         return define
 
-    def add_platformio_option(self, key: str, value: str | list[str]) -> None:
+    def add_platformio_option(
+        self, key: str, value: str | list[str], *, replace: bool = False
+    ) -> None:
+        """Set a platformio.ini option; list values append to an existing list
+        unless ``replace`` is True, which overwrites any existing value."""
         new_val = value
         old_val = self.platformio_options.get(key)
-        if isinstance(old_val, list):
+        if not replace and isinstance(old_val, list):
             assert isinstance(value, list)
             new_val = old_val + value
         self.platformio_options[key] = new_val
diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index 6bcf4eed77..e6b8c0de42 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -699,6 +699,11 @@ def add_build_flag(build_flag: str):
     CORE.add_build_flag(build_flag)
 
 
+def add_cmake_arg(name: str, value: str) -> None:
+    """Add a CMake arg for CMake-based toolchains; see ``EsphomeCore.add_cmake_arg``."""
+    CORE.add_cmake_arg(name, value)
+
+
 def add_cxx_build_flag(build_flag: str) -> None:
     """Add a global build flag that applies to C++ compiles only.
 
diff --git a/tests/unit_tests/build_gen/test_espidf.py b/tests/unit_tests/build_gen/test_espidf.py
index ec01000920..29010bcf0e 100644
--- a/tests/unit_tests/build_gen/test_espidf.py
+++ b/tests/unit_tests/build_gen/test_espidf.py
@@ -16,6 +16,7 @@ from esphome.components.esp32 import (
     KEY_PATH,
     KEY_REF,
     KEY_REPO,
+    register_exclude_components_cmake_arg,
 )
 import esphome.config_validation as cv
 from esphome.const import KEY_CORE
@@ -137,6 +138,27 @@ def test_get_project_cmakelists_full_emits_builtin_components_property(
     assert "JPEGDEC APPEND" not in content
 
 
+def test_get_project_cmakelists_emits_cmake_args() -> None:
+    """Args registered via CORE.add_cmake_arg() are emitted as set() lines,
+    on minimal writes too."""
+    CORE.add_cmake_arg("EXECUTABLE_COMPONENT_NAME", "src")
+
+    content = _render(minimal=True)
+
+    assert 'set(EXECUTABLE_COMPONENT_NAME "src")' in content
+
+
+def test_get_project_cmakelists_escapes_backslashes_in_cmake_args() -> None:
+    """Backslashes (the only character escaping applies to; the rest are
+    rejected at registration) are doubled so CMake reads the value back
+    verbatim."""
+    CORE.add_cmake_arg("MY_PATH", r"C:\esp\idf")
+
+    content = _render(minimal=True)
+
+    assert r'set(MY_PATH "C:\\esp\\idf")' in content
+
+
 def test_get_project_cmakelists_emits_exclude_components(tmp_path: Path) -> None:
     """Excluded components are passed to IDF via EXCLUDE_COMPONENTS and are
     dropped from ESPHOME_PROJECT_BUILTIN_COMPONENTS even when a stale
@@ -151,6 +173,7 @@ def test_get_project_cmakelists_emits_exclude_components(tmp_path: Path) -> None
         },
     )
     CORE.data[KEY_ESP32][KEY_EXCLUDE_COMPONENTS] = {"unity", "esp_lcd"}
+    register_exclude_components_cmake_arg()
 
     content = _render()
 
@@ -169,6 +192,7 @@ def test_get_project_cmakelists_minimal_emits_exclude_components() -> None:
     """The discovery (minimal) write also excludes components so they never
     register in project_description.json."""
     CORE.data[KEY_ESP32][KEY_EXCLUDE_COMPONENTS] = {"unity"}
+    register_exclude_components_cmake_arg()
 
     content = _render(minimal=True)
 
@@ -177,6 +201,8 @@ def test_get_project_cmakelists_minimal_emits_exclude_components() -> None:
 
 def test_get_project_cmakelists_no_exclude_components_line_when_empty() -> None:
     """No EXCLUDE_COMPONENTS line at all when nothing is excluded."""
+    register_exclude_components_cmake_arg()
+
     content = _render()
 
     assert "EXCLUDE_COMPONENTS" not in content
@@ -197,6 +223,7 @@ def test_include_builtin_idf_component_removes_exclusion() -> None:
 
     assert get_excluded_builtin_components() == ["unity"]
 
+    register_exclude_components_cmake_arg()
     content = _render()
 
     assert 'set(EXCLUDE_COMPONENTS "unity")' in content
diff --git a/tests/unit_tests/build_gen/test_platformio.py b/tests/unit_tests/build_gen/test_platformio.py
index 3df2fb1036..20acbe302c 100644
--- a/tests/unit_tests/build_gen/test_platformio.py
+++ b/tests/unit_tests/build_gen/test_platformio.py
@@ -169,6 +169,7 @@ def clean_core(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(CORE, "platformio_libraries", {})
     monkeypatch.setattr(CORE, "build_flags", set())
     monkeypatch.setattr(CORE, "build_unflags", set())
+    monkeypatch.setattr(CORE, "cmake_args", {})
 
 
 def test_get_ini_content_pins_cpp_standard(
@@ -202,6 +203,49 @@ def test_get_ini_content_no_cpp_standard(
     assert "-std=" not in content
 
 
+def test_get_ini_content_emits_cmake_args(
+    clean_core: None, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """Registered args are space-joined into one option, sorted by name."""
+    monkeypatch.setattr(
+        CORE,
+        "cmake_args",
+        {"EXECUTABLE_COMPONENT_NAME": "src", "EXCLUDE_COMPONENTS": "unity"},
+    )
+
+    content = platformio.get_ini_content()
+
+    assert (
+        "board_build.cmake_extra_args = "
+        "-DEXCLUDE_COMPONENTS=unity -DEXECUTABLE_COMPONENT_NAME=src" in content
+    )
+
+
+def test_get_ini_content_no_cmake_option_when_no_args(clean_core: None) -> None:
+    """No board_build.cmake_extra_args line at all when nothing registered
+    (ESP8266/RP2040/LibreTiny builds must not get a blank option)."""
+    content = platformio.get_ini_content()
+
+    assert "board_build.cmake_extra_args" not in content
+
+
+def test_get_ini_content_overwrites_list_valued_user_cmake_option(
+    clean_core: None, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """A user-supplied board_build.cmake_extra_args may be a list; the
+    registered args must replace it without tripping add_platformio_option's
+    list-append assert."""
+    monkeypatch.setattr(
+        CORE, "platformio_options", {"board_build.cmake_extra_args": ["-DFOO=1"]}
+    )
+    monkeypatch.setattr(CORE, "cmake_args", {"EXECUTABLE_COMPONENT_NAME": "src"})
+
+    content = platformio.get_ini_content()
+
+    assert "board_build.cmake_extra_args = -DEXECUTABLE_COMPONENT_NAME=src" in content
+    assert "-DFOO=1" not in content
+
+
 def test_write_cxx_flags_script_emits_registered_flags(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
diff --git a/tests/unit_tests/test_core.py b/tests/unit_tests/test_core.py
index 7f00d00ef7..c373116106 100644
--- a/tests/unit_tests/test_core.py
+++ b/tests/unit_tests/test_core.py
@@ -990,3 +990,35 @@ class TestEsphomeCore:
         )
         # The unflag is still recorded either way.
         assert target.build_unflags == {"-fno-rtti", "-fno-exceptions"}
+
+    def test_add_cmake_arg(self, target) -> None:
+        target.add_cmake_arg("EXCLUDE_COMPONENTS", "unity;esp_lcd")
+        assert target.cmake_args == {"EXCLUDE_COMPONENTS": "unity;esp_lcd"}
+
+    @pytest.mark.parametrize("name", ["", "BAD NAME", 'A"B', "A(B)", "1ABC"])
+    def test_add_cmake_arg__rejects_invalid_name(self, target, name: str) -> None:
+        with pytest.raises(ValueError, match="Invalid CMake arg name"):
+            target.add_cmake_arg(name, "value")
+
+    @pytest.mark.parametrize("value", ["a b", "a\tb", 'a"b', "a'b", "a${FOO}b"])
+    def test_add_cmake_arg__rejects_invalid_value(self, target, value: str) -> None:
+        """Whitespace and quotes are rejected (the PlatformIO backend passes
+        args as one space-joined string, which would split such a value), and
+        so is '$' (expanded differently by CMake and PlatformIO)."""
+        with pytest.raises(ValueError, match="must not contain"):
+            target.add_cmake_arg("MY_ARG", value)
+
+    def test_add_cmake_arg__warns_on_overwrite(
+        self, target, caplog: pytest.LogCaptureFixture
+    ) -> None:
+        """Re-registering with a different value is last-writer-wins; warn so
+        the silently dropped value is diagnosable."""
+        target.add_cmake_arg("MY_ARG", "one")
+        target.add_cmake_arg("MY_ARG", "one")
+        assert "overwriting" not in caplog.text
+
+        target.add_cmake_arg("MY_ARG", "two")
+        assert (
+            "CMake arg MY_ARG already set to one; overwriting with two" in caplog.text
+        )
+        assert target.cmake_args == {"MY_ARG": "two"}

From 6343c11873fb62b1ed83b841f4e9c46e5fc73697 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Aug 2026 07:56:02 +1200
Subject: [PATCH 021/155] [core] Add type annotations to component Python
 (5/11) (#18342)

Co-authored-by: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
---
 esphome/components/bedjet/__init__.py         |  6 ++++--
 esphome/components/bedjet/climate/__init__.py |  3 ++-
 esphome/components/bedjet/fan/__init__.py     |  3 ++-
 esphome/components/bedjet/sensor/__init__.py  |  3 ++-
 esphome/components/bme680_bsec/__init__.py    |  3 ++-
 esphome/components/bme680_bsec/sensor.py      |  6 ++++--
 esphome/components/bme680_bsec/text_sensor.py |  6 ++++--
 esphome/components/cs5460a/sensor.py          | 14 +++++++++++---
 esphome/components/esp32_touch/__init__.py    | 13 ++++++++-----
 .../components/esp32_touch/binary_sensor.py   |  3 ++-
 esphome/components/esp8266_pwm/output.py      | 14 +++++++++++---
 esphome/components/factory_reset/__init__.py  |  7 ++++---
 .../factory_reset/button/__init__.py          |  3 ++-
 .../factory_reset/switch/__init__.py          |  3 ++-
 esphome/components/hbridge/fan/__init__.py    | 12 ++++++++++--
 esphome/components/hbridge/light/__init__.py  |  3 ++-
 esphome/components/hbridge/switch/__init__.py |  3 ++-
 esphome/components/hmc5883l/sensor.py         | 15 +++++++++++----
 esphome/components/mhz19/sensor.py            | 19 ++++++++++++++++---
 esphome/components/mpr121/__init__.py         | 14 +++++++++-----
 .../mpr121/binary_sensor/__init__.py          |  3 ++-
 esphome/components/pcf85063/time.py           | 19 ++++++++++++++++---
 esphome/components/pcf8563/time.py            | 19 ++++++++++++++++---
 esphome/components/pcm5122/audio_dac.py       | 12 +++++++-----
 esphome/components/pcm5122/switch/__init__.py |  3 ++-
 esphome/components/pmwcs3/sensor.py           | 19 ++++++++++++++++---
 esphome/components/qmc5883l/sensor.py         | 13 +++++++++----
 .../components/remote_transmitter/__init__.py | 15 +++++++++++----
 esphome/components/rotary_encoder/sensor.py   | 14 +++++++++++---
 .../components/rp2040_pio_led_strip/light.py  |  8 ++++----
 esphome/components/rx8130/time.py             | 19 ++++++++++++++++---
 esphome/components/servo/__init__.py          | 19 ++++++++++++++++---
 esphome/components/sx1509/__init__.py         | 10 ++++++----
 .../sx1509/binary_sensor/__init__.py          |  3 ++-
 esphome/components/sx1509/output/__init__.py  |  3 ++-
 35 files changed, 246 insertions(+), 86 deletions(-)

diff --git a/esphome/components/bedjet/__init__.py b/esphome/components/bedjet/__init__.py
index d4bf813846..1b967e665a 100644
--- a/esphome/components/bedjet/__init__.py
+++ b/esphome/components/bedjet/__init__.py
@@ -2,6 +2,8 @@ import esphome.codegen as cg
 from esphome.components import ble_client, time
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_RECEIVE_TIMEOUT, CONF_TIME_ID
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jhansche"]
 DEPENDENCIES = ["ble_client"]
@@ -32,12 +34,12 @@ BEDJET_CLIENT_SCHEMA = cv.Schema(
 )
 
 
-async def register_bedjet_child(var, config):
+async def register_bedjet_child(var: MockObj, config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_BEDJET_ID])
     cg.add(parent.register_child(var))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_client.register_ble_node(var, config)
diff --git a/esphome/components/bedjet/climate/__init__.py b/esphome/components/bedjet/climate/__init__.py
index 4de9dcca0b..36650d643c 100644
--- a/esphome/components/bedjet/climate/__init__.py
+++ b/esphome/components/bedjet/climate/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import climate
 import esphome.config_validation as cv
 from esphome.const import CONF_HEAT_MODE, CONF_TEMPERATURE_SOURCE
+from esphome.types import ConfigType
 
 from .. import BEDJET_CLIENT_SCHEMA, bedjet_ns, register_bedjet_child
 
@@ -37,7 +38,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate.new_climate(config)
     await cg.register_component(var, config)
     await register_bedjet_child(var, config)
diff --git a/esphome/components/bedjet/fan/__init__.py b/esphome/components/bedjet/fan/__init__.py
index a4a611fefc..f5dfe32f4c 100644
--- a/esphome/components/bedjet/fan/__init__.py
+++ b/esphome/components/bedjet/fan/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import fan
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import BEDJET_CLIENT_SCHEMA, bedjet_ns, register_bedjet_child
 
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await fan.new_fan(config)
     await cg.register_component(var, config)
     await register_bedjet_child(var, config)
diff --git a/esphome/components/bedjet/sensor/__init__.py b/esphome/components/bedjet/sensor/__init__.py
index fa9ca7953e..595e798e49 100644
--- a/esphome/components/bedjet/sensor/__init__.py
+++ b/esphome/components/bedjet/sensor/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 from .. import BEDJET_CLIENT_SCHEMA, bedjet_ns, register_bedjet_child
 
@@ -38,7 +39,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(BEDJET_CLIENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await register_bedjet_child(var, config)
diff --git a/esphome/components/bme680_bsec/__init__.py b/esphome/components/bme680_bsec/__init__.py
index e1e01facd0..35df2a7ea3 100644
--- a/esphome/components/bme680_bsec/__init__.py
+++ b/esphome/components/bme680_bsec/__init__.py
@@ -3,6 +3,7 @@ from esphome.components import esp32, i2c
 from esphome.components.const import CONF_STATE_SAVE_INTERVAL
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_SAMPLE_RATE, CONF_TEMPERATURE_OFFSET, Framework
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@trvrnrth"]
 DEPENDENCIES = ["i2c"]
@@ -76,7 +77,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/bme680_bsec/sensor.py b/esphome/components/bme680_bsec/sensor.py
index bdc8d8f2d3..153890b57f 100644
--- a/esphome/components/bme680_bsec/sensor.py
+++ b/esphome/components/bme680_bsec/sensor.py
@@ -29,6 +29,8 @@ from esphome.const import (
     UNIT_PARTS_PER_MILLION,
     UNIT_PERCENT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_BME680_BSEC_ID, SAMPLE_RATE_OPTIONS, BME680BSECComponent
 
@@ -110,7 +112,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def setup_conf(config, key, hub):
+async def setup_conf(config: ConfigType, key: str, hub: MockObj) -> None:
     if sensor_config := config.get(key):
         sens = await sensor.new_sensor(sensor_config)
         cg.add(getattr(hub, f"set_{key}_sensor")(sens))
@@ -120,7 +122,7 @@ async def setup_conf(config, key, hub):
             )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_BME680_BSEC_ID])
     for key in TYPES:
         await setup_conf(config, key, hub)
diff --git a/esphome/components/bme680_bsec/text_sensor.py b/esphome/components/bme680_bsec/text_sensor.py
index 1fbb9e2aeb..6da1c9d287 100644
--- a/esphome/components/bme680_bsec/text_sensor.py
+++ b/esphome/components/bme680_bsec/text_sensor.py
@@ -2,6 +2,8 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_IAQ_ACCURACY
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_BME680_BSEC_ID, BME680BSECComponent
 
@@ -21,13 +23,13 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def setup_conf(config, key, hub):
+async def setup_conf(config: ConfigType, key: str, hub: MockObj) -> None:
     if sensor_config := config.get(key):
         sens = await text_sensor.new_text_sensor(sensor_config)
         cg.add(getattr(hub, f"set_{key}_text_sensor")(sens))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_BME680_BSEC_ID])
     for key in TYPES:
         await setup_conf(config, key, hub)
diff --git a/esphome/components/cs5460a/sensor.py b/esphome/components/cs5460a/sensor.py
index 0c6ae0d821..5f14457101 100644
--- a/esphome/components/cs5460a/sensor.py
+++ b/esphome/components/cs5460a/sensor.py
@@ -17,6 +17,9 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@balrog-kun"]
 DEPENDENCIES = ["spi"]
@@ -40,7 +43,7 @@ CONF_VOLTAGE_HPF = "voltage_hpf"
 CONF_PULSE_ENERGY = "pulse_energy"
 
 
-def validate_config(config):
+def validate_config(config: ConfigType) -> ConfigType:
     current_gain = abs(config[CONF_CURRENT_GAIN]) * (
         1.0 if config[CONF_PGA_GAIN] == "10X" else 5.0
     )
@@ -105,7 +108,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
@@ -138,6 +141,11 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def restart_action_to_code(config, action_id, template_arg, args):
+async def restart_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
diff --git a/esphome/components/esp32_touch/__init__.py b/esphome/components/esp32_touch/__init__.py
index 10ad339b12..ede6beb9b6 100644
--- a/esphome/components/esp32_touch/__init__.py
+++ b/esphome/components/esp32_touch/__init__.py
@@ -1,4 +1,6 @@
+from collections.abc import Callable, Iterable
 import logging
+from typing import Any
 
 import esphome.codegen as cg
 from esphome.components import esp32
@@ -23,6 +25,7 @@ from esphome.const import (
     CONF_VOLTAGE_ATTENUATION,
 )
 from esphome.core import TimePeriod
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -181,7 +184,7 @@ EFFECTIVE_HIGH_VOLTAGE = {
 }
 
 
-def validate_touch_pad(value):
+def validate_touch_pad(value: Any) -> int:
     value = gpio.gpio_pin_number_validator(value)
     variant = get_esp32_variant()
     pads = TOUCH_PADS.get(variant)
@@ -192,7 +195,7 @@ def validate_touch_pad(value):
     return pads[value]  # Return integer channel ID
 
 
-def validate_variant_vars(config):
+def validate_variant_vars(config: ConfigType) -> ConfigType:
     variant = get_esp32_variant()
     invalid_vars = set()
     if variant == VARIANT_ESP32:
@@ -219,8 +222,8 @@ def validate_variant_vars(config):
     return config
 
 
-def validate_voltage(values):
-    def validator(value):
+def validate_voltage(values: Iterable[str]) -> Callable[[Any], str]:
+    def validator(value: Any) -> str:
         if isinstance(value, float) and value.is_integer():
             value = int(value)
         value = cv.string(value)
@@ -300,7 +303,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # New unified touch sensor driver
     include_builtin_idf_component("esp_driver_touch_sens")
 
diff --git a/esphome/components/esp32_touch/binary_sensor.py b/esphome/components/esp32_touch/binary_sensor.py
index 75560d71b1..2489c2abc1 100644
--- a/esphome/components/esp32_touch/binary_sensor.py
+++ b/esphome/components/esp32_touch/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PIN, CONF_THRESHOLD
+from esphome.types import ConfigType
 
 from . import ESP32TouchComponent, esp32_touch_ns, validate_touch_pad
 
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(ESP32TouchBinarySensor).exten
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_ESP32_TOUCH_ID])
     var = cg.new_Pvariable(
         config[CONF_ID],
diff --git a/esphome/components/esp8266_pwm/output.py b/esphome/components/esp8266_pwm/output.py
index f119a6ba9f..dd151a3e04 100644
--- a/esphome/components/esp8266_pwm/output.py
+++ b/esphome/components/esp8266_pwm/output.py
@@ -4,11 +4,14 @@ from esphome.components import output
 from esphome.components.esp8266.const import require_waveform
 import esphome.config_validation as cv
 from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_NUMBER, CONF_PIN
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["esp8266"]
 
 
-def valid_pwm_pin(value):
+def valid_pwm_pin(value: ConfigType) -> ConfigType:
     num = value[CONF_NUMBER]
     cv.one_of(0, 1, 2, 3, 4, 5, 9, 10, 12, 13, 14, 15, 16)(num)
     return value
@@ -35,7 +38,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config) -> None:
+async def to_code(config: ConfigType) -> None:
     require_waveform()
 
     var = cg.new_Pvariable(config[CONF_ID])
@@ -59,7 +62,12 @@ async def to_code(config) -> None:
     ),
     synchronous=True,
 )
-async def esp8266_set_frequency_to_code(config, action_id, template_arg, args):
+async def esp8266_set_frequency_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_FREQUENCY], args, cg.float_)
diff --git a/esphome/components/factory_reset/__init__.py b/esphome/components/factory_reset/__init__.py
index d5d5d2ecb5..a9064eb18f 100644
--- a/esphome/components/factory_reset/__init__.py
+++ b/esphome/components/factory_reset/__init__.py
@@ -12,6 +12,7 @@ from esphome.const import (
 )
 from esphome.core import CORE
 from esphome.final_validate import full_config
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@anatoly-savchenkov"]
 
@@ -23,7 +24,7 @@ CONF_RESETS_REQUIRED = "resets_required"
 CONF_ON_INCREMENT = "on_increment"
 
 
-def _validate(config):
+def _validate(config: ConfigType) -> ConfigType:
     if CONF_RESETS_REQUIRED in config:
         return cv.only_on(
             [
@@ -60,7 +61,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate(config) -> None:
+def _final_validate(config: ConfigType) -> None:
     if CORE.is_esp8266 and CONF_RESETS_REQUIRED in config:
         fconfig = full_config.get()
         if not fconfig.get_config_for_path([KEY_ESP8266, CONF_RESTORE_FROM_FLASH]):
@@ -81,7 +82,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if reset_count := config.get(CONF_RESETS_REQUIRED):
         var = cg.new_Pvariable(
             config[CONF_ID],
diff --git a/esphome/components/factory_reset/button/__init__.py b/esphome/components/factory_reset/button/__init__.py
index 61df5f297b..040614c151 100644
--- a/esphome/components/factory_reset/button/__init__.py
+++ b/esphome/components/factory_reset/button/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import (
     ENTITY_CATEGORY_CONFIG,
     ICON_RESTART_ALERT,
 )
+from esphome.types import ConfigType
 
 from .. import factory_reset_ns
 
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = button.button_schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await button.register_button(var, config)
diff --git a/esphome/components/factory_reset/switch/__init__.py b/esphome/components/factory_reset/switch/__init__.py
index a384a57f80..69a635a917 100644
--- a/esphome/components/factory_reset/switch/__init__.py
+++ b/esphome/components/factory_reset/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_CONFIG, ICON_RESTART_ALERT
+from esphome.types import ConfigType
 
 from .. import factory_reset_ns
 
@@ -17,6 +18,6 @@ CONFIG_SCHEMA = switch.switch_schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await switch.new_switch(config)
     await cg.register_component(var, config)
diff --git a/esphome/components/hbridge/fan/__init__.py b/esphome/components/hbridge/fan/__init__.py
index 8ea8677ba2..2cf1693b47 100644
--- a/esphome/components/hbridge/fan/__init__.py
+++ b/esphome/components/hbridge/fan/__init__.py
@@ -13,6 +13,9 @@ from esphome.const import (
     CONF_PRESET_MODES,
     CONF_SPEED_COUNT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 from .. import hbridge_ns
 
@@ -54,12 +57,17 @@ CONFIG_SCHEMA = (
     maybe_simple_id({cv.GenerateID(): cv.use_id(HBridgeFan)}),
     synchronous=True,
 )
-async def fan_hbridge_brake_to_code(config, action_id, template_arg, args):
+async def fan_hbridge_brake_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await fan.new_fan(
         config,
         config[CONF_SPEED_COUNT],
diff --git a/esphome/components/hbridge/light/__init__.py b/esphome/components/hbridge/light/__init__.py
index f9451e2594..f7866cb990 100644
--- a/esphome/components/hbridge/light/__init__.py
+++ b/esphome/components/hbridge/light/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import light, output
 import esphome.config_validation as cv
 from esphome.const import CONF_OUTPUT_ID, CONF_PIN_A, CONF_PIN_B, CONF_UPDATE_INTERVAL
+from esphome.types import ConfigType
 
 from .. import hbridge_ns
 
@@ -21,7 +22,7 @@ CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     cg.add(var.set_update_interval(config.pop(CONF_UPDATE_INTERVAL)))
     await cg.register_component(var, config)
diff --git a/esphome/components/hbridge/switch/__init__.py b/esphome/components/hbridge/switch/__init__.py
index e26bd6b1d8..294be6ed5f 100644
--- a/esphome/components/hbridge/switch/__init__.py
+++ b/esphome/components/hbridge/switch/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import CONF_OPTIMISTIC, CONF_PULSE_LENGTH, CONF_WAIT_TIME
+from esphome.types import ConfigType
 
 from .. import hbridge_ns
 
@@ -30,7 +31,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await switch.new_switch(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/hmc5883l/sensor.py b/esphome/components/hmc5883l/sensor.py
index cf3c594f36..a2e1f8054a 100644
--- a/esphome/components/hmc5883l/sensor.py
+++ b/esphome/components/hmc5883l/sensor.py
@@ -1,3 +1,6 @@
+from collections.abc import Callable
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
@@ -17,6 +20,8 @@ from esphome.const import (
     UNIT_DEGREES,
     UNIT_MICROTESLA,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -59,14 +64,16 @@ HMC5883L_RANGES = {
 }
 
 
-def validate_enum(enum_values, units=None, int=True):
+def validate_enum(
+    enum_values: dict[Any, Any], units: str | list[str] | None = None, int: bool = True
+) -> Callable[[Any], Any]:
     _units = []
     if units is not None:
         _units = units if isinstance(units, list) else [units]
         _units = [str(x) for x in _units]
     enum_bound = cv.enum(enum_values, int=int)
 
-    def validate_enum_bound(value):
+    def validate_enum_bound(value: Any) -> Any:
         value = cv.string(value)
         for unit in _units:
             if value.endswith(unit):
@@ -112,7 +119,7 @@ CONFIG_SCHEMA = (
 )
 
 
-def auto_data_rate(config):
+def auto_data_rate(config: ConfigType) -> MockObj:
     interval_msec = config[CONF_UPDATE_INTERVAL].total_milliseconds
     interval_hz = 1000.0 / interval_msec
     for datarate in sorted(HMC5883LDatarates.keys()):
@@ -121,7 +128,7 @@ def auto_data_rate(config):
     return HMC5883LDatarates[75]
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mhz19/sensor.py b/esphome/components/mhz19/sensor.py
index b7d0ad1998..33cb27080c 100644
--- a/esphome/components/mhz19/sensor.py
+++ b/esphome/components/mhz19/sensor.py
@@ -15,6 +15,9 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -78,7 +81,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+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)
@@ -129,7 +132,12 @@ NO_ARGS_ACTION_SCHEMA = maybe_simple_id(
     NO_ARGS_ACTION_SCHEMA,
     synchronous=True,
 )
-async def mhz19_no_args_action_to_code(config, action_id, template_arg, args):
+async def mhz19_no_args_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -151,7 +159,12 @@ RANGE_ACTION_SCHEMA = maybe_simple_id(
     RANGE_ACTION_SCHEMA,
     synchronous=True,
 )
-async def mhz19_detection_range_set_to_code(config, action_id, template_arg, args):
+async def mhz19_detection_range_set_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     detection_range = config.get(CONF_DETECTION_RANGE)
diff --git a/esphome/components/mpr121/__init__.py b/esphome/components/mpr121/__init__.py
index 0bf9377275..da56b4ff4b 100644
--- a/esphome/components/mpr121/__init__.py
+++ b/esphome/components/mpr121/__init__.py
@@ -12,7 +12,9 @@ from esphome.const import (
     CONF_NUMBER,
     CONF_OUTPUT,
 )
+from esphome.cpp_generator import MockObj
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 CONF_TOUCH_THRESHOLD = "touch_threshold"
 CONF_RELEASE_THRESHOLD = "release_threshold"
@@ -49,7 +51,7 @@ CONFIG_SCHEMA = (
 )
 
 
-def _final_validate(config):
+def _final_validate(config: ConfigType) -> None:
     fconf = fv.full_config.get()
     max_touch_channel = 3
     if (binary_sensors := fconf.get(CONF_BINARY_SENSOR)) is not None:
@@ -71,7 +73,7 @@ def _final_validate(config):
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_touch_debounce(config[CONF_TOUCH_DEBOUNCE]))
     cg.add(var.set_release_debounce(config[CONF_RELEASE_DEBOUNCE]))
@@ -82,7 +84,7 @@ async def to_code(config):
     await i2c.register_i2c_device(var, config)
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if bool(value[CONF_INPUT]) == bool(value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     return value
@@ -105,7 +107,9 @@ MPR121_GPIO_PIN_SCHEMA = pins.gpio_base_schema(
 )
 
 
-def mpr121_pin_final_validate(pin_config, parent_config):
+def mpr121_pin_final_validate(
+    pin_config: ConfigType, parent_config: ConfigType
+) -> None:
     if pin_config[CONF_NUMBER] <= parent_config[CONF_MAX_TOUCH_CHANNEL]:
         raise cv.Invalid(
             "Pin number must be higher than the max touch channel of the MPR121 component",
@@ -115,7 +119,7 @@ def mpr121_pin_final_validate(pin_config, parent_config):
 @pins.PIN_SCHEMA_REGISTRY.register(
     CONF_MPR121, MPR121_GPIO_PIN_SCHEMA, mpr121_pin_final_validate
 )
-async def mpr121_gpio_pin_to_code(config):
+async def mpr121_gpio_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_MPR121])
 
diff --git a/esphome/components/mpr121/binary_sensor/__init__.py b/esphome/components/mpr121/binary_sensor/__init__.py
index 1252a65a84..565789cdc3 100644
--- a/esphome/components/mpr121/binary_sensor/__init__.py
+++ b/esphome/components/mpr121/binary_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL
+from esphome.types import ConfigType
 
 from .. import (
     CONF_MPR121_ID,
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(MPR121BinarySensor).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     hub = await cg.get_variable(config[CONF_MPR121_ID])
     cg.add(var.set_channel(config[CONF_CHANNEL]))
diff --git a/esphome/components/pcf85063/time.py b/esphome/components/pcf85063/time.py
index 8e19178cc9..771461905e 100644
--- a/esphome/components/pcf85063/time.py
+++ b/esphome/components/pcf85063/time.py
@@ -3,6 +3,9 @@ import esphome.codegen as cg
 from esphome.components import i2c, time
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@brogon"]
 DEPENDENCIES = ["i2c"]
@@ -31,7 +34,12 @@ CONFIG_SCHEMA = time.TIME_SCHEMA.extend(
     ),
     synchronous=True,
 )
-async def pcf85063_write_time_to_code(config, action_id, template_arg, args):
+async def pcf85063_write_time_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -47,13 +55,18 @@ async def pcf85063_write_time_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def pcf85063_read_time_to_code(config, action_id, template_arg, args):
+async def pcf85063_read_time_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
 
     await cg.register_component(var, config)
diff --git a/esphome/components/pcf8563/time.py b/esphome/components/pcf8563/time.py
index 1502158c29..8a0b871be9 100644
--- a/esphome/components/pcf8563/time.py
+++ b/esphome/components/pcf8563/time.py
@@ -3,6 +3,9 @@ import esphome.codegen as cg
 from esphome.components import i2c, time
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@KoenBreeman"]
 
@@ -34,7 +37,12 @@ CONFIG_SCHEMA = time.TIME_SCHEMA.extend(
     ),
     synchronous=True,
 )
-async def pcf8563_write_time_to_code(config, action_id, template_arg, args):
+async def pcf8563_write_time_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -50,13 +58,18 @@ async def pcf8563_write_time_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def pcf8563_read_time_to_code(config, action_id, template_arg, args):
+async def pcf8563_read_time_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
 
     await cg.register_component(var, config)
diff --git a/esphome/components/pcm5122/audio_dac.py b/esphome/components/pcm5122/audio_dac.py
index c18fb3993e..5091efabea 100644
--- a/esphome/components/pcm5122/audio_dac.py
+++ b/esphome/components/pcm5122/audio_dac.py
@@ -13,6 +13,8 @@ from esphome.const import (
     CONF_NUMBER,
     CONF_OUTPUT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@remcom"]
 DEPENDENCIES = ["i2c"]
@@ -50,7 +52,7 @@ PCM5122_CHANNEL_MIX_ENUM = {
 _validate_bits = cv.float_with_unit("bits", "bit")
 
 
-def _validate_volume_range(config):
+def _validate_volume_range(config: ConfigType) -> ConfigType:
     if config[CONF_VOLUME_MIN_DB] >= config[CONF_VOLUME_MAX_DB]:
         raise cv.Invalid(f"{CONF_VOLUME_MIN_DB} must be less than {CONF_VOLUME_MAX_DB}")
     return config
@@ -90,7 +92,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _validate_pin_mode(value):
+def _validate_pin_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -98,7 +100,7 @@ def _validate_pin_mode(value):
     return value
 
 
-def _validate_pin(value):
+def _validate_pin(value: ConfigType) -> ConfigType:
     if value[CONF_MODE][CONF_INPUT] and value[CONF_NUMBER] == 6:
         raise cv.Invalid("GPIO6 cannot be used as input on the PCM5122")
     return value
@@ -120,7 +122,7 @@ PIN_SCHEMA = cv.All(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_PCM5122, PIN_SCHEMA)
-async def pcm5122_pin_to_code(config):
+async def pcm5122_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_PCM5122])
 
@@ -130,7 +132,7 @@ async def pcm5122_pin_to_code(config):
     return var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/pcm5122/switch/__init__.py b/esphome/components/pcm5122/switch/__init__.py
index 10519da895..829adeccb7 100644
--- a/esphome/components/pcm5122/switch/__init__.py
+++ b/esphome/components/pcm5122/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import CONF_POWER_MODE, ENTITY_CATEGORY_CONFIG
+from esphome.types import ConfigType
 
 from ..audio_dac import CONF_PCM5122, PCM5122, pcm5122_ns
 
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = switch.switch_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await switch.new_switch(config)
     await cg.register_parented(var, config[CONF_PCM5122])
     cg.add(var.set_power_mode(config[CONF_POWER_MODE]))
diff --git a/esphome/components/pmwcs3/sensor.py b/esphome/components/pmwcs3/sensor.py
index c0bc54c5ba..ae22b3e0d6 100644
--- a/esphome/components/pmwcs3/sensor.py
+++ b/esphome/components/pmwcs3/sensor.py
@@ -10,6 +10,9 @@ from esphome.const import (
     ICON_THERMOMETER,
     STATE_CLASS_MEASUREMENT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@SeByDocKy"]
 DEPENDENCIES = ["i2c"]
@@ -72,7 +75,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -114,7 +117,12 @@ PMWCS3_CALIBRATION_SCHEMA = cv.Schema(
     PMWCS3_CALIBRATION_SCHEMA,
     synchronous=True,
 )
-async def pmwcs3_calibration_to_code(config, action_id, template_arg, args):
+async def pmwcs3_calibration_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     parent = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, parent)
 
@@ -134,7 +142,12 @@ PMWCS3_NEW_I2C_ADDRESS_SCHEMA = cv.maybe_simple_value(
     PMWCS3_NEW_I2C_ADDRESS_SCHEMA,
     synchronous=True,
 )
-async def pmwcs3newi2caddress_to_code(config, action_id, template_arg, args):
+async def pmwcs3newi2caddress_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     parent = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, parent)
     address = await cg.templatable(config[CONF_ADDRESS], args, cg.int_)
diff --git a/esphome/components/qmc5883l/sensor.py b/esphome/components/qmc5883l/sensor.py
index fe34381ad8..e0186be163 100644
--- a/esphome/components/qmc5883l/sensor.py
+++ b/esphome/components/qmc5883l/sensor.py
@@ -1,4 +1,6 @@
+from collections.abc import Callable
 import logging
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -24,6 +26,7 @@ from esphome.const import (
     UNIT_DEGREES,
     UNIT_MICROTESLA,
 )
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -60,7 +63,7 @@ QMC5883LOversamplings = {
 }
 
 
-def validate_config(config):
+def validate_config(config: ConfigType) -> ConfigType:
     if (
         config[CONF_UPDATE_INTERVAL].total_milliseconds < 15
         and CONF_DRDY_PIN not in config
@@ -72,14 +75,16 @@ def validate_config(config):
     return config
 
 
-def validate_enum(enum_values, units=None, int=True):
+def validate_enum(
+    enum_values: dict[Any, Any], units: str | list[str] | None = None, int: bool = True
+) -> Callable[[Any], Any]:
     _units = []
     if units is not None:
         _units = units if isinstance(units, list) else [units]
         _units = [str(x) for x in _units]
     enum_bound = cv.enum(enum_values, int=int)
 
-    def validate_enum_bound(value):
+    def validate_enum_bound(value: Any) -> Any:
         value = cv.string(value)
         for unit in _units:
             if value.endswith(unit):
@@ -137,7 +142,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/remote_transmitter/__init__.py b/esphome/components/remote_transmitter/__init__.py
index 521c3daf87..a97b925e06 100644
--- a/esphome/components/remote_transmitter/__init__.py
+++ b/esphome/components/remote_transmitter/__init__.py
@@ -18,7 +18,9 @@ from esphome.const import (
     CONF_VALUE,
     PlatformFramework,
 )
-from esphome.core import CORE
+from esphome.core import CORE, ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -94,7 +96,7 @@ CONFIG_SCHEMA = (
 )
 
 
-def _validate_non_blocking(config):
+def _validate_non_blocking(config: ConfigType) -> None:
     if (
         CORE.is_esp32
         and esp32.get_esp32_variant() not in esp32_rmt.VARIANTS_NO_RMT
@@ -125,7 +127,12 @@ DIGITAL_WRITE_ACTION_SCHEMA = cv.maybe_simple_value(
     DIGITAL_WRITE_ACTION_SCHEMA,
     synchronous=True,
 )
-async def digital_write_action_to_code(config, action_id, template_arg, args):
+async def digital_write_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_TRANSMITTER_ID])
     template_ = await cg.templatable(config[CONF_VALUE], args, cg.bool_)
@@ -133,7 +140,7 @@ async def digital_write_action_to_code(config, action_id, template_arg, args):
     return var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     if CORE.is_esp32 and esp32.get_esp32_variant() not in esp32_rmt.VARIANTS_NO_RMT:
         # Re-enable ESP-IDF's RMT driver (excluded by default to save compile time)
diff --git a/esphome/components/rotary_encoder/sensor.py b/esphome/components/rotary_encoder/sensor.py
index 0e5a03523d..72722ec4b1 100644
--- a/esphome/components/rotary_encoder/sensor.py
+++ b/esphome/components/rotary_encoder/sensor.py
@@ -15,6 +15,9 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_STEPS,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 rotary_encoder_ns = cg.esphome_ns.namespace("rotary_encoder")
 
@@ -44,7 +47,7 @@ RotaryEncoderSetValueAction = rotary_encoder_ns.class_(
 )
 
 
-def validate_min_max_value(config):
+def validate_min_max_value(config: ConfigType) -> ConfigType:
     if CONF_MIN_VALUE in config and CONF_MAX_VALUE in config:
         min_val = config[CONF_MIN_VALUE]
         max_val = config[CONF_MAX_VALUE]
@@ -92,7 +95,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
@@ -126,7 +129,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def sensor_template_publish_to_code(config, action_id, template_arg, args):
+async def sensor_template_publish_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_VALUE], args, cg.int_)
diff --git a/esphome/components/rp2040_pio_led_strip/light.py b/esphome/components/rp2040_pio_led_strip/light.py
index 9f7479edd0..5b7259f9e5 100644
--- a/esphome/components/rp2040_pio_led_strip/light.py
+++ b/esphome/components/rp2040_pio_led_strip/light.py
@@ -18,7 +18,7 @@ from esphome.types import ConfigType
 from esphome.util import _LOGGER
 
 
-def get_nops(timing):
+def get_nops(timing: float) -> list[float | str]:
     """
     Calculate the number of NOP instructions required to wait for a given amount of time.
     """
@@ -39,7 +39,7 @@ def get_nops(timing):
     return nops
 
 
-def generate_assembly_code(id, t0h, t0l, t1h, t1l):
+def generate_assembly_code(id: str, t0h: int, t0l: int, t1h: int, t1l: int) -> str:
     """
     Generate assembly code with the given timing values.
     """
@@ -125,7 +125,7 @@ writezero:
     return assembly_template + const_csdk_code
 
 
-def time_to_cycles(time_us):
+def time_to_cycles(time_us: float) -> int:
     cycles_per_us = 57.5
     return round(float(time_us) * cycles_per_us)
 
@@ -172,7 +172,7 @@ CONF_BIT1_HIGH = "bit1_high"
 CONF_BIT1_LOW = "bit1_low"
 
 
-def _validate_timing(value):
+def _validate_timing(value: str) -> float:
     # if doesn't end with us, raise error
     if not value.endswith("us"):
         raise cv.Invalid("Timing must be in microseconds (us)")
diff --git a/esphome/components/rx8130/time.py b/esphome/components/rx8130/time.py
index 4f6310358c..40d10e9f6b 100644
--- a/esphome/components/rx8130/time.py
+++ b/esphome/components/rx8130/time.py
@@ -3,6 +3,9 @@ import esphome.codegen as cg
 from esphome.components import i2c, time
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@beormund"]
 DEPENDENCIES = ["i2c"]
@@ -29,7 +32,12 @@ CONFIG_SCHEMA = time.TIME_SCHEMA.extend(
     ),
     synchronous=True,
 )
-async def rx8130_write_time_to_code(config, action_id, template_arg, args):
+async def rx8130_write_time_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -45,13 +53,18 @@ async def rx8130_write_time_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def rx8130_read_time_to_code(config, action_id, template_arg, args):
+async def rx8130_read_time_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/servo/__init__.py b/esphome/components/servo/__init__.py
index c2eaefe455..666c7dbcdd 100644
--- a/esphome/components/servo/__init__.py
+++ b/esphome/components/servo/__init__.py
@@ -13,6 +13,9 @@ from esphome.const import (
     CONF_RESTORE,
     CONF_TRANSITION_LENGTH,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 servo_ns = cg.esphome_ns.namespace("servo")
 Servo = servo_ns.class_("Servo", cg.Component)
@@ -39,7 +42,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
@@ -64,7 +67,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def servo_write_to_code(config, action_id, template_arg, args):
+async def servo_write_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_LEVEL], args, cg.float_)
@@ -82,6 +90,11 @@ async def servo_write_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def servo_detach_to_code(config, action_id, template_arg, args):
+async def servo_detach_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
diff --git a/esphome/components/sx1509/__init__.py b/esphome/components/sx1509/__init__.py
index b61b92fd1e..c1e4e11d54 100644
--- a/esphome/components/sx1509/__init__.py
+++ b/esphome/components/sx1509/__init__.py
@@ -15,6 +15,8 @@ from esphome.const import (
     CONF_PULLUP,
     CONF_TRIGGER_ID,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CONF_KEYPAD = "keypad"
 CONF_KEYS = "keys"
@@ -40,7 +42,7 @@ SX1509KeyTrigger = sx1509_ns.class_(
 )
 
 
-def check_keys(config):
+def check_keys(config: ConfigType) -> ConfigType:
     if (
         CONF_KEYS in config
         and len(config[CONF_KEYS]) != config[CONF_KEY_ROWS] * config[CONF_KEY_COLUMNS]
@@ -82,7 +84,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -104,7 +106,7 @@ async def to_code(config):
             await automation.build_automation(trigger, [(cg.uint8, "x")], tconf)
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -142,7 +144,7 @@ SX1509_PIN_SCHEMA = cv.All(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_SX1509, SX1509_PIN_SCHEMA)
-async def sx1509_pin_to_code(config):
+async def sx1509_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_SX1509])
     cg.add(var.set_parent(parent))
diff --git a/esphome/components/sx1509/binary_sensor/__init__.py b/esphome/components/sx1509/binary_sensor/__init__.py
index 0ceca77a5d..154a841348 100644
--- a/esphome/components/sx1509/binary_sensor/__init__.py
+++ b/esphome/components/sx1509/binary_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_COL, CONF_ROW
+from esphome.types import ConfigType
 
 from .. import CONF_SX1509_ID, SX1509Component, sx1509_ns
 
@@ -18,7 +19,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(SX1509BinarySensor).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     hub = await cg.get_variable(config[CONF_SX1509_ID])
     cg.add(var.set_row_col(config[CONF_ROW], config[CONF_COL]))
diff --git a/esphome/components/sx1509/output/__init__.py b/esphome/components/sx1509/output/__init__.py
index 9e2db7bb10..aed5ab7dd4 100644
--- a/esphome/components/sx1509/output/__init__.py
+++ b/esphome/components/sx1509/output/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PIN
+from esphome.types import ConfigType
 
 from .. import CONF_SX1509_ID, SX1509Component, sx1509_ns
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_SX1509_ID])
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)

From c006e9804a2e88d5852ca6761800c01c0cde6fa7 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Aug 2026 07:56:48 +1200
Subject: [PATCH 022/155] [core] Add type annotations to component Python
 (9/11) (#18346)

---
 esphome/components/as3935/__init__.py               |  4 +++-
 esphome/components/as3935/binary_sensor.py          |  3 ++-
 esphome/components/as3935/sensor.py                 |  3 ++-
 esphome/components/bthome_mithermometer/__init__.py |  8 ++++++--
 esphome/components/bthome_mithermometer/sensor.py   |  3 ++-
 esphome/components/color/__init__.py                | 11 +++++++----
 esphome/components/ds248x/__init__.py               |  7 ++++---
 esphome/components/ds248x/one_wire.py               |  5 +++--
 esphome/components/emontx/__init__.py               | 10 +++++++---
 esphome/components/gdk101/__init__.py               |  3 ++-
 esphome/components/gdk101/binary_sensor.py          |  3 ++-
 esphome/components/gdk101/sensor.py                 |  3 ++-
 esphome/components/gdk101/text_sensor.py            |  3 ++-
 esphome/components/hc8/sensor.py                    | 12 ++++++++++--
 esphome/components/lcd_base/__init__.py             | 10 +++++++---
 esphome/components/libretiny_pwm/output.py          | 12 ++++++++++--
 esphome/components/lightwaverf/__init__.py          | 12 ++++++++++--
 esphome/components/max17043/sensor.py               | 12 ++++++++++--
 esphome/components/nau7802/sensor.py                | 12 ++++++++++--
 esphome/components/ntc/sensor.py                    | 12 +++++++-----
 esphome/components/openthread_info/sensor.py        |  5 +++--
 esphome/components/openthread_info/text_sensor.py   |  5 +++--
 esphome/components/pmsx003/sensor.py                | 12 ++++++++----
 esphome/components/pzemac/sensor.py                 | 11 +++++++++--
 esphome/components/pzemdc/sensor.py                 | 11 +++++++++--
 esphome/components/remote_receiver/__init__.py      |  9 ++++++---
 esphome/components/remote_receiver/binary_sensor.py |  3 ++-
 esphome/components/scd30/sensor.py                  | 12 +++++++++---
 esphome/components/senseair/sensor.py               | 12 ++++++++++--
 esphome/components/sml/__init__.py                  |  6 ++++--
 esphome/components/sml/sensor/__init__.py           |  3 ++-
 esphome/components/sml/text_sensor/__init__.py      |  3 ++-
 esphome/components/sn74hc595/__init__.py            | 12 ++++++++----
 esphome/components/spa06_base/__init__.py           | 12 +++++++-----
 esphome/components/sy6970/__init__.py               |  3 ++-
 esphome/components/sy6970/binary_sensor/__init__.py |  3 ++-
 esphome/components/sy6970/sensor/__init__.py        |  3 ++-
 esphome/components/sy6970/text_sensor/__init__.py   |  3 ++-
 esphome/components/tm1638/binary_sensor/__init__.py |  3 ++-
 esphome/components/tm1638/display.py                |  3 ++-
 esphome/components/tm1638/output/__init__.py        |  3 ++-
 esphome/components/tm1638/switch/__init__.py        |  3 ++-
 esphome/components/uponor_smatrix/__init__.py       |  6 ++++--
 .../components/uponor_smatrix/climate/__init__.py   |  3 ++-
 .../components/uponor_smatrix/sensor/__init__.py    |  3 ++-
 esphome/components/vl53l0x/sensor.py                | 10 +++++++---
 esphome/components/weikai/__init__.py               | 12 +++++++-----
 esphome/components/zephyr_ble_server/__init__.py    | 13 ++++++++++---
 48 files changed, 238 insertions(+), 97 deletions(-)

diff --git a/esphome/components/as3935/__init__.py b/esphome/components/as3935/__init__.py
index 70015c53b9..bd02d22d1b 100644
--- a/esphome/components/as3935/__init__.py
+++ b/esphome/components/as3935/__init__.py
@@ -14,6 +14,8 @@ from esphome.const import (
     CONF_TUNE_ANTENNA,
     CONF_WATCHDOG_THRESHOLD,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 MULTI_CONF = True
 
@@ -42,7 +44,7 @@ AS3935_SCHEMA = cv.Schema(
 )
 
 
-async def setup_as3935(var, config):
+async def setup_as3935(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
 
     irq_pin = await cg.gpio_pin_expression(config[CONF_IRQ_PIN])
diff --git a/esphome/components/as3935/binary_sensor.py b/esphome/components/as3935/binary_sensor.py
index 10004e69dc..929b653294 100644
--- a/esphome/components/as3935/binary_sensor.py
+++ b/esphome/components/as3935/binary_sensor.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from . import AS3935, CONF_AS3935_ID
 
@@ -13,7 +14,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema().extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_AS3935_ID])
     var = await binary_sensor.new_binary_sensor(config)
     cg.add(hub.set_thunder_alert_binary_sensor(var))
diff --git a/esphome/components/as3935/sensor.py b/esphome/components/as3935/sensor.py
index 9b43155563..b727b8fdb9 100644
--- a/esphome/components/as3935/sensor.py
+++ b/esphome/components/as3935/sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_KILOMETER,
 )
+from esphome.types import ConfigType
 
 from . import AS3935, CONF_AS3935_ID
 
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_AS3935_ID])
 
     if distance_config := config.get(CONF_DISTANCE):
diff --git a/esphome/components/bthome_mithermometer/__init__.py b/esphome/components/bthome_mithermometer/__init__.py
index 4be7ca8268..ed0cbaa9e1 100644
--- a/esphome/components/bthome_mithermometer/__init__.py
+++ b/esphome/components/bthome_mithermometer/__init__.py
@@ -3,6 +3,8 @@ from esphome.components import ble_device_base
 import esphome.config_validation as cv
 from esphome.const import CONF_BINDKEY, CONF_ID, CONF_MAC_ADDRESS
 from esphome.core import HexInt
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@nagyrobi"]
 AUTO_LOAD = ["ble_device_base"]
@@ -14,7 +16,9 @@ BTHomeMiThermometer = bthome_mithermometer_ns.class_(
 )
 
 
-def bthome_mithermometer_base_schema(extra_schema=None):
+def bthome_mithermometer_base_schema(
+    extra_schema: cv.Schema | dict | None = None,
+) -> cv.All:
     if extra_schema is None:
         extra_schema = {}
     return cv.All(
@@ -32,7 +36,7 @@ def bthome_mithermometer_base_schema(extra_schema=None):
     )
 
 
-async def setup_bthome_mithermometer(var, config):
+async def setup_bthome_mithermometer(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
     cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
diff --git a/esphome/components/bthome_mithermometer/sensor.py b/esphome/components/bthome_mithermometer/sensor.py
index 02551391ad..f559d0aa9b 100644
--- a/esphome/components/bthome_mithermometer/sensor.py
+++ b/esphome/components/bthome_mithermometer/sensor.py
@@ -20,6 +20,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 from . import bthome_mithermometer_base_schema, setup_bthome_mithermometer
 
@@ -67,7 +68,7 @@ CONFIG_SCHEMA = bthome_mithermometer_base_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await setup_bthome_mithermometer(var, config)
 
diff --git a/esphome/components/color/__init__.py b/esphome/components/color/__init__.py
index c39c5924af..70240eff07 100644
--- a/esphome/components/color/__init__.py
+++ b/esphome/components/color/__init__.py
@@ -1,5 +1,8 @@
+from typing import Any
+
 from esphome import codegen as cg, config_validation as cv
 from esphome.const import CONF_BLUE, CONF_GREEN, CONF_ID, CONF_RED, CONF_WHITE
+from esphome.types import ConfigType
 
 ColorStruct = cg.esphome_ns.struct("Color")
 
@@ -14,7 +17,7 @@ CONF_WHITE_INT = "white_int"
 CONF_HEX = "hex"
 
 
-def hex_color(value):
+def hex_color(value: Any) -> tuple[int, int, int]:
     if isinstance(value, int):
         value = str(value)
     if not isinstance(value, str):
@@ -39,7 +42,7 @@ components = {
 }
 
 
-def validate_color(config):
+def validate_color(config: ConfigType) -> ConfigType:
     has_components = set(config) & components
     has_hex = CONF_HEX in config
     if has_hex and has_components:
@@ -68,7 +71,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def from_rgbw(config):
+def from_rgbw(config: ConfigType) -> tuple[int, int, int, int]:
     r = 0
     if CONF_RED in config:
         r = int(config[CONF_RED] * 255)
@@ -96,7 +99,7 @@ def from_rgbw(config):
     return (r, g, b, w)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if CONF_HEX in config:
         r, g, b = config[CONF_HEX]
         w = 0
diff --git a/esphome/components/ds248x/__init__.py b/esphome/components/ds248x/__init__.py
index 5a26ceab50..a2e2a87ed0 100644
--- a/esphome/components/ds248x/__init__.py
+++ b/esphome/components/ds248x/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_SLEEP_PIN, CONF_TYPE
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@tomwellnitz"]
 MULTI_CONF = True
@@ -35,7 +36,7 @@ ds248x_ns = cg.esphome_ns.namespace("ds248x")
 DS248xComponent = ds248x_ns.class_("DS248xComponent", cg.Component, i2c.I2CDevice)
 
 
-def _component_schema(*extras):
+def _component_schema(*extras: dict) -> cv.Schema:
     schema = cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(DS248xComponent),
@@ -79,11 +80,11 @@ CONFIG_SCHEMA = cv.typed_schema(
 )
 
 
-def get_channel_count(config):
+def get_channel_count(config: ConfigType) -> int:
     return CHANNEL_COUNTS[config[CONF_TYPE]]
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ds248x/one_wire.py b/esphome/components/ds248x/one_wire.py
index 19861eae36..b028958132 100644
--- a/esphome/components/ds248x/one_wire.py
+++ b/esphome/components/ds248x/one_wire.py
@@ -12,6 +12,7 @@ import esphome.codegen as cg
 from esphome.components.one_wire import OneWireBus
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from . import CONF_DS248X_ID, DS248xComponent, ds248x_ns, get_channel_count
 
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-def _final_validate(config):
+def _final_validate(config: ConfigType) -> None:
     """Validate that the channel is within the parent's channel count."""
     fconf = fv.full_config.get()
     path = fconf.get_path_for_id(config[CONF_DS248X_ID])[:-1]
@@ -47,7 +48,7 @@ def _final_validate(config):
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/emontx/__init__.py b/esphome/components/emontx/__init__.py
index 3f83578926..7dde794f0b 100644
--- a/esphome/components/emontx/__init__.py
+++ b/esphome/components/emontx/__init__.py
@@ -11,7 +11,8 @@ from esphome.const import (
     CONF_RX_BUFFER_SIZE,
     CONF_UART_ID,
 )
-from esphome.core import CORE
+from esphome.core import CORE, ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
 import esphome.final_validate as fv
 from esphome.types import ConfigType
 
@@ -143,8 +144,11 @@ EMONTX_SEND_COMMAND_ACTION_SCHEMA = cv.Schema(
     synchronous=True,
 )
 async def emontx_send_command_action_to_code(
-    config: ConfigType, action_id, template_arg, args
-) -> None:
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_COMMAND], args, cg.std_string)
diff --git a/esphome/components/gdk101/__init__.py b/esphome/components/gdk101/__init__.py
index 878f27bc44..f98af3f863 100644
--- a/esphome/components/gdk101/__init__.py
+++ b/esphome/components/gdk101/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Szewcson"]
 
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/gdk101/binary_sensor.py b/esphome/components/gdk101/binary_sensor.py
index a80487977f..14f5fa0e1c 100644
--- a/esphome/components/gdk101/binary_sensor.py
+++ b/esphome/components/gdk101/binary_sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     ENTITY_CATEGORY_DIAGNOSTIC,
     ICON_VIBRATE,
 )
+from esphome.types import ConfigType
 
 from . import CONF_GDK101_ID, GDK101Component
 
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_GDK101_ID])
     var = await binary_sensor.new_binary_sensor(config[CONF_VIBRATIONS])
     cg.add(hub.set_vibration_binary_sensor(var))
diff --git a/esphome/components/gdk101/sensor.py b/esphome/components/gdk101/sensor.py
index 6cf89e0fd4..4ed081a7be 100644
--- a/esphome/components/gdk101/sensor.py
+++ b/esphome/components/gdk101/sensor.py
@@ -15,6 +15,7 @@ from esphome.const import (
     UNIT_MICROSILVERTS_PER_HOUR,
     UNIT_SECOND,
 )
+from esphome.types import ConfigType
 
 from . import CONF_GDK101_ID, GDK101Component
 
@@ -59,7 +60,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_GDK101_ID])
 
     if radiation_dose_per_1m := config.get(CONF_RADIATION_DOSE_PER_1M):
diff --git a/esphome/components/gdk101/text_sensor.py b/esphome/components/gdk101/text_sensor.py
index 703e68493a..bdef2466df 100644
--- a/esphome/components/gdk101/text_sensor.py
+++ b/esphome/components/gdk101/text_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_VERSION, ENTITY_CATEGORY_DIAGNOSTIC, ICON_CHIP
+from esphome.types import ConfigType
 
 from . import CONF_GDK101_ID, GDK101Component
 
@@ -17,7 +18,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_GDK101_ID])
     var = await text_sensor.new_text_sensor(config[CONF_VERSION])
     cg.add(hub.set_fw_version_text_sensor(var))
diff --git a/esphome/components/hc8/sensor.py b/esphome/components/hc8/sensor.py
index 29b428e310..616162eb40 100644
--- a/esphome/components/hc8/sensor.py
+++ b/esphome/components/hc8/sensor.py
@@ -12,6 +12,9 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -47,7 +50,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
@@ -73,7 +76,12 @@ CALIBRATION_ACTION_SCHEMA = cv.Schema(
     CALIBRATION_ACTION_SCHEMA,
     synchronous=True,
 )
-async def hc8_calibration_to_code(config, action_id, template_arg, args):
+async def hc8_calibration_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_BASELINE], args, cg.uint16)
diff --git a/esphome/components/lcd_base/__init__.py b/esphome/components/lcd_base/__init__.py
index bf1072ce66..08ec395720 100644
--- a/esphome/components/lcd_base/__init__.py
+++ b/esphome/components/lcd_base/__init__.py
@@ -1,7 +1,11 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import display
 import esphome.config_validation as cv
 from esphome.const import CONF_DATA, CONF_DIMENSIONS, CONF_POSITION
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CONF_USER_CHARACTERS = "user_characters"
 
@@ -9,7 +13,7 @@ lcd_base_ns = cg.esphome_ns.namespace("lcd_base")
 LCDDisplay = lcd_base_ns.class_("LCDDisplay", cg.PollingComponent)
 
 
-def validate_lcd_dimensions(value):
+def validate_lcd_dimensions(value: Any) -> list[int]:
     value = cv.dimensions(value)
     if value[0] > 0x40:
         raise cv.Invalid("LCD displays can't have more than 64 columns")
@@ -18,7 +22,7 @@ def validate_lcd_dimensions(value):
     return value
 
 
-def validate_user_characters(value):
+def validate_user_characters(value: list[ConfigType]) -> list[ConfigType]:
     positions = set()
     for conf in value:
         if conf[CONF_POSITION] in positions:
@@ -51,7 +55,7 @@ LCD_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def setup_lcd_display(var, config):
+async def setup_lcd_display(var: MockObj, config: ConfigType) -> None:
     await display.register_display(var, config)
     cg.add(var.set_dimensions(config[CONF_DIMENSIONS][0], config[CONF_DIMENSIONS][1]))
     if CONF_USER_CHARACTERS in config:
diff --git a/esphome/components/libretiny_pwm/output.py b/esphome/components/libretiny_pwm/output.py
index 6f71530aaf..716ccfad2b 100644
--- a/esphome/components/libretiny_pwm/output.py
+++ b/esphome/components/libretiny_pwm/output.py
@@ -3,6 +3,9 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_PIN
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["libretiny"]
 
@@ -21,7 +24,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     gpio = await cg.gpio_pin_expression(config[CONF_PIN])
     var = cg.new_Pvariable(config[CONF_ID], gpio)
     await cg.register_component(var, config)
@@ -40,7 +43,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def libretiny_pwm_set_frequency_to_code(config, action_id, template_arg, args):
+async def libretiny_pwm_set_frequency_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_FREQUENCY], args, cg.float_)
diff --git a/esphome/components/lightwaverf/__init__.py b/esphome/components/lightwaverf/__init__.py
index 76eabc2b71..0f42083cb5 100644
--- a/esphome/components/lightwaverf/__init__.py
+++ b/esphome/components/lightwaverf/__init__.py
@@ -11,7 +11,10 @@ from esphome.const import (
     CONF_REPEAT,
     CONF_WRITE_PIN,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.cpp_helpers import gpio_pin_expression
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@max246"]
 
@@ -57,7 +60,12 @@ LIGHTWAVE_SEND_SCHEMA = cv.Any(
     LIGHTWAVE_SEND_SCHEMA,
     synchronous=True,
 )
-async def send_raw_to_code(config, action_id, template_arg, args):
+async def send_raw_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -71,7 +79,7 @@ async def send_raw_to_code(config, action_id, template_arg, args):
     return var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/max17043/sensor.py b/esphome/components/max17043/sensor.py
index ebb045dfce..67fb8aa5b7 100644
--- a/esphome/components/max17043/sensor.py
+++ b/esphome/components/max17043/sensor.py
@@ -14,6 +14,9 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -50,7 +53,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -74,6 +77,11 @@ MAX17043_ACTION_SCHEMA = maybe_simple_id(
 @automation.register_action(
     "max17043.sleep_mode", SleepAction, MAX17043_ACTION_SCHEMA, synchronous=True
 )
-async def max17043_sleep_mode_to_code(config, action_id, template_arg, args):
+async def max17043_sleep_mode_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
diff --git a/esphome/components/nau7802/sensor.py b/esphome/components/nau7802/sensor.py
index 9798c1c297..415ae09daf 100644
--- a/esphome/components/nau7802/sensor.py
+++ b/esphome/components/nau7802/sensor.py
@@ -4,6 +4,9 @@ import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_GAIN, CONF_ID, ICON_SCALE, STATE_CLASS_MEASUREMENT
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@cujomalainey"]
 DEPENDENCIES = ["i2c"]
@@ -93,7 +96,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -131,7 +134,12 @@ NAU7802_CALIBRATE_SCHEMA = maybe_simple_id(
     NAU7802_CALIBRATE_SCHEMA,
     synchronous=True,
 )
-async def nau7802_calibrate_to_code(config, action_id, template_arg, args):
+async def nau7802_calibrate_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/ntc/sensor.py b/esphome/components/ntc/sensor.py
index dd7d1bd35d..6c2cb69990 100644
--- a/esphome/components/ntc/sensor.py
+++ b/esphome/components/ntc/sensor.py
@@ -1,4 +1,5 @@
 from math import log
+from typing import Any
 
 import esphome.codegen as cg
 from esphome.components import sensor
@@ -15,6 +16,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 ntc_ns = cg.esphome_ns.namespace("ntc")
 NTC = ntc_ns.class_("NTC", cg.Component, sensor.Sensor)
@@ -25,7 +27,7 @@ CONF_C = "c"
 ZERO_POINT = 273.15
 
 
-def validate_calibration_parameter(value):
+def validate_calibration_parameter(value: Any) -> ConfigType:
     if isinstance(value, dict):
         return cv.Schema(
             {
@@ -48,7 +50,7 @@ def validate_calibration_parameter(value):
     )
 
 
-def calc_steinhart_hart(value):
+def calc_steinhart_hart(value: list[ConfigType]) -> tuple[float, float, float]:
     r1 = value[0][CONF_VALUE]
     r2 = value[1][CONF_VALUE]
     r3 = value[2][CONF_VALUE]
@@ -73,7 +75,7 @@ def calc_steinhart_hart(value):
     return a, b, c
 
 
-def calc_b(value):
+def calc_b(value: ConfigType) -> tuple[float, float, float]:
     beta = value[CONF_B_CONSTANT]
     t0 = value[CONF_REFERENCE_TEMPERATURE] + ZERO_POINT
     r0 = value[CONF_REFERENCE_RESISTANCE]
@@ -85,7 +87,7 @@ def calc_b(value):
     return a, b, c
 
 
-def process_calibration(value):
+def process_calibration(value: Any) -> ConfigType:
     if isinstance(value, dict):
         value = cv.Schema(
             {
@@ -132,7 +134,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/openthread_info/sensor.py b/esphome/components/openthread_info/sensor.py
index 4d5b3d54f4..e77b84e17c 100644
--- a/esphome/components/openthread_info/sensor.py
+++ b/esphome/components/openthread_info/sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     UNIT_DECIBEL_MILLIWATT,
     UNIT_EMPTY,
 )
+from esphome.types import ConfigType
 
 CONF_PARENT_AVERAGE_RSSI = "parent_average_rssi"
 CONF_PARENT_LAST_RSSI = "parent_last_rssi"
@@ -166,13 +167,13 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def setup_conf(config: dict, key: str):
+async def setup_conf(config: dict, key: str) -> None:
     if conf := config.get(key):
         var = await sensor.new_sensor(conf)
         await cg.register_component(var, conf)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await setup_conf(config, CONF_PARENT_AVERAGE_RSSI)
     await setup_conf(config, CONF_PARENT_LAST_RSSI)
     await setup_conf(config, CONF_PARENT_LINK_QUALITY_IN)
diff --git a/esphome/components/openthread_info/text_sensor.py b/esphome/components/openthread_info/text_sensor.py
index b672831bf0..da789ae706 100644
--- a/esphome/components/openthread_info/text_sensor.py
+++ b/esphome/components/openthread_info/text_sensor.py
@@ -8,6 +8,7 @@ from esphome.components.openthread.const import (
 )
 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"
@@ -86,13 +87,13 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def setup_conf(config: dict, key: str):
+async def setup_conf(config: dict, key: str) -> None:
     if conf := config.get(key):
         var = await text_sensor.new_text_sensor(conf)
         await cg.register_component(var, conf)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await setup_conf(config, CONF_IP_ADDRESS)
     await setup_conf(config, CONF_ROLE)
     await setup_conf(config, CONF_RLOC16)
diff --git a/esphome/components/pmsx003/sensor.py b/esphome/components/pmsx003/sensor.py
index 0a11120bf0..fe784c5ffe 100644
--- a/esphome/components/pmsx003/sensor.py
+++ b/esphome/components/pmsx003/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import sensor, uart
 import esphome.config_validation as cv
@@ -32,6 +34,8 @@ from esphome.const import (
     UNIT_MICROGRAMS_PER_CUBIC_METER,
     UNIT_PERCENT,
 )
+from esphome.core import TimePeriodMilliseconds
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ximex"]
 DEPENDENCIES = ["uart"]
@@ -167,14 +171,14 @@ SENSORS_TO_TYPE = {
 }
 
 
-def validate_pmsx003_sensors(value):
+def validate_pmsx003_sensors(value: ConfigType) -> ConfigType:
     for key, types in SENSORS_TO_TYPE.items():
         if key in value and value[CONF_TYPE] not in types:
             raise cv.Invalid(f"{value[CONF_TYPE]} does not have {key} sensor!")
     return value
 
 
-def validate_update_interval(value):
+def validate_update_interval(value: Any) -> TimePeriodMilliseconds:
     value = cv.positive_time_period_milliseconds(value)
     if value == cv.time_period("0s"):
         return value
@@ -295,7 +299,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def final_validate(config):
+def final_validate(config: ConfigType) -> None:
     require_tx = config[CONF_UPDATE_INTERVAL] > cv.time_period("0s")
     schema = uart.final_validate_device_schema(
         "pmsx003", baud_rate=9600, require_rx=True, require_tx=require_tx
@@ -306,7 +310,7 @@ def final_validate(config):
 FINAL_VALIDATE_SCHEMA = final_validate
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/pzemac/sensor.py b/esphome/components/pzemac/sensor.py
index 5bb734cb2d..f093262e18 100644
--- a/esphome/components/pzemac/sensor.py
+++ b/esphome/components/pzemac/sensor.py
@@ -26,6 +26,8 @@ from esphome.const import (
     UNIT_WATT,
     UNIT_WATT_HOURS,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 AUTO_LOAD = ["modbus"]
@@ -93,7 +95,12 @@ CONFIG_SCHEMA = (
     ),
     synchronous=True,
 )
-async def reset_energy_to_code(config, action_id, template_arg, args):
+async def reset_energy_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -105,7 +112,7 @@ def _final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await modbus.register_modbus_client_device(var, config)
diff --git a/esphome/components/pzemdc/sensor.py b/esphome/components/pzemdc/sensor.py
index b2c7c3a29d..b9f7246b72 100644
--- a/esphome/components/pzemdc/sensor.py
+++ b/esphome/components/pzemdc/sensor.py
@@ -20,6 +20,8 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 AUTO_LOAD = ["modbus"]
@@ -75,7 +77,12 @@ CONFIG_SCHEMA = (
     ),
     synchronous=True,
 )
-async def reset_energy_to_code(config, action_id, template_arg, args):
+async def reset_energy_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -87,7 +94,7 @@ def _final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await modbus.register_modbus_client_device(var, config)
diff --git a/esphome/components/remote_receiver/__init__.py b/esphome/components/remote_receiver/__init__.py
index ad9c4b5a18..6e8c73d331 100644
--- a/esphome/components/remote_receiver/__init__.py
+++ b/esphome/components/remote_receiver/__init__.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components import esp32, esp32_rmt, remote_base
@@ -21,6 +23,7 @@ from esphome.const import (
     PlatformFramework,
 )
 from esphome.core import CORE, TimePeriod
+from esphome.types import ConfigType
 
 CONF_FILTER_SYMBOLS = "filter_symbols"
 CONF_RECEIVE_SYMBOLS = "receive_symbols"
@@ -62,7 +65,7 @@ RemoteReceiverComponent = remote_receiver_ns.class_(
 )
 
 
-def validate_config(config):
+def validate_config(config: ConfigType) -> ConfigType:
     if CORE.is_esp32:
         variant = esp32.get_esp32_variant()
         if variant in esp32_rmt.VARIANTS_NO_RMT:
@@ -78,7 +81,7 @@ def validate_config(config):
     return config
 
 
-def validate_tolerance(value):
+def validate_tolerance(value: Any) -> ConfigType:
     if isinstance(value, dict):
         return TOLERANCE_SCHEMA(value)
 
@@ -196,7 +199,7 @@ CONFIG_SCHEMA = remote_base.validate_triggers(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     if CORE.is_esp32 and esp32.get_esp32_variant() not in esp32_rmt.VARIANTS_NO_RMT:
         # Re-enable ESP-IDF's RMT driver (excluded by default to save compile time)
diff --git a/esphome/components/remote_receiver/binary_sensor.py b/esphome/components/remote_receiver/binary_sensor.py
index fe3e2af950..d4009f396b 100644
--- a/esphome/components/remote_receiver/binary_sensor.py
+++ b/esphome/components/remote_receiver/binary_sensor.py
@@ -1,4 +1,5 @@
 from esphome.components import binary_sensor, remote_base
+from esphome.types import ConfigType
 
 from . import FILTER_SOURCE_FILES  # noqa: F401  pylint: disable=unused-import
 
@@ -7,6 +8,6 @@ DEPENDENCIES = ["remote_receiver"]
 CONFIG_SCHEMA = remote_base.validate_binary_sensor
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await remote_base.build_binary_sensor(config)
     await binary_sensor.register_binary_sensor(var, config)
diff --git a/esphome/components/scd30/sensor.py b/esphome/components/scd30/sensor.py
index f60e913a0c..37789100f7 100644
--- a/esphome/components/scd30/sensor.py
+++ b/esphome/components/scd30/sensor.py
@@ -22,6 +22,9 @@ from esphome.const import (
     UNIT_PARTS_PER_MILLION,
     UNIT_PERCENT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["sensirion_common"]
@@ -82,7 +85,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -131,8 +134,11 @@ async def to_code(config):
     synchronous=True,
 )
 async def scd30_force_recalibration_with_reference_to_code(
-    config, action_id, template_arg, args
-):
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_VALUE], args, cg.uint16)
diff --git a/esphome/components/senseair/sensor.py b/esphome/components/senseair/sensor.py
index 277648137a..82368a60d0 100644
--- a/esphome/components/senseair/sensor.py
+++ b/esphome/components/senseair/sensor.py
@@ -11,6 +11,9 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -62,7 +65,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
@@ -109,6 +112,11 @@ CALIBRATION_ACTION_SCHEMA = maybe_simple_id(
     CALIBRATION_ACTION_SCHEMA,
     synchronous=True,
 )
-async def senseair_action_to_code(config, action_id, template_arg, args):
+async def senseair_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
diff --git a/esphome/components/sml/__init__.py b/esphome/components/sml/__init__.py
index d25e883fa1..07ca5bf444 100644
--- a/esphome/components/sml/__init__.py
+++ b/esphome/components/sml/__init__.py
@@ -1,10 +1,12 @@
 import re
+from typing import Any
 
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_ON_DATA
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@alengwenus"]
 
@@ -46,14 +48,14 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def to_code(config):
+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)
     await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)
 
 
-def obis_code(value):
+def obis_code(value: Any) -> str:
     value = cv.string(value)
     match = re.match(r"^\d{1,3}-\d{1,3}:\d{1,3}\.\d{1,3}\.\d{1,3}$", value)
     if match is None:
diff --git a/esphome/components/sml/sensor/__init__.py b/esphome/components/sml/sensor/__init__.py
index e6d7180f17..64ac9773c6 100644
--- a/esphome/components/sml/sensor/__init__.py
+++ b/esphome/components/sml/sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 from .. import CONF_OBIS_CODE, CONF_SERVER_ID, CONF_SML_ID, Sml, obis_code, sml_ns
 
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(
         config[CONF_ID], config[CONF_SERVER_ID], config[CONF_OBIS_CODE]
     )
diff --git a/esphome/components/sml/text_sensor/__init__.py b/esphome/components/sml/text_sensor/__init__.py
index 5a5ab658c4..feff4ef256 100644
--- a/esphome/components/sml/text_sensor/__init__.py
+++ b/esphome/components/sml/text_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_FORMAT
+from esphome.types import ConfigType
 
 from .. import CONF_OBIS_CODE, CONF_SERVER_ID, CONF_SML_ID, Sml, obis_code, sml_ns
 
@@ -33,7 +34,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await text_sensor.new_text_sensor(
         config,
         config[CONF_SERVER_ID],
diff --git a/esphome/components/sn74hc595/__init__.py b/esphome/components/sn74hc595/__init__.py
index 26e5c03802..367b65176b 100644
--- a/esphome/components/sn74hc595/__init__.py
+++ b/esphome/components/sn74hc595/__init__.py
@@ -12,6 +12,8 @@ from esphome.const import (
     CONF_OUTPUT,
     CONF_TYPE,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 MULTI_CONF = True
 
@@ -65,7 +67,7 @@ CONFIG_SCHEMA = cv.typed_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     if config[CONF_TYPE] == TYPE_GPIO:
@@ -84,7 +86,7 @@ async def to_code(config):
     cg.add(var.set_sr_count(config[CONF_SR_COUNT]))
 
 
-def _validate_output_mode(value):
+def _validate_output_mode(value: ConfigType) -> ConfigType:
     if value.get(CONF_OUTPUT) is not True:
         raise cv.Invalid("Only output mode is supported")
     return value
@@ -103,7 +105,9 @@ SN74HC595_PIN_SCHEMA = pins.gpio_base_schema(
 )
 
 
-def sn74hc595_pin_final_validate(pin_config, parent_config):
+def sn74hc595_pin_final_validate(
+    pin_config: ConfigType, parent_config: ConfigType
+) -> None:
     max_pins = parent_config[CONF_SR_COUNT] * 8
     if pin_config[CONF_NUMBER] >= max_pins:
         raise cv.Invalid(f"Pin number must be less than {max_pins}")
@@ -112,7 +116,7 @@ def sn74hc595_pin_final_validate(pin_config, parent_config):
 @pins.PIN_SCHEMA_REGISTRY.register(
     CONF_SN74HC595, SN74HC595_PIN_SCHEMA, sn74hc595_pin_final_validate
 )
-async def sn74hc595_pin_to_code(config):
+async def sn74hc595_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_SN74HC595])
 
diff --git a/esphome/components/spa06_base/__init__.py b/esphome/components/spa06_base/__init__.py
index 97d09aad81..c995c2c087 100644
--- a/esphome/components/spa06_base/__init__.py
+++ b/esphome/components/spa06_base/__init__.py
@@ -15,6 +15,8 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PASCAL,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@danielkent-net"]
 
@@ -55,7 +57,7 @@ OVERSAMPLING_OPTIONS = {
 SPA06Component = spa06_ns.class_("SPA06Component", cg.PollingComponent)
 
 
-def spa_oversample_time(oversample):
+def spa_oversample_time(oversample: str) -> float:
     # Pressure oversampling conversion times are listed on datasheet Pg. 26
     # Datasheet does not have a table for temperature oversampling;
     # assumption is that it is the same as pressure
@@ -72,7 +74,7 @@ def spa_oversample_time(oversample):
     return OVERSAMPLING_CONVERSION_TIMES[oversample]
 
 
-def spa_sample_rate(rate):
+def spa_sample_rate(rate: str) -> float:
     SAMPLE_RATE_OPTIONS_HZ = {
         "1": 1.0,
         "2": 2.0,
@@ -94,7 +96,7 @@ def spa_sample_rate(rate):
     return SAMPLE_RATE_OPTIONS_HZ[rate]
 
 
-def compute_measurement_conversion_time(config):
+def compute_measurement_conversion_time(config: ConfigType) -> int:
     # - adds up sensor conversion time based on temperature and pressure oversampling rates given in datasheet
     # - returns a rounded up time in ms
 
@@ -115,7 +117,7 @@ def compute_measurement_conversion_time(config):
     return math.ceil(1.05 * (pressure_conversion_time + temperature_conversion_time))
 
 
-def measurement_timing_check(config):
+def measurement_timing_check(config: ConfigType) -> ConfigType:
 
     temp_time = 0.0
     if temperature_config := config.get(CONF_TEMPERATURE):
@@ -176,7 +178,7 @@ CONFIG_SCHEMA_BASE = cv.Schema(
 CONFIG_SCHEMA_BASE.add_extra(measurement_timing_check)
 
 
-async def to_code_base(config):
+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):
diff --git a/esphome/components/sy6970/__init__.py b/esphome/components/sy6970/__init__.py
index 2390d046e4..cb9d64aee7 100644
--- a/esphome/components/sy6970/__init__.py
+++ b/esphome/components/sy6970/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@linkedupbits"]
 DEPENDENCIES = ["i2c"]
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(
         config[CONF_ID],
         config[CONF_ENABLE_STATUS_LED],
diff --git a/esphome/components/sy6970/binary_sensor/__init__.py b/esphome/components/sy6970/binary_sensor/__init__.py
index 132b282051..c95850aadc 100644
--- a/esphome/components/sy6970/binary_sensor/__init__.py
+++ b/esphome/components/sy6970/binary_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_CONNECTIVITY, DEVICE_CLASS_POWER
+from esphome.types import ConfigType
 
 from .. import CONF_SY6970_ID, SY6970Component, sy6970_ns
 
@@ -40,7 +41,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_SY6970_ID])
 
     if vbus_connected_config := config.get(CONF_VBUS_CONNECTED):
diff --git a/esphome/components/sy6970/sensor/__init__.py b/esphome/components/sy6970/sensor/__init__.py
index e6ee9d1337..8f8090b6ee 100644
--- a/esphome/components/sy6970/sensor/__init__.py
+++ b/esphome/components/sy6970/sensor/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     UNIT_MILLIAMP,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_SY6970_ID, SY6970Component, sy6970_ns
 
@@ -71,7 +72,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_SY6970_ID])
 
     if vbus_voltage_config := config.get(CONF_VBUS_VOLTAGE):
diff --git a/esphome/components/sy6970/text_sensor/__init__.py b/esphome/components/sy6970/text_sensor/__init__.py
index 2a4eb90811..03a55393b9 100644
--- a/esphome/components/sy6970/text_sensor/__init__.py
+++ b/esphome/components/sy6970/text_sensor/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import CONF_SY6970_ID, SY6970Component, sy6970_ns
 
@@ -36,7 +37,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_SY6970_ID])
 
     if bus_status_config := config.get(CONF_BUS_STATUS):
diff --git a/esphome/components/tm1638/binary_sensor/__init__.py b/esphome/components/tm1638/binary_sensor/__init__.py
index de6ea35e54..4f89b7bf5e 100644
--- a/esphome/components/tm1638/binary_sensor/__init__.py
+++ b/esphome/components/tm1638/binary_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_KEY
+from esphome.types import ConfigType
 
 from ..display import CONF_TM1638_ID, TM1638Component, tm1638_ns
 
@@ -15,7 +16,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(TM1638Key).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     cg.add(var.set_keycode(config[CONF_KEY]))
     hub = await cg.get_variable(config[CONF_TM1638_ID])
diff --git a/esphome/components/tm1638/display.py b/esphome/components/tm1638/display.py
index 14b70be94d..d6491129c6 100644
--- a/esphome/components/tm1638/display.py
+++ b/esphome/components/tm1638/display.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_LAMBDA,
     CONF_STB_PIN,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@skykingjwc"]
 
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await display.register_display(var, config)
 
diff --git a/esphome/components/tm1638/output/__init__.py b/esphome/components/tm1638/output/__init__.py
index b16b08d504..961abfee47 100644
--- a/esphome/components/tm1638/output/__init__.py
+++ b/esphome/components/tm1638/output/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_LED
+from esphome.types import ConfigType
 
 from ..display import CONF_TM1638_ID, TM1638Component, tm1638_ns
 
@@ -17,7 +18,7 @@ CONFIG_SCHEMA = output.BINARY_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
     await cg.register_component(var, config)
diff --git a/esphome/components/tm1638/switch/__init__.py b/esphome/components/tm1638/switch/__init__.py
index 90ff87938c..f42b835e03 100644
--- a/esphome/components/tm1638/switch/__init__.py
+++ b/esphome/components/tm1638/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import CONF_LED
+from esphome.types import ConfigType
 
 from ..display import CONF_TM1638_ID, TM1638Component, tm1638_ns
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await switch.new_switch(config)
     await cg.register_component(var, config)
     cg.add(var.set_lednum(config[CONF_LED]))
diff --git a/esphome/components/uponor_smatrix/__init__.py b/esphome/components/uponor_smatrix/__init__.py
index 9588b0df7f..093408e868 100644
--- a/esphome/components/uponor_smatrix/__init__.py
+++ b/esphome/components/uponor_smatrix/__init__.py
@@ -2,6 +2,8 @@ import esphome.codegen as cg
 from esphome.components import time, uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ADDRESS, CONF_ID, CONF_TIME_ID
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kroimon"]
 
@@ -61,7 +63,7 @@ UPONOR_SMATRIX_DEVICE_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(uponor_smatrix_ns.using)
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
@@ -74,7 +76,7 @@ async def to_code(config):
             cg.add(var.set_time_device_address(time_device_address))
 
 
-async def register_uponor_smatrix_device(var, config):
+async def register_uponor_smatrix_device(var: MockObj, config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_UPONOR_SMATRIX_ID])
     cg.add(var.set_parent(parent))
     cg.add(var.set_address(config[CONF_ADDRESS]))
diff --git a/esphome/components/uponor_smatrix/climate/__init__.py b/esphome/components/uponor_smatrix/climate/__init__.py
index 47495fde9a..e80f59df24 100644
--- a/esphome/components/uponor_smatrix/climate/__init__.py
+++ b/esphome/components/uponor_smatrix/climate/__init__.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate
+from esphome.types import ConfigType
 
 from .. import (
     UPONOR_SMATRIX_DEVICE_SCHEMA,
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = climate.climate_schema(UponorSmatrixClimate).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate.new_climate(config)
     await cg.register_component(var, config)
     await register_uponor_smatrix_device(var, config)
diff --git a/esphome/components/uponor_smatrix/sensor/__init__.py b/esphome/components/uponor_smatrix/sensor/__init__.py
index f2b34538ba..52e755f005 100644
--- a/esphome/components/uponor_smatrix/sensor/__init__.py
+++ b/esphome/components/uponor_smatrix/sensor/__init__.py
@@ -13,6 +13,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 from .. import (
     UPONOR_SMATRIX_DEVICE_SCHEMA,
@@ -61,7 +62,7 @@ CONFIG_SCHEMA = cv.COMPONENT_SCHEMA.extend(
 ).extend(UPONOR_SMATRIX_DEVICE_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await register_uponor_smatrix_device(var, config)
diff --git a/esphome/components/vl53l0x/sensor.py b/esphome/components/vl53l0x/sensor.py
index 583d6ccca9..3029e0f77b 100644
--- a/esphome/components/vl53l0x/sensor.py
+++ b/esphome/components/vl53l0x/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components import i2c, sensor
@@ -10,6 +12,8 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_METER,
 )
+from esphome.core import TimePeriodMicroseconds
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -23,7 +27,7 @@ CONF_LONG_RANGE = "long_range"
 CONF_TIMING_BUDGET = "timing_budget"
 
 
-def check_keys(obj):
+def check_keys(obj: ConfigType) -> ConfigType:
     if obj[CONF_ADDRESS] != 0x29 and CONF_ENABLE_PIN not in obj:
         msg = "Address other then 0x29 requires enable_pin definition to allow sensor\r"
         msg += "re-addressing. Also if you have more then one VL53 device on the same\r"
@@ -32,7 +36,7 @@ def check_keys(obj):
     return obj
 
 
-def check_timeout(value):
+def check_timeout(value: Any) -> TimePeriodMicroseconds:
     value = cv.positive_time_period_microseconds(value)
     if value.total_seconds > 60:
         raise cv.Invalid("Maximum timeout can not be greater then 60 seconds")
@@ -70,7 +74,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     cg.add(var.set_signal_rate_limit(config[CONF_SIGNAL_RATE_LIMIT]))
diff --git a/esphome/components/weikai/__init__.py b/esphome/components/weikai/__init__.py
index bc80f167ef..8f0cf4ba33 100644
--- a/esphome/components/weikai/__init__.py
+++ b/esphome/components/weikai/__init__.py
@@ -12,6 +12,8 @@ from esphome.const import (
     CONF_NUMBER,
     CONF_OUTPUT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@DrCoolZic"]
 AUTO_LOAD = ["uart"]
@@ -26,7 +28,7 @@ WeikaiComponent = weikai_ns.class_("WeikaiComponent", cg.Component)
 WeikaiChannel = weikai_ns.class_("WeikaiChannel", uart.UARTComponent)
 
 
-def check_channel_max(value, max):
+def check_channel_max(value: ConfigType, max: int) -> ConfigType:
     channel_uniq = []
     channel_dup = []
     for x in value[CONF_UART]:
@@ -41,11 +43,11 @@ def check_channel_max(value, max):
     return value
 
 
-def check_channel_max_4(value):
+def check_channel_max_4(value: ConfigType) -> ConfigType:
     return check_channel_max(value, 4)
 
 
-def check_channel_max_2(value):
+def check_channel_max_2(value: ConfigType) -> ConfigType:
     return check_channel_max(value, 2)
 
 
@@ -70,7 +72,7 @@ WKBASE_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def register_weikai(var, config):
+async def register_weikai(var: MockObj, config: ConfigType) -> None:
     """Register an weikai device with the given config."""
     cg.add(var.set_crystal(config[CONF_CRYSTAL]))
     cg.add(var.set_test_mode(config[CONF_TEST_MODE]))
@@ -85,7 +87,7 @@ async def register_weikai(var, config):
         cg.add(chan.set_parity(uart_elem[CONF_PARITY]))
 
 
-def validate_pin_mode(value):
+def validate_pin_mode(value: ConfigType) -> ConfigType:
     """Checks input/output mode inconsistency"""
     if not (value[CONF_MODE][CONF_INPUT] or value[CONF_MODE][CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
diff --git a/esphome/components/zephyr_ble_server/__init__.py b/esphome/components/zephyr_ble_server/__init__.py
index 658137d1a2..463b9c0887 100644
--- a/esphome/components/zephyr_ble_server/__init__.py
+++ b/esphome/components/zephyr_ble_server/__init__.py
@@ -3,7 +3,9 @@ import esphome.codegen as cg
 from esphome.components.zephyr import zephyr_add_prj_conf
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, Framework
-from esphome.core import CORE
+from esphome.core import CORE, ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 zephyr_ble_server_ns = cg.esphome_ns.namespace("zephyr_ble_server")
 BLEServer = zephyr_ble_server_ns.class_("BLEServer", cg.Component)
@@ -32,7 +34,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     zephyr_add_prj_conf("BT", True)
     zephyr_add_prj_conf("BT_PERIPHERAL", True)
@@ -65,7 +67,12 @@ BLE_NUMERIC_COMPARISON_REPLY_ACTION_SCHEMA = cv.Schema(
     BLE_NUMERIC_COMPARISON_REPLY_ACTION_SCHEMA,
     synchronous=True,
 )
-async def numeric_comparison_reply_to_code(config, action_id, template_arg, args):
+async def numeric_comparison_reply_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     parent = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, parent)
 

From 12da2140cf93273875315823ba041eb4b5841ade Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Aug 2026 07:57:14 +1200
Subject: [PATCH 023/155] [core] Add type annotations to component Python
 (11/11) (#18348)

---
 esphome/components/animation/image.py                |  9 ++++++++-
 esphome/components/apds9960/__init__.py              |  3 ++-
 esphome/components/apds9960/binary_sensor.py         |  3 ++-
 esphome/components/apds9960/sensor.py                |  3 ++-
 esphome/components/emc2101/__init__.py               |  3 ++-
 esphome/components/emc2101/output/__init__.py        |  3 ++-
 esphome/components/emc2101/sensor/__init__.py        |  3 ++-
 esphome/components/graph/__init__.py                 |  9 ++++++---
 esphome/components/pylontech/__init__.py             |  3 ++-
 esphome/components/pylontech/sensor/__init__.py      |  3 ++-
 esphome/components/pylontech/text_sensor/__init__.py |  3 ++-
 esphome/components/rd03d/__init__.py                 |  3 ++-
 esphome/components/rd03d/binary_sensor.py            |  3 ++-
 esphome/components/rd03d/sensor.py                   |  3 ++-
 esphome/components/sun_gtil2/__init__.py             |  3 ++-
 esphome/components/sun_gtil2/sensor.py               |  3 ++-
 esphome/components/sun_gtil2/text_sensor.py          |  3 ++-
 esphome/components/teleinfo/__init__.py              |  3 ++-
 esphome/components/teleinfo/sensor/__init__.py       |  3 ++-
 esphome/components/teleinfo/text_sensor/__init__.py  |  3 ++-
 esphome/components/ufm01/__init__.py                 |  3 ++-
 esphome/components/ufm01/binary_sensor.py            |  3 ++-
 esphome/components/ufm01/sensor.py                   |  3 ++-
 esphome/components/xl9535/__init__.py                | 10 ++++++----
 24 files changed, 62 insertions(+), 29 deletions(-)

diff --git a/esphome/components/animation/image.py b/esphome/components/animation/image.py
index 73d428bd20..0265a350f7 100644
--- a/esphome/components/animation/image.py
+++ b/esphome/components/animation/image.py
@@ -6,6 +6,8 @@ from esphome.components.file.image import image_schema, write_image
 from esphome.components.image import Image_, validate_settings
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_REPEAT
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@syndlex"]
@@ -79,7 +81,12 @@ SET_FRAME_SCHEMA = cv.Schema(
 @automation.register_action(
     "animation.set_frame", SetFrameAction, SET_FRAME_SCHEMA, synchronous=True
 )
-async def animation_action_to_code(config, action_id, template_arg, args):
+async def animation_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
diff --git a/esphome/components/apds9960/__init__.py b/esphome/components/apds9960/__init__.py
index 99e37d3764..7ac1e5eb32 100644
--- a/esphome/components/apds9960/__init__.py
+++ b/esphome/components/apds9960/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 MULTI_CONF = True
@@ -57,7 +58,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/apds9960/binary_sensor.py b/esphome/components/apds9960/binary_sensor.py
index 48e923ab2b..342f688249 100644
--- a/esphome/components/apds9960/binary_sensor.py
+++ b/esphome/components/apds9960/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_DIRECTION, DEVICE_CLASS_MOVING
+from esphome.types import ConfigType
 
 from . import APDS9960, CONF_APDS9960_ID
 
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_APDS9960_ID])
     var = await binary_sensor.new_binary_sensor(config)
     func = getattr(hub, f"set_{config[CONF_DIRECTION]}_direction_binary_sensor")
diff --git a/esphome/components/apds9960/sensor.py b/esphome/components/apds9960/sensor.py
index 468eb0995f..a75fb79d1b 100644
--- a/esphome/components/apds9960/sensor.py
+++ b/esphome/components/apds9960/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 from . import APDS9960, CONF_APDS9960_ID
 
@@ -27,7 +28,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_APDS9960_ID])
     var = await sensor.new_sensor(config)
     func = getattr(hub, f"set_{config[CONF_TYPE]}_sensor")
diff --git a/esphome/components/emc2101/__init__.py b/esphome/components/emc2101/__init__.py
index 323195e99a..639847345f 100644
--- a/esphome/components/emc2101/__init__.py
+++ b/esphome/components/emc2101/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INVERTED, CONF_RESOLUTION
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ellull"]
 
@@ -68,7 +69,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/emc2101/output/__init__.py b/esphome/components/emc2101/output/__init__.py
index 586f0800a6..a8820345e2 100644
--- a/esphome/components/emc2101/output/__init__.py
+++ b/esphome/components/emc2101/output/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 from .. import CONF_EMC2101_ID, EMC2101_COMPONENT_SCHEMA, emc2101_ns
 
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = EMC2101_COMPONENT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_EMC2101_ID])
     var = cg.new_Pvariable(config[CONF_ID], paren)
     await output.register_output(var, config)
diff --git a/esphome/components/emc2101/sensor/__init__.py b/esphome/components/emc2101/sensor/__init__.py
index b6a2c8a333..cc8901cf38 100644
--- a/esphome/components/emc2101/sensor/__init__.py
+++ b/esphome/components/emc2101/sensor/__init__.py
@@ -13,6 +13,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_REVOLUTIONS_PER_MINUTE,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_EMC2101_ID, EMC2101_COMPONENT_SCHEMA, emc2101_ns
 
@@ -53,7 +54,7 @@ CONFIG_SCHEMA = EMC2101_COMPONENT_SCHEMA.extend(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_EMC2101_ID])
     var = cg.new_Pvariable(config[CONF_ID], paren)
     await cg.register_component(var, config)
diff --git a/esphome/components/graph/__init__.py b/esphome/components/graph/__init__.py
index 0749d7e2a3..1b99491f9c 100644
--- a/esphome/components/graph/__init__.py
+++ b/esphome/components/graph/__init__.py
@@ -29,6 +29,7 @@ from esphome.const import (
     CONF_X_GRID,
     CONF_Y_GRID,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@synco"]
 
@@ -115,7 +116,9 @@ GRAPH_SCHEMA = cv.Schema(
 )
 
 
-def _relocate_fields_to_subfolder(config, subfolder, subschema):
+def _relocate_fields_to_subfolder(
+    config: ConfigType, subfolder: str, subschema: cv.Schema
+) -> ConfigType:
     fields = [k.schema for k in subschema.schema]
     fields.remove(CONF_ID)
     if subfolder in config:
@@ -138,7 +141,7 @@ def _relocate_fields_to_subfolder(config, subfolder, subschema):
     return config
 
 
-def _relocate_trace(config):
+def _relocate_trace(config: ConfigType) -> ConfigType:
     return _relocate_fields_to_subfolder(config, CONF_TRACES, GRAPH_TRACE_SCHEMA)
 
 
@@ -148,7 +151,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_duration(config[CONF_DURATION]))
     cg.add(var.set_width(config[CONF_WIDTH]))
diff --git a/esphome/components/pylontech/__init__.py b/esphome/components/pylontech/__init__.py
index 82b98654a2..4ab606d9f9 100644
--- a/esphome/components/pylontech/__init__.py
+++ b/esphome/components/pylontech/__init__.py
@@ -4,6 +4,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -41,7 +42,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/pylontech/sensor/__init__.py b/esphome/components/pylontech/sensor/__init__.py
index 450f663274..40391206fb 100644
--- a/esphome/components/pylontech/sensor/__init__.py
+++ b/esphome/components/pylontech/sensor/__init__.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_BATTERY, CONF_PYLONTECH_ID, PYLONTECH_COMPONENT_SCHEMA, pylontech_ns
 
@@ -90,7 +91,7 @@ CONFIG_SCHEMA = PYLONTECH_COMPONENT_SCHEMA.extend(
 ).extend({cv.Optional(marker): schema for marker, schema in TYPES.items()})
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_PYLONTECH_ID])
     bat = cg.new_Pvariable(config[CONF_ID], config[CONF_BATTERY])
 
diff --git a/esphome/components/pylontech/text_sensor/__init__.py b/esphome/components/pylontech/text_sensor/__init__.py
index f68ca10374..511eb7d542 100644
--- a/esphome/components/pylontech/text_sensor/__init__.py
+++ b/esphome/components/pylontech/text_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 from .. import CONF_BATTERY, CONF_PYLONTECH_ID, PYLONTECH_COMPONENT_SCHEMA, pylontech_ns
 
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = PYLONTECH_COMPONENT_SCHEMA.extend(
 ).extend({cv.Optional(marker): text_sensor.text_sensor_schema() for marker in MARKERS})
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_PYLONTECH_ID])
     bat = cg.new_Pvariable(config[CONF_ID], config[CONF_BATTERY])
 
diff --git a/esphome/components/rd03d/__init__.py b/esphome/components/rd03d/__init__.py
index 52e9a2c09a..4fff41e4f6 100644
--- a/esphome/components/rd03d/__init__.py
+++ b/esphome/components/rd03d/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_THROTTLE
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jasstrong"]
 DEPENDENCIES = ["uart"]
@@ -38,7 +39,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/rd03d/binary_sensor.py b/esphome/components/rd03d/binary_sensor.py
index afb7527aa1..2c040d0560 100644
--- a/esphome/components/rd03d/binary_sensor.py
+++ b/esphome/components/rd03d/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_TARGET, DEVICE_CLASS_OCCUPANCY
+from esphome.types import ConfigType
 
 from . import CONF_RD03D_ID, RD03DComponent
 
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_RD03D_ID])
 
     if target_config := config.get(CONF_TARGET):
diff --git a/esphome/components/rd03d/sensor.py b/esphome/components/rd03d/sensor.py
index 953d99c2da..d29656bab0 100644
--- a/esphome/components/rd03d/sensor.py
+++ b/esphome/components/rd03d/sensor.py
@@ -15,6 +15,7 @@ from esphome.const import (
     UNIT_DEGREES,
     UNIT_MILLIMETER,
 )
+from esphome.types import ConfigType
 
 from . import CONF_RD03D_ID, RD03DComponent
 
@@ -75,7 +76,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend({cv.Optional(f"target_{i + 1}"): TARGET_SCHEMA for i in range(MAX_TARGETS)})
 
 
-async def to_code(config):
+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):
diff --git a/esphome/components/sun_gtil2/__init__.py b/esphome/components/sun_gtil2/__init__.py
index c7082794db..0f5ae27753 100644
--- a/esphome/components/sun_gtil2/__init__.py
+++ b/esphome/components/sun_gtil2/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Mat931"]
 MULTI_CONF = True
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/sun_gtil2/sensor.py b/esphome/components/sun_gtil2/sensor.py
index 55c8195391..26435cfa67 100644
--- a/esphome/components/sun_gtil2/sensor.py
+++ b/esphome/components/sun_gtil2/sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 from . import CONF_SUN_GTIL2_ID, SunGTIL2Component
 
@@ -73,7 +74,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_SUN_GTIL2_ID])
     if ac_voltage_config := config.get(CONF_AC_VOLTAGE):
         sens = await sensor.new_sensor(ac_voltage_config)
diff --git a/esphome/components/sun_gtil2/text_sensor.py b/esphome/components/sun_gtil2/text_sensor.py
index f74f89b3b4..eae69fb4df 100644
--- a/esphome/components/sun_gtil2/text_sensor.py
+++ b/esphome/components/sun_gtil2/text_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_STATE
+from esphome.types import ConfigType
 
 from . import CONF_SUN_GTIL2_ID, SunGTIL2Component
 
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_SUN_GTIL2_ID])
     if state_config := config.get(CONF_STATE):
         sens = await text_sensor.new_text_sensor(state_config)
diff --git a/esphome/components/teleinfo/__init__.py b/esphome/components/teleinfo/__init__.py
index 87c7b9e85c..f9233511e1 100644
--- a/esphome/components/teleinfo/__init__.py
+++ b/esphome/components/teleinfo/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@0hax"]
 MULTI_CONF = True
@@ -34,7 +35,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID], config[CONF_HISTORICAL_MODE])
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
diff --git a/esphome/components/teleinfo/sensor/__init__.py b/esphome/components/teleinfo/sensor/__init__.py
index 150484d97a..b51d4cb795 100644
--- a/esphome/components/teleinfo/sensor/__init__.py
+++ b/esphome/components/teleinfo/sensor/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_TOTAL_INCREASING,
     UNIT_WATT_HOURS,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_TAG_NAME, CONF_TELEINFO_ID, TELEINFO_LISTENER_SCHEMA, teleinfo_ns
 
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
 ).extend(TELEINFO_LISTENER_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID], config[CONF_TAG_NAME])
     await cg.register_component(var, config)
     await sensor.register_sensor(var, config)
diff --git a/esphome/components/teleinfo/text_sensor/__init__.py b/esphome/components/teleinfo/text_sensor/__init__.py
index 79fabd10d0..0b6ff11d74 100644
--- a/esphome/components/teleinfo/text_sensor/__init__.py
+++ b/esphome/components/teleinfo/text_sensor/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import text_sensor
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 from .. import CONF_TAG_NAME, CONF_TELEINFO_ID, TELEINFO_LISTENER_SCHEMA, teleinfo_ns
 
@@ -13,7 +14,7 @@ CONFIG_SCHEMA = text_sensor.text_sensor_schema(TeleInfoTextSensor).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID], config[CONF_TAG_NAME])
     await cg.register_component(var, config)
     await text_sensor.register_text_sensor(var, config)
diff --git a/esphome/components/ufm01/__init__.py b/esphome/components/ufm01/__init__.py
index 51cf3cfd91..ca0ea57796 100644
--- a/esphome/components/ufm01/__init__.py
+++ b/esphome/components/ufm01/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ljungqvist"]
 
@@ -34,7 +35,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/ufm01/binary_sensor.py b/esphome/components/ufm01/binary_sensor.py
index 92ae585d96..59583357e4 100644
--- a/esphome/components/ufm01/binary_sensor.py
+++ b/esphome/components/ufm01/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_PROBLEM, ENTITY_CATEGORY_DIAGNOSTIC
+from esphome.types import ConfigType
 
 from . import CONF_UFM01_ID, UFM01Component
 
@@ -32,7 +33,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ufm01_component = await cg.get_variable(config[CONF_UFM01_ID])
 
     if ufc_chip_error_config := config.get(CONF_UFC_CHIP_ERROR):
diff --git a/esphome/components/ufm01/sensor.py b/esphome/components/ufm01/sensor.py
index 4dcd7ceebe..e3281f0b2d 100644
--- a/esphome/components/ufm01/sensor.py
+++ b/esphome/components/ufm01/sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     UNIT_CUBIC_METER_PER_HOUR,
     UNIT_LITRE,
 )
+from esphome.types import ConfigType
 
 from . import CONF_UFM01_ID, UFM01Component
 
@@ -47,7 +48,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     ufm01_component = await cg.get_variable(config[CONF_UFM01_ID])
 
     if CONF_ACCUMULATED_FLOW in config:
diff --git a/esphome/components/xl9535/__init__.py b/esphome/components/xl9535/__init__.py
index 58ce4a30f8..5686b74173 100644
--- a/esphome/components/xl9535/__init__.py
+++ b/esphome/components/xl9535/__init__.py
@@ -10,6 +10,8 @@ from esphome.const import (
     CONF_NUMBER,
     CONF_OUTPUT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CONF_XL9535 = "xl9535"
 
@@ -29,13 +31,13 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
 
-def validate_mode(mode):
+def validate_mode(mode: ConfigType) -> ConfigType:
     if not (mode[CONF_INPUT] or mode[CONF_OUTPUT]) or (
         mode[CONF_INPUT] and mode[CONF_OUTPUT]
     ):
@@ -43,7 +45,7 @@ def validate_mode(mode):
     return mode
 
 
-def validate_pin(pin):
+def validate_pin(pin: int) -> int:
     if pin in (8, 9):
         raise cv.Invalid(f"pin {pin} doesn't exist")
     return pin
@@ -67,7 +69,7 @@ XL9535_PIN_SCHEMA = cv.All(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_XL9535, XL9535_PIN_SCHEMA)
-async def xl9535_pin_to_code(config):
+async def xl9535_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_XL9535])
 

From 44dcd82d78bf4da00ac00f1738d9b95e9735df9e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 21 Aug 2026 07:58:11 +1200
Subject: [PATCH 024/155] [mipi_spi] Toggle D/C only while holding the SPI bus
 (#18529)

---
 esphome/components/mipi_spi/mipi_spi.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/esphome/components/mipi_spi/mipi_spi.h b/esphome/components/mipi_spi/mipi_spi.h
index b269f46dc9..2552451bd7 100644
--- a/esphome/components/mipi_spi/mipi_spi.h
+++ b/esphome/components/mipi_spi/mipi_spi.h
@@ -246,33 +246,36 @@ class MipiSpi : public display::Display,
       this->write_cmd_addr_data(8, 0x02, 24, cmd << 8, bytes, len);
       this->disable();
     } else if constexpr (BUS_TYPE == BUS_TYPE_OCTAL) {
-      this->dc_pin_->digital_write(false);
+      // Toggle D/C only while holding the bus; on boards where D/C doubles as
+      // another bus signal, driving it while another device owns the bus
+      // corrupts that device's transfer.
       this->enable();
+      this->dc_pin_->digital_write(false);
       this->write_cmd_addr_data(0, 0, 0, 0, &cmd, 1, 8);
-      this->disable();
       this->dc_pin_->digital_write(true);
+      this->disable();
       if (len != 0) {
         this->enable();
         this->write_cmd_addr_data(0, 0, 0, 0, bytes, len, 8);
         this->disable();
       }
     } else if constexpr (BUS_TYPE == BUS_TYPE_SINGLE) {
-      this->dc_pin_->digital_write(false);
       this->enable();
+      this->dc_pin_->digital_write(false);
       this->write_byte(cmd);
-      this->disable();
       this->dc_pin_->digital_write(true);
+      this->disable();
       if (len != 0) {
         this->enable();
         this->write_array(bytes, len);
         this->disable();
       }
     } else if constexpr (BUS_TYPE == BUS_TYPE_SINGLE_16) {
-      this->dc_pin_->digital_write(false);
       this->enable();
+      this->dc_pin_->digital_write(false);
       this->write_byte(cmd);
-      this->disable();
       this->dc_pin_->digital_write(true);
+      this->disable();
       for (size_t i = 0; i != len; i++) {
         this->enable();
         this->write_byte(0);

From edd4a86d14a0d4ac64b1b6efc2bcb00cee0d5111 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2026 15:02:15 -0500
Subject: [PATCH 025/155] Bump prek from 0.4.13 to 0.4.14 (#18563)

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index cedc107b17..079c375c01 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -2,7 +2,7 @@ pylint==4.0.7
 flake8==7.3.0  # also change in .pre-commit-config.yaml when updating
 ruff==0.16.3  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.21.2  # also change in .pre-commit-config.yaml when updating
-prek==0.4.13  # also change in .github/workflows/ci.yml when updating
+prek==0.4.14  # also change in .github/workflows/ci.yml when updating
 
 # Unit tests
 pytest==9.1.1

From 4cfa4893ef4bde01ab73da64470f83eeef2e7461 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2026 15:24:28 -0500
Subject: [PATCH 026/155] Bump docker/setup-buildx-action from 4.2.0 to 4.3.0
 in the docker-actions group (#18564)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci-docker.yml | 4 ++--
 .github/workflows/release.yml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 71dedd65aa..f3f7cb30eb 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -67,7 +67,7 @@ jobs:
         with:
           python-version: "3.12"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
+        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
 
       - name: Determine tag and whether to push
         id: tag
@@ -153,7 +153,7 @@ jobs:
         with:
           python-version: "3.12"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
+        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
 
       - name: Log in to the GitHub container registry
         uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 10b28ace38..d0dee8165c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -123,7 +123,7 @@ jobs:
           python-version: "3.12"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
+        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
 
       - name: Log in to docker hub
         uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
@@ -202,7 +202,7 @@ jobs:
           merge-multiple: true
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
+        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
 
       - name: Log in to docker hub
         if: matrix.registry == 'dockerhub'

From ece90ee97b11ecfeff40a3c2da11cf357cf381f7 Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2026 16:59:30 -0500
Subject: [PATCH 027/155] Bump bundled esphome-device-builder to 1.12.2
 (#18573)

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 55aa0ac982..2bbe5331e5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN \
     -r /requirements.txt
 
 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.12.1
+RUN uv pip install --no-cache-dir esphome-device-builder==1.12.2
 
 RUN \
     platformio settings set enable_telemetry No \

From 5177972c041d75bf00351c7f6d2cb250253c19e5 Mon Sep 17 00:00:00 2001
From: guillempages <guillempages@users.noreply.github.com>
Date: Fri, 21 Aug 2026 00:27:44 +0200
Subject: [PATCH 028/155] [runtime_image] keep decoder allocated (#18488)

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Co-authored-by: J. Nick Koston <nick@home-assistant.io>
Co-authored-by: J. Nick Koston <nick@koston.org>
---
 .../components/online_image/online_image.cpp  |   2 +-
 esphome/components/runtime_image/__init__.py  |   5 +
 .../components/runtime_image/bmp_decoder.cpp  |  21 +-
 .../components/runtime_image/bmp_decoder.h    |  12 +-
 .../components/runtime_image/image_decoder.h  |  34 +-
 .../components/runtime_image/image_format.h   |  19 +
 .../components/runtime_image/jpeg_decoder.cpp |   6 -
 .../components/runtime_image/jpeg_decoder.h   |   3 +-
 .../components/runtime_image/png_decoder.cpp  |   7 +-
 .../components/runtime_image/png_decoder.h    |   8 +
 .../runtime_image/runtime_image.cpp           |  53 +--
 .../components/runtime_image/runtime_image.h  |  34 +-
 .../sendspin/image/sendspin_image.cpp         |   4 +-
 tests/components/runtime_image/__init__.py    |  15 +
 .../runtime_image/test_decoder_reuse.cpp      | 336 ++++++++++++++++++
 15 files changed, 487 insertions(+), 72 deletions(-)
 create mode 100644 esphome/components/runtime_image/image_format.h
 create mode 100644 tests/components/runtime_image/__init__.py
 create mode 100644 tests/components/runtime_image/test_decoder_reuse.cpp

diff --git a/esphome/components/online_image/online_image.cpp b/esphome/components/online_image/online_image.cpp
index 22bce4cc41..fe4f727cd6 100644
--- a/esphome/components/online_image/online_image.cpp
+++ b/esphome/components/online_image/online_image.cpp
@@ -216,7 +216,7 @@ void OnlineImage::loop() {
 }
 
 void OnlineImage::end_connection_() {
-  // Abort any in-progress decode to free decoder resources.
+  // Abort any in-progress decode; the decoder object is kept warm for the next decode.
   // Use RuntimeImage::release() directly to avoid recursion with OnlineImage::release().
   if (this->is_decoding()) {
     RuntimeImage::release();
diff --git a/esphome/components/runtime_image/__init__.py b/esphome/components/runtime_image/__init__.py
index 9fa32a5a65..3c130a7d75 100644
--- a/esphome/components/runtime_image/__init__.py
+++ b/esphome/components/runtime_image/__init__.py
@@ -77,6 +77,11 @@ class JPEGFormat(Format):
     def actions(self) -> None:
         cg.add_define("USE_RUNTIME_IMAGE_JPEG")
         cg.add_library("JPEGDEC", "1.8.4", "https://github.com/bitbank2/JPEGDEC#1.8.4")
+        if CORE.is_host:
+            # JPEGDEC's host detection checks __MACH__/__LINUX__, but gcc only
+            # predefines the lowercase __linux__; without this a Linux host
+            # build tries to include Arduino.h.
+            cg.add_build_flag("-D__LINUX__")
         if CORE.is_esp32:
             from esphome.components.esp32 import add_idf_component
 
diff --git a/esphome/components/runtime_image/bmp_decoder.cpp b/esphome/components/runtime_image/bmp_decoder.cpp
index 6a1bd61d86..5d45621fb7 100644
--- a/esphome/components/runtime_image/bmp_decoder.cpp
+++ b/esphome/components/runtime_image/bmp_decoder.cpp
@@ -12,6 +12,22 @@ namespace esphome::runtime_image {
 
 static const char *const TAG = "image_decoder.bmp";
 
+void BmpDecoder::reset() {
+  ImageDecoder::reset();
+  this->bits_per_pixel_ = 0;
+  this->compression_method_ = 0;
+  this->image_data_size_ = 0;
+  this->width_ = 0;
+  this->height_ = 0;
+  this->current_index_ = 0;
+  this->paint_index_ = 0;
+  // color_table_ is deliberately kept allocated so the next decode can reuse it
+  this->color_table_entries_ = 0;
+  this->data_offset_ = 0;
+  this->padding_bytes_ = 0;
+  this->width_bytes_ = 0;
+}
+
 int HOT BmpDecoder::decode(uint8_t *buffer, size_t size) {
   size_t index = 0;
   if (this->current_index_ == 0) {
@@ -85,7 +101,10 @@ int HOT BmpDecoder::decode(uint8_t *buffer, size_t size) {
         size_t header_size = encode_uint32(buffer[17], buffer[16], buffer[15], buffer[14]);
         size_t offset = 14 + header_size;
 
-        this->color_table_ = std::make_unique<uint32_t[]>(this->color_table_entries_);
+        if (this->color_table_entries_ > this->color_table_capacity_) {
+          this->color_table_ = std::make_unique<uint32_t[]>(this->color_table_entries_);
+          this->color_table_capacity_ = this->color_table_entries_;
+        }
 
         for (size_t i = 0; i < this->color_table_entries_; i++) {
           this->color_table_[i] = encode_uint32(buffer[offset + i * 4 + 3], buffer[offset + i * 4 + 2],
diff --git a/esphome/components/runtime_image/bmp_decoder.h b/esphome/components/runtime_image/bmp_decoder.h
index a52a561584..01acc41f91 100644
--- a/esphome/components/runtime_image/bmp_decoder.h
+++ b/esphome/components/runtime_image/bmp_decoder.h
@@ -21,8 +21,9 @@ class BmpDecoder : public ImageDecoder {
    *
    * @param image The RuntimeImage to decode the stream into.
    */
-  BmpDecoder(RuntimeImage *image) : ImageDecoder(image) {}
+  BmpDecoder(RuntimeImage *image) : ImageDecoder(image, BMP) {}
 
+  void reset() override;
   int HOT decode(uint8_t *buffer, size_t size) override;
 
   bool is_finished() const override {
@@ -35,17 +36,18 @@ class BmpDecoder : public ImageDecoder {
   }
 
  protected:
+  std::unique_ptr<uint32_t[]> color_table_;
   size_t current_index_{0};
   size_t paint_index_{0};
   ssize_t width_{0};
   ssize_t height_{0};
-  uint16_t bits_per_pixel_{0};
+  size_t width_bytes_{0};
+  size_t data_offset_{0};
   uint32_t compression_method_{0};
   uint32_t image_data_size_{0};
   uint32_t color_table_entries_{0};
-  std::unique_ptr<uint32_t[]> color_table_;
-  size_t width_bytes_{0};
-  size_t data_offset_{0};
+  uint32_t color_table_capacity_{0};  // Allocated entries in color_table_, kept across decodes
+  uint16_t bits_per_pixel_{0};
   uint8_t padding_bytes_{0};
 };
 
diff --git a/esphome/components/runtime_image/image_decoder.h b/esphome/components/runtime_image/image_decoder.h
index 6d351a10aa..2a8b393888 100644
--- a/esphome/components/runtime_image/image_decoder.h
+++ b/esphome/components/runtime_image/image_decoder.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "esphome/core/color.h"
+#include "image_format.h"
 
 namespace esphome::runtime_image {
 
@@ -36,18 +37,41 @@ class ImageDecoder {
    * @brief Construct a new Image Decoder object
    *
    * @param image The RuntimeImage to decode the stream into.
+   * @param format The image format this decoder handles.
    */
-  ImageDecoder(RuntimeImage *image) : image_(image) {}
+  ImageDecoder(RuntimeImage *image, ImageFormat format) : image_(image), format_(format) {}
   virtual ~ImageDecoder() = default;
 
+  /// @brief Get the image format handled by this decoder.
+  ImageFormat get_format() const { return this->format_; }
+
+  /// @brief Check if a decoding session is in progress (prepare() called, reset() not yet).
+  bool is_active() const { return this->active_; }
+
   /**
-   * @brief Initialize the decoder.
+   * @brief Reset the decoder state, ending any decoding session.
+   *        Subclasses should override this method to reset any format-specific state.
+   *        Buffers the next decode can reuse should be kept allocated to avoid heap churn.
+   */
+  virtual void reset() {
+    this->active_ = false;
+    this->expected_size_ = 0;
+    this->decoded_bytes_ = 0;
+    this->size_valid_ = true;
+    this->x_scale_ = 1.0;
+    this->y_scale_ = 1.0;
+  }
+
+  /**
+   * @brief Initialize the decoder, starting a new decoding session.
    *
    * @param expected_size Hint about the expected data size (0 if unknown).
    * @return int          Returns 0 on success, a {@see DecodeError} value in case of an error.
    */
   virtual int prepare(size_t expected_size) {
+    this->reset();
     this->expected_size_ = expected_size;
+    this->active_ = true;
     return 0;
   }
 
@@ -103,11 +127,13 @@ class ImageDecoder {
   }
 
  protected:
+  double x_scale_ = 1.0;
+  double y_scale_ = 1.0;
   RuntimeImage *image_;
   size_t expected_size_ = 0;  // Expected data size (0 if unknown)
   size_t decoded_bytes_ = 0;  // Bytes processed so far
-  double x_scale_ = 1.0;
-  double y_scale_ = 1.0;
+  const ImageFormat format_;
+  bool active_ = false;     // A decoding session is in progress
   bool size_valid_ = true;  // Last set_size() result; draw() no-ops while false
 };
 
diff --git a/esphome/components/runtime_image/image_format.h b/esphome/components/runtime_image/image_format.h
new file mode 100644
index 0000000000..524e52d7bc
--- /dev/null
+++ b/esphome/components/runtime_image/image_format.h
@@ -0,0 +1,19 @@
+#pragma once
+
+namespace esphome::runtime_image {
+
+/**
+ * @brief Image format types that can be decoded dynamically.
+ */
+enum ImageFormat {
+  /** Automatically detect from data. Not implemented yet. */
+  AUTO,
+  /** JPEG format. */
+  JPEG,
+  /** PNG format. */
+  PNG,
+  /** BMP format. */
+  BMP,
+};
+
+}  // namespace esphome::runtime_image
diff --git a/esphome/components/runtime_image/jpeg_decoder.cpp b/esphome/components/runtime_image/jpeg_decoder.cpp
index c46e86fd0d..85ec945259 100644
--- a/esphome/components/runtime_image/jpeg_decoder.cpp
+++ b/esphome/components/runtime_image/jpeg_decoder.cpp
@@ -52,12 +52,6 @@ static int draw_callback(JPEGDRAW *jpeg) {
   return 1;
 }
 
-int JpegDecoder::prepare(size_t expected_size) {
-  ImageDecoder::prepare(expected_size);
-  // JPEG decoder needs complete data before decoding
-  return 0;
-}
-
 int HOT JpegDecoder::decode(uint8_t *buffer, size_t size) {
   // JPEG decoder requires complete data
   // If we know the expected size, wait for it
diff --git a/esphome/components/runtime_image/jpeg_decoder.h b/esphome/components/runtime_image/jpeg_decoder.h
index ed2401e263..67c9b77f4d 100644
--- a/esphome/components/runtime_image/jpeg_decoder.h
+++ b/esphome/components/runtime_image/jpeg_decoder.h
@@ -18,10 +18,9 @@ class JpegDecoder : public ImageDecoder {
    *
    * @param image The RuntimeImage to decode the stream into.
    */
-  JpegDecoder(RuntimeImage *image) : ImageDecoder(image) {}
+  JpegDecoder(RuntimeImage *image) : ImageDecoder(image, JPEG) {}
   ~JpegDecoder() override {}
 
-  int prepare(size_t expected_size) override;
   int HOT decode(uint8_t *buffer, size_t size) override;
 
  protected:
diff --git a/esphome/components/runtime_image/png_decoder.cpp b/esphome/components/runtime_image/png_decoder.cpp
index 9501702711..106f25bbe1 100644
--- a/esphome/components/runtime_image/png_decoder.cpp
+++ b/esphome/components/runtime_image/png_decoder.cpp
@@ -48,7 +48,7 @@ static void draw_callback(pngle_t *pngle, uint32_t x, uint32_t y, uint32_t w, ui
   }
 }
 
-PngDecoder::PngDecoder(RuntimeImage *image) : ImageDecoder(image) {
+PngDecoder::PngDecoder(RuntimeImage *image) : ImageDecoder(image, PNG) {
   {
     RAMAllocator<pngle_t> allocator;
     pngle_t *pngle = allocator.allocate(1, PNGLE_T_SIZE);
@@ -57,8 +57,8 @@ PngDecoder::PngDecoder(RuntimeImage *image) : ImageDecoder(image) {
       return;
     }
     memset(pngle, 0, PNGLE_T_SIZE);
-    pngle_reset(pngle);
     this->pngle_ = pngle;
+    pngle_reset(this->pngle_);
   }
 }
 
@@ -71,11 +71,12 @@ PngDecoder::~PngDecoder() {
 }
 
 int PngDecoder::prepare(size_t expected_size) {
-  ImageDecoder::prepare(expected_size);
+  // Check before the base prepare() so a failure never leaves an active session
   if (!this->pngle_) {
     ESP_LOGE(TAG, "PNG decoder engine not initialized!");
     return DECODE_ERROR_OUT_OF_MEMORY;
   }
+  ImageDecoder::prepare(expected_size);
   pngle_set_user_data(this->pngle_, this);
   pngle_set_init_callback(this->pngle_, init_callback);
   pngle_set_draw_callback(this->pngle_, draw_callback);
diff --git a/esphome/components/runtime_image/png_decoder.h b/esphome/components/runtime_image/png_decoder.h
index 24521d33a8..a1cd60e0a6 100644
--- a/esphome/components/runtime_image/png_decoder.h
+++ b/esphome/components/runtime_image/png_decoder.h
@@ -22,6 +22,14 @@ class PngDecoder : public ImageDecoder {
   PngDecoder(RuntimeImage *image);
   ~PngDecoder() override;
 
+  void reset() override {
+    ImageDecoder::reset();
+    if (this->pngle_) {
+      pngle_reset(this->pngle_);
+    }
+    this->pixels_decoded_ = 0;
+  }
+
   int prepare(size_t expected_size) override;
   int HOT decode(uint8_t *buffer, size_t size) override;
 
diff --git a/esphome/components/runtime_image/runtime_image.cpp b/esphome/components/runtime_image/runtime_image.cpp
index 8fe9be4c8c..e269f7d8f3 100644
--- a/esphome/components/runtime_image/runtime_image.cpp
+++ b/esphome/components/runtime_image/runtime_image.cpp
@@ -172,33 +172,38 @@ void RuntimeImage::draw(int x, int y, display::Display *display, Color color_on,
 }
 
 bool RuntimeImage::begin_decode(size_t expected_size) {
-  if (this->decoder_) {
+  if (this->is_decoding()) {
     ESP_LOGW(TAG, "Decoding already in progress");
     return false;
   }
 
-  this->decoder_ = this->create_decoder_();
+  // An idle decoder for a different format cannot be reused
+  if (this->decoder_ != nullptr && this->decoder_->get_format() != this->format_) {
+    ESP_LOGD(TAG, "Decoder format mismatch: current: %d, new: %d", this->decoder_->get_format(), this->format_);
+    this->decoder_ = nullptr;
+  }
+
   if (!this->decoder_) {
-    ESP_LOGE(TAG, "Failed to create decoder for format %d", this->format_);
-    return false;
+    this->decoder_ = this->create_decoder_(this->format_);
+    if (!this->decoder_) {
+      ESP_LOGE(TAG, "Failed to create decoder for format %d", this->format_);
+      return false;
+    }
   }
 
-  this->total_size_ = expected_size;
   this->decoded_bytes_ = 0;
 
-  // Initialize decoder
   int result = this->decoder_->prepare(expected_size);
   if (result < 0) {
     ESP_LOGE(TAG, "Failed to prepare decoder: %d", result);
-    this->decoder_ = nullptr;
+    this->decoder_ = nullptr;  // If prepare fails, a full reset is needed
     return false;
   }
-
   return true;
 }
 
 int RuntimeImage::feed_data(uint8_t *data, size_t len) {
-  if (!this->decoder_) {
+  if (!this->is_decoding()) {
     ESP_LOGE(TAG, "No decoder initialized");
     return -1;
   }
@@ -212,7 +217,7 @@ int RuntimeImage::feed_data(uint8_t *data, size_t len) {
 }
 
 bool RuntimeImage::end_decode() {
-  if (!this->decoder_) {
+  if (!this->is_decoding()) {
     return false;
   }
 
@@ -224,26 +229,23 @@ bool RuntimeImage::end_decode() {
     this->data_start_ = this->buffer_;
   }
 
-  // Clean up decoder
-  this->decoder_ = nullptr;
+  // End the session; the decoder object stays warm so the next decode can
+  // reuse it (and its buffers) without churning the heap.
+  this->decoder_->reset();
 
   ESP_LOGD(TAG, "Decoding complete: %dx%d, %zu bytes", this->width_, this->height_, this->decoded_bytes_);
   return true;
 }
 
-bool RuntimeImage::is_decode_finished() const {
-  if (!this->decoder_) {
-    return false;
-  }
-  return this->decoder_->is_finished();
-}
+bool RuntimeImage::is_decode_finished() const { return this->is_decoding() && this->decoder_->is_finished(); }
 
 void RuntimeImage::release() {
   this->release_buffer_();
-  // Reset decoder separately — release() can be called from within the decoder
-  // (via set_size -> resize -> resize_buffer_), so we must not destroy the decoder here.
-  // The decoder lifecycle is managed by begin_decode()/end_decode().
-  this->decoder_ = nullptr;
+  // End any active decode session; decoders free the format-specific working buffers
+  // they can (PNG), while the decoder object itself is kept warm for the next decode.
+  if (this->decoder_) {
+    this->decoder_->reset();
+  }
 }
 
 void RuntimeImage::release_buffer_() {
@@ -347,8 +349,9 @@ size_t RuntimeImage::get_buffer_size(int width, int height) const {
 
 int RuntimeImage::get_position_(int x, int y) const { return (x + y * this->buffer_width_) * this->get_bpp() / 8; }
 
-std::unique_ptr<ImageDecoder> RuntimeImage::create_decoder_() {
-  switch (this->format_) {
+std::unique_ptr<ImageDecoder> RuntimeImage::create_decoder_(ImageFormat format) {
+  ESP_LOGV(TAG, "Creating decoder for format %d", format);
+  switch (format) {
 #ifdef USE_RUNTIME_IMAGE_BMP
     case BMP:
       return make_unique<BmpDecoder>(this);
@@ -362,7 +365,7 @@ std::unique_ptr<ImageDecoder> RuntimeImage::create_decoder_() {
       return make_unique<PngDecoder>(this);
 #endif
     default:
-      ESP_LOGE(TAG, "Unsupported image format: %d", this->format_);
+      ESP_LOGE(TAG, "Unsupported image format: %d", format);
       return nullptr;
   }
 }
diff --git a/esphome/components/runtime_image/runtime_image.h b/esphome/components/runtime_image/runtime_image.h
index 10ce980be2..cfac253fdb 100644
--- a/esphome/components/runtime_image/runtime_image.h
+++ b/esphome/components/runtime_image/runtime_image.h
@@ -3,25 +3,11 @@
 #include "esphome/components/image/image.h"
 #include "esphome/core/helpers.h"
 
+#include "image_decoder.h"
+#include "image_format.h"
+
 namespace esphome::runtime_image {
 
-// Forward declaration
-class ImageDecoder;
-
-/**
- * @brief Image format types that can be decoded dynamically.
- */
-enum ImageFormat {
-  /** Automatically detect from data. Not implemented yet. */
-  AUTO,
-  /** JPEG format. */
-  JPEG,
-  /** PNG format. */
-  PNG,
-  /** BMP format. */
-  BMP,
-};
-
 /**
  * @brief A dynamic image that can be loaded and decoded at runtime.
  *
@@ -99,7 +85,7 @@ class RuntimeImage : public image::Image {
   /**
    * @brief Check if decoding is currently in progress.
    */
-  bool is_decoding() const { return this->decoder_ != nullptr; }
+  bool is_decoding() const { return this->decoder_ != nullptr && this->decoder_->is_active(); }
 
   /**
    * @brief Check if the decoder has finished processing all data.
@@ -120,9 +106,10 @@ class RuntimeImage : public image::Image {
   ImageFormat get_format() const { return this->format_; }
 
   /**
-   * @brief Release the image buffer and free memory.
+   * @brief Release the image buffer and free its memory, ending any decode session.
    *
-   * An external buffer is let go of rather than freed.
+   * An external buffer is let go of rather than freed. The decoder object is kept
+   * warm so the next decode can reuse it without churning the heap.
    */
   void release();
 
@@ -194,9 +181,11 @@ class RuntimeImage : public image::Image {
   int get_position_(int x, int y) const;
 
   /**
-   * @brief Create decoder instance for the image's format.
+   * @brief Create decoder instance for the requested format.
+   * @param format The image format to decode.
+   * @return Unique pointer to the created decoder, or nullptr on failure.
    */
-  std::unique_ptr<ImageDecoder> create_decoder_();
+  std::unique_ptr<ImageDecoder> create_decoder_(ImageFormat format);
 
   // Memory management
   uint8_t *buffer_{nullptr};
@@ -224,7 +213,6 @@ class RuntimeImage : public image::Image {
   int buffer_height_{0};
 
   // Decoding state
-  size_t total_size_{0};
   size_t decoded_bytes_{0};
 
   /** Fixed width requested on configuration, or 0 if not specified. */
diff --git a/esphome/components/sendspin/image/sendspin_image.cpp b/esphome/components/sendspin/image/sendspin_image.cpp
index 626d7966b7..558a292d5b 100644
--- a/esphome/components/sendspin/image/sendspin_image.cpp
+++ b/esphome/components/sendspin/image/sendspin_image.cpp
@@ -86,8 +86,8 @@ void SendspinImageSlot::on_decode_(const uint8_t *data, size_t length) {
   }
 
   const bool decoded = this->decode_frame_(data, length, target);
-  // Drops any half-finished decoder. An external buffer is let go of rather than freed, so this is
-  // safe on every path.
+  // Ends any half-finished decode session (the decoder object is kept for reuse). An external
+  // buffer is let go of rather than freed, so this is safe on every path.
   this->decode_sink_.release();
 
   if (!decoded) {
diff --git a/tests/components/runtime_image/__init__.py b/tests/components/runtime_image/__init__.py
new file mode 100644
index 0000000000..a8ff4bb68e
--- /dev/null
+++ b/tests/components/runtime_image/__init__.py
@@ -0,0 +1,15 @@
+from esphome.components.runtime_image import enable_format
+from esphome.types import ConfigType
+from tests.testing_helpers import ComponentManifestOverride
+
+
+def override_manifest(manifest: ComponentManifestOverride) -> None:
+    # to_code is suppressed in cpptest builds; formats are normally enabled by
+    # process_runtime_image_config(). Enable all formats so the format-switch
+    # tests have two decoder types and every retained decoder is under test.
+    async def to_code_testing(config: ConfigType) -> None:
+        enable_format("BMP")
+        enable_format("PNG")
+        enable_format("JPEG")
+
+    manifest.to_code = to_code_testing
diff --git a/tests/components/runtime_image/test_decoder_reuse.cpp b/tests/components/runtime_image/test_decoder_reuse.cpp
new file mode 100644
index 0000000000..87e77b00be
--- /dev/null
+++ b/tests/components/runtime_image/test_decoder_reuse.cpp
@@ -0,0 +1,336 @@
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <algorithm>
+#include <array>
+#include <cstring>
+#include <vector>
+
+#include "esphome/components/runtime_image/image_decoder.h"
+#include "esphome/components/runtime_image/runtime_image.h"
+
+namespace esphome::runtime_image::testing {
+
+// 3x2 24bpp BMP, every pixel a unique color (rows padded to 4 bytes)
+static const uint8_t BMP_24BPP[] = {
+    0x42, 0x4D, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00,
+    0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xC4, 0x0E, 0x00, 0x00, 0xC4, 0x0E, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x22, 0x11, 0x77, 0x88, 0x99, 0xEF, 0xCD, 0xAB, 0x00,
+    0x00, 0x00, 0x20, 0x10, 0xE0, 0x40, 0xC0, 0x30, 0xA0, 0x60, 0x50, 0x00, 0x00, 0x00,
+};
+
+static const uint8_t BMP_24BPP_EXPECTED[2][3][3] = {
+    {{0xE0, 0x10, 0x20}, {0x30, 0xC0, 0x40}, {0x50, 0x60, 0xA0}},
+    {{0x11, 0x22, 0x33}, {0x99, 0x88, 0x77}, {0xAB, 0xCD, 0xEF}},
+};
+
+// 3x2 8bpp BMP with a 4-entry color table
+static const uint8_t BMP_8BPP[] = {
+    0x42, 0x4D, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0x28, 0x00,
+    0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x13, 0x0B, 0x00, 0x00, 0x13, 0x0B, 0x00, 0x00, 0x04, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x20, 0x10, 0x00, 0xD0, 0xE0, 0xF0, 0x00, 0x00, 0xFF,
+    0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x01, 0x02, 0x00,
+};
+
+static const uint8_t BMP_8BPP_EXPECTED[2][3][3] = {
+    {{0x10, 0x20, 0x30}, {0xF0, 0xE0, 0xD0}, {0x00, 0xFF, 0x00}},
+    {{0xFF, 0x00, 0xFF}, {0x00, 0xFF, 0x00}, {0xF0, 0xE0, 0xD0}},
+};
+
+// 3x2 8bpp BMP with an 8-entry color table, all colors distinct from BMP_8BPP's
+static const uint8_t BMP_8BPP_BIG[] = {
+    0x42, 0x4D, 0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x03,
+    0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+    0x13, 0x0B, 0x00, 0x00, 0x13, 0x0B, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x18, 0x08,
+    0x00, 0xA8, 0xB8, 0xC8, 0x00, 0xFF, 0x80, 0x00, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x00, 0x80, 0xFF, 0x00, 0x55, 0x99,
+    0x11, 0x00, 0xCC, 0x00, 0x66, 0x00, 0x44, 0x22, 0xEE, 0x00, 0x01, 0x06, 0x04, 0x00, 0x07, 0x05, 0x03, 0x00,
+};
+
+static const uint8_t BMP_8BPP_BIG_EXPECTED[2][3][3] = {
+    {{0xEE, 0x22, 0x44}, {0x11, 0x99, 0x55}, {0x80, 0xFF, 0x00}},
+    {{0xC8, 0xB8, 0xA8}, {0x66, 0x00, 0xCC}, {0xFF, 0x80, 0x00}},
+};
+
+// 4x4 RGB PNG, every pixel a unique color
+static const uint8_t PNG_RGB[] = {
+    0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00,
+    0x04, 0x00, 0x00, 0x00, 0x04, 0x08, 0x02, 0x00, 0x00, 0x00, 0x26, 0x93, 0x09, 0x29, 0x00, 0x00, 0x00, 0x38, 0x49,
+    0x44, 0x41, 0x54, 0x78, 0x9C, 0x63, 0x60, 0x64, 0x62, 0x16, 0x50, 0x30, 0x58, 0xB0, 0xE1, 0xC0, 0xFF, 0xFF, 0x0C,
+    0x0C, 0x0E, 0x0C, 0x50, 0xEC, 0xE0, 0xE0, 0xC0, 0x50, 0xCF, 0xF0, 0x9F, 0xA1, 0xFE, 0xFF, 0xFF, 0x7A, 0x86, 0xFA,
+    0xFF, 0x0C, 0x0C, 0x42, 0x26, 0x61, 0xA9, 0xCE, 0x8A, 0xFF, 0xEE, 0xEC, 0x5A, 0x7D, 0xF6, 0x3D, 0x00, 0x81, 0xCB,
+    0x12, 0x4D, 0xB3, 0xFB, 0xD4, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4E, 0x44, 0xAE, 0x42, 0x60, 0x82,
+};
+
+static const uint8_t PNG_RGB_EXPECTED[4][4][3] = {
+    {{0x01, 0x02, 0x03}, {0x10, 0x20, 0x30}, {0xA0, 0xB0, 0xC0}, {0xFF, 0xFF, 0x00}},
+    {{0x40, 0x00, 0x00}, {0x00, 0x40, 0x00}, {0x00, 0x00, 0x40}, {0x40, 0x40, 0x40}},
+    {{0x7F, 0x00, 0xFF}, {0x00, 0x7F, 0xFF}, {0xFF, 0x7F, 0x00}, {0x7F, 0xFF, 0x00}},
+    {{0x12, 0x34, 0x56}, {0x65, 0x43, 0x21}, {0xFE, 0xDC, 0xBA}, {0xAB, 0xCD, 0xEF}},
+};
+
+/// Exposes the protected decoder machinery so reuse and eviction can be observed directly.
+class TestableRuntimeImage : public RuntimeImage {
+ public:
+  explicit TestableRuntimeImage(ImageFormat format)
+      : RuntimeImage(format, image::IMAGE_TYPE_RGB, image::TRANSPARENCY_OPAQUE, nullptr, false, 0, 0) {}
+
+  ImageDecoder *decoder() { return this->decoder_.get(); }
+
+  /// Simulates the state a dynamic-format producer (PR #16337) would leave behind:
+  /// a cached decoder whose format no longer matches the image's format.
+  /// TODO: once #16337 adds a public way to change the format, drive the mismatch
+  /// through it and delete this seam.
+  void plant_decoder(ImageFormat format) { this->decoder_ = this->create_decoder_(format); }
+};
+
+/// Runs one full decode session. Returns true when every stage succeeded.
+static bool decode_all(TestableRuntimeImage &img, const uint8_t *data, size_t len) {
+  std::vector<uint8_t> buffer(data, data + len);  // feed_data needs mutable bytes
+  if (!img.begin_decode(len)) {
+    return false;
+  }
+  size_t offset = 0;
+  while (offset < len) {
+    int consumed = img.feed_data(buffer.data() + offset, len - offset);
+    if (consumed <= 0) {
+      return false;  // decode error, or no progress despite full data
+    }
+    offset += consumed;
+  }
+  return img.end_decode();
+}
+
+/// Feeds the image the way online_image's download loop does: append a small
+/// chunk to a window, feed the window, drop what was consumed, repeat. A zero
+/// return mid-stream means "need more data" and grows the window.
+static bool decode_chunked(TestableRuntimeImage &img, const uint8_t *data, size_t len, size_t chunk_size) {
+  if (!img.begin_decode(len)) {
+    return false;
+  }
+  std::vector<uint8_t> window;
+  size_t supplied = 0;
+  while (supplied < len || !window.empty()) {
+    if (supplied < len) {
+      size_t take = std::min(chunk_size, len - supplied);
+      window.insert(window.end(), data + supplied, data + supplied + take);
+      supplied += take;
+    }
+    int consumed = img.feed_data(window.data(), window.size());
+    if (consumed < 0 || (consumed == 0 && supplied >= len)) {
+      return false;  // decode error, or stuck with all data supplied
+    }
+    window.erase(window.begin(), window.begin() + consumed);
+  }
+  return img.end_decode();
+}
+
+template<size_t H, size_t W> static void expect_pixels(TestableRuntimeImage &img, const uint8_t (&expected)[H][W][3]) {
+  ASSERT_EQ(img.get_width(), static_cast<int>(W));
+  ASSERT_EQ(img.get_height(), static_cast<int>(H));
+  for (size_t y = 0; y < H; y++) {
+    for (size_t x = 0; x < W; x++) {
+      SCOPED_TRACE(::testing::Message() << "pixel (" << x << "," << y << ")");
+      Color color = img.get_pixel(x, y);
+      EXPECT_THAT((std::array<uint8_t, 3>{color.r, color.g, color.b}), ::testing::ElementsAreArray(expected[y][x]));
+    }
+  }
+}
+
+TEST(RuntimeImageDecoder, DecoderStaysWarmAcrossDecodes) {
+  TestableRuntimeImage img(BMP);
+
+  ASSERT_TRUE(decode_all(img, BMP_24BPP, sizeof(BMP_24BPP)));
+  expect_pixels(img, BMP_24BPP_EXPECTED);
+  ImageDecoder *first = img.decoder();
+  ASSERT_NE(first, nullptr);
+
+  ASSERT_TRUE(decode_all(img, BMP_24BPP, sizeof(BMP_24BPP)));
+  expect_pixels(img, BMP_24BPP_EXPECTED);
+  EXPECT_EQ(img.decoder(), first) << "decoder must be reused, not reallocated";
+}
+
+TEST(RuntimeImageDecoder, SecondDecodeStartsClean) {
+  TestableRuntimeImage img(BMP);
+
+  // Palettized decode, then a 24bpp decode, then palettized again, all on the
+  // same decoder: each session must produce correct pixels for its own image.
+  ASSERT_TRUE(decode_all(img, BMP_8BPP, sizeof(BMP_8BPP)));
+  expect_pixels(img, BMP_8BPP_EXPECTED);
+  ImageDecoder *first = img.decoder();
+
+  ASSERT_TRUE(decode_all(img, BMP_24BPP, sizeof(BMP_24BPP)));
+  expect_pixels(img, BMP_24BPP_EXPECTED);
+  EXPECT_EQ(img.decoder(), first);
+
+  ASSERT_TRUE(decode_all(img, BMP_8BPP, sizeof(BMP_8BPP)));
+  expect_pixels(img, BMP_8BPP_EXPECTED);
+  EXPECT_EQ(img.decoder(), first);
+}
+
+TEST(RuntimeImageDecoder, ColorTableGrowsAndShrinksAcrossReuse) {
+  TestableRuntimeImage img(BMP);
+
+  // Small palette first: the retained table is allocated at 4 entries.
+  ASSERT_TRUE(decode_all(img, BMP_8BPP, sizeof(BMP_8BPP)));
+  expect_pixels(img, BMP_8BPP_EXPECTED);
+  ImageDecoder *first = img.decoder();
+
+  // Growing to 8 entries on the reused decoder must reallocate, not overflow.
+  ASSERT_TRUE(decode_all(img, BMP_8BPP_BIG, sizeof(BMP_8BPP_BIG)));
+  expect_pixels(img, BMP_8BPP_BIG_EXPECTED);
+  EXPECT_EQ(img.decoder(), first);
+
+  // Shrinking back must not surface stale colors from the larger table.
+  ASSERT_TRUE(decode_all(img, BMP_8BPP, sizeof(BMP_8BPP)));
+  expect_pixels(img, BMP_8BPP_EXPECTED);
+  EXPECT_EQ(img.decoder(), first);
+}
+
+TEST(RuntimeImageDecoder, ChunkedFeedDecodesLikeDownloadLoop) {
+  TestableRuntimeImage img(BMP);
+
+  ASSERT_TRUE(decode_chunked(img, BMP_24BPP, sizeof(BMP_24BPP), 16));
+  expect_pixels(img, BMP_24BPP_EXPECTED);
+  ImageDecoder *first = img.decoder();
+
+  // Chunked again on the warm decoder: the cross-call resume state
+  // (current_index_ / paint_index_) must have been fully reset.
+  ASSERT_TRUE(decode_chunked(img, BMP_24BPP, sizeof(BMP_24BPP), 16));
+  expect_pixels(img, BMP_24BPP_EXPECTED);
+  EXPECT_EQ(img.decoder(), first);
+}
+
+TEST(RuntimeImageDecoder, FormatSwitchEvictsMismatchedDecoder) {
+  // PNG image holding a stale BMP decoder: begin_decode must evict and recreate.
+  TestableRuntimeImage png_img(PNG);
+  png_img.plant_decoder(BMP);
+  ASSERT_NE(png_img.decoder(), nullptr);
+  ASSERT_EQ(png_img.decoder()->get_format(), BMP);
+
+  ASSERT_TRUE(decode_all(png_img, PNG_RGB, sizeof(PNG_RGB)));
+  EXPECT_EQ(png_img.decoder()->get_format(), PNG);
+  expect_pixels(png_img, PNG_RGB_EXPECTED);
+
+  // And the other direction: BMP image holding a stale PNG decoder.
+  TestableRuntimeImage bmp_img(BMP);
+  bmp_img.plant_decoder(PNG);
+  ASSERT_NE(bmp_img.decoder(), nullptr);
+  ASSERT_EQ(bmp_img.decoder()->get_format(), PNG);
+
+  ASSERT_TRUE(decode_all(bmp_img, BMP_24BPP, sizeof(BMP_24BPP)));
+  EXPECT_EQ(bmp_img.decoder()->get_format(), BMP);
+  expect_pixels(bmp_img, BMP_24BPP_EXPECTED);
+}
+
+TEST(RuntimeImageDecoder, ReleaseKeepsDecoderWarm) {
+  TestableRuntimeImage img(PNG);
+
+  ASSERT_TRUE(decode_all(img, PNG_RGB, sizeof(PNG_RGB)));
+  ImageDecoder *first = img.decoder();
+  ASSERT_NE(first, nullptr);
+
+  img.release();
+  EXPECT_EQ(img.decoder(), first) << "release() must keep the decoder for reuse";
+  EXPECT_FALSE(img.is_decoding());
+  EXPECT_EQ(img.get_width(), 0);
+  EXPECT_EQ(img.get_height(), 0);
+
+  ASSERT_TRUE(decode_all(img, PNG_RGB, sizeof(PNG_RGB)));
+  expect_pixels(img, PNG_RGB_EXPECTED);
+  EXPECT_EQ(img.decoder(), first);
+}
+
+TEST(RuntimeImageDecoder, FailedDecodeRecovers) {
+  TestableRuntimeImage img(BMP);
+
+  uint8_t garbage[32];
+  memset(garbage, 'X', sizeof(garbage));
+  ASSERT_TRUE(img.begin_decode(sizeof(garbage)));
+  EXPECT_LT(img.feed_data(garbage, sizeof(garbage)), 0) << "garbage must fail to decode";
+  img.release();
+
+  ASSERT_TRUE(decode_all(img, BMP_24BPP, sizeof(BMP_24BPP)));
+  expect_pixels(img, BMP_24BPP_EXPECTED);
+}
+
+#ifdef USE_RUNTIME_IMAGE_JPEG
+// 8x8 gradient JPEG (quality 90). JPEG is lossy, so the test asserts that a
+// reused decoder reproduces the exact same pixels, not absolute colors.
+static const uint8_t JPEG_GRADIENT[] = {
+    0xFF, 0xD8, 0xFF, 0xE0, 0x00, 0x10, 0x4A, 0x46, 0x49, 0x46, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00,
+    0x00, 0xFF, 0xDB, 0x00, 0x43, 0x00, 0x03, 0x02, 0x02, 0x03, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x03, 0x03,
+    0x04, 0x05, 0x08, 0x05, 0x05, 0x04, 0x04, 0x05, 0x0A, 0x07, 0x07, 0x06, 0x08, 0x0C, 0x0A, 0x0C, 0x0C, 0x0B, 0x0A,
+    0x0B, 0x0B, 0x0D, 0x0E, 0x12, 0x10, 0x0D, 0x0E, 0x11, 0x0E, 0x0B, 0x0B, 0x10, 0x16, 0x10, 0x11, 0x13, 0x14, 0x15,
+    0x15, 0x15, 0x0C, 0x0F, 0x17, 0x18, 0x16, 0x14, 0x18, 0x12, 0x14, 0x15, 0x14, 0xFF, 0xDB, 0x00, 0x43, 0x01, 0x03,
+    0x04, 0x04, 0x05, 0x04, 0x05, 0x09, 0x05, 0x05, 0x09, 0x14, 0x0D, 0x0B, 0x0D, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14,
+    0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14,
+    0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14,
+    0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0xFF, 0xC0, 0x00, 0x11, 0x08, 0x00, 0x08, 0x00, 0x08, 0x03, 0x01, 0x22, 0x00,
+    0x02, 0x11, 0x01, 0x03, 0x11, 0x01, 0xFF, 0xC4, 0x00, 0x1F, 0x00, 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A,
+    0x0B, 0xFF, 0xC4, 0x00, 0xB5, 0x10, 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03, 0x05, 0x05, 0x04, 0x04, 0x00,
+    0x00, 0x01, 0x7D, 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
+    0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1, 0x08, 0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 0xD1, 0xF0, 0x24, 0x33, 0x62,
+    0x72, 0x82, 0x09, 0x0A, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A,
+    0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x83, 0x84, 0x85,
+    0x86, 0x87, 0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6,
+    0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
+    0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+    0xE8, 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFF, 0xC4, 0x00, 0x1F, 0x01, 0x00,
+    0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03,
+    0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0xFF, 0xC4, 0x00, 0xB5, 0x11, 0x00, 0x02, 0x01, 0x02, 0x04, 0x04,
+    0x03, 0x04, 0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77, 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31,
+    0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, 0xA1, 0xB1, 0xC1, 0x09,
+    0x23, 0x33, 0x52, 0xF0, 0x15, 0x62, 0x72, 0xD1, 0x0A, 0x16, 0x24, 0x34, 0xE1, 0x25, 0xF1, 0x17, 0x18, 0x19, 0x1A,
+    0x26, 0x27, 0x28, 0x29, 0x2A, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A,
+    0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75,
+    0x76, 0x77, 0x78, 0x79, 0x7A, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7,
+    0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8,
+    0xD9, 0xDA, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9,
+    0xFA, 0xFF, 0xDA, 0x00, 0x0C, 0x03, 0x01, 0x00, 0x02, 0x11, 0x03, 0x11, 0x00, 0x3F, 0x00, 0xE5, 0x3E, 0x0B, 0xFE,
+    0xC8, 0x7F, 0xEA, 0x3F, 0xD0, 0xBD, 0x3F, 0x86, 0x8A, 0x28, 0xAA, 0xC2, 0x62, 0x6A, 0xFB, 0x25, 0xA9, 0xD5, 0xC0,
+    0x7C, 0x6B, 0x9D, 0x7F, 0x62, 0xD3, 0xFD, 0xEF, 0xF5, 0xF7, 0x9F, 0xFF, 0xD9,
+};
+
+static std::vector<uint8_t> pixel_bytes(TestableRuntimeImage &img) {
+  const uint8_t *start = img.get_data_start();
+  return std::vector<uint8_t>(start, start + img.get_width_stride() * img.get_height());
+}
+
+TEST(RuntimeImageDecoder, JpegDecoderStaysWarmAcrossDecodes) {
+  TestableRuntimeImage img(JPEG);
+
+  ASSERT_TRUE(decode_all(img, JPEG_GRADIENT, sizeof(JPEG_GRADIENT)));
+  ASSERT_EQ(img.get_width(), 8);
+  ASSERT_EQ(img.get_height(), 8);
+  std::vector<uint8_t> first_pixels = pixel_bytes(img);
+  ImageDecoder *first = img.decoder();
+  ASSERT_NE(first, nullptr);
+
+  ASSERT_TRUE(decode_all(img, JPEG_GRADIENT, sizeof(JPEG_GRADIENT)));
+  EXPECT_EQ(img.decoder(), first);
+  EXPECT_EQ(pixel_bytes(img), first_pixels) << "reused decoder must reproduce identical pixels";
+}
+#endif  // USE_RUNTIME_IMAGE_JPEG
+
+TEST(RuntimeImageDecoder, SessionFlagsTrackLifecycle) {
+  TestableRuntimeImage img(BMP);
+  std::vector<uint8_t> buffer(BMP_24BPP, BMP_24BPP + sizeof(BMP_24BPP));
+
+  ASSERT_TRUE(img.begin_decode(buffer.size()));
+  EXPECT_TRUE(img.is_decoding());
+  EXPECT_FALSE(img.is_decode_finished());
+
+  ASSERT_EQ(img.feed_data(buffer.data(), buffer.size()), static_cast<int>(buffer.size()));
+  EXPECT_TRUE(img.is_decode_finished()) << "all pixel data consumed";
+
+  ASSERT_TRUE(img.end_decode());
+  EXPECT_FALSE(img.is_decoding()) << "end_decode() must close the session";
+  EXPECT_FALSE(img.is_decode_finished()) << "no session means nothing is 'finished'";
+}
+
+}  // namespace esphome::runtime_image::testing

From 46f90d0c54af2ce42af6aa55dcdcdbaf2717e5ae Mon Sep 17 00:00:00 2001
From: guillempages <guillempages@users.noreply.github.com>
Date: Fri, 21 Aug 2026 00:28:17 +0200
Subject: [PATCH 029/155] [core] Add portable strcasestr implementation named
 str_contains_ignore_case (#18497)

Co-authored-by: J. Nick Koston <nick@koston.org>
---
 esphome/components/audio/audio.cpp     |  2 +-
 esphome/core/helpers.cpp               | 13 ++++++++
 esphome/core/helpers.h                 | 19 +++++++++++
 tests/components/core/helpers_test.cpp | 46 ++++++++++++++++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/esphome/components/audio/audio.cpp b/esphome/components/audio/audio.cpp
index b0aa3c1abb..402e741059 100644
--- a/esphome/components/audio/audio.cpp
+++ b/esphome/components/audio/audio.cpp
@@ -86,7 +86,7 @@ AudioFileType detect_audio_file_type(const char *content_type, const char *url)
     // Match "audio/ogg" with a codecs parameter containing "opus"
     // Valid forms: audio/ogg;codecs=opus, audio/ogg; codecs="opus", etc.
     // Plain "audio/ogg" without opus is not matched (almost always Ogg Vorbis)
-    if (strncasecmp(content_type, "audio/ogg", 9) == 0 && strcasestr(content_type + 9, "opus") != nullptr) {
+    if (strncasecmp(content_type, "audio/ogg", 9) == 0 && str_contains_ignore_case(content_type + 9, "opus")) {
       return AudioFileType::OPUS;
     }
 #endif
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index bd08d3b63e..a276020be4 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -220,6 +220,19 @@ bool str_endswith_ignore_case(const char *str, size_t str_len, const char *suffi
   return strncasecmp(str + str_len - suffix_len, suffix, suffix_len) == 0;
 }
 
+bool str_contains_ignore_case_fallback(const char *haystack, const char *needle) {
+  const size_t needle_len = strlen(needle);
+  if (needle_len == 0) {
+    return true;
+  }
+  for (const char *p = haystack; *p != '\0'; p++) {
+    if (strncasecmp(p, needle, needle_len) == 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
 // str_truncate, str_until, str_lower_case, str_upper_case, str_snake_case moved to alloc_helpers.cpp
 char *str_sanitize_to(char *buffer, size_t buffer_size, const char *str) {
   if (buffer_size == 0) {
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 994fa2c26a..5a9c120b84 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -981,6 +981,25 @@ inline bool str_endswith_ignore_case(const std::string &str, const char *suffix)
   return str_endswith_ignore_case(str.c_str(), str.size(), suffix, strlen(suffix));
 }
 
+/// Fallback implementation for case insensitive substring comparison.
+bool str_contains_ignore_case_fallback(const char *haystack, const char *needle);
+
+/// Case-insensitive check if needle string is contained in haystack (no heap allocation).
+inline bool str_contains_ignore_case(const char *haystack, const char *needle) {
+  if (!needle || !haystack) {
+    return false;
+  }
+
+// strcasestr is a GNU extension: newlib only declares it when _GNU_SOURCE is set.
+// ESP32/ESP8266/host builds get it from their framework or from g++ on Linux;
+// LibreTiny, RP2 and Zephyr do not, so they use the hand-rolled fallback.
+#if defined(USE_LIBRETINY) || defined(USE_RP2) || defined(USE_ZEPHYR)
+  return str_contains_ignore_case_fallback(haystack, needle);
+#else   // defined(USE_LIBRETINY) || defined(USE_RP2) || defined(USE_ZEPHYR)
+  return strcasestr(haystack, needle) != nullptr;
+#endif  // defined(USE_LIBRETINY) || defined(USE_RP2) || defined(USE_ZEPHYR)
+}
+
 // str_truncate moved to alloc_helpers.h - remove this include before 2026.11.0
 
 // str_until, str_lower_case, str_upper_case moved to alloc_helpers.h - remove this comment before 2026.11.0
diff --git a/tests/components/core/helpers_test.cpp b/tests/components/core/helpers_test.cpp
index a9a940392f..d5219f9d47 100644
--- a/tests/components/core/helpers_test.cpp
+++ b/tests/components/core/helpers_test.cpp
@@ -83,4 +83,50 @@ TEST(StaticVectorTest, ConvertingConstructorSameSize) {
   EXPECT_EQ(dst[2], 3);
 }
 
+TEST(StringContainsIgnoreCaseTest, NullPointerAlwaysFalse) {
+  const char *haystack = nullptr;
+  const char *needle = nullptr;
+
+  EXPECT_FALSE(str_contains_ignore_case(haystack, needle));
+  EXPECT_FALSE(str_contains_ignore_case("Hello World", needle));
+  EXPECT_FALSE(str_contains_ignore_case(haystack, "anything"));
+}
+
+TEST(StringContainsIgnoreCaseTest, EmptySearchMatches) {
+  const char *haystack = "Hello World";
+
+  EXPECT_TRUE(str_contains_ignore_case_fallback(haystack, ""));
+}
+
+TEST(StringContainsIgnoreCaseTest, MiscCaseMatches) {
+  const char *haystack = "Hello World";
+
+  EXPECT_TRUE(str_contains_ignore_case_fallback(haystack, "Hello"));
+  EXPECT_TRUE(str_contains_ignore_case_fallback(haystack, "hello"));
+  EXPECT_TRUE(str_contains_ignore_case_fallback(haystack, "HELLO"));
+  EXPECT_TRUE(str_contains_ignore_case_fallback(haystack, "hELLO"));
+}
+
+TEST(StringContainsIgnoreCaseTest, MiscNotMatching) {
+  const char *haystack = "Hello World";
+
+  // Expected to match
+  EXPECT_TRUE(str_contains_ignore_case_fallback(haystack, "Hell"));
+
+  // Expected not to match
+  EXPECT_FALSE(str_contains_ignore_case_fallback(haystack, "Heaven"));
+  EXPECT_FALSE(str_contains_ignore_case_fallback(haystack, "Hello!"));
+  EXPECT_FALSE(str_contains_ignore_case_fallback(haystack, "world!"));
+}
+
+TEST(StringContainsIgnoreCaseTest, FallbackMatchesLibc) {
+  const char *haystack = "Hello World";
+  for (const char *needle : {"", "Hello", "hELLO", "Hell", "world", "Heaven", "Hello!", "d"}) {
+    EXPECT_EQ(str_contains_ignore_case_fallback(haystack, needle), str_contains_ignore_case(haystack, needle))
+        << "needle: " << needle;
+  }
+  EXPECT_EQ(str_contains_ignore_case_fallback("", ""), str_contains_ignore_case("", ""));
+  EXPECT_EQ(str_contains_ignore_case_fallback("ab", "abc"), str_contains_ignore_case("ab", "abc"));
+}
+
 }  // namespace esphome

From 52bfc0efb1c574324910c5d0c1de628a4bcc1147 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 20 Aug 2026 18:06:23 -0500
Subject: [PATCH 030/155] [espnow] Fix dump_config crash when enable_on_boot is
 false (#18572)

---
 esphome/components/espnow/espnow_component.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/esphome/components/espnow/espnow_component.cpp b/esphome/components/espnow/espnow_component.cpp
index df9a1b8668..ecf0f79e4a 100644
--- a/esphome/components/espnow/espnow_component.cpp
+++ b/esphome/components/espnow/espnow_component.cpp
@@ -129,14 +129,17 @@ void on_data_received(const esp_now_recv_info_t *info, const uint8_t *data, int
 ESPNowComponent::ESPNowComponent() { global_esp_now = this; }
 
 void ESPNowComponent::dump_config() {
-  uint32_t version = 0;
-  esp_now_get_version(&version);
-
   ESP_LOGCONFIG(TAG, "espnow:");
-  if (this->is_disabled()) {
-    ESP_LOGCONFIG(TAG, "  Disabled");
+  // Only report driver details once enabled; with enable_on_boot: false the
+  // Wi-Fi driver is not initialized yet and esp_now_get_version() would crash,
+  // and after a failed enable_() the values would be meaningless.
+  if (this->state_ != ESPNOW_STATE_ENABLED) {
+    // OFF here means enable_() failed; the core logs the FAILED marker separately
+    ESP_LOGCONFIG(TAG, "  %s", this->is_disabled() ? LOG_STR_LITERAL("Disabled") : LOG_STR_LITERAL("Not enabled"));
     return;
   }
+  uint32_t version = 0;
+  esp_now_get_version(&version);
   char own_addr_buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
   format_mac_addr_upper(this->own_address_, own_addr_buf);
   ESP_LOGCONFIG(TAG,

From 7957808f00eec1eac78e40cd59dac8815ae7c55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Metrich?=
 <45318189+FredM67@users.noreply.github.com>
Date: Fri, 21 Aug 2026 16:57:58 +0200
Subject: [PATCH 031/155] [emontx] Fix sensor state_class defaults not being
 applied correctly (#17610)

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 esphome/components/emontx/sensor/__init__.py  |  63 ++++++-----
 tests/component_tests/emontx/__init__.py      |   0
 .../emontx/test_sensor_defaults.py            | 100 ++++++++++++++++++
 tests/components/emontx/test.esp32-idf.yaml   |   3 +-
 tests/components/emontx/test.esp8266-ard.yaml |   3 +-
 tests/components/emontx/test.rp2040-ard.yaml  |   3 +-
 .../components/emontx/validate.esp32-idf.yaml |  73 +++++++++++++
 7 files changed, 213 insertions(+), 32 deletions(-)
 create mode 100644 tests/component_tests/emontx/__init__.py
 create mode 100644 tests/component_tests/emontx/test_sensor_defaults.py
 create mode 100644 tests/components/emontx/validate.esp32-idf.yaml

diff --git a/esphome/components/emontx/sensor/__init__.py b/esphome/components/emontx/sensor/__init__.py
index 83a972c5e0..967bc4e699 100644
--- a/esphome/components/emontx/sensor/__init__.py
+++ b/esphome/components/emontx/sensor/__init__.py
@@ -68,6 +68,7 @@ PATTERN_CONFIGS = {
     "PULSE": {
         CONF_UNIT_OF_MEASUREMENT: UNIT_PULSES,
         CONF_DEVICE_CLASS: DEVICE_CLASS_ENERGY,
+        CONF_STATE_CLASS: STATE_CLASS_TOTAL_INCREASING,
         CONF_ACCURACY_DECIMALS: 0,
     },
     "PF": {
@@ -78,12 +79,13 @@ PATTERN_CONFIGS = {
     },
 }
 
-# Create a base schema that's flexible for any tag
-BASE_SCHEMA = sensor.sensor_schema(
-    EmonTxSensor,
-    state_class=STATE_CLASS_MEASUREMENT,
-    accuracy_decimals=0,
-).extend(
+# BASE_SCHEMA intentionally omits state_class and accuracy_decimals defaults.
+# Passing them to sensor_schema() would register them via cv.Optional(key, default=...),
+# making them always present in the validated config dict and preventing
+# apply_tag_defaults from overriding them with the correct per-prefix values.
+# They are injected by apply_tag_defaults below, after running through
+# sensor.validate_state_class() so the value is code-generation-ready.
+BASE_SCHEMA = sensor.sensor_schema(EmonTxSensor).extend(
     {
         cv.GenerateID(CONF_EMONTX_ID): cv.use_id(EmonTx),
         cv.Required(CONF_TAG_NAME): cv.string,
@@ -91,34 +93,43 @@ BASE_SCHEMA = sensor.sensor_schema(
 )
 
 
+def _apply_defaults(config: ConfigType, defaults: dict) -> None:
+    """Inject defaults into config, skipping keys already set by the user.
+    state_class values are run through validate_state_class so they are
+    code-generation-ready, matching what sensor_schema() would normally do."""
+    for key, value in defaults.items():
+        if key not in config:
+            if key == CONF_STATE_CLASS:
+                value = sensor.validate_state_class(value)
+            config[key] = value
+
+
 def apply_tag_defaults(config: ConfigType) -> ConfigType:
     """Apply defaults based on tag prefix if applicable, but don't restrict any tags."""
     tag = config[CONF_TAG_NAME]
 
-    # Skip if tag is too short
-    if len(tag) < 2:
-        return config
+    if len(tag) >= 2:
+        tag_upper = tag.upper()
 
-    # Check if this tag starts with a known prefix
-    tag_upper = tag.upper()
+        for pattern, pattern_config in PATTERN_CONFIGS.items():
+            if tag_upper.startswith(pattern):
+                _apply_defaults(config, pattern_config)
+                return config
 
-    for pattern, pattern_config in PATTERN_CONFIGS.items():
-        if tag_upper.startswith(pattern):
-            # Apply pattern defaults if not overridden by user
-            for key, value in pattern_config.items():
-                if key not in config:
-                    config[key] = value
+        # Only apply defaults for known prefixes with numeric indices (e.g. E1, V2, T3)
+        prefix = tag_upper[0]
+        if prefix in SENSOR_CONFIGS and tag[1:].isdigit():
+            _apply_defaults(config, SENSOR_CONFIGS[prefix])
             return config
 
-    # Only apply defaults for known prefixes with numeric indices
-    prefix = tag_upper[0]
-    if prefix in SENSOR_CONFIGS and len(tag) > 1 and tag[1:].isdigit():
-        # Apply defaults for known tag types, but only if not overridden by user
-        defaults = SENSOR_CONFIGS[prefix]
-        for key, value in defaults.items():
-            if key not in config:
-                config[key] = value
-
+    # Fall back to generic defaults for tags with no known prefix
+    _apply_defaults(
+        config,
+        {
+            CONF_STATE_CLASS: STATE_CLASS_MEASUREMENT,
+            CONF_ACCURACY_DECIMALS: 0,
+        },
+    )
     return config
 
 
diff --git a/tests/component_tests/emontx/__init__.py b/tests/component_tests/emontx/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/component_tests/emontx/test_sensor_defaults.py b/tests/component_tests/emontx/test_sensor_defaults.py
new file mode 100644
index 0000000000..00d24d282e
--- /dev/null
+++ b/tests/component_tests/emontx/test_sensor_defaults.py
@@ -0,0 +1,100 @@
+"""Tests for emontx sensor tag defaults."""
+
+import pytest
+
+from esphome.components import sensor
+from esphome.components.emontx.sensor import CONFIG_SCHEMA, apply_tag_defaults
+from esphome.const import (
+    CONF_ACCURACY_DECIMALS,
+    CONF_STATE_CLASS,
+    STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_TOTAL_INCREASING,
+)
+
+
+def _resolve_via_config_schema(tag: str) -> dict:
+    """Run a minimal config through the real CONFIG_SCHEMA pipeline, the
+    same path a user's YAML goes through."""
+    return CONFIG_SCHEMA(
+        {"tag_name": tag, "emontx_id": "my_emontx", "name": f"{tag} sensor"}
+    )
+
+
+def test_config_schema_applies_tag_default_state_class():
+    """If sensor_schema(state_class=...) is reintroduced, the schema-level
+    default wins over apply_tag_defaults' per-prefix value, and E1 would
+    resolve to measurement instead of total_increasing. Driving the real
+    CONFIG_SCHEMA (not just apply_tag_defaults) catches that, since
+    sensor_schema() runs before apply_tag_defaults in the cv.All() chain.
+    """
+    result = _resolve_via_config_schema("E1")
+    assert result[CONF_STATE_CLASS] == sensor.validate_state_class(
+        STATE_CLASS_TOTAL_INCREASING
+    )
+
+
+def test_config_schema_applies_tag_default_accuracy_decimals():
+    """Same root cause as the state_class regression: reintroducing
+    sensor_schema(accuracy_decimals=...) would make V1 resolve to the
+    schema-level default instead of the prefix-specific value of 2.
+    """
+    result = _resolve_via_config_schema("V1")
+    assert result[CONF_ACCURACY_DECIMALS] == 2
+
+
+def _make_config(tag: str) -> dict:
+    """Minimal config dict with only tag_name set — no overrides."""
+    return {"tag_name": tag}
+
+
+@pytest.mark.parametrize(
+    ("tag", "expected_state_class", "expected_decimals"),
+    [
+        # Known numeric-index prefixes
+        ("E1", STATE_CLASS_TOTAL_INCREASING, 0),
+        ("E12", STATE_CLASS_TOTAL_INCREASING, 0),
+        ("P1", STATE_CLASS_MEASUREMENT, 0),
+        ("V1", STATE_CLASS_MEASUREMENT, 2),
+        ("I1", STATE_CLASS_MEASUREMENT, 2),
+        ("T1", STATE_CLASS_MEASUREMENT, 2),
+        # Known patterns
+        ("PULSE1", STATE_CLASS_TOTAL_INCREASING, 0),
+        ("PULSE12", STATE_CLASS_TOTAL_INCREASING, 0),
+        ("PF1", STATE_CLASS_MEASUREMENT, 2),
+        # Unknown / free-form tags fall back to generic defaults
+        ("CUSTOM1", STATE_CLASS_MEASUREMENT, 0),
+        ("X", STATE_CLASS_MEASUREMENT, 0),
+    ],
+)
+def test_apply_tag_defaults(tag, expected_state_class, expected_decimals):
+    """apply_tag_defaults must inject the correct state_class and accuracy_decimals
+    for each tag type when no user overrides are present."""
+    config = _make_config(tag)
+    result = apply_tag_defaults(config)
+
+    assert result[CONF_STATE_CLASS] == sensor.validate_state_class(expected_state_class)
+    assert result[CONF_ACCURACY_DECIMALS] == expected_decimals
+
+
+@pytest.mark.parametrize(
+    ("tag", "user_state_class", "user_decimals"),
+    [
+        # User overrides must not be clobbered by defaults
+        ("E1", STATE_CLASS_MEASUREMENT, 3),
+        ("PULSE1", STATE_CLASS_MEASUREMENT, 1),
+        ("V1", STATE_CLASS_TOTAL_INCREASING, 0),
+        ("CUSTOM1", STATE_CLASS_TOTAL_INCREASING, 4),
+    ],
+)
+def test_apply_tag_defaults_respects_user_overrides(
+    tag, user_state_class, user_decimals
+):
+    """apply_tag_defaults must not overwrite values already set by the user."""
+    config = _make_config(tag)
+    config[CONF_STATE_CLASS] = sensor.validate_state_class(user_state_class)
+    config[CONF_ACCURACY_DECIMALS] = user_decimals
+
+    result = apply_tag_defaults(config)
+
+    assert result[CONF_STATE_CLASS] == sensor.validate_state_class(user_state_class)
+    assert result[CONF_ACCURACY_DECIMALS] == user_decimals
diff --git a/tests/components/emontx/test.esp32-idf.yaml b/tests/components/emontx/test.esp32-idf.yaml
index a0784fcd53..e56b1bda5d 100644
--- a/tests/components/emontx/test.esp32-idf.yaml
+++ b/tests/components/emontx/test.esp32-idf.yaml
@@ -1,4 +1,3 @@
 packages:
   uart_115200: !include ../../test_build_components/common/uart_115200/esp32-idf.yaml
-
-<<: !include common.yaml
+  emontx: !include common.yaml
diff --git a/tests/components/emontx/test.esp8266-ard.yaml b/tests/components/emontx/test.esp8266-ard.yaml
index 80a2cb2fc0..9ec9377437 100644
--- a/tests/components/emontx/test.esp8266-ard.yaml
+++ b/tests/components/emontx/test.esp8266-ard.yaml
@@ -1,4 +1,3 @@
 packages:
   uart_115200: !include ../../test_build_components/common/uart_115200/esp8266-ard.yaml
-
-<<: !include common.yaml
+  emontx: !include common.yaml
diff --git a/tests/components/emontx/test.rp2040-ard.yaml b/tests/components/emontx/test.rp2040-ard.yaml
index 410c579d4b..6f4952d8e5 100644
--- a/tests/components/emontx/test.rp2040-ard.yaml
+++ b/tests/components/emontx/test.rp2040-ard.yaml
@@ -1,4 +1,3 @@
 packages:
   uart_115200: !include ../../test_build_components/common/uart_115200/rp2040-ard.yaml
-
-<<: !include common.yaml
+  emontx: !include common.yaml
diff --git a/tests/components/emontx/validate.esp32-idf.yaml b/tests/components/emontx/validate.esp32-idf.yaml
new file mode 100644
index 0000000000..7caee78a07
--- /dev/null
+++ b/tests/components/emontx/validate.esp32-idf.yaml
@@ -0,0 +1,73 @@
+packages:
+  uart_115200: !include ../../test_build_components/common/uart_115200/esp32-idf.yaml
+  emontx: !include common.yaml
+
+# Validate that each sensor type gets the correct default state_class,
+# unit_of_measurement, device_class, and accuracy_decimals when NO overrides
+# are provided. The values are intentionally omitted so apply_tag_defaults is
+# exercised, not the user-override path.
+
+sensor:
+  # Energy sensor (E prefix): expects state_class=total_increasing, unit=Wh,
+  # device_class=energy, accuracy_decimals=0
+  - platform: emontx
+    tag_name: E1
+    name: Energy 1
+    emontx_id: test_emontx
+
+  # Power sensor (P prefix): expects state_class=measurement, unit=W,
+  # device_class=power, accuracy_decimals=0
+  - platform: emontx
+    tag_name: P1
+    name: Power 1
+    emontx_id: test_emontx
+
+  # Voltage sensor (V prefix): expects state_class=measurement, unit=V,
+  # device_class=voltage, accuracy_decimals=2
+  - platform: emontx
+    tag_name: V1
+    name: Voltage 1
+    emontx_id: test_emontx
+
+  # Current sensor (I prefix): expects state_class=measurement, unit=A,
+  # device_class=current, accuracy_decimals=2
+  - platform: emontx
+    tag_name: I1
+    name: Current 1
+    emontx_id: test_emontx
+
+  # Temperature sensor (T prefix): expects state_class=measurement, unit=°C,
+  # device_class=temperature, accuracy_decimals=2
+  - platform: emontx
+    tag_name: T1
+    name: Temperature 1
+    emontx_id: test_emontx
+
+  # Pulse sensor (PULSE pattern): expects state_class=total_increasing,
+  # unit=pulses, device_class=energy, accuracy_decimals=0
+  - platform: emontx
+    tag_name: PULSE1
+    name: Pulse 1
+    emontx_id: test_emontx
+
+  # Power factor sensor (PF pattern): expects state_class=measurement,
+  # device_class=power_factor, accuracy_decimals=2
+  - platform: emontx
+    tag_name: PF1
+    name: Power Factor 1
+    emontx_id: test_emontx
+
+  # Unknown tag: no prefix match, falls back to state_class=measurement,
+  # accuracy_decimals=0
+  - platform: emontx
+    tag_name: CUSTOM1
+    name: Custom sensor
+    emontx_id: test_emontx
+
+  # User override: verify that explicit values are respected and not clobbered
+  - platform: emontx
+    tag_name: E2
+    name: Energy 2 (user override)
+    emontx_id: test_emontx
+    state_class: measurement
+    accuracy_decimals: 3

From 409d74a48da48ea3152c7d8aedb49f622123782f Mon Sep 17 00:00:00 2001
From: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
Date: Fri, 21 Aug 2026 11:53:44 -0400
Subject: [PATCH 032/155] [esp32_hosted] Fire on_update_available trigger when
 update is detected (#18591)

---
 .../esp32_hosted/update/esp32_hosted_update.cpp          | 9 +++++++++
 .../esp32_hosted/test-embedded.esp32-p4-idf.yaml         | 3 +++
 .../components/esp32_hosted/test-http.esp32-p4-idf.yaml  | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/esphome/components/esp32_hosted/update/esp32_hosted_update.cpp b/esphome/components/esp32_hosted/update/esp32_hosted_update.cpp
index 351b0869b0..4eb5d1745b 100644
--- a/esphome/components/esp32_hosted/update/esp32_hosted_update.cpp
+++ b/esphome/components/esp32_hosted/update/esp32_hosted_update.cpp
@@ -135,6 +135,10 @@ void Esp32HostedUpdate::setup() {
   // Publish state
   this->status_clear_error();
   this->publish_state();
+  // Defer so the automation runs on the main loop after setup, not during App.setup()
+  if (this->state_ == update::UPDATE_STATE_AVAILABLE && this->update_available_trigger_) {
+    this->defer([this]() { this->update_available_trigger_->trigger(this->update_info_); });
+  }
 #else
   // HTTP mode: check every 10s until network is ready (max 6 attempts)
   // Only if update interval is > 1 minute to avoid redundant checks
@@ -185,6 +189,8 @@ void Esp32HostedUpdate::check() {
     return;
   }
 
+  const bool was_available = this->state_ == update::UPDATE_STATE_AVAILABLE;
+
   // Compare versions
   if (this->update_info_.latest_version.empty() ||
       this->update_info_.latest_version == this->update_info_.current_version) {
@@ -197,6 +203,9 @@ void Esp32HostedUpdate::check() {
   this->update_info_.progress = 0.0f;
   this->status_clear_error();
   this->publish_state();
+  if (this->state_ == update::UPDATE_STATE_AVAILABLE && !was_available && this->update_available_trigger_) {
+    this->update_available_trigger_->trigger(this->update_info_);
+  }
 #endif
 }
 
diff --git a/tests/components/esp32_hosted/test-embedded.esp32-p4-idf.yaml b/tests/components/esp32_hosted/test-embedded.esp32-p4-idf.yaml
index 9640032b34..5cf33179ba 100644
--- a/tests/components/esp32_hosted/test-embedded.esp32-p4-idf.yaml
+++ b/tests/components/esp32_hosted/test-embedded.esp32-p4-idf.yaml
@@ -6,3 +6,6 @@ update:
     type: embedded
     path: $component_dir/test_firmware.bin
     sha256: de2f256064a0af797747c2b97505dc0b9f3df0de4f489eac731c23ae9ca9cc31
+    on_update_available:
+      then:
+        - logger.log: "Coprocessor update available"
diff --git a/tests/components/esp32_hosted/test-http.esp32-p4-idf.yaml b/tests/components/esp32_hosted/test-http.esp32-p4-idf.yaml
index 17cde0f35d..88b620cfe8 100644
--- a/tests/components/esp32_hosted/test-http.esp32-p4-idf.yaml
+++ b/tests/components/esp32_hosted/test-http.esp32-p4-idf.yaml
@@ -8,3 +8,6 @@ update:
     type: http
     source: https://esphome.github.io/esp-hosted-firmware/manifest/esp32c6.json
     update_interval: 6h
+    on_update_available:
+      then:
+        - logger.log: "Coprocessor update available"

From aa944456e0ab4531d7b9184d5d97de166d522913 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 22 Aug 2026 04:11:52 +1200
Subject: [PATCH 033/155] [core] Add type annotations to component Python
 (6/11) (#18343)

---
 esphome/components/ags10/sensor.py            | 19 ++++++++++---
 esphome/components/at581x/__init__.py         | 19 ++++++++++---
 esphome/components/at581x/switch/__init__.py  |  3 ++-
 esphome/components/canbus/__init__.py         | 20 +++++++++-----
 esphome/components/daly_bms/__init__.py       |  3 ++-
 esphome/components/daly_bms/binary_sensor.py  |  6 +++--
 esphome/components/daly_bms/sensor.py         |  6 +++--
 esphome/components/daly_bms/text_sensor.py    |  6 +++--
 esphome/components/deep_sleep/__init__.py     | 21 +++++++++++----
 esphome/components/ds1307/time.py             | 19 ++++++++++---
 .../components/esp32_ble_tracker/__init__.py  | 21 ++++++++++-----
 esphome/components/ethernet/__init__.py       | 27 ++++++++++++-------
 esphome/components/hdc302x/sensor.py          | 23 +++++++++++++---
 esphome/components/htu21d/sensor.py           | 19 ++++++++++---
 esphome/components/ld6002b/__init__.py        |  2 +-
 esphome/components/ld6002b/binary_sensor.py   |  3 ++-
 esphome/components/ld6002b/button/__init__.py |  2 +-
 esphome/components/ld6002b/number/__init__.py |  2 +-
 esphome/components/ld6002b/select/__init__.py |  3 ++-
 esphome/components/ld6002b/sensor.py          |  3 ++-
 esphome/components/ld6002b/switch/__init__.py |  3 ++-
 esphome/components/ld6002b/text_sensor.py     |  3 ++-
 esphome/components/m5stack_8angle/__init__.py |  3 ++-
 .../m5stack_8angle/binary_sensor/__init__.py  |  3 ++-
 .../m5stack_8angle/light/__init__.py          |  3 ++-
 .../m5stack_8angle/sensor/__init__.py         |  3 ++-
 esphome/components/modbus/__init__.py         | 20 ++++++++------
 esphome/components/openthread/__init__.py     | 25 +++++++++++------
 esphome/components/pulse_counter/sensor.py    | 21 ++++++++++-----
 esphome/components/pulse_meter/sensor.py      | 21 ++++++++++-----
 esphome/components/shelly_dimmer/light.py     | 11 ++++----
 31 files changed, 246 insertions(+), 97 deletions(-)

diff --git a/esphome/components/ags10/sensor.py b/esphome/components/ags10/sensor.py
index 6491d7d810..8606e7c247 100644
--- a/esphome/components/ags10/sensor.py
+++ b/esphome/components/ags10/sensor.py
@@ -17,6 +17,9 @@ from esphome.const import (
     UNIT_OHM,
     UNIT_PARTS_PER_BILLION,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CONF_RESISTANCE = "resistance"
 
@@ -62,7 +65,7 @@ CONFIG_SCHEMA = (
 FINAL_VALIDATE_SCHEMA = i2c.final_validate_device_schema("ags10", max_frequency="15khz")
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -94,7 +97,12 @@ AGS10_NEW_I2C_ADDRESS_SCHEMA = cv.maybe_simple_value(
     AGS10_NEW_I2C_ADDRESS_SCHEMA,
     synchronous=True,
 )
-async def ags10newi2caddress_to_code(config, action_id, template_arg, args):
+async def ags10newi2caddress_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     address = await cg.templatable(config[CONF_ADDRESS], args, cg.uint8)
@@ -126,7 +134,12 @@ AGS10_SET_ZERO_POINT_SCHEMA = cv.Schema(
     AGS10_SET_ZERO_POINT_SCHEMA,
     synchronous=True,
 )
-async def ags10setzeropoint_to_code(config, action_id, template_arg, args):
+async def ags10setzeropoint_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     mode = await cg.templatable(
diff --git a/esphome/components/at581x/__init__.py b/esphome/components/at581x/__init__.py
index 5031b72cce..193e62f615 100644
--- a/esphome/components/at581x/__init__.py
+++ b/esphome/components/at581x/__init__.py
@@ -4,6 +4,9 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_FREQUENCY, CONF_ID
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@X-Ryl669"]
 DEPENDENCIES = ["i2c"]
@@ -70,7 +73,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -91,7 +94,12 @@ AT581XSettingsAction = at581x_ns.class_("AT581XSettingsAction", automation.Actio
     ),
     synchronous=True,
 )
-async def at581x_reset_to_code(config, action_id, template_arg, args):
+async def at581x_reset_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
 
@@ -163,7 +171,12 @@ RADAR_SETTINGS_SCHEMA = cv.Schema(
     RADAR_SETTINGS_SCHEMA,
     synchronous=True,
 )
-async def at581x_settings_to_code(config, action_id, template_arg, args):
+async def at581x_settings_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
 
diff --git a/esphome/components/at581x/switch/__init__.py b/esphome/components/at581x/switch/__init__.py
index 8e1b82b356..7e45ed89ec 100644
--- a/esphome/components/at581x/switch/__init__.py
+++ b/esphome/components/at581x/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_SWITCH, ICON_WIFI
+from esphome.types import ConfigType
 
 from .. import CONF_AT581X_ID, AT581XComponent, at581x_ns
 
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = switch.switch_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     at581x_component = await cg.get_variable(config[CONF_AT581X_ID])
     s = await switch.new_switch(config)
     await cg.register_parented(s, config[CONF_AT581X_ID])
diff --git a/esphome/components/canbus/__init__.py b/esphome/components/canbus/__init__.py
index fcd342ad38..b7de235dd1 100644
--- a/esphome/components/canbus/__init__.py
+++ b/esphome/components/canbus/__init__.py
@@ -1,10 +1,13 @@
 import re
+from typing import Any
 
 from esphome import automation
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_DATA, CONF_ID, CONF_TRIGGER_ID
 from esphome.core import CORE, ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@mvturnho", "@danielschramm"]
 IS_PLATFORM_COMPONENT = True
@@ -18,7 +21,7 @@ CONF_BIT_RATE = "bit_rate"
 CONF_ON_FRAME = "on_frame"
 
 
-def validate_id(config):
+def validate_id(config: ConfigType) -> ConfigType:
     if CONF_CAN_ID in config:
         can_id = config[CONF_CAN_ID]
         id_ext = config[CONF_USE_EXTENDED_ID]
@@ -27,7 +30,7 @@ def validate_id(config):
     return config
 
 
-def validate_raw_data(value):
+def validate_raw_data(value: Any) -> bytes | list:
     if isinstance(value, str):
         return value.encode("utf-8")
     if isinstance(value, list):
@@ -71,7 +74,7 @@ CAN_SPEEDS = {
 }
 
 
-def get_rate(value):
+def get_rate(value: str) -> int:
     match = re.match(r"(\d+)(?:K(\d+)?)?BPS", value, re.IGNORECASE)
     if not match:
         raise ValueError(f"Invalid rate format: {value}")
@@ -103,7 +106,7 @@ CANBUS_SCHEMA = cv.Schema(
 CANBUS_SCHEMA.add_extra(validate_id)
 
 
-async def setup_canbus_core_(var, config):
+async def setup_canbus_core_(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
     cg.add(var.set_can_id([config[CONF_CAN_ID]]))
     cg.add(var.set_use_extended_id([config[CONF_USE_EXTENDED_ID]]))
@@ -134,7 +137,7 @@ async def setup_canbus_core_(var, config):
         )
 
 
-async def register_canbus(var, config):
+async def register_canbus(var: MockObj, config: ConfigType) -> None:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.new_Pvariable(config[CONF_ID], var)
     await setup_canbus_core_(var, config)
@@ -157,7 +160,12 @@ async def register_canbus(var, config):
     ),
     synchronous=True,
 )
-async def canbus_action_to_code(config, action_id, template_arg, args):
+async def canbus_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_CANBUS_ID])
 
diff --git a/esphome/components/daly_bms/__init__.py b/esphome/components/daly_bms/__init__.py
index 87f00ce507..ba0be4d3a5 100644
--- a/esphome/components/daly_bms/__init__.py
+++ b/esphome/components/daly_bms/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ADDRESS, CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@s1lvi0"]
 MULTI_CONF = True
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/daly_bms/binary_sensor.py b/esphome/components/daly_bms/binary_sensor.py
index 95a2ae3b44..2b6ceffff1 100644
--- a/esphome/components/daly_bms/binary_sensor.py
+++ b/esphome/components/daly_bms/binary_sensor.py
@@ -1,6 +1,8 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_BMS_DALY_ID, DalyBmsComponent
 
@@ -27,13 +29,13 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def setup_conf(config, key, hub):
+async def setup_conf(config: ConfigType, key: str, hub: MockObj) -> None:
     if sensor_config := config.get(key):
         var = await binary_sensor.new_binary_sensor(sensor_config)
         cg.add(getattr(hub, f"set_{key}_binary_sensor")(var))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_BMS_DALY_ID])
     for key in TYPES:
         await setup_conf(config, key, hub)
diff --git a/esphome/components/daly_bms/sensor.py b/esphome/components/daly_bms/sensor.py
index aa92cfa86a..3e91fb280a 100644
--- a/esphome/components/daly_bms/sensor.py
+++ b/esphome/components/daly_bms/sensor.py
@@ -23,6 +23,8 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_BMS_DALY_ID, DalyBmsComponent
 
@@ -222,13 +224,13 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def setup_conf(config, key, hub):
+async def setup_conf(config: ConfigType, key: str, hub: MockObj) -> None:
     if sensor_config := config.get(key):
         sens = await sensor.new_sensor(sensor_config)
         cg.add(getattr(hub, f"set_{key}_sensor")(sens))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_BMS_DALY_ID])
     for key in TYPES:
         await setup_conf(config, key, hub)
diff --git a/esphome/components/daly_bms/text_sensor.py b/esphome/components/daly_bms/text_sensor.py
index 9f4e2df85a..1a91081bbf 100644
--- a/esphome/components/daly_bms/text_sensor.py
+++ b/esphome/components/daly_bms/text_sensor.py
@@ -2,6 +2,8 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_STATUS
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_BMS_DALY_ID, DalyBmsComponent
 
@@ -23,13 +25,13 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def setup_conf(config, key, hub):
+async def setup_conf(config: ConfigType, key: str, hub: MockObj) -> None:
     if sensor_config := config.get(key):
         sens = await text_sensor.new_text_sensor(sensor_config)
         cg.add(getattr(hub, f"set_{key}_text_sensor")(sens))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_BMS_DALY_ID])
     for key in TYPES:
         await setup_conf(config, key, hub)
diff --git a/esphome/components/deep_sleep/__init__.py b/esphome/components/deep_sleep/__init__.py
index 3b70f947d2..91131a3ed7 100644
--- a/esphome/components/deep_sleep/__init__.py
+++ b/esphome/components/deep_sleep/__init__.py
@@ -38,7 +38,8 @@ from esphome.const import (
     PLATFORM_NRF52,
     PlatformFramework,
 )
-from esphome.core import CORE
+from esphome.core import CORE, ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 WAKEUP_PINS = {
@@ -174,7 +175,7 @@ def validate_config(config: ConfigType) -> ConfigType:
     return config
 
 
-def _validate_ex1_wakeup_mode(value):
+def _validate_ex1_wakeup_mode(value: str) -> str:
     if value == "ALL_LOW":
         esp32.only_on_variant(supported=[VARIANT_ESP32], msg_prefix="ALL_LOW")(value)
     if value == "ANY_LOW":
@@ -345,7 +346,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
@@ -458,7 +459,12 @@ DEEP_SLEEP_ENTER_SCHEMA = cv.All(
     DEEP_SLEEP_ENTER_SCHEMA,
     synchronous=True,
 )
-async def deep_sleep_enter_to_code(config, action_id, template_arg, args):
+async def deep_sleep_enter_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     if CONF_SLEEP_DURATION in config:
@@ -487,7 +493,12 @@ async def deep_sleep_enter_to_code(config, action_id, template_arg, args):
     automation.maybe_simple_id(DEEP_SLEEP_ACTION_SCHEMA),
     synchronous=True,
 )
-async def deep_sleep_action_to_code(config, action_id, template_arg, args):
+async def deep_sleep_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/ds1307/time.py b/esphome/components/ds1307/time.py
index 0e7bb976a2..a3ae3eb5af 100644
--- a/esphome/components/ds1307/time.py
+++ b/esphome/components/ds1307/time.py
@@ -3,6 +3,9 @@ import esphome.codegen as cg
 from esphome.components import i2c, time
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@badbadc0ffee"]
 DEPENDENCIES = ["i2c"]
@@ -29,7 +32,12 @@ CONFIG_SCHEMA = time.TIME_SCHEMA.extend(
     ),
     synchronous=True,
 )
-async def ds1307_write_time_to_code(config, action_id, template_arg, args):
+async def ds1307_write_time_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
@@ -45,13 +53,18 @@ async def ds1307_write_time_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def ds1307_read_time_to_code(config, action_id, template_arg, args):
+async def ds1307_read_time_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
 
     await cg.register_component(var, config)
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 28c8c7fcf1..4f6355df70 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -38,7 +38,8 @@ from esphome.const import (
     CONF_SERVICE_UUID,
     CONF_TRIGGER_ID,
 )
-from esphome.core import CORE, CoroPriority, TimePeriod, coroutine_with_priority
+from esphome.core import CORE, ID, CoroPriority, TimePeriod, coroutine_with_priority
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.enum import StrEnum
 from esphome.types import ConfigType
 
@@ -262,7 +263,7 @@ ESP_BLE_DEVICE_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # Register the loggers this component needs
     esp32_ble.register_bt_logger(BTLoggers.BLE_SCAN)
 
@@ -360,7 +361,7 @@ async def to_code(config):
 # chance to call register_ble_tracker and register_client before the list is checked
 # and added to the global defines list.
 @coroutine_with_priority(CoroPriority.FINAL)
-async def _add_ble_features():
+async def _add_ble_features() -> None:
     # Add feature-specific defines based on what's needed
     required_features = _get_required_features()
     # Sensors registered through the neutral ble_device_base path (BLEHub) need
@@ -389,8 +390,11 @@ ESP32_BLE_START_SCAN_ACTION_SCHEMA = cv.Schema(
     synchronous=True,
 )
 async def esp32_ble_tracker_start_scan_action_to_code(
-    config, action_id, template_arg, args
-):
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_CONTINUOUS], args, cg.bool_)
@@ -414,8 +418,11 @@ ESP32_BLE_STOP_SCAN_ACTION_SCHEMA = automation.maybe_simple_id(
     synchronous=True,
 )
 async def esp32_ble_tracker_stop_scan_action_to_code(
-    config, action_id, template_arg, args
-):
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/ethernet/__init__.py b/esphome/components/ethernet/__init__.py
index 7686b64cb4..cd5904f501 100644
--- a/esphome/components/ethernet/__init__.py
+++ b/esphome/components/ethernet/__init__.py
@@ -48,10 +48,12 @@ from esphome.const import (
 )
 from esphome.core import (
     CORE,
+    ID,
     CoroPriority,
     TimePeriodMilliseconds,
     coroutine_with_priority,
 )
+from esphome.cpp_generator import MockObj, TemplateArgsType
 import esphome.final_validate as fv
 from esphome.types import ConfigType
 
@@ -276,7 +278,7 @@ def _validate_spi_interface(config: ConfigType) -> ConfigType:
     return config
 
 
-def _validate(config):
+def _validate(config: ConfigType) -> ConfigType:
     if CONF_USE_ADDRESS not in config:
         if CONF_MANUAL_IP in config:
             use_address = str(config[CONF_MANUAL_IP][CONF_STATIC_IP])
@@ -441,7 +443,7 @@ GENERIC_SCHEMA = cv.All(
 )
 
 
-def _spi_schema(default_clock: str = "26.67MHz", max_clock: int = int(80e6)):
+def _spi_schema(default_clock: str = "26.67MHz", max_clock: int = int(80e6)) -> cv.All:
     return cv.All(
         BASE_SCHEMA.extend(
             cv.Schema(
@@ -517,7 +519,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate_spi(config):
+def _final_validate_spi(config: ConfigType) -> None:
     if not CORE.is_esp32:
         return  # SPI interface validation is ESP32-only
     if config[CONF_TYPE] not in SPI_ETHERNET_TYPES:
@@ -537,7 +539,7 @@ def _final_validate_spi(config):
                     )
 
 
-def manual_ip(config):
+def manual_ip(config: ConfigType) -> cg.StructInitializer:
     return cg.StructInitializer(
         ManualIP,
         ("static_ip", ip_address_literal(config[CONF_STATIC_IP])),
@@ -548,7 +550,7 @@ def manual_ip(config):
     )
 
 
-def phy_register(address: int, value: int, page: int):
+def phy_register(address: int, value: int, page: int) -> cg.StructInitializer:
     return cg.StructInitializer(
         PHYRegister,
         ("address", address),
@@ -558,7 +560,7 @@ def phy_register(address: int, value: int, page: int):
 
 
 @coroutine_with_priority(CoroPriority.COMMUNICATION)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
 
     # Apply network priority before register_component (which emits the user's
@@ -610,7 +612,7 @@ async def to_code(config):
     CORE.add_job(final_step)
 
 
-async def _to_code_esp32(var: cg.Pvariable, config: ConfigType) -> None:
+async def _to_code_esp32(var: cg.MockObj, config: ConfigType) -> None:
     from esphome.components.esp32 import (
         add_idf_component,
         add_idf_sdkconfig_option,
@@ -698,7 +700,7 @@ async def _to_code_esp32(var: cg.Pvariable, config: ConfigType) -> None:
         add_idf_component(name=component.name, ref=component.version)
 
 
-async def _to_code_rp2040(var: cg.Pvariable, config: ConfigType) -> None:
+async def _to_code_rp2040(var: cg.MockObj, config: ConfigType) -> None:
     cg.add(var.set_clk_pin(config[CONF_CLK_PIN]))
     cg.add(var.set_miso_pin(config[CONF_MISO_PIN]))
     cg.add(var.set_mosi_pin(config[CONF_MOSI_PIN]))
@@ -793,7 +795,7 @@ FINAL_VALIDATE_SCHEMA = _final_validate
 
 
 @coroutine_with_priority(CoroPriority.FINAL)
-async def final_step():
+async def final_step() -> None:
     """Final code generation step to configure optional Ethernet features."""
     if ip_state_count := CORE.data.get(ETHERNET_IP_STATE_LISTENERS_KEY, 0):
         cg.add_define("USE_ETHERNET_IP_STATE_LISTENERS")
@@ -845,7 +847,12 @@ def _filter_source_files() -> list[str]:
 FILTER_SOURCE_FILES = _filter_source_files
 
 
-async def _new_pvariable_to_code(config, id_, template_arg, args):
+async def _new_pvariable_to_code(
+    config: ConfigType,
+    id_: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     return cg.new_Pvariable(id_, template_arg)
 
 
diff --git a/esphome/components/hdc302x/sensor.py b/esphome/components/hdc302x/sensor.py
index a6265b9b98..6d91c3df7c 100644
--- a/esphome/components/hdc302x/sensor.py
+++ b/esphome/components/hdc302x/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation
 from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
@@ -16,6 +18,9 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -62,7 +67,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -86,7 +91,7 @@ HDC302X_HEATER_POWER_MAP = {
 }
 
 
-def heater_power_value(value):
+def heater_power_value(value: Any) -> cv.Lambda | int:
     """Accept enum names or raw uint16 values"""
     if isinstance(value, cv.Lambda):
         return value
@@ -119,7 +124,12 @@ HDC302X_HEATER_ON_ACTION_SCHEMA = maybe_simple_id(
     HDC302X_HEATER_ON_ACTION_SCHEMA,
     synchronous=True,
 )
-async def hdc302x_heater_on_to_code(config, action_id, template_arg, args):
+async def hdc302x_heater_on_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     template_ = await cg.templatable(config[CONF_POWER], args, cg.uint16)
@@ -135,7 +145,12 @@ async def hdc302x_heater_on_to_code(config, action_id, template_arg, args):
     HDC302X_ACTION_SCHEMA,
     synchronous=True,
 )
-async def hdc302x_heater_off_to_code(config, action_id, template_arg, args):
+async def hdc302x_heater_off_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     return var
diff --git a/esphome/components/htu21d/sensor.py b/esphome/components/htu21d/sensor.py
index 8808dc70f5..86dca77725 100644
--- a/esphome/components/htu21d/sensor.py
+++ b/esphome/components/htu21d/sensor.py
@@ -17,6 +17,9 @@ from esphome.const import (
     UNIT_EMPTY,
     UNIT_PERCENT,
 )
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -63,7 +66,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -95,7 +98,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def set_heater_level_to_code(config, action_id, template_arg, args):
+async def set_heater_level_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     level_ = await cg.templatable(config[CONF_LEVEL], args, cg.uint8)
@@ -115,7 +123,12 @@ async def set_heater_level_to_code(config, action_id, template_arg, args):
     ),
     synchronous=True,
 )
-async def set_heater_to_code(config, action_id, template_arg, args):
+async def set_heater_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
     status_ = await cg.templatable(config[CONF_STATUS], args, cg.bool_)
diff --git a/esphome/components/ld6002b/__init__.py b/esphome/components/ld6002b/__init__.py
index 99f2ead3bb..af1e501a6a 100644
--- a/esphome/components/ld6002b/__init__.py
+++ b/esphome/components/ld6002b/__init__.py
@@ -60,7 +60,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/ld6002b/binary_sensor.py b/esphome/components/ld6002b/binary_sensor.py
index 63f7b40c23..74095d5ded 100644
--- a/esphome/components/ld6002b/binary_sensor.py
+++ b/esphome/components/ld6002b/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_TARGET, DEVICE_CLASS_OCCUPANCY
+from esphome.types import ConfigType
 
 from . import LD6002BComponent
 from .const import AREA_COUNT, CONF_LD6002B_ID, MAX_TARGETS
@@ -36,7 +37,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_LD6002B_ID])
 
     if target_config := config.get(CONF_TARGET):
diff --git a/esphome/components/ld6002b/button/__init__.py b/esphome/components/ld6002b/button/__init__.py
index 508d5c2bc6..a664890a86 100644
--- a/esphome/components/ld6002b/button/__init__.py
+++ b/esphome/components/ld6002b/button/__init__.py
@@ -129,7 +129,7 @@ BUTTON_MAP = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     for key, button_type in BUTTON_MAP.items():
         if button_config := config.get(key):
             b = cg.new_Pvariable(button_config[CONF_ID], button_type)
diff --git a/esphome/components/ld6002b/number/__init__.py b/esphome/components/ld6002b/number/__init__.py
index 452e38d6e3..236b049f53 100644
--- a/esphome/components/ld6002b/number/__init__.py
+++ b/esphome/components/ld6002b/number/__init__.py
@@ -136,7 +136,7 @@ def final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_LD6002B_ID])
 
     for key, number_type, setter, min_value, max_value, step in (
diff --git a/esphome/components/ld6002b/select/__init__.py b/esphome/components/ld6002b/select/__init__.py
index 3da647ee2c..7f5e528b84 100644
--- a/esphome/components/ld6002b/select/__init__.py
+++ b/esphome/components/ld6002b/select/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import select
 import esphome.config_validation as cv
 from esphome.const import CONF_AREA_ID, CONF_SENSITIVITY, ENTITY_CATEGORY_CONFIG
+from esphome.types import ConfigType
 
 from .. import LD6002BComponent, ld6002b_ns
 from ..const import CONF_INSTALLATION_MODE, CONF_LD6002B_ID, CONF_TRIGGER_SPEED
@@ -64,7 +65,7 @@ SELECT_MAP = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_LD6002B_ID])
 
     for key, select_type, setter, options in SELECT_MAP:
diff --git a/esphome/components/ld6002b/sensor.py b/esphome/components/ld6002b/sensor.py
index 3aedaf9fdd..cceefb3837 100644
--- a/esphome/components/ld6002b/sensor.py
+++ b/esphome/components/ld6002b/sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_METER,
 )
+from esphome.types import ConfigType
 
 from . import LD6002BComponent
 from .const import (
@@ -150,7 +151,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_LD6002B_ID])
 
     if target_count_config := config.get(CONF_TARGET_COUNT):
diff --git a/esphome/components/ld6002b/switch/__init__.py b/esphome/components/ld6002b/switch/__init__.py
index d27baa87fe..a414308b65 100644
--- a/esphome/components/ld6002b/switch/__init__.py
+++ b/esphome/components/ld6002b/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_SWITCH, ENTITY_CATEGORY_CONFIG
+from esphome.types import ConfigType
 
 from .. import LD6002BComponent, ld6002b_ns
 from ..const import (
@@ -46,7 +47,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_LD6002B_ID])
 
     for key, switch_type, setter in (
diff --git a/esphome/components/ld6002b/text_sensor.py b/esphome/components/ld6002b/text_sensor.py
index a18d387437..0e8e2e80e7 100644
--- a/esphome/components/ld6002b/text_sensor.py
+++ b/esphome/components/ld6002b/text_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_DIAGNOSTIC
+from esphome.types import ConfigType
 
 from . import LD6002BComponent
 from .const import CONF_LD6002B_ID, CONF_OTA_VERSION, CONF_WORK_MODE
@@ -21,7 +22,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_LD6002B_ID])
     if work_mode_config := config.get(CONF_WORK_MODE):
         sens = await text_sensor.new_text_sensor(work_mode_config)
diff --git a/esphome/components/m5stack_8angle/__init__.py b/esphome/components/m5stack_8angle/__init__.py
index a1c197b381..6404bcf64c 100644
--- a/esphome/components/m5stack_8angle/__init__.py
+++ b/esphome/components/m5stack_8angle/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@rnauber"]
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(i2c.i2c_device_schema(0x43))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/m5stack_8angle/binary_sensor/__init__.py b/esphome/components/m5stack_8angle/binary_sensor/__init__.py
index 22ab73e901..09398876d4 100644
--- a/esphome/components/m5stack_8angle/binary_sensor/__init__.py
+++ b/esphome/components/m5stack_8angle/binary_sensor/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import CONF_M5STACK_8ANGLE_ID, M5Stack8AngleComponent, m5stack_8angle_ns
 
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_M5STACK_8ANGLE_ID])
     sens = await binary_sensor.new_binary_sensor(config)
     cg.add(sens.set_parent(hub))
diff --git a/esphome/components/m5stack_8angle/light/__init__.py b/esphome/components/m5stack_8angle/light/__init__.py
index 806ecaabf4..5c4863acf7 100644
--- a/esphome/components/m5stack_8angle/light/__init__.py
+++ b/esphome/components/m5stack_8angle/light/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import light
 import esphome.config_validation as cv
 from esphome.const import CONF_OUTPUT_ID
+from esphome.types import ConfigType
 
 from .. import CONF_M5STACK_8ANGLE_ID, M5Stack8AngleComponent, m5stack_8angle_ns
 
@@ -21,7 +22,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_M5STACK_8ANGLE_ID])
     lights = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await light.register_light(lights, config)
diff --git a/esphome/components/m5stack_8angle/sensor/__init__.py b/esphome/components/m5stack_8angle/sensor/__init__.py
index 2132eaa4c2..87d1425241 100644
--- a/esphome/components/m5stack_8angle/sensor/__init__.py
+++ b/esphome/components/m5stack_8angle/sensor/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     ICON_ROTATE_RIGHT,
     STATE_CLASS_MEASUREMENT,
 )
+from esphome.types import ConfigType
 
 from .. import (
     CONF_M5STACK_8ANGLE_ID,
@@ -55,7 +56,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await cg.register_parented(var, config[CONF_M5STACK_8ANGLE_ID])
diff --git a/esphome/components/modbus/__init__.py b/esphome/components/modbus/__init__.py
index 58bd0f65dc..a98591c6bc 100644
--- a/esphome/components/modbus/__init__.py
+++ b/esphome/components/modbus/__init__.py
@@ -8,8 +8,10 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ADDRESS, CONF_DISABLE_CRC, CONF_FLOW_CONTROL_PIN, CONF_ID
+from esphome.cpp_generator import MockObj
 from esphome.cpp_helpers import gpio_pin_expression
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -84,7 +86,7 @@ CONFIG_SCHEMA = cv.typed_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(modbus_ns.using)
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
@@ -112,7 +114,9 @@ def _validate_server_address(value: Any) -> int:
     return address
 
 
-def modbus_device_schema(default_address, role: Literal["client", "server"] = "client"):
+def modbus_device_schema(
+    default_address: int | None, role: Literal["client", "server"] = "client"
+) -> cv.Schema:
     hub_type = ModbusClient if role == "client" else ModbusServer
     address_validator = _validate_server_address if role == "server" else cv.hex_uint8_t
     schema = {
@@ -127,14 +131,14 @@ def modbus_device_schema(default_address, role: Literal["client", "server"] = "c
 
 def final_validate_modbus_device(
     name: str, *, role: Literal["server", "client"] | None = None
-):
-    def validate_role(value):
+) -> cv.Schema:
+    def validate_role(value: str) -> str:
         assert role in MODBUS_ROLES
         if value != role:
             raise cv.Invalid(f"Component {name} requires role to be {role}")
         return value
 
-    def validate_hub(hub_config):
+    def validate_hub(hub_config: ConfigType) -> ConfigType:
         hub_schema = {}
         if role is not None:
             hub_schema[cv.Required(CONF_ROLE)] = validate_role
@@ -147,19 +151,19 @@ def final_validate_modbus_device(
     )
 
 
-async def register_modbus_client_device(var, config):
+async def register_modbus_client_device(var: MockObj, config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_MODBUS_ID])
     cg.add(var.set_parent(parent))
     cg.add(var.set_address(config[CONF_ADDRESS]))
 
 
-async def register_modbus_server_device(var, config):
+async def register_modbus_server_device(var: MockObj, config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_MODBUS_ID])
     cg.add(var.set_address(config[CONF_ADDRESS]))
     cg.add(parent.register_device(var))
 
 
-async def register_modbus_device(var, config):
+async def register_modbus_device(var: MockObj, config: ConfigType) -> None:
     # Remove before 2026.12.0
     _LOGGER.warning(
         "'register_modbus_device' is deprecated, use 'register_modbus_client_device' "
diff --git a/esphome/components/openthread/__init__.py b/esphome/components/openthread/__init__.py
index 4018ad81e7..ab69f5d9ae 100644
--- a/esphome/components/openthread/__init__.py
+++ b/esphome/components/openthread/__init__.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components.esp32 import (
@@ -31,10 +33,12 @@ from esphome.const import (
 )
 from esphome.core import (
     CORE,
+    ID,
     CoroPriority,
     TimePeriodMilliseconds,
     coroutine_with_priority,
 )
+from esphome.cpp_generator import MockObj, TemplateArgsType
 import esphome.final_validate as fv
 from esphome.types import ConfigType
 
@@ -76,7 +80,7 @@ CONF_DEVICE_TYPES = [
 ]
 
 
-def _validate_txpower(value):
+def _validate_txpower(value: Any) -> int | float:
     if CORE.is_esp32:
         variant = get_esp32_variant()
 
@@ -90,7 +94,7 @@ def _validate_txpower(value):
     return value  # Unsupported, fail later with clear error
 
 
-def set_sdkconfig_options(config):
+def set_sdkconfig_options(config: ConfigType) -> None:
     # and expose options for using SPI/UART RCPs
     add_idf_sdkconfig_option("CONFIG_IEEE802154_ENABLED", True)
     add_idf_sdkconfig_option("CONFIG_OPENTHREAD_RADIO_NATIVE", True)
@@ -180,7 +184,7 @@ def _validate(config: ConfigType) -> ConfigType:
     return config
 
 
-def _require_vfs_select(config):
+def _require_vfs_select(config: ConfigType) -> ConfigType:
     """Register VFS select requirement during config validation."""
     # OpenThread uses esp_vfs_eventfd which requires VFS select support (ESP32 only)
     if CORE.is_esp32:
@@ -188,7 +192,7 @@ def _require_vfs_select(config):
     return config
 
 
-def _validate_platform(config):
+def _validate_platform(config: ConfigType) -> ConfigType:
     if CORE.using_zephyr:
         return config
     return only_on_variant(
@@ -203,7 +207,7 @@ def _validate_platform(config):
     )(config)
 
 
-def _validate_tlv_hex(value):
+def _validate_tlv_hex(value: Any) -> str:
     s = cv.string_strict(value)
     if len(s) % 2 != 0:
         raise cv.Invalid("TLV must have an even number of hex characters")
@@ -242,7 +246,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate(_):
+def _final_validate(_: ConfigType) -> None:
     full_config = fv.full_config.get()
     network_config = full_config.get("network", {})
     if not network_config.get(CONF_ENABLE_IPV6, False):
@@ -274,7 +278,7 @@ FILTER_SOURCE_FILES = filter_source_files_from_platform(
 
 
 @coroutine_with_priority(CoroPriority.COMMUNICATION)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # Re-enable openthread IDF component (excluded by default)
     if CORE.is_esp32:
         include_builtin_idf_component("openthread")
@@ -339,7 +343,12 @@ POLL_PERIOD_ACTION_SCHEMA = automation.maybe_conf(
     POLL_PERIOD_ACTION_SCHEMA,
     synchronous=True,
 )
-async def openthread_poll_period_action_to_code(config, action_id, template_arg, args):
+async def openthread_poll_period_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_POLL_PERIOD], args, cg.uint32)
diff --git a/esphome/components/pulse_counter/sensor.py b/esphome/components/pulse_counter/sensor.py
index 3326745846..7c5a0590d7 100644
--- a/esphome/components/pulse_counter/sensor.py
+++ b/esphome/components/pulse_counter/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation, pins
 import esphome.codegen as cg
 from esphome.components import sensor
@@ -19,7 +21,9 @@ from esphome.const import (
     UNIT_PULSES,
     UNIT_PULSES_PER_MINUTE,
 )
-from esphome.core import CORE
+from esphome.core import CORE, ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CONF_USE_PCNT = "use_pcnt"
 
@@ -42,7 +46,7 @@ SetTotalPulsesAction = pulse_counter_ns.class_(
 )
 
 
-def validate_internal_filter(value):
+def validate_internal_filter(value: ConfigType) -> ConfigType:
     use_pcnt = value.get(CONF_USE_PCNT)
     if CORE.is_esp8266 and use_pcnt:
         raise cv.Invalid(
@@ -63,7 +67,7 @@ def validate_internal_filter(value):
     return value
 
 
-def validate_pulse_counter_pin(value):
+def validate_pulse_counter_pin(value: Any) -> ConfigType:
     value = pins.internal_gpio_input_pin_schema(value)
     if CORE.is_esp8266 and value[CONF_NUMBER] >= 16:
         raise cv.Invalid(
@@ -72,7 +76,7 @@ def validate_pulse_counter_pin(value):
     return value
 
 
-def validate_count_mode(value):
+def validate_count_mode(value: ConfigType) -> ConfigType:
     rising_edge = value[CONF_RISING_EDGE]
     falling_edge = value[CONF_FALLING_EDGE]
     if rising_edge == "DISABLE" and falling_edge == "DISABLE":
@@ -126,7 +130,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     use_pcnt = config.get(CONF_USE_PCNT)
     if CORE.is_esp32 and use_pcnt:
         include_builtin_idf_component("esp_driver_pcnt")
@@ -157,7 +161,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def set_total_action_to_code(config, action_id, template_arg, args):
+async def set_total_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_VALUE], args, cg.uint32)
diff --git a/esphome/components/pulse_meter/sensor.py b/esphome/components/pulse_meter/sensor.py
index ab3dd2a249..9bda891efc 100644
--- a/esphome/components/pulse_meter/sensor.py
+++ b/esphome/components/pulse_meter/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation, pins
 import esphome.codegen as cg
 from esphome.components import sensor
@@ -17,7 +19,9 @@ from esphome.const import (
     UNIT_PULSES,
     UNIT_PULSES_PER_MINUTE,
 )
-from esphome.core import CORE
+from esphome.core import CORE, ID, TimePeriodMicroseconds
+from esphome.cpp_generator import MockObj, TemplateArgsType
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@stevebaxter", "@cstaahl", "@TrentHouliston"]
 
@@ -37,18 +41,18 @@ FILTER_MODES = {
 SetTotalPulsesAction = pulse_meter_ns.class_("SetTotalPulsesAction", automation.Action)
 
 
-def validate_internal_filter(value):
+def validate_internal_filter(value: Any) -> TimePeriodMicroseconds:
     return cv.positive_time_period_microseconds(value)
 
 
-def validate_timeout(value):
+def validate_timeout(value: Any) -> TimePeriodMicroseconds:
     value = cv.positive_time_period_microseconds(value)
     if value.total_minutes > 70:
         raise cv.Invalid("Maximum timeout is 70 minutes")
     return value
 
 
-def validate_pulse_meter_pin(value):
+def validate_pulse_meter_pin(value: Any) -> ConfigType:
     value = pins.internal_gpio_input_pin_schema(value)
     if CORE.is_esp8266 and value[CONF_NUMBER] >= 16:
         raise cv.Invalid(
@@ -81,7 +85,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
@@ -107,7 +111,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def set_total_action_to_code(config, action_id, template_arg, args):
+async def set_total_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
     template_ = await cg.templatable(config[CONF_VALUE], args, cg.uint32)
diff --git a/esphome/components/shelly_dimmer/light.py b/esphome/components/shelly_dimmer/light.py
index dd99fcbc90..c166076e0f 100644
--- a/esphome/components/shelly_dimmer/light.py
+++ b/esphome/components/shelly_dimmer/light.py
@@ -1,6 +1,7 @@
 import hashlib
 from pathlib import Path
 import re
+from typing import Any
 
 from esphome import external_files, pins
 import esphome.codegen as cg
@@ -66,7 +67,7 @@ KNOWN_FIRMWARE = {
 }
 
 
-def parse_firmware_version(value):
+def parse_firmware_version(value: str) -> tuple[int, int]:
     match = re.fullmatch(r"(\d+)\.(\d+)", value)
     if match is None:
         raise ValueError(f"Not a valid version number {value}")
@@ -154,7 +155,7 @@ def _extract_firmware_ref(entry: ConfigType) -> RemoteFile | None:
 PREFETCH_FILES = external_files.single_stage_prefetch(_extract_firmware_ref)
 
 
-def validate_firmware(value):
+def validate_firmware(value: ConfigType) -> ConfigType:
     config = value.copy()
     if CONF_URL not in config:
         try:
@@ -167,14 +168,14 @@ def validate_firmware(value):
     return config
 
 
-def validate_sha256(value):
+def validate_sha256(value: Any) -> str:
     value = cv.string(value)
     if not re.fullmatch(r"[0-9a-fA-F]{64}", value):
         raise ValueError(f"Not a valid SHA256 hex string: {value}")
     return value
 
 
-def validate_version(value):
+def validate_version(value: str) -> str:
     parse_firmware_version(value)
     return value
 
@@ -231,7 +232,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     fw_hex = get_firmware(config[CONF_FIRMWARE])
     fw_major, fw_minor = parse_firmware_version(config[CONF_FIRMWARE][CONF_VERSION])
 

From 00cffa09a2491be8a39ffd1a62d2c6355bedc61c Mon Sep 17 00:00:00 2001
From: Kevin Ahrendt <kevin.ahrendt@openhomefoundation.org>
Date: Fri, 21 Aug 2026 14:05:07 -0400
Subject: [PATCH 034/155] [sendspin] Convert tests to package-style includes
 (#18588)

---
 tests/components/sendspin/common-action.yaml          |  2 +-
 tests/components/sendspin/common-ethernet.yaml        |  5 +++++
 tests/components/sendspin/common-hub.yaml             |  6 ++++++
 tests/components/sendspin/common-media_player.yaml    |  3 ++-
 tests/components/sendspin/common-media_source.yaml    |  3 ++-
 tests/components/sendspin/common-sensor.yaml          |  3 ++-
 tests/components/sendspin/common-text_sensor.yaml     |  3 ++-
 tests/components/sendspin/common.yaml                 | 10 +++-------
 tests/components/sendspin/test-action.esp32-idf.yaml  |  3 ++-
 .../components/sendspin/test-ethernet.esp32-idf.yaml  | 11 ++---------
 .../sendspin/test-media_player.esp32-idf.yaml         |  3 ++-
 .../sendspin/test-media_source.esp32-idf.yaml         |  3 ++-
 tests/components/sendspin/test-sensor.esp32-idf.yaml  |  3 ++-
 .../sendspin/test-text_sensor.esp32-idf.yaml          |  3 ++-
 tests/components/sendspin/test.esp32-idf.yaml         |  3 ++-
 15 files changed, 37 insertions(+), 27 deletions(-)
 create mode 100644 tests/components/sendspin/common-ethernet.yaml
 create mode 100644 tests/components/sendspin/common-hub.yaml

diff --git a/tests/components/sendspin/common-action.yaml b/tests/components/sendspin/common-action.yaml
index 16f19ad7d1..1bba06ab46 100644
--- a/tests/components/sendspin/common-action.yaml
+++ b/tests/components/sendspin/common-action.yaml
@@ -1,6 +1,6 @@
 # `sendspin.switch` action enables the controller role, so we use a standalone test
 packages:
-  base: !include common.yaml
+  sendspin: !include common.yaml
 
 wifi:
   on_connect:
diff --git a/tests/components/sendspin/common-ethernet.yaml b/tests/components/sendspin/common-ethernet.yaml
new file mode 100644
index 0000000000..276163cda1
--- /dev/null
+++ b/tests/components/sendspin/common-ethernet.yaml
@@ -0,0 +1,5 @@
+packages:
+  sendspin_hub: !include common-hub.yaml
+
+ethernet:
+  type: OPENETH
diff --git a/tests/components/sendspin/common-hub.yaml b/tests/components/sendspin/common-hub.yaml
new file mode 100644
index 0000000000..7a6a9ffd4f
--- /dev/null
+++ b/tests/components/sendspin/common-hub.yaml
@@ -0,0 +1,6 @@
+psram:
+  mode: quad
+
+sendspin:
+  id: sendspin_hub_id
+  task_stack_in_psram: true
diff --git a/tests/components/sendspin/common-media_player.yaml b/tests/components/sendspin/common-media_player.yaml
index d3792cf470..afb8b992f3 100644
--- a/tests/components/sendspin/common-media_player.yaml
+++ b/tests/components/sendspin/common-media_player.yaml
@@ -1,4 +1,5 @@
-<<: !include common.yaml
+packages:
+  sendspin: !include common.yaml
 
 media_player:
   - platform: sendspin
diff --git a/tests/components/sendspin/common-media_source.yaml b/tests/components/sendspin/common-media_source.yaml
index 5b33a54647..1977b79c04 100644
--- a/tests/components/sendspin/common-media_source.yaml
+++ b/tests/components/sendspin/common-media_source.yaml
@@ -1,4 +1,5 @@
-<<: !include common.yaml
+packages:
+  sendspin: !include common.yaml
 
 media_source:
   - platform: sendspin
diff --git a/tests/components/sendspin/common-sensor.yaml b/tests/components/sendspin/common-sensor.yaml
index 6d9745cff9..6467e38b90 100644
--- a/tests/components/sendspin/common-sensor.yaml
+++ b/tests/components/sendspin/common-sensor.yaml
@@ -1,4 +1,5 @@
-<<: !include common.yaml
+packages:
+  sendspin: !include common.yaml
 
 sensor:
   - platform: sendspin
diff --git a/tests/components/sendspin/common-text_sensor.yaml b/tests/components/sendspin/common-text_sensor.yaml
index fc6a56a21a..23111e8d37 100644
--- a/tests/components/sendspin/common-text_sensor.yaml
+++ b/tests/components/sendspin/common-text_sensor.yaml
@@ -1,4 +1,5 @@
-<<: !include common.yaml
+packages:
+  sendspin: !include common.yaml
 
 text_sensor:
   - platform: sendspin
diff --git a/tests/components/sendspin/common.yaml b/tests/components/sendspin/common.yaml
index 9d7da76758..980635b4e3 100644
--- a/tests/components/sendspin/common.yaml
+++ b/tests/components/sendspin/common.yaml
@@ -1,9 +1,5 @@
+packages:
+  sendspin_hub: !include common-hub.yaml
+
 wifi:
   ap:
-
-psram:
-  mode: quad
-
-sendspin:
-  id: sendspin_hub_id
-  task_stack_in_psram: true
diff --git a/tests/components/sendspin/test-action.esp32-idf.yaml b/tests/components/sendspin/test-action.esp32-idf.yaml
index 70a7ee1bad..080eb59034 100644
--- a/tests/components/sendspin/test-action.esp32-idf.yaml
+++ b/tests/components/sendspin/test-action.esp32-idf.yaml
@@ -1 +1,2 @@
-<<: !include common-action.yaml
+packages:
+  sendspin: !include common-action.yaml
diff --git a/tests/components/sendspin/test-ethernet.esp32-idf.yaml b/tests/components/sendspin/test-ethernet.esp32-idf.yaml
index 069e397d99..09a951d211 100644
--- a/tests/components/sendspin/test-ethernet.esp32-idf.yaml
+++ b/tests/components/sendspin/test-ethernet.esp32-idf.yaml
@@ -1,9 +1,2 @@
-ethernet:
-  type: OPENETH
-
-psram:
-  mode: quad
-
-sendspin:
-  id: sendspin_hub_id
-  task_stack_in_psram: true
+packages:
+  sendspin: !include common-ethernet.yaml
diff --git a/tests/components/sendspin/test-media_player.esp32-idf.yaml b/tests/components/sendspin/test-media_player.esp32-idf.yaml
index cbbdb07c77..bcd4062bbe 100644
--- a/tests/components/sendspin/test-media_player.esp32-idf.yaml
+++ b/tests/components/sendspin/test-media_player.esp32-idf.yaml
@@ -1 +1,2 @@
-<<: !include common-media_player.yaml
+packages:
+  sendspin: !include common-media_player.yaml
diff --git a/tests/components/sendspin/test-media_source.esp32-idf.yaml b/tests/components/sendspin/test-media_source.esp32-idf.yaml
index 47aeb2257c..faadccb06d 100644
--- a/tests/components/sendspin/test-media_source.esp32-idf.yaml
+++ b/tests/components/sendspin/test-media_source.esp32-idf.yaml
@@ -1 +1,2 @@
-<<: !include common-media_source.yaml
+packages:
+  sendspin: !include common-media_source.yaml
diff --git a/tests/components/sendspin/test-sensor.esp32-idf.yaml b/tests/components/sendspin/test-sensor.esp32-idf.yaml
index f9127d47bc..1646902ca3 100644
--- a/tests/components/sendspin/test-sensor.esp32-idf.yaml
+++ b/tests/components/sendspin/test-sensor.esp32-idf.yaml
@@ -1 +1,2 @@
-<<: !include common-sensor.yaml
+packages:
+  sendspin: !include common-sensor.yaml
diff --git a/tests/components/sendspin/test-text_sensor.esp32-idf.yaml b/tests/components/sendspin/test-text_sensor.esp32-idf.yaml
index 8998b8896e..69cf8e63fb 100644
--- a/tests/components/sendspin/test-text_sensor.esp32-idf.yaml
+++ b/tests/components/sendspin/test-text_sensor.esp32-idf.yaml
@@ -1 +1,2 @@
-<<: !include common-text_sensor.yaml
+packages:
+  sendspin: !include common-text_sensor.yaml
diff --git a/tests/components/sendspin/test.esp32-idf.yaml b/tests/components/sendspin/test.esp32-idf.yaml
index dade44d145..36667f7fae 100644
--- a/tests/components/sendspin/test.esp32-idf.yaml
+++ b/tests/components/sendspin/test.esp32-idf.yaml
@@ -1 +1,2 @@
-<<: !include common.yaml
+packages:
+  sendspin: !include common.yaml

From abc9098bd833ca2186b4dc0ec59bf32d049d862d Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 14:05:00 -0500
Subject: [PATCH 035/155] Bump bundled esphome-device-builder to 1.12.3
 (#18601)

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2bbe5331e5..4cde6505b3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN \
     -r /requirements.txt
 
 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.12.2
+RUN uv pip install --no-cache-dir esphome-device-builder==1.12.3
 
 RUN \
     platformio settings set enable_telemetry No \

From 11ea819bc7728d72586f34f381de3c57d1584ff5 Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 14:36:47 -0500
Subject: [PATCH 036/155] Bump aioesphomeapi from 45.12.0 to 45.13.1 (#18600)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 740a8c1a79..3362e43239 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pyserial==3.5
 platformio==6.1.19
 esptool==5.3.1
 click==8.3.3
-aioesphomeapi==45.12.0
+aioesphomeapi==45.13.1
 aiohappyeyeballs==2.7.1  # Happy Eyeballs for requests downloads; already pulled in by aioesphomeapi
 zeroconf==0.150.0
 puremagic==2.2.0

From 8e9fb0f93c9c8da438dd1f301e8ef593d94ca4c2 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Fri, 21 Aug 2026 23:10:47 -0500
Subject: [PATCH 037/155] [remote_transmitter] Fix repeat gap timing on
 LibreTiny Beken (#18585)

Co-authored-by: J. Nick Koston <nick@koston.org>
---
 .../remote_transmitter/remote_transmitter.cpp | 40 ++++++++++++-------
 .../remote_transmitter/remote_transmitter.h   |  2 +-
 .../remote_transmitter/test.bk72xx-ard.yaml   |  7 ++++
 3 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 tests/components/remote_transmitter/test.bk72xx-ard.yaml

diff --git a/esphome/components/remote_transmitter/remote_transmitter.cpp b/esphome/components/remote_transmitter/remote_transmitter.cpp
index 49c711330b..31e7464314 100644
--- a/esphome/components/remote_transmitter/remote_transmitter.cpp
+++ b/esphome/components/remote_transmitter/remote_transmitter.cpp
@@ -81,25 +81,37 @@ void RemoteTransmitterComponent::send_internal(uint32_t send_times, uint32_t sen
   ESP_LOGD(TAG, "Sending remote code");
   uint32_t on_time, off_time;
   this->calculate_on_off_time_(this->temp_.get_carrier_frequency(), &on_time, &off_time);
-  this->target_time_ = 0;
   this->transmit_trigger_.trigger();
   for (uint32_t i = 0; i < send_times; i++) {
-    InterruptLock lock;
-    for (int32_t item : this->temp_.get_data()) {
-      if (item > 0) {
-        const auto length = uint32_t(item);
-        this->mark_(on_time, off_time, length);
-      } else {
-        const auto length = uint32_t(-item);
-        this->space_(length);
+    {
+      InterruptLock lock;
+      // Re-anchor every iteration: timing must never span a lock boundary, as micros() can
+      // jump when interrupts are re-enabled between repeats (e.g. LibreTiny's Beken micros()
+      // discards its interrupt-lock correction, stretching the repeat gap by the lock duration)
+      this->target_time_ = 0;
+      for (int32_t item : this->temp_.get_data()) {
+        if (item > 0) {
+          const auto length = uint32_t(item);
+          this->mark_(on_time, off_time, length);
+        } else {
+          const auto length = uint32_t(-item);
+          this->space_(length);
+        }
+        App.feed_wdt();
       }
-      App.feed_wdt();
+      this->await_target_time_();  // wait for duration of last pulse
+      this->pin_->digital_write(false);
     }
-    this->await_target_time_();  // wait for duration of last pulse
-    this->pin_->digital_write(false);
 
-    if (i + 1 < send_times)
-      this->target_time_ += send_wait;
+    if (i + 1 < send_times) {
+      // Wait out the repeat gap with interrupts enabled: wait_time is unbounded user config
+      // (previously this spin ran inside the next iteration's lock, disabling interrupts for
+      // the whole gap). Anchoring after the lock release keeps it exact on all platforms.
+      const uint32_t gap_end = micros() + send_wait;
+      while ((int32_t) (gap_end - micros()) > 0) {
+        App.feed_wdt();
+      }
+    }
   }
   this->complete_trigger_.trigger();
 }
diff --git a/esphome/components/remote_transmitter/remote_transmitter.h b/esphome/components/remote_transmitter/remote_transmitter.h
index e2d33d13cc..0aa04682ba 100644
--- a/esphome/components/remote_transmitter/remote_transmitter.h
+++ b/esphome/components/remote_transmitter/remote_transmitter.h
@@ -72,7 +72,7 @@ class RemoteTransmitterComponent final : public remote_base::RemoteTransmitterBa
   void space_(uint32_t usec);
 
   void await_target_time_();
-  uint32_t target_time_;
+  uint32_t target_time_{0};
 #endif
 
 #if defined(USE_ESP32) && SOC_RMT_SUPPORTED
diff --git a/tests/components/remote_transmitter/test.bk72xx-ard.yaml b/tests/components/remote_transmitter/test.bk72xx-ard.yaml
new file mode 100644
index 0000000000..2a5cceddec
--- /dev/null
+++ b/tests/components/remote_transmitter/test.bk72xx-ard.yaml
@@ -0,0 +1,7 @@
+remote_transmitter:
+  id: xmitr
+  pin: GPIO26
+  carrier_duty_percent: 50%
+
+packages:
+  buttons: !include common-buttons.yaml

From 5a300e92f14ef6e2f308dd2394bc5f999fcd5b5f Mon Sep 17 00:00:00 2001
From: Brandon Harvey <8107750+bharvey88@users.noreply.github.com>
Date: Fri, 21 Aug 2026 23:14:56 -0500
Subject: [PATCH 038/155] [wifi] Inline the trivial WiFiScanResult accessors
 (#18613)

---
 esphome/components/wifi/wifi_component.cpp |  8 --------
 esphome/components/wifi/wifi_component.h   | 14 +++++++-------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 127eb50df1..5ed5fc9094 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -2396,14 +2396,6 @@ bool WiFiScanResult::matches(const WiFiAP &config) const {
   }
   return true;
 }
-bool WiFiScanResult::get_matches() const { return this->matches_; }
-void WiFiScanResult::set_matches(bool matches) { this->matches_ = matches; }
-const bssid_t &WiFiScanResult::get_bssid() const { return this->bssid_; }
-uint8_t WiFiScanResult::get_channel() const { return this->channel_; }
-int8_t WiFiScanResult::get_rssi() const { return this->rssi_; }
-bool WiFiScanResult::get_with_auth() const { return this->with_auth_; }
-bool WiFiScanResult::get_is_hidden() const { return this->is_hidden_; }
-
 bool WiFiScanResult::operator==(const WiFiScanResult &rhs) const { return this->bssid_ == rhs.bssid_; }
 
 void WiFiComponent::clear_roaming_state_() {
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index ea043fd5c6..ff90fbe49b 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -319,14 +319,14 @@ class WiFiScanResult {
 
   bool matches(const WiFiAP &config) const;
 
-  bool get_matches() const;
-  void set_matches(bool matches);
-  const bssid_t &get_bssid() const;
+  bool get_matches() const { return this->matches_; }
+  void set_matches(bool matches) { this->matches_ = matches; }
+  const bssid_t &get_bssid() const { return this->bssid_; }
   StringRef get_ssid() const { return this->ssid_.ref(); }
-  uint8_t get_channel() const;
-  int8_t get_rssi() const;
-  bool get_with_auth() const;
-  bool get_is_hidden() const;
+  uint8_t get_channel() const { return this->channel_; }
+  int8_t get_rssi() const { return this->rssi_; }
+  bool get_with_auth() const { return this->with_auth_; }
+  bool get_is_hidden() const { return this->is_hidden_; }
   int8_t get_priority() const { return priority_; }
   void set_priority(int8_t priority) { priority_ = priority; }
 

From a30e82459f2d7fbb97d2c4861f87b2c784938c9f Mon Sep 17 00:00:00 2001
From: Brandon Harvey <8107750+bharvey88@users.noreply.github.com>
Date: Fri, 21 Aug 2026 23:51:19 -0500
Subject: [PATCH 039/155] [deep_sleep] Reject wakeup_pin_mode at both levels on
 BK72xx (#18615)

---
 esphome/components/deep_sleep/__init__.py     |  5 +++
 .../deep_sleep/test_deep_sleep.py             | 40 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/esphome/components/deep_sleep/__init__.py b/esphome/components/deep_sleep/__init__.py
index 91131a3ed7..dc03708645 100644
--- a/esphome/components/deep_sleep/__init__.py
+++ b/esphome/components/deep_sleep/__init__.py
@@ -163,6 +163,11 @@ def validate_config(config: ConfigType) -> ConfigType:
                     "You need to remove the global wakeup_pin_mode and define it per pin"
                 )
             if wakeup_pins:
+                if CONF_WAKEUP_PIN_MODE in wakeup_pins[0]:
+                    raise cv.Invalid(
+                        "Specify wakeup_pin_mode either at the top level under deep_sleep "
+                        "or under the pin entry, not both"
+                    )
                 wakeup_pins[0][CONF_WAKEUP_PIN_MODE] = config.pop(CONF_WAKEUP_PIN_MODE)
     elif (
         isinstance(config.get(CONF_WAKEUP_PIN), list)
diff --git a/tests/component_tests/deep_sleep/test_deep_sleep.py b/tests/component_tests/deep_sleep/test_deep_sleep.py
index f105ed5888..e68b1d17cc 100644
--- a/tests/component_tests/deep_sleep/test_deep_sleep.py
+++ b/tests/component_tests/deep_sleep/test_deep_sleep.py
@@ -1,5 +1,13 @@
 """Tests for the deep sleep component."""
 
+import pytest
+
+from esphome import config_validation as cv
+from esphome.components import deep_sleep
+from esphome.const import CONF_WAKEUP_PIN, PlatformFramework
+
+from ..types import SetCoreConfigCallable
+
 
 def test_deep_sleep_setup(generate_main):
     """
@@ -83,3 +91,35 @@ def test_deep_sleep_run_duration_dictionary(generate_main):
         "    .gpio_cause = 30000,\n"
         "});"
     ) in main_cpp
+
+
+def test_deep_sleep_bk72xx_wakeup_pin_mode_at_both_levels_rejected(
+    set_core_config: SetCoreConfigCallable,
+) -> None:
+    """On BK72xx, wakeup_pin_mode at the top level and under the pin entry is an error."""
+    set_core_config(PlatformFramework.BK72XX_ARDUINO)
+    config = {
+        CONF_WAKEUP_PIN: [
+            {"pin": "GPIO12", deep_sleep.CONF_WAKEUP_PIN_MODE: "KEEP_AWAKE"}
+        ],
+        deep_sleep.CONF_WAKEUP_PIN_MODE: "INVERT_WAKEUP",
+    }
+    with pytest.raises(cv.Invalid, match="not both"):
+        deep_sleep.validate_config(config)
+
+
+def test_deep_sleep_bk72xx_top_level_wakeup_pin_mode_moved_onto_single_pin(
+    set_core_config: SetCoreConfigCallable,
+) -> None:
+    """On BK72xx, a top-level wakeup_pin_mode is moved onto the only pin entry."""
+    set_core_config(PlatformFramework.BK72XX_ARDUINO)
+    config = {
+        CONF_WAKEUP_PIN: [{"pin": "GPIO12"}],
+        deep_sleep.CONF_WAKEUP_PIN_MODE: "INVERT_WAKEUP",
+    }
+    result = deep_sleep.validate_config(config)
+
+    assert deep_sleep.CONF_WAKEUP_PIN_MODE not in result
+    assert (
+        result[CONF_WAKEUP_PIN][0][deep_sleep.CONF_WAKEUP_PIN_MODE] == "INVERT_WAKEUP"
+    )

From 65704e881f868546390770ec1ca75b63c97739de Mon Sep 17 00:00:00 2001
From: Boris Krivonog <boris.krivonog@inova.si>
Date: Sat, 22 Aug 2026 06:52:18 +0200
Subject: [PATCH 040/155] [mitsubishi_cn105] Add Fahrenheit support (#15488)

Co-authored-by: J. Nick Koston <nick@koston.org>
---
 .../components/mitsubishi_cn105/__init__.py   |  3 +
 .../mitsubishi_cn105/mitsubishi_cn105.h       |  1 +
 .../mitsubishi_cn105_climate.cpp              | 20 ++++---
 .../mitsubishi_cn105_component.cpp            |  7 +++
 .../mitsubishi_cn105_component.h              | 35 ++++++++++-
 esphome/components/mqtt/mqtt_climate.cpp      |  3 +-
 .../mitsubishi_cn105_climate_tests.cpp        | 60 +++++++++++++++++++
 tests/components/mitsubishi_cn105/common.h    |  1 +
 tests/components/mitsubishi_cn105/common.yaml |  1 +
 9 files changed, 121 insertions(+), 10 deletions(-)

diff --git a/esphome/components/mitsubishi_cn105/__init__.py b/esphome/components/mitsubishi_cn105/__init__.py
index 450d1cd222..470b7be5fc 100644
--- a/esphome/components/mitsubishi_cn105/__init__.py
+++ b/esphome/components/mitsubishi_cn105/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_ON_STATE,
     CONF_TEMPERATURE,
     CONF_UPDATE_INTERVAL,
+    CONF_USE_FAHRENHEIT,
 )
 from esphome.core import ID, Lambda
 from esphome.cpp_generator import LambdaExpression, MockObj
@@ -71,6 +72,7 @@ CONFIG_SCHEMA = (
             cv.Optional(
                 CONF_TELEMETRY_REQUEST_MIN_INTERVAL, default="60s"
             ): cv.update_interval,
+            cv.Optional(CONF_USE_FAHRENHEIT, default=False): cv.boolean,
             cv.Optional(CONF_VANE): cv.Schema(
                 {
                     cv.Optional(CONF_ON_STATE): automation.validate_automation({}),
@@ -114,6 +116,7 @@ async def to_code(config: ConfigType) -> None:
             config[CONF_TELEMETRY_REQUEST_MIN_INTERVAL]
         )
     )
+    cg.add(var.set_use_fahrenheit(config[CONF_USE_FAHRENHEIT]))
     if on_state := config.get(CONF_VANE, {}).get(CONF_ON_STATE):
         cg.add_global(mitsubishi_ns.using)
         for conf in on_state:
diff --git a/esphome/components/mitsubishi_cn105/mitsubishi_cn105.h b/esphome/components/mitsubishi_cn105/mitsubishi_cn105.h
index b6b11b4820..4d3f899dee 100644
--- a/esphome/components/mitsubishi_cn105/mitsubishi_cn105.h
+++ b/esphome/components/mitsubishi_cn105/mitsubishi_cn105.h
@@ -83,6 +83,7 @@ class MitsubishiCN105 {
     return this->is_telemetry_polling_enabled() ? !std::isnan(this->status_.room_temperature)
                                                 : !std::isnan(this->status_.target_temperature);
   }
+  bool is_temperature_encoding_b() const { return this->property_context_.use_temperature_encoding_b; }
 
   void set_power(bool power_on);
   void set_target_temperature(float target_temperature);
diff --git a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.cpp b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.cpp
index 197e1e1bb5..17ff6d34ca 100644
--- a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.cpp
+++ b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.cpp
@@ -50,7 +50,11 @@ static constexpr std::optional<Left> reverse_map_lookup(const std::array<std::pa
   return key.has_value() ? reverse_map_lookup(map, *key) : std::nullopt;
 }
 
-void MitsubishiCN105Climate::dump_config() { LOG_CLIMATE("", "Mitsubishi CN105 Climate", this); }
+void MitsubishiCN105Climate::dump_config() {
+  LOG_CLIMATE("", "Mitsubishi CN105 Climate", this);
+  ESP_LOGCONFIG(TAG, "  Temperature unit: °%c",
+                this->parent_->get_temperature_mapping().get_use_fahrenheit() ? 'F' : 'C');
+}
 
 void MitsubishiCN105Climate::setup() {
   this->parent_->add_on_status_callback([this]() { this->apply_values_(); });
@@ -72,13 +76,15 @@ climate::ClimateTraits MitsubishiCN105Climate::traits() {
 
   traits.set_supported_swing_modes(this->supported_swing_modes_);
 
-  traits.set_visual_min_temperature(16.0f);
-  traits.set_visual_max_temperature(31.0f);
+  const bool use_fahrenheit = this->parent_->get_temperature_mapping().get_use_fahrenheit();
+  traits.set_temperature_unit(use_fahrenheit ? TemperatureUnit::FAHRENHEIT : TemperatureUnit::CELSIUS);
+  traits.set_visual_min_temperature(use_fahrenheit ? 61.0f : 16.0f);
+  traits.set_visual_max_temperature(use_fahrenheit ? 88.0f : 31.0f);
   traits.set_visual_temperature_step(1.0f);
 
   if (this->parent_->is_telemetry_polling_enabled()) {
     traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE);
-    traits.set_visual_current_temperature_step(0.5f);
+    traits.set_visual_current_temperature_step(use_fahrenheit ? 1.0f : 0.5f);
   }
 
   return traits;
@@ -86,7 +92,7 @@ climate::ClimateTraits MitsubishiCN105Climate::traits() {
 
 void MitsubishiCN105Climate::control(const climate::ClimateCall &call) {
   if (const auto target_temperature = call.get_target_temperature()) {
-    this->parent_->set_target_temperature(*target_temperature);
+    this->parent_->set_target_temperature(this->parent_->get_temperature_mapping().to_mitsubishi(*target_temperature));
   }
 
   if (const auto mode = call.get_mode()) {
@@ -139,10 +145,10 @@ void MitsubishiCN105Climate::control(const climate::ClimateCall &call) {
 void MitsubishiCN105Climate::apply_values_() {
   const auto &status = this->parent_->status();
 
-  this->target_temperature = status.target_temperature;
+  this->target_temperature = this->parent_->get_temperature_mapping().from_mitsubishi(status.target_temperature);
 
   if (this->parent_->is_telemetry_polling_enabled()) {
-    this->current_temperature = status.room_temperature;
+    this->current_temperature = this->parent_->get_temperature_mapping().from_mitsubishi(status.room_temperature);
   }
 
   if (status.power_on) {
diff --git a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.cpp b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.cpp
index 8e9e954645..e2a6ee05af 100644
--- a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.cpp
+++ b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.cpp
@@ -27,6 +27,13 @@ void MitsubishiCN105Component::setup() { this->hp_.initialize(); }
 
 void MitsubishiCN105Component::loop() {
   if (this->hp_.update()) {
+    // Encoding A only supports whole °C values and cannot represent native °F setpoints accurately.
+    // See https://github.com/esphome/esphome/pull/15488#issuecomment-5268304343
+    if (this->temperature_mapping_.get_use_fahrenheit() && !this->hp_.is_temperature_encoding_b()) {
+      ESP_LOGE(TAG, "Unit reports encoding A, which cannot accurately convert °F setpoints; disable 'use_fahrenheit'");
+      this->mark_failed();
+      return;
+    }
     this->notify_status_listeners_();
   }
 }
diff --git a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.h b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.h
index 6461fb464b..508a15e6d5 100644
--- a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.h
+++ b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.h
@@ -3,13 +3,43 @@
 #include "mitsubishi_cn105.h"
 
 #include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
 #include "esphome/components/uart/uart.h"
 
-#include <utility>
+#include <algorithm>
+#include <cmath>
 #include <optional>
+#include <utility>
 
 namespace esphome::mitsubishi_cn105 {
 
+struct TemperatureMapping {
+  float to_mitsubishi(float value) const {
+    if (!this->use_fahrenheit_) {
+      return value;
+    }
+    const int fahrenheit = std::clamp(static_cast<int>(std::round(value)), 61, 88);
+    return 0.5f * (fahrenheit - 28 + (fahrenheit > 68) - (fahrenheit < 68));
+  }
+
+  float from_mitsubishi(float value) const {
+    if (!this->use_fahrenheit_) {
+      return value;
+    }
+    if (value < 16.0f || value > 30.5f) {
+      return celsius_to_fahrenheit(value);
+    }
+    const int mitsubishi_half_degrees = static_cast<int>(std::round(value * 2.0f));
+    return mitsubishi_half_degrees + 29 - (mitsubishi_half_degrees >= 40) - (mitsubishi_half_degrees > 40);
+  }
+
+  bool get_use_fahrenheit() const { return this->use_fahrenheit_; }
+  void set_use_fahrenheit(bool value) { this->use_fahrenheit_ = value; }
+
+ protected:
+  bool use_fahrenheit_{false};
+};
+
 enum VerticalVaneMode : uint8_t {
   VERTICAL_VANE_MODE_AUTO = static_cast<uint8_t>(MitsubishiCN105::VaneMode::AUTO),
   VERTICAL_VANE_MODE_POSITION_1 = static_cast<uint8_t>(MitsubishiCN105::VaneMode::POSITION_1),
@@ -60,6 +90,7 @@ class MitsubishiCN105Component : public Component, public uart::UARTDevice {
 
   void set_update_interval(uint32_t ms) { this->hp_.set_update_interval(ms); }
   void set_telemetry_request_min_interval(uint32_t ms) { this->hp_.set_telemetry_request_min_interval(ms); }
+  void set_use_fahrenheit(bool value) { this->temperature_mapping_.set_use_fahrenheit(value); }
 
   void set_remote_temperature(float temperature) { this->hp_.set_remote_temperature(temperature); }
   void clear_remote_temperature() { this->hp_.clear_remote_temperature(); }
@@ -75,6 +106,7 @@ class MitsubishiCN105Component : public Component, public uart::UARTDevice {
   const MitsubishiCN105::Status &status() const { return this->hp_.status(); }
   bool is_status_initialized() const { return this->hp_.is_status_initialized(); }
   bool is_telemetry_polling_enabled() const { return this->hp_.is_telemetry_polling_enabled(); }
+  const TemperatureMapping &get_temperature_mapping() const { return this->temperature_mapping_; }
 
   template<typename F> void add_on_status_callback(F &&callback) {
     this->status_callback_.add(std::forward<F>(callback));
@@ -99,6 +131,7 @@ class MitsubishiCN105Component : public Component, public uart::UARTDevice {
   }
 
   MitsubishiCN105 hp_;
+  TemperatureMapping temperature_mapping_;
   CallbackManager<void()> status_callback_;
   LazyCallbackManager<void(const VaneState &)> vane_state_callback_;
 };
diff --git a/esphome/components/mqtt/mqtt_climate.cpp b/esphome/components/mqtt/mqtt_climate.cpp
index d5ee4c6a9b..0e6a374f9b 100644
--- a/esphome/components/mqtt/mqtt_climate.cpp
+++ b/esphome/components/mqtt/mqtt_climate.cpp
@@ -118,8 +118,7 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
   root[MQTT_TARGET_TEMPERATURE_STEP] = roundf(traits.get_visual_target_temperature_step() * 10) * 0.1f;
   // current_temp_step
   root[MQTT_CURRENT_TEMPERATURE_STEP] = roundf(traits.get_visual_current_temperature_step() * 10) * 0.1f;
-  // temperature units are always coerced to Celsius internally
-  root[MQTT_TEMPERATURE_UNIT] = "C";
+  root[MQTT_TEMPERATURE_UNIT] = traits.get_temperature_unit() == TemperatureUnit::FAHRENHEIT ? "F" : "C";
 
   // min_humidity
   root[MQTT_MIN_HUMIDITY] = traits.get_visual_min_humidity();
diff --git a/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp b/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp
index 36e0fc90b4..b91252c9fa 100644
--- a/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp
+++ b/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp
@@ -1,7 +1,67 @@
+#include <array>
+#include <utility>
 #include "../common.h"
 
 namespace esphome::mitsubishi_cn105::testing {
 
+TEST(MitsubishiCN105ClimateTests, CelsiusTemperatureMappingAndTraitsMatchExpectedValues) {
+  TestableMitsubishiCN105Climate sut;
+  const auto mapping = TemperatureMapping();
+
+  for (int temperature = 16; temperature <= 31; ++temperature) {
+    EXPECT_EQ(mapping.to_mitsubishi(temperature), temperature);
+    EXPECT_EQ(mapping.from_mitsubishi(temperature), temperature);
+  }
+
+  const auto traits = sut.traits();
+  EXPECT_EQ(traits.get_temperature_unit(), TemperatureUnit::CELSIUS);
+  EXPECT_FLOAT_EQ(traits.get_visual_min_temperature(), 16.0f);
+  EXPECT_FLOAT_EQ(traits.get_visual_max_temperature(), 31.0f);
+  EXPECT_FLOAT_EQ(traits.get_visual_target_temperature_step(), 1.0f);
+  EXPECT_FLOAT_EQ(traits.get_visual_current_temperature_step(), 0.5f);
+}
+
+TEST(MitsubishiCN105ClimateTests, FahrenheitTemperatureMappingAndTraitsMatchExpectedValues) {
+  TestableMitsubishiCN105Climate sut;
+  auto mapping = TemperatureMapping();
+  mapping.set_use_fahrenheit(true);
+  sut.set_use_fahrenheit(true);
+
+  const std::array cases{
+      std::pair{61, 16.0f}, std::pair{62, 16.5f}, std::pair{63, 17.0f}, std::pair{64, 17.5f}, std::pair{65, 18.0f},
+      std::pair{66, 18.5f}, std::pair{67, 19.0f}, std::pair{68, 20.0f}, std::pair{69, 21.0f}, std::pair{70, 21.5f},
+      std::pair{71, 22.0f}, std::pair{72, 22.5f}, std::pair{73, 23.0f}, std::pair{74, 23.5f}, std::pair{75, 24.0f},
+      std::pair{76, 24.5f}, std::pair{77, 25.0f}, std::pair{78, 25.5f}, std::pair{79, 26.0f}, std::pair{80, 26.5f},
+      std::pair{81, 27.0f}, std::pair{82, 27.5f}, std::pair{83, 28.0f}, std::pair{84, 28.5f}, std::pair{85, 29.0f},
+      std::pair{86, 29.5f}, std::pair{87, 30.0f}, std::pair{88, 30.5f},
+  };
+
+  for (const auto &[fahrenheit, mitsubishi_celsius] : cases) {
+    EXPECT_FLOAT_EQ(mapping.to_mitsubishi(fahrenheit), mitsubishi_celsius);
+    EXPECT_FLOAT_EQ(mapping.from_mitsubishi(mitsubishi_celsius), fahrenheit);
+  }
+  const auto traits = sut.traits();
+  EXPECT_EQ(traits.get_temperature_unit(), TemperatureUnit::FAHRENHEIT);
+  EXPECT_FLOAT_EQ(traits.get_visual_min_temperature(), 61.0f);
+  EXPECT_FLOAT_EQ(traits.get_visual_max_temperature(), 88.0f);
+  EXPECT_FLOAT_EQ(traits.get_visual_target_temperature_step(), 1.0f);
+  EXPECT_FLOAT_EQ(traits.get_visual_current_temperature_step(), 1.0f);
+}
+
+TEST(MitsubishiCN105ClimateTests, FahrenheitTemperatureMappingUsesLinearConversionOutsideSetpointRange) {
+  auto mapping = TemperatureMapping();
+  mapping.set_use_fahrenheit(true);
+
+  const std::array cases{
+      std::pair{0.0f, 32.0f},  std::pair{10.0f, 50.0f}, std::pair{15.5f, 59.9f},
+      std::pair{31.0f, 87.8f}, std::pair{35.0f, 95.0f}, std::pair{40.0f, 104.0f},
+  };
+
+  for (const auto &[celsius, fahrenheit] : cases) {
+    EXPECT_FLOAT_EQ(mapping.from_mitsubishi(celsius), fahrenheit);
+  }
+}
+
 TEST(MitsubishiCN105ClimateTests, SupportedSwingModeOffLeavesTraitsEmpty) {
   TestableMitsubishiCN105Climate sut;
 
diff --git a/tests/components/mitsubishi_cn105/common.h b/tests/components/mitsubishi_cn105/common.h
index f542880eef..ee287d2548 100644
--- a/tests/components/mitsubishi_cn105/common.h
+++ b/tests/components/mitsubishi_cn105/common.h
@@ -73,6 +73,7 @@ class TestableMitsubishiCN105Climate : public MitsubishiCN105Climate {
   using MitsubishiCN105Climate::last_non_swing_wide_vane_mode_;
 
   MitsubishiCN105::Status &status() { return const_cast<MitsubishiCN105::Status &>(this->component_.status()); }
+  void set_use_fahrenheit(bool value) { this->component_.set_use_fahrenheit(value); }
 
  protected:
   MitsubishiCN105Component component_;
diff --git a/tests/components/mitsubishi_cn105/common.yaml b/tests/components/mitsubishi_cn105/common.yaml
index fc14724786..3f7e8c8f95 100644
--- a/tests/components/mitsubishi_cn105/common.yaml
+++ b/tests/components/mitsubishi_cn105/common.yaml
@@ -3,6 +3,7 @@ mitsubishi_cn105:
   uart_id: uart_bus
   update_interval: 30s
   telemetry_request_min_interval: 120s
+  use_fahrenheit: true
   vane:
     on_state:
       - logger.log:

From dccf55eadc6c41eaadeca24d10d7cd470ccf8bd7 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Fri, 21 Aug 2026 23:53:16 -0500
Subject: [PATCH 041/155] [remote_transmitter] Use hardware PWM on rtl87xx to
 fix watchdog crash (#18579)

---
 .../components/remote_transmitter/__init__.py |   4 +-
 .../remote_transmitter/remote_transmitter.cpp |   3 +-
 .../remote_transmitter/remote_transmitter.h   |  13 +-
 .../remote_transmitter_rtl87xx.cpp            | 137 ++++++++++++++++++
 .../remote_transmitter/test.rtl87xx-ard.yaml  |   7 +
 5 files changed, 159 insertions(+), 5 deletions(-)
 create mode 100644 esphome/components/remote_transmitter/remote_transmitter_rtl87xx.cpp
 create mode 100644 tests/components/remote_transmitter/test.rtl87xx-ard.yaml

diff --git a/esphome/components/remote_transmitter/__init__.py b/esphome/components/remote_transmitter/__init__.py
index a97b925e06..9d8761ea90 100644
--- a/esphome/components/remote_transmitter/__init__.py
+++ b/esphome/components/remote_transmitter/__init__.py
@@ -185,12 +185,14 @@ FILTER_SOURCE_FILES = filter_source_files_from_platform(
             PlatformFramework.ESP32_ARDUINO,
             PlatformFramework.ESP32_IDF,
         },
+        "remote_transmitter_rtl87xx.cpp": {
+            PlatformFramework.RTL87XX_ARDUINO,
+        },
         "remote_transmitter.cpp": {
             PlatformFramework.ESP32_ARDUINO,
             PlatformFramework.ESP32_IDF,
             PlatformFramework.ESP8266_ARDUINO,
             PlatformFramework.BK72XX_ARDUINO,
-            PlatformFramework.RTL87XX_ARDUINO,
             PlatformFramework.LN882X_ARDUINO,
             PlatformFramework.RP2_ARDUINO,
         },
diff --git a/esphome/components/remote_transmitter/remote_transmitter.cpp b/esphome/components/remote_transmitter/remote_transmitter.cpp
index 31e7464314..67341e936f 100644
--- a/esphome/components/remote_transmitter/remote_transmitter.cpp
+++ b/esphome/components/remote_transmitter/remote_transmitter.cpp
@@ -2,7 +2,8 @@
 #include "esphome/core/log.h"
 #include "esphome/core/application.h"
 
-#if defined(USE_LIBRETINY) || defined(USE_ESP8266) || defined(USE_RP2) || (defined(USE_ESP32) && !SOC_RMT_SUPPORTED)
+#if (defined(USE_LIBRETINY) && !defined(USE_RTL87XX)) || defined(USE_ESP8266) || defined(USE_RP2) || \
+    (defined(USE_ESP32) && !SOC_RMT_SUPPORTED)
 
 namespace esphome::remote_transmitter {
 
diff --git a/esphome/components/remote_transmitter/remote_transmitter.h b/esphome/components/remote_transmitter/remote_transmitter.h
index 0aa04682ba..94bcb74b09 100644
--- a/esphome/components/remote_transmitter/remote_transmitter.h
+++ b/esphome/components/remote_transmitter/remote_transmitter.h
@@ -65,14 +65,21 @@ class RemoteTransmitterComponent final : public remote_base::RemoteTransmitterBa
  protected:
   void send_internal(uint32_t send_times, uint32_t send_wait) override;
 #if defined(USE_ESP8266) || defined(USE_LIBRETINY) || defined(USE_RP2) || (defined(USE_ESP32) && !SOC_RMT_SUPPORTED)
+  void await_target_time_();
+  uint32_t target_time_{0};
+#endif
+#if defined(USE_ESP8266) || (defined(USE_LIBRETINY) && !defined(USE_RTL87XX)) || defined(USE_RP2) || \
+    (defined(USE_ESP32) && !SOC_RMT_SUPPORTED)
   void calculate_on_off_time_(uint32_t carrier_frequency, uint32_t *on_time_period, uint32_t *off_time_period);
 
   void mark_(uint32_t on_time, uint32_t off_time, uint32_t usec);
 
   void space_(uint32_t usec);
-
-  void await_target_time_();
-  uint32_t target_time_{0};
+#endif
+#ifdef USE_RTL87XX
+  // Carrier frequency the PWM is currently configured for; 0 = not yet configured
+  uint32_t current_carrier_frequency_{0};
+  void *pwm_{nullptr};  // pwmout_t*, opaque here to keep the SDK header out of this shared header
 #endif
 
 #if defined(USE_ESP32) && SOC_RMT_SUPPORTED
diff --git a/esphome/components/remote_transmitter/remote_transmitter_rtl87xx.cpp b/esphome/components/remote_transmitter/remote_transmitter_rtl87xx.cpp
new file mode 100644
index 0000000000..b7078b9d69
--- /dev/null
+++ b/esphome/components/remote_transmitter/remote_transmitter_rtl87xx.cpp
@@ -0,0 +1,137 @@
+#include "remote_transmitter.h"
+#include "esphome/core/application.h"
+#include "esphome/core/log.h"
+
+// clang-tidy cannot parse the Realtek SDK headers pulled in via ArduinoPrivate.h
+#if defined(USE_RTL87XX) && !defined(CLANG_TIDY)
+
+// ArduinoPrivate.h = Arduino.h + the SDK's mbed HAL (pwmout etc.) with the core's fixes for
+// type-name collisions between the two (e.g. PinMode)
+#include <ArduinoPrivate.h>
+#include <FreeRTOS.h>
+#include <task.h>
+
+namespace esphome::remote_transmitter {
+
+static const char *const TAG = "remote_transmitter";
+
+// The carrier is generated by the PWM peripheral instead of bit-banging the pin: software carrier
+// generation requires disabling interrupts for the whole frame, but this core's micros() is derived
+// from the FreeRTOS tick and freezes while interrupts are off, so the timing loop never advances and
+// the watchdog resets the chip. With hardware PWM, software only times the mark/space envelope and
+// interrupts can stay enabled.
+//
+// The PWM is driven through the SDK's pwmout HAL directly rather than the Arduino wiring layer:
+// changing the carrier frequency via the wiring requires a GPIO/PWM pin mode round-trip, which
+// use-after-frees the core's per-pin state (pinRemoveMode() frees without nulling) and corrupts the
+// heap. pwmout_period_us() changes the frequency with no mode transitions.
+
+void RemoteTransmitterComponent::setup() {
+  // Deliberately no pin_->setup(): registering the pin as GPIO claims it in the SDK's pin
+  // management, and the pad is then never handed over to the PWM peripheral -- pwmout_init()
+  // must own the pin from the start.
+  PinInfo *info = pinInfo(this->pin_->get_pin());
+  if (info == nullptr || !pinSupported(info, PIN_PWM)) {
+    // checked here because the AmebaZ (RTL8710B) SDK does not report PWM init failure
+    ESP_LOGE(TAG, "Pin %u is not PWM-capable", this->pin_->get_pin());
+    this->mark_failed();
+    return;
+  }
+  auto *pwm = new pwmout_t();
+  this->pwm_ = pwm;
+  pwmout_init(pwm, static_cast<PinName>(info->gpio));
+#if LT_RTL8720C
+  // only the AmebaZ2 SDK's pwmout_s reports init success
+  if (!pwm->is_init) {
+    ESP_LOGE(TAG, "PWM init failed on pin %u", this->pin_->get_pin());
+    delete pwm;
+    this->pwm_ = nullptr;
+    this->mark_failed();
+    return;
+  }
+#endif
+  pwmout_period_us(pwm, 26);  // placeholder; the real carrier period is set per transmission
+  pwmout_write(pwm, this->pin_->is_inverted() ? 1.0f : 0.0f);
+}
+
+void RemoteTransmitterComponent::dump_config() {
+  ESP_LOGCONFIG(TAG,
+                "Remote Transmitter:\n"
+                "  Carrier Duty: %u%%",
+                this->carrier_duty_percent_);
+  LOG_PIN("  Pin: ", this->pin_);
+}
+
+void RemoteTransmitterComponent::await_target_time_() {
+  const uint32_t current_time = micros();
+  if (this->target_time_ == 0) {
+    this->target_time_ = current_time;
+  } else {
+    while ((int32_t) (this->target_time_ - micros()) > 0) {
+    }
+  }
+}
+
+void RemoteTransmitterComponent::digital_write(bool value) {
+  if (this->pwm_ == nullptr)
+    return;
+  pwmout_write(static_cast<pwmout_t *>(this->pwm_), (value != this->pin_->is_inverted()) ? 1.0f : 0.0f);
+}
+
+void RemoteTransmitterComponent::send_internal(uint32_t send_times, uint32_t send_wait) {
+  auto *pwm = static_cast<pwmout_t *>(this->pwm_);
+  if (pwm == nullptr) {
+    ESP_LOGW(TAG, "Cannot send: PWM not initialized");
+    return;
+  }
+  ESP_LOGD(TAG, "Sending remote code");
+  const uint32_t carrier_frequency = this->temp_.get_carrier_frequency();
+  // unmodulated protocols (no carrier or 100% duty) drive the pin constantly during marks
+  float mark_duty =
+      (carrier_frequency > 0 && this->carrier_duty_percent_ < 100) ? this->carrier_duty_percent_ / 100.0f : 1.0f;
+  float space_duty = 0.0f;
+  if (this->pin_->is_inverted()) {
+    mark_duty = 1.0f - mark_duty;
+    space_duty = 1.0f;
+  }
+  if (carrier_frequency > 0 && carrier_frequency != this->current_carrier_frequency_) {
+    // round(1000000/freq), clamped like the bit-bang path so a bad lambda can't hand the SDK a zero period
+    const uint32_t period = std::max(uint32_t(1), (1000000UL + carrier_frequency / 2) / carrier_frequency);
+    pwmout_period_us(pwm, period);
+    this->current_carrier_frequency_ = carrier_frequency;
+  }
+  this->transmit_trigger_.trigger();
+  const UBaseType_t saved_priority = uxTaskPriorityGet(nullptr);
+  for (uint32_t i = 0; i < send_times; i++) {
+    // Boost task priority for the frame only, so WiFi/lwIP tasks can't preempt mid-frame and
+    // merge adjacent marks. Interrupts stay enabled: micros() needs the FreeRTOS tick, and
+    // ISR latency is within receiver tolerance.
+    vTaskPrioritySet(nullptr, configMAX_PRIORITIES - 1);
+    // Re-anchor every iteration: a late exit from the normal-priority gap wait must not
+    // leave the schedule behind micros(), which would compress the next frame's leading items
+    this->target_time_ = 0;
+    for (int32_t item : this->temp_.get_data()) {
+      const bool is_mark = item > 0;
+      this->await_target_time_();
+      pwmout_write(pwm, is_mark ? mark_duty : space_duty);
+      this->target_time_ += is_mark ? uint32_t(item) : uint32_t(-item);
+      App.feed_wdt();
+    }
+    this->await_target_time_();  // wait for duration of last pulse
+    pwmout_write(pwm, space_duty);
+    vTaskPrioritySet(nullptr, saved_priority);
+    if (i + 1 < send_times) {
+      // The repeat gap is user-configurable and unbounded, so wait it out at normal
+      // priority, feeding the watchdog
+      const uint32_t gap_end = micros() + send_wait;
+      while ((int32_t) (gap_end - micros()) > 0) {
+        App.feed_wdt();
+      }
+    }
+  }
+  this->complete_trigger_.trigger();
+}
+
+}  // namespace esphome::remote_transmitter
+
+#endif  // USE_RTL87XX && !CLANG_TIDY
diff --git a/tests/components/remote_transmitter/test.rtl87xx-ard.yaml b/tests/components/remote_transmitter/test.rtl87xx-ard.yaml
new file mode 100644
index 0000000000..769adbdf5c
--- /dev/null
+++ b/tests/components/remote_transmitter/test.rtl87xx-ard.yaml
@@ -0,0 +1,7 @@
+remote_transmitter:
+  id: xmitr
+  pin: GPIO12
+  carrier_duty_percent: 50%
+
+packages:
+  buttons: !include common-buttons.yaml

From ef1d77885dd5a7f1beef4e3d34e22e26d5661fa1 Mon Sep 17 00:00:00 2001
From: Brandon Harvey <8107750+bharvey88@users.noreply.github.com>
Date: Sat, 22 Aug 2026 00:04:08 -0500
Subject: [PATCH 042/155] [captive_portal] Show each network once in the scan
 list (#17847)

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Co-authored-by: J. Nick Koston <nick@koston.org>
Co-authored-by: Bluetooth Devices Bot <bluetooth@koston.org>
---
 .../captive_portal/captive_portal.cpp         |  11 +-
 esphome/components/captive_portal/scan_list.h |  28 ++++
 esphome/components/wifi/wifi_component.h      |   1 +
 tests/components/captive_portal/__init__.py   |  10 ++
 .../captive_portal/scan_list_test.cpp         | 130 ++++++++++++++++++
 5 files changed, 176 insertions(+), 4 deletions(-)
 create mode 100644 esphome/components/captive_portal/scan_list.h
 create mode 100644 tests/components/captive_portal/__init__.py
 create mode 100644 tests/components/captive_portal/scan_list_test.cpp

diff --git a/esphome/components/captive_portal/captive_portal.cpp b/esphome/components/captive_portal/captive_portal.cpp
index 704a61d4de..ffd121499b 100644
--- a/esphome/components/captive_portal/captive_portal.cpp
+++ b/esphome/components/captive_portal/captive_portal.cpp
@@ -6,6 +6,7 @@
 #include "esphome/core/string_ref.h"
 #include "esphome/components/wifi/wifi_component.h"
 #include "captive_index.h"
+#include "scan_list.h"
 
 namespace esphome::captive_portal {
 
@@ -33,8 +34,10 @@ void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
     // Invariant: only bounded in-memory work under the lock; the network send
     // happens later in request->send()
     wifi::ScanResultsLock lock(wifi::global_wifi_component);
-    for (const auto &scan : wifi::global_wifi_component->get_scan_result()) {
-      if (scan.get_is_hidden())
+    const auto &results = wifi::global_wifi_component->get_scan_result();
+    for (const auto &scan : results) {
+      bool with_auth = false;
+      if (!should_show_scan_entry(results, scan, with_auth))
         continue;
 
       json_escape_into_buffer(escaped_ssid, scan.get_ssid());
@@ -44,10 +47,10 @@ void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
       stream->print(ESPHOME_F("\",\"rssi\":"));
       stream->print(scan.get_rssi());
       stream->print(ESPHOME_F(",\"lock\":"));
-      stream->print(scan.get_with_auth());
+      stream->print(with_auth);
       stream->print(ESPHOME_F("}"));
 #else
-      stream->printf(R"(,{"ssid":"%s","rssi":%d,"lock":%d})", escaped_ssid, scan.get_rssi(), scan.get_with_auth());
+      stream->printf(R"(,{"ssid":"%s","rssi":%d,"lock":%d})", escaped_ssid, scan.get_rssi(), with_auth);
 #endif
     }
   }
diff --git a/esphome/components/captive_portal/scan_list.h b/esphome/components/captive_portal/scan_list.h
new file mode 100644
index 0000000000..d24a88a670
--- /dev/null
+++ b/esphome/components/captive_portal/scan_list.h
@@ -0,0 +1,28 @@
+#pragma once
+#include <cstdint>
+
+namespace esphome::captive_portal {
+
+// A scan lists every BSSID, so one SSID can appear several times. Returns true for
+// the strongest entry per SSID (earliest on ties), never for hidden entries. scan
+// must be an element of results. with_auth is written only when returning true and
+// is set if any entry with that SSID needs a key. Templated for host tests.
+template<typename Results, typename Entry>
+bool should_show_scan_entry(const Results &results, const Entry &scan, bool &with_auth) {
+  if (scan.get_is_hidden())
+    return false;
+  const int8_t rssi = scan.get_rssi();
+  bool any_auth = false;
+  for (const auto &other : results) {
+    if (other.get_is_hidden() || !other.ssid_equals(scan))
+      continue;
+    // Same array, so address order is index order. scan fails both checks against itself.
+    if (other.get_rssi() > rssi || (other.get_rssi() == rssi && &other < &scan))
+      return false;
+    any_auth |= other.get_with_auth();
+  }
+  with_auth = any_auth;
+  return true;
+}
+
+}  // namespace esphome::captive_portal
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index ff90fbe49b..c54fbc004b 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -327,6 +327,7 @@ class WiFiScanResult {
   int8_t get_rssi() const { return this->rssi_; }
   bool get_with_auth() const { return this->with_auth_; }
   bool get_is_hidden() const { return this->is_hidden_; }
+  bool ssid_equals(const WiFiScanResult &other) const { return this->ssid_ == other.ssid_; }
   int8_t get_priority() const { return priority_; }
   void set_priority(int8_t priority) { priority_ = priority; }
 
diff --git a/tests/components/captive_portal/__init__.py b/tests/components/captive_portal/__init__.py
new file mode 100644
index 0000000000..1ac0704a59
--- /dev/null
+++ b/tests/components/captive_portal/__init__.py
@@ -0,0 +1,10 @@
+from tests.testing_helpers import ComponentManifestOverride
+
+
+def override_manifest(manifest: ComponentManifestOverride) -> None:
+    # The scan list helper is header-only and needs none of the component's real
+    # dependencies. Pulling them in breaks the host build: web_server_base
+    # includes ESPAsyncWebServer.h and ota.web_server includes md5/md5.h, neither
+    # of which exists there.
+    manifest.dependencies = []
+    manifest.auto_load = []
diff --git a/tests/components/captive_portal/scan_list_test.cpp b/tests/components/captive_portal/scan_list_test.cpp
new file mode 100644
index 0000000000..f67581dc0b
--- /dev/null
+++ b/tests/components/captive_portal/scan_list_test.cpp
@@ -0,0 +1,130 @@
+#include <gtest/gtest.h>
+
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "esphome/components/captive_portal/scan_list.h"
+
+namespace esphome::captive_portal::testing {
+
+namespace {
+
+// Stand-in for wifi::WiFiScanResult, which does not compile on the host.
+struct Entry {
+  std::string ssid;
+  int8_t rssi;
+  bool with_auth{true};
+  bool is_hidden{false};
+
+  // Compares length and bytes like CompactString does, so an embedded NUL counts.
+  bool ssid_equals(const Entry &other) const { return this->ssid == other.ssid; }
+  int8_t get_rssi() const { return this->rssi; }
+  bool get_with_auth() const { return this->with_auth; }
+  bool get_is_hidden() const { return this->is_hidden; }
+};
+
+// One row as the portal would emit it.
+struct Row {
+  std::string ssid;
+  int8_t rssi;
+  bool lock;
+
+  bool operator==(const Row &rhs) const { return ssid == rhs.ssid && rssi == rhs.rssi && lock == rhs.lock; }
+};
+
+// Walk the results the way handle_config does and collect the rows that survive.
+std::vector<Row> rows(const std::vector<Entry> &results) {
+  std::vector<Row> out;
+  for (size_t i = 0; i < results.size(); i++) {
+    bool with_auth = false;
+    if (!should_show_scan_entry(results, results[i], with_auth))
+      continue;
+    out.push_back({results[i].ssid, results[i].rssi, with_auth});
+  }
+  return out;
+}
+
+}  // namespace
+
+TEST(ScanList, SingleEntryShown) {
+  std::vector<Entry> results = {{"Home", -60}};
+  EXPECT_EQ(rows(results), (std::vector<Row>{{"Home", -60, true}}));
+}
+
+TEST(ScanList, DistinctSsidsAllShownInOrder) {
+  std::vector<Entry> results = {{"Home", -60}, {"Guest", -70}, {"Cafe", -40}};
+  EXPECT_EQ(rows(results), (std::vector<Row>{{"Home", -60, true}, {"Guest", -70, true}, {"Cafe", -40, true}}));
+}
+
+// Results are ordered by connection preference, not RSSI, so the strongest entry
+// can sit anywhere in the list.
+TEST(ScanList, SameSsidKeepsStrongest) {
+  std::vector<Entry> results = {{"Home", -70}, {"Home", -50}, {"Home", -60}};
+  EXPECT_EQ(rows(results), (std::vector<Row>{{"Home", -50, true}}));
+}
+
+TEST(ScanList, EqualRssiKeepsFirst) {
+  std::vector<Entry> results = {{"Home", -60}, {"Home", -60}, {"Home", -60}};
+  bool with_auth = false;
+  EXPECT_TRUE(should_show_scan_entry(results, results[0], with_auth));
+  EXPECT_FALSE(should_show_scan_entry(results, results[1], with_auth));
+  EXPECT_FALSE(should_show_scan_entry(results, results[2], with_auth));
+  EXPECT_EQ(rows(results), (std::vector<Row>{{"Home", -60, true}}));
+}
+
+// with_auth is an out-parameter that must only be written for a shown entry.
+TEST(ScanList, WithAuthUntouchedWhenNotShown) {
+  std::vector<Entry> results = {{"Home", -50, false}, {"Home", -70, true}};
+  bool with_auth = false;
+  EXPECT_FALSE(should_show_scan_entry(results, results[1], with_auth));
+  EXPECT_FALSE(with_auth);
+}
+
+TEST(ScanList, DuplicatesInterleavedWithOtherNetworks) {
+  std::vector<Entry> results = {{"Home", -70}, {"Guest", -55}, {"Home", -50}, {"Guest", -65}};
+  EXPECT_EQ(rows(results), (std::vector<Row>{{"Guest", -55, true}, {"Home", -50, true}}));
+}
+
+// Hidden networks scan with an empty SSID. They are never listed and do not
+// collapse into each other or into anything else.
+TEST(ScanList, HiddenEntriesNeverShown) {
+  std::vector<Entry> results = {{"", -40, true, true}, {"Home", -70}, {"", -30, true, true}};
+  EXPECT_EQ(rows(results), (std::vector<Row>{{"Home", -70, true}}));
+}
+
+// On ESP8266 the hidden flag comes from the driver alongside a real SSID, so a
+// hidden access point can share its name with a visible one. It must not
+// outrank that visible entry and leave the network unlisted.
+TEST(ScanList, HiddenEntryDoesNotSuppressVisibleSameSsid) {
+  std::vector<Entry> results = {{"Home", -40, true, true}, {"Home", -70}};
+  EXPECT_EQ(rows(results), (std::vector<Row>{{"Home", -70, true}}));
+}
+
+// An open access point and a secured one sharing an SSID collapse to one row that
+// still asks for a password, whichever of them is strongest.
+TEST(ScanList, LockSetWhenAnyEntryRequiresAuth) {
+  std::vector<Entry> open_stronger = {{"Home", -50, false}, {"Home", -70, true}};
+  EXPECT_EQ(rows(open_stronger), (std::vector<Row>{{"Home", -50, true}}));
+
+  std::vector<Entry> secured_stronger = {{"Home", -70, false}, {"Home", -50, true}};
+  EXPECT_EQ(rows(secured_stronger), (std::vector<Row>{{"Home", -50, true}}));
+}
+
+TEST(ScanList, LockClearWhenEveryEntryIsOpen) {
+  std::vector<Entry> results = {{"Cafe", -60, false}, {"Cafe", -50, false}};
+  EXPECT_EQ(rows(results), (std::vector<Row>{{"Cafe", -50, false}}));
+}
+
+// The auth flag of an unrelated network must not leak into another SSID's row.
+TEST(ScanList, LockIsPerSsid) {
+  std::vector<Entry> results = {{"Cafe", -60, false}, {"Home", -50, true}};
+  EXPECT_EQ(rows(results), (std::vector<Row>{{"Cafe", -60, false}, {"Home", -50, true}}));
+}
+
+TEST(ScanList, EmptyListShowsNothing) {
+  std::vector<Entry> results;
+  EXPECT_TRUE(rows(results).empty());
+}
+
+}  // namespace esphome::captive_portal::testing

From ea10f94376d967f2099701abd12902efdc9e7cf8 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sun, 23 Aug 2026 03:31:47 +1200
Subject: [PATCH 043/155] [core] Add type annotations to component Python
 (10/11) (#18347)

Co-authored-by: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
---
 esphome/components/adc/__init__.py            |  5 ++-
 esphome/components/adc/sensor.py              |  6 +--
 esphome/components/api/__init__.py            | 36 ++++++++++++-----
 esphome/components/button/__init__.py         | 20 ++++++----
 esphome/components/climate/__init__.py        | 29 ++++++++++----
 esphome/components/cover/__init__.py          | 40 ++++++++++++++-----
 .../components/dashboard_import/__init__.py   | 10 +++--
 esphome/components/debug/__init__.py          |  3 +-
 esphome/components/debug/sensor.py            |  3 +-
 esphome/components/debug/text_sensor.py       |  3 +-
 esphome/components/esp8266/__init__.py        | 18 +++++----
 esphome/components/esp8266/gpio.py            | 15 ++++---
 esphome/components/file/image.py              | 17 ++++----
 esphome/components/globals/__init__.py        | 12 ++++--
 .../components/gpio/binary_sensor/__init__.py |  5 ++-
 esphome/components/gpio/one_wire/__init__.py  |  3 +-
 esphome/components/gpio/output/__init__.py    |  3 +-
 esphome/components/gpio/switch/__init__.py    |  3 +-
 esphome/components/homeassistant/__init__.py  | 12 ++++--
 .../homeassistant/binary_sensor/__init__.py   |  3 +-
 .../homeassistant/number/__init__.py          |  3 +-
 .../homeassistant/sensor/__init__.py          |  3 +-
 .../homeassistant/switch/__init__.py          |  3 +-
 .../homeassistant/text_sensor/__init__.py     |  3 +-
 .../components/homeassistant/time/__init__.py |  3 +-
 esphome/components/host/__init__.py           |  5 ++-
 esphome/components/host/gpio.py               |  9 +++--
 esphome/components/host/time/__init__.py      |  3 +-
 esphome/components/i2c/__init__.py            | 32 ++++++++-------
 esphome/components/lock/__init__.py           | 34 +++++++++++-----
 30 files changed, 230 insertions(+), 114 deletions(-)

diff --git a/esphome/components/adc/__init__.py b/esphome/components/adc/__init__.py
index 1c50b6b81b..5c763a4f4c 100644
--- a/esphome/components/adc/__init__.py
+++ b/esphome/components/adc/__init__.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components.esp32 import (
@@ -16,6 +18,7 @@ from esphome.components.esp32 import (
 import esphome.config_validation as cv
 from esphome.const import CONF_ANALOG, CONF_INPUT, CONF_NUMBER, PLATFORM_ESP8266
 from esphome.core import CORE
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
 
@@ -225,7 +228,7 @@ ESP32_VARIANT_ADC2_PIN_TO_CHANNEL = {
 }
 
 
-def validate_adc_pin(value):
+def validate_adc_pin(value: Any) -> ConfigType | str:
     if str(value).upper() == "VCC":
         if CORE.is_rp2:
             return pins.internal_gpio_input_pin_schema(29)
diff --git a/esphome/components/adc/sensor.py b/esphome/components/adc/sensor.py
index b2a4382a21..5d1031825e 100644
--- a/esphome/components/adc/sensor.py
+++ b/esphome/components/adc/sensor.py
@@ -52,7 +52,7 @@ _attenuation = cv.enum(ATTENUATION_MODES, lower=True)
 _sampling_mode = cv.enum(SAMPLING_MODES, lower=True)
 
 
-def validate_config(config):
+def validate_config(config: ConfigType) -> ConfigType:
     if config[CONF_RAW] and config.get(CONF_ATTENUATION, None) == "auto":
         raise cv.Invalid("Automatic attenuation cannot be used when raw output is set")
 
@@ -120,7 +120,7 @@ CONFIG_SCHEMA = cv.All(
 CONF_ADC_CHANNEL_ID = "adc_channel_id"
 
 
-def _overlay_io_channels():
+def _overlay_io_channels() -> str:
     channel_count = CORE.data[CONF_ADC_CHANNEL_ID]
     entries = ", ".join(f"<&adc {channel_id}>" for channel_id in range(channel_count))
     return f"""
@@ -132,7 +132,7 @@ def _overlay_io_channels():
             """
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await sensor.register_sensor(var, config)
diff --git a/esphome/components/api/__init__.py b/esphome/components/api/__init__.py
index 912d580a0f..0dc4b905bf 100644
--- a/esphome/components/api/__init__.py
+++ b/esphome/components/api/__init__.py
@@ -1,5 +1,6 @@
 import base64
 import logging
+from typing import Any
 
 from esphome import automation
 from esphome.automation import Condition
@@ -129,7 +130,7 @@ def _register_provisioning_source(config: ConfigType) -> ConfigType:
     return config
 
 
-def validate_encryption_key(value):
+def validate_encryption_key(value: Any) -> str:
     value = cv.string_strict(value)
     try:
         decoded = base64.b64decode(value, validate=True)
@@ -217,7 +218,7 @@ def _auto_detect_supports_response(config: ConfigType) -> ConfigType:
     return config
 
 
-def _validate_supports_response(value):
+def _validate_supports_response(value: Any) -> str:
     """Validate supports_response after auto-detection has set the value."""
     return cv.enum(SUPPORTS_RESPONSE_OPTIONS, lower=True)(value)
 
@@ -256,7 +257,7 @@ ENCRYPTION_SCHEMA = cv.Schema(
 )
 
 
-def _encryption_schema(config):
+def _encryption_schema(config: ConfigType | None) -> ConfigType:
     if config is None:
         config = {}
     return ENCRYPTION_SCHEMA(config)
@@ -393,7 +394,7 @@ async def to_code(config: ConfigType) -> None:
 
     if actions := config.get(CONF_ACTIONS, []):
         # Collect all triggers first, then register all at once with initializer_list
-        triggers: list[cg.Pvariable] = []
+        triggers: list[cg.MockObj] = []
         for conf in actions:
             func_args: list[tuple[MockObj, str]] = []
             service_template_args: list[MockObj] = []  # User service argument types
@@ -581,7 +582,7 @@ async def homeassistant_service_to_code(
     action_id: ID,
     template_arg: cg.TemplateArguments,
     args: TemplateArgsType,
-):
+) -> MockObj:
     cg.add_define("USE_API_HOMEASSISTANT_SERVICES")
     serv = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, serv, False)
@@ -647,7 +648,7 @@ async def homeassistant_service_to_code(
     return var
 
 
-def validate_homeassistant_event(value):
+def validate_homeassistant_event(value: Any) -> str:
     value = cv.string(value)
     if not value.startswith("esphome."):
         raise cv.Invalid(
@@ -676,7 +677,12 @@ HOMEASSISTANT_EVENT_ACTION_SCHEMA = cv.Schema(
     HOMEASSISTANT_EVENT_ACTION_SCHEMA,
     synchronous=True,
 )
-async def homeassistant_event_to_code(config, action_id, template_arg, args):
+async def homeassistant_event_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     cg.add_define("USE_API_HOMEASSISTANT_SERVICES")
     serv = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, serv, True)
@@ -724,7 +730,12 @@ HOMEASSISTANT_TAG_SCANNED_ACTION_SCHEMA = cv.maybe_simple_value(
     HOMEASSISTANT_TAG_SCANNED_ACTION_SCHEMA,
     synchronous=True,
 )
-async def homeassistant_tag_scanned_to_code(config, action_id, template_arg, args):
+async def homeassistant_tag_scanned_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     cg.add_define("USE_API_HOMEASSISTANT_SERVICES")
     serv = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, serv, True)
@@ -740,7 +751,7 @@ CONF_SUCCESS = "success"
 CONF_ERROR_MESSAGE = "error_message"
 
 
-def _validate_api_respond_data(config):
+def _validate_api_respond_data(config: ConfigType) -> ConfigType:
     """Set flag during validation so AUTO_LOAD can include json component."""
     if CONF_DATA in config:
         CORE.data.setdefault(DOMAIN, {})[CONF_CAPTURE_RESPONSE] = True
@@ -824,7 +835,12 @@ API_CONNECTED_CONDITION_SCHEMA = cv.Schema(
 @automation.register_condition(
     "api.connected", APIConnectedCondition, API_CONNECTED_CONDITION_SCHEMA
 )
-async def api_connected_to_code(config, condition_id, template_arg, args):
+async def api_connected_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     var = cg.new_Pvariable(condition_id, template_arg)
     templ = await cg.templatable(config[CONF_STATE_SUBSCRIPTION_ONLY], args, cg.bool_)
     cg.add(var.set_state_subscription_only(templ))
diff --git a/esphome/components/button/__init__.py b/esphome/components/button/__init__.py
index a4245f43e6..ee24002b8a 100644
--- a/esphome/components/button/__init__.py
+++ b/esphome/components/button/__init__.py
@@ -16,14 +16,15 @@ from esphome.const import (
     DEVICE_CLASS_RESTART,
     DEVICE_CLASS_UPDATE,
 )
-from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.core import CORE, ID, CoroPriority, coroutine_with_priority
 from esphome.core.entity_helpers import (
     entity_duplicate_validator,
     queue_entity_register,
     setup_device_class,
     setup_entity,
 )
-from esphome.cpp_generator import MockObjClass
+from esphome.cpp_generator import MockObj, MockObjClass, TemplateArgsType
+from esphome.types import ConfigType, SafeExpType
 
 CODEOWNERS = ["@esphome/core"]
 IS_PLATFORM_COMPONENT = True
@@ -88,7 +89,7 @@ _CALLBACK_AUTOMATIONS = (
 
 
 @setup_entity("button")
-async def setup_button_core_(var, config):
+async def setup_button_core_(var: MockObj, config: ConfigType) -> None:
     await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)
 
     setup_device_class(config)
@@ -101,7 +102,7 @@ async def setup_button_core_(var, config):
         await web_server.add_entity_config(var, web_server_config)
 
 
-async def register_button(var, config):
+async def register_button(var: MockObj, config: ConfigType) -> None:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     queue_entity_register("button", config)
@@ -109,7 +110,7 @@ async def register_button(var, config):
     await setup_button_core_(var, config)
 
 
-async def new_button(config, *args):
+async def new_button(config: ConfigType, *args: SafeExpType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID], *args)
     await register_button(var, config)
     return var
@@ -125,11 +126,16 @@ BUTTON_PRESS_SCHEMA = maybe_simple_id(
 @automation.register_action(
     "button.press", PressAction, BUTTON_PRESS_SCHEMA, synchronous=True
 )
-async def button_press_to_code(config, action_id, template_arg, args):
+async def button_press_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(button_ns.using)
diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index fe050fca22..80dd913fba 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import mqtt, web_server
@@ -48,13 +50,19 @@ from esphome.const import (
     CONF_VISUAL,
     CONF_WEB_SERVER,
 )
-from esphome.core import CORE, CoroPriority, Lambda, coroutine_with_priority
+from esphome.core import CORE, ID, CoroPriority, Lambda, coroutine_with_priority
 from esphome.core.entity_helpers import (
     entity_duplicate_validator,
     queue_entity_register,
     setup_entity,
 )
-from esphome.cpp_generator import LambdaExpression, MockObjClass
+from esphome.cpp_generator import (
+    LambdaExpression,
+    MockObj,
+    MockObjClass,
+    TemplateArgsType,
+)
+from esphome.types import ConfigType, SafeExpType
 
 IS_PLATFORM_COMPONENT = True
 
@@ -132,7 +140,7 @@ VISUAL_TEMPERATURE_STEP_SCHEMA = cv.Schema(
 )
 
 
-def visual_temperature_step(value):
+def visual_temperature_step(value: Any) -> ConfigType:
     # Allow defining target/current temperature steps separately
     if isinstance(value, dict):
         return VISUAL_TEMPERATURE_STEP_SCHEMA(value)
@@ -273,7 +281,7 @@ def climate_schema(
 
 
 @setup_entity("climate")
-async def setup_climate_core_(var, config):
+async def setup_climate_core_(var: MockObj, config: ConfigType) -> None:
     visual = config.get(CONF_VISUAL, {})
     if (min_temp := visual.get(CONF_MIN_TEMPERATURE)) is not None:
         cg.add_define("USE_CLIMATE_VISUAL_OVERRIDES")
@@ -443,7 +451,7 @@ async def setup_climate_core_(var, config):
         await web_server.add_entity_config(var, web_server_config)
 
 
-async def register_climate(var, config):
+async def register_climate(var: MockObj, config: ConfigType) -> None:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     queue_entity_register("climate", config)
@@ -451,7 +459,7 @@ async def register_climate(var, config):
     await setup_climate_core_(var, config)
 
 
-async def new_climate(config, *args):
+async def new_climate(config: ConfigType, *args: SafeExpType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID], *args)
     await register_climate(var, config)
     return var
@@ -485,7 +493,12 @@ CLIMATE_CONTROL_ACTION_SCHEMA = cv.Schema(
     CLIMATE_CONTROL_ACTION_SCHEMA,
     synchronous=True,
 )
-async def climate_control_to_code(config, action_id, template_arg, args):
+async def climate_control_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
 
     # All configured fields are folded into a single stateless lambda whose
@@ -549,5 +562,5 @@ async def climate_control_to_code(config, action_id, template_arg, args):
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(climate_ns.using)
diff --git a/esphome/components/cover/__init__.py b/esphome/components/cover/__init__.py
index 7639e15334..011b2c2f04 100644
--- a/esphome/components/cover/__init__.py
+++ b/esphome/components/cover/__init__.py
@@ -46,7 +46,7 @@ from esphome.core.entity_helpers import (
     setup_entity,
 )
 from esphome.cpp_generator import LambdaExpression, MockObj, MockObjClass
-from esphome.types import ConfigType, TemplateArgsType
+from esphome.types import ConfigType, SafeExpType, TemplateArgsType
 
 IS_PLATFORM_COMPONENT = True
 
@@ -162,7 +162,7 @@ _COVER_SCHEMA = (
 _COVER_SCHEMA.add_extra(entity_duplicate_validator("cover"))
 
 
-def _validate_mqtt_state_topics(config):
+def _validate_mqtt_state_topics(config: ConfigType) -> ConfigType:
     if config.get(CONF_MQTT_JSON_STATE_PAYLOAD):
         if CONF_POSITION_STATE_TOPIC in config:
             raise cv.Invalid(
@@ -201,7 +201,7 @@ def cover_schema(
 
 
 @setup_entity("cover")
-async def setup_cover_core_(var, config):
+async def setup_cover_core_(var: MockObj, config: ConfigType) -> None:
     setup_device_class(config)
 
     if CONF_ON_OPEN in config:
@@ -235,7 +235,7 @@ async def setup_cover_core_(var, config):
         await web_server.add_entity_config(var, web_server_config)
 
 
-async def register_cover(var, config):
+async def register_cover(var: MockObj, config: ConfigType) -> None:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     queue_entity_register("cover", config)
@@ -243,7 +243,7 @@ async def register_cover(var, config):
     await setup_cover_core_(var, config)
 
 
-async def new_cover(config, *args):
+async def new_cover(config: ConfigType, *args: SafeExpType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID], *args)
     await register_cover(var, config)
     return var
@@ -259,7 +259,12 @@ COVER_ACTION_SCHEMA = maybe_simple_id(
 @automation.register_action(
     "cover.open", OpenAction, COVER_ACTION_SCHEMA, synchronous=True
 )
-async def cover_open_to_code(config, action_id, template_arg, args):
+async def cover_open_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -267,7 +272,12 @@ async def cover_open_to_code(config, action_id, template_arg, args):
 @automation.register_action(
     "cover.close", CloseAction, COVER_ACTION_SCHEMA, synchronous=True
 )
-async def cover_close_to_code(config, action_id, template_arg, args):
+async def cover_close_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -275,7 +285,12 @@ async def cover_close_to_code(config, action_id, template_arg, args):
 @automation.register_action(
     "cover.stop", StopAction, COVER_ACTION_SCHEMA, synchronous=True
 )
-async def cover_stop_to_code(config, action_id, template_arg, args):
+async def cover_stop_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -283,7 +298,12 @@ async def cover_stop_to_code(config, action_id, template_arg, args):
 @automation.register_action(
     "cover.toggle", ToggleAction, COVER_ACTION_SCHEMA, synchronous=True
 )
-async def cover_toggle_to_code(config, action_id, template_arg, args):
+async def cover_toggle_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
@@ -421,5 +441,5 @@ automation.register_condition(
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(cover_ns.using)
diff --git a/esphome/components/dashboard_import/__init__.py b/esphome/components/dashboard_import/__init__.py
index 31559a514c..c27669d77e 100644
--- a/esphome/components/dashboard_import/__init__.py
+++ b/esphome/components/dashboard_import/__init__.py
@@ -2,6 +2,7 @@ import base64
 from pathlib import Path
 import re
 import secrets
+from typing import Any
 
 import requests
 from ruamel.yaml import YAML
@@ -13,6 +14,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_ESPHOME, CONF_PROJECT, CONF_REF, CONF_WIFI
 import esphome.final_validate as fv
 from esphome.happy_eyeballs import ensure_happy_eyeballs
+from esphome.types import ConfigType
 from esphome.yaml_util import dump
 
 dashboard_import_ns = cg.esphome_ns.namespace("dashboard_import")
@@ -23,14 +25,14 @@ DEPENDENCIES = ["api"]
 CODEOWNERS = ["@esphome/core"]
 
 
-def validate_import_url(value):
+def validate_import_url(value: Any) -> str:
     value = cv.string_strict(value)
     value = cv.Length(max=255)(value)
     validate_source_shorthand(value)
     return value
 
 
-def validate_full_url(config):
+def validate_full_url(config: ConfigType) -> ConfigType:
     if not config[CONF_IMPORT_FULL_CONFIG]:
         return config
     source = validate_source_shorthand(config[CONF_PACKAGE_IMPORT_URL])
@@ -55,7 +57,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate(config):
+def _final_validate(config: ConfigType) -> None:
     full_config = fv.full_config.get()[CONF_ESPHOME]
     if CONF_PROJECT not in full_config:
         raise cv.Invalid(
@@ -73,7 +75,7 @@ wifi:
 """
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_DASHBOARD_IMPORT")
     url = config[CONF_PACKAGE_IMPORT_URL]
     if config[CONF_IMPORT_FULL_CONFIG]:
diff --git a/esphome/components/debug/__init__.py b/esphome/components/debug/__init__.py
index 3e94d04f21..a889d13329 100644
--- a/esphome/components/debug/__init__.py
+++ b/esphome/components/debug/__init__.py
@@ -12,6 +12,7 @@ from esphome.const import (
     PlatformFramework,
 )
 from esphome.core import CORE
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
 DEPENDENCIES = ["logger"]
@@ -45,7 +46,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if CORE.using_zephyr:
         zephyr_add_prj_conf("HWINFO", True)
         # gdb thread support
diff --git a/esphome/components/debug/sensor.py b/esphome/components/debug/sensor.py
index a018ce5c3b..72e2efebc2 100644
--- a/esphome/components/debug/sensor.py
+++ b/esphome/components/debug/sensor.py
@@ -21,6 +21,7 @@ from esphome.const import (
     UNIT_MILLISECOND,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 from . import (  # noqa: F401  pylint: disable=unused-import
     CONF_DEBUG_ID,
@@ -111,7 +112,7 @@ CONFIG_SCHEMA = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     debug_component = await cg.get_variable(config[CONF_DEBUG_ID])
 
     if free_conf := config.get(CONF_FREE):
diff --git a/esphome/components/debug/text_sensor.py b/esphome/components/debug/text_sensor.py
index c69b8d9461..9d4fcc1b42 100644
--- a/esphome/components/debug/text_sensor.py
+++ b/esphome/components/debug/text_sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     ICON_CHIP,
     ICON_RESTART,
 )
+from esphome.types import ConfigType
 
 from . import (  # noqa: F401  pylint: disable=unused-import
     CONF_DEBUG_ID,
@@ -33,7 +34,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     debug_component = await cg.get_variable(config[CONF_DEBUG_ID])
 
     if CONF_DEVICE in config:
diff --git a/esphome/components/esp8266/__init__.py b/esphome/components/esp8266/__init__.py
index 2161a902cb..3dd9750c6f 100644
--- a/esphome/components/esp8266/__init__.py
+++ b/esphome/components/esp8266/__init__.py
@@ -3,6 +3,7 @@ from pathlib import Path
 import platform
 import re
 import subprocess
+from typing import Any
 
 import esphome.codegen as cg
 import esphome.config_validation as cv
@@ -31,6 +32,7 @@ from esphome.core import (
 from esphome.core.config import BOARD_MAX_LENGTH
 from esphome.helpers import IS_MACOS, copy_file_if_changed
 from esphome.platformio.toolchain import copy_ccache_script
+from esphome.storage_json import StorageJSON
 from esphome.types import ConfigType
 
 from .boards import BOARDS, ESP8266_LD_SCRIPTS
@@ -88,7 +90,7 @@ def lambdas_use_scanf_float(config: ConfigType) -> bool:
     return False
 
 
-def set_core_data(config):
+def set_core_data(config: ConfigType) -> ConfigType:
     CORE.data[KEY_ESP8266] = {}
     CORE.data[KEY_CORE][KEY_TARGET_PLATFORM] = PLATFORM_ESP8266
     CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK] = "arduino"
@@ -102,7 +104,7 @@ def set_core_data(config):
     return config
 
 
-def get_download_types(storage_json):
+def get_download_types(storage_json: StorageJSON) -> list[dict[str, str]]:
     """Binary-download entries for a built ESP8266 firmware.
 
     Used by device-builder (esphome/device-builder), via
@@ -157,7 +159,7 @@ ARDUINO_3_PLATFORM_VERSION = cv.Version(3, 2, 0)
 ARDUINO_4_PLATFORM_VERSION = cv.Version(4, 2, 1)
 
 
-def _arduino_check_versions(value):
+def _arduino_check_versions(value: ConfigType) -> ConfigType:
     value = value.copy()
     lookups = {
         "dev": (cv.Version(3, 1, 2), "https://github.com/esp8266/Arduino.git"),
@@ -200,7 +202,7 @@ def _arduino_check_versions(value):
     return value
 
 
-def _parse_platform_version(value):
+def _parse_platform_version(value: Any) -> str:
     try:
         # if platform version is a valid version constraint, prefix the default package
         cv.platformio_version_constraint(value)
@@ -275,7 +277,7 @@ def check_rosetta() -> None:
 
 
 @coroutine_with_priority(CoroPriority.PLATFORM)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add(esp8266_ns.setup_preferences())
 
     cg.add_platformio_option("lib_ldf_mode", "off")
@@ -504,7 +506,7 @@ ESP8266_EXCEPTION_CODES = {
 }
 
 
-def _decode_pc(config, addr):
+def _decode_pc(config: ConfigType, addr: str) -> None:
     from esphome.platformio import toolchain
 
     idedata = toolchain.get_idedata(config)
@@ -525,7 +527,7 @@ def _decode_pc(config, addr):
     _LOGGER.warning("Decoded %s", translation)
 
 
-def _parse_register(config, regex, line):
+def _parse_register(config: ConfigType, regex: re.Pattern[str], line: str) -> None:
     match = regex.match(line)
     if match is not None:
         _decode_pc(config, match.group(1))
@@ -549,7 +551,7 @@ STACKTRACE_BAD_ALLOC_RE = re.compile(
 STACKTRACE_ESP8266_BACKTRACE_PC_RE = re.compile(r"4[0-9a-f]{7}")
 
 
-def process_stacktrace(config, line, backtrace_state):
+def process_stacktrace(config: ConfigType, line: str, backtrace_state: bool) -> bool:
     line = line.strip()
     # ESP8266 Exception type
     match = re.match(STACKTRACE_ESP8266_EXCEPTION_TYPE_RE, line)
diff --git a/esphome/components/esp8266/gpio.py b/esphome/components/esp8266/gpio.py
index 64be4a6495..356af6e006 100644
--- a/esphome/components/esp8266/gpio.py
+++ b/esphome/components/esp8266/gpio.py
@@ -1,5 +1,6 @@
 from dataclasses import dataclass
 import logging
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -18,6 +19,8 @@ from esphome.const import (
     PLATFORM_ESP8266,
 )
 from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import boards
 from .const import KEY_BOARD, KEY_ESP8266, KEY_PIN_INITIAL_STATES, esp8266_ns
@@ -27,7 +30,7 @@ _LOGGER = logging.getLogger(__name__)
 ESP8266GPIOPin = esp8266_ns.class_("ESP8266GPIOPin", cg.InternalGPIOPin)
 
 
-def _lookup_pin(value):
+def _lookup_pin(value: str) -> int:
     board = CORE.data[KEY_ESP8266][KEY_BOARD]
     board_pins = boards.ESP8266_BOARD_PINS.get(board, {})
 
@@ -42,7 +45,7 @@ def _lookup_pin(value):
     raise cv.Invalid(f"Cannot resolve pin name '{value}' for board {board}.")
 
 
-def _translate_pin(value):
+def _translate_pin(value: Any) -> int:
     if isinstance(value, dict) or value is None:
         raise cv.Invalid(
             "This variable only supports pin numbers, not full pin schemas "
@@ -69,7 +72,7 @@ _ESP_SDIO_PINS = {
 }
 
 
-def validate_gpio_pin(value):
+def validate_gpio_pin(value: Any) -> int:
     value = _translate_pin(value)
     if value < 0 or value > 17:
         raise cv.Invalid(f"ESP8266: Invalid pin number: {value}")
@@ -86,7 +89,7 @@ def validate_gpio_pin(value):
     return value
 
 
-def validate_supports(value):
+def validate_supports(value: ConfigType) -> ConfigType:
     num = value[CONF_NUMBER]
     mode = value[CONF_MODE]
     is_input = mode[CONF_INPUT]
@@ -160,7 +163,7 @@ class PinInitialState:
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(PLATFORM_ESP8266, ESP8266_PIN_SCHEMA)
-async def esp8266_pin_to_code(config):
+async def esp8266_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     num = config[CONF_NUMBER]
     mode = config[CONF_MODE]
@@ -192,7 +195,7 @@ async def esp8266_pin_to_code(config):
 
 
 @coroutine_with_priority(CoroPriority.WORKAROUNDS)
-async def add_pin_initial_states_array():
+async def add_pin_initial_states_array() -> None:
     # Add includes at the very end, so that they override everything
     initial_states: list[PinInitialState] = CORE.data[KEY_ESP8266][
         KEY_PIN_INITIAL_STATES
diff --git a/esphome/components/file/image.py b/esphome/components/file/image.py
index feced063d0..7cef7c754a 100644
--- a/esphome/components/file/image.py
+++ b/esphome/components/file/image.py
@@ -5,6 +5,7 @@ import io
 import logging
 from pathlib import Path
 import re
+from typing import Any
 
 from PIL import Image, UnidentifiedImageError
 
@@ -75,12 +76,12 @@ def compute_local_image_path(value: str | ConfigType) -> Path:
     return external_files.compute_local_file_path(DOMAIN, url)
 
 
-def local_path(value):
+def local_path(value: str | ConfigType) -> str:
     value = value[CONF_PATH] if isinstance(value, dict) else value
     return str(CORE.relative_config_path(value))
 
 
-def download_file(url, path):
+def download_file(url: str, path: Path) -> str:
     # The shared NETWORK_TIMEOUT applies; a per-caller timeout would be
     # silently ignored on a per-run memo hit anyway (memos key by path).
     external_files.download_content(url, path)
@@ -98,7 +99,7 @@ def download_gh_svg(value: str | ConfigType, source: str) -> str:
     return download_file(url, path)
 
 
-def download_image(value):
+def download_image(value: str | ConfigType) -> str:
     value = value[CONF_URL] if isinstance(value, dict) else value
     return download_file(value, compute_local_image_path(value))
 
@@ -146,7 +147,7 @@ def _extract_entry_ref(entry: ConfigType) -> RemoteFile | None:
 PREFETCH_FILES = external_files.single_stage_prefetch(_extract_entry_ref)
 
 
-def validate_file_shorthand(value):
+def validate_file_shorthand(value: Any) -> str:
     value = cv.string_strict(value)
     if (remote := _parse_remote_shorthand(value)) is not None:
         return download_file(remote.url, remote.path)
@@ -163,8 +164,8 @@ LOCAL_SCHEMA = cv.All(
 )
 
 
-def mdi_schema(source):
-    def validate_mdi(value):
+def mdi_schema(source: str) -> cv.All:
+    def validate_mdi(value: ConfigType) -> str:
         return download_gh_svg(value, source)
 
     return cv.All(
@@ -259,7 +260,9 @@ async def new_image(config: ConfigType) -> MockObj:
     return var
 
 
-async def write_image(config, all_frames=False):
+async def write_image(
+    config: ConfigType, all_frames: bool = False
+) -> tuple[MockObj, int, int, MockObj, MockObj, int]:
     path = Path(config[CONF_FILE])
     if not path.is_file():
         raise core.EsphomeError(f"Could not load image file {path}")
diff --git a/esphome/components/globals/__init__.py b/esphome/components/globals/__init__.py
index 46725fe6dd..bd6bc5f783 100644
--- a/esphome/components/globals/__init__.py
+++ b/esphome/components/globals/__init__.py
@@ -8,7 +8,8 @@ from esphome.const import (
     CONF_TYPE,
     CONF_VALUE,
 )
-from esphome.core import CoroPriority, coroutine_with_priority
+from esphome.core import ID, CoroPriority, coroutine_with_priority
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
@@ -62,7 +63,7 @@ CONFIG_SCHEMA = _globals_schema
 
 # Run with low priority so that namespaces are registered first
 @coroutine_with_priority(CoroPriority.LATE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     type_ = cg.RawExpression(config[CONF_TYPE])
     restore = config[CONF_RESTORE_VALUE]
 
@@ -104,7 +105,12 @@ async def to_code(config):
     ),
     synchronous=True,
 )
-async def globals_set_to_code(config, action_id, template_arg, args):
+async def globals_set_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     full_id, paren = await cg.get_variable_with_full_id(config[CONF_ID])
     template_arg = cg.TemplateArguments(full_id.type, *template_arg)
     var = cg.new_Pvariable(action_id, template_arg, paren)
diff --git a/esphome/components/gpio/binary_sensor/__init__.py b/esphome/components/gpio/binary_sensor/__init__.py
index 703806670c..7cc16eb5b2 100644
--- a/esphome/components/gpio/binary_sensor/__init__.py
+++ b/esphome/components/gpio/binary_sensor/__init__.py
@@ -12,6 +12,7 @@ from esphome.const import (
     CONF_PIN,
 )
 from esphome.core import CORE
+from esphome.types import ConfigType
 
 from .. import gpio_ns
 
@@ -68,7 +69,7 @@ def _pin_shared_only_with_deep_sleep(pin_num: int) -> bool:
     return any(path and path[0] == "deep_sleep" for path, _, _ in pin_users)
 
 
-def _final_validate(config) -> None:
+def _final_validate(config: ConfigType) -> None:
     use_interrupt = config[CONF_USE_INTERRUPT]
     if not use_interrupt:
         return
@@ -124,7 +125,7 @@ def _final_validate(config) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/gpio/one_wire/__init__.py b/esphome/components/gpio/one_wire/__init__.py
index e2bb94dd66..feb8b53dff 100644
--- a/esphome/components/gpio/one_wire/__init__.py
+++ b/esphome/components/gpio/one_wire/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components.one_wire import OneWireBus
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PIN
+from esphome.types import ConfigType
 
 from .. import gpio_ns
 
@@ -18,7 +19,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/gpio/output/__init__.py b/esphome/components/gpio/output/__init__.py
index 786e04bac0..ab242c643f 100644
--- a/esphome/components/gpio/output/__init__.py
+++ b/esphome/components/gpio/output/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PIN
+from esphome.types import ConfigType
 
 from .. import gpio_ns
 
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = output.BINARY_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
     await cg.register_component(var, config)
diff --git a/esphome/components/gpio/switch/__init__.py b/esphome/components/gpio/switch/__init__.py
index 9462cd0161..2e0b0969bc 100644
--- a/esphome/components/gpio/switch/__init__.py
+++ b/esphome/components/gpio/switch/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import CONF_INTERLOCK, CONF_PIN
+from esphome.types import ConfigType
 
 from .. import gpio_ns
 
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await switch.new_switch(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/homeassistant/__init__.py b/esphome/components/homeassistant/__init__.py
index 7b23775b47..1b66842f1e 100644
--- a/esphome/components/homeassistant/__init__.py
+++ b/esphome/components/homeassistant/__init__.py
@@ -1,13 +1,19 @@
+from collections.abc import Callable, Iterable
+
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ATTRIBUTE, CONF_ENTITY_ID, CONF_INTERNAL
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@OttoWinter", "@esphome/core"]
 homeassistant_ns = cg.esphome_ns.namespace("homeassistant")
 
 
-def validate_entity_domain(platform, supported_domains):
-    def validator(config):
+def validate_entity_domain(
+    platform: str, supported_domains: Iterable[str]
+) -> Callable[[ConfigType], ConfigType]:
+    def validator(config: ConfigType) -> ConfigType:
         domain = config[CONF_ENTITY_ID].split(".", 1)[0]
         if domain not in supported_domains:
             raise cv.Invalid(
@@ -34,7 +40,7 @@ HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA = cv.Schema(
 )
 
 
-def setup_home_assistant_entity(var, config):
+def setup_home_assistant_entity(var: MockObj, config: ConfigType) -> None:
     cg.add(var.set_entity_id(config[CONF_ENTITY_ID]))
     if CONF_ATTRIBUTE in config:
         cg.add(var.set_attribute(config[CONF_ATTRIBUTE]))
diff --git a/esphome/components/homeassistant/binary_sensor/__init__.py b/esphome/components/homeassistant/binary_sensor/__init__.py
index a943368dd7..6ea17b6831 100644
--- a/esphome/components/homeassistant/binary_sensor/__init__.py
+++ b/esphome/components/homeassistant/binary_sensor/__init__.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
+from esphome.types import ConfigType
 
 from .. import (
     HOME_ASSISTANT_IMPORT_SCHEMA,
@@ -18,7 +19,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(HomeassistantBinarySensor).ex
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     setup_home_assistant_entity(var, config)
diff --git a/esphome/components/homeassistant/number/__init__.py b/esphome/components/homeassistant/number/__init__.py
index 8f760772c3..ab1389e13a 100644
--- a/esphome/components/homeassistant/number/__init__.py
+++ b/esphome/components/homeassistant/number/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import number
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import (
     HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA,
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_API_HOMEASSISTANT_SERVICES")
     var = await number.new_number(
         config,
diff --git a/esphome/components/homeassistant/sensor/__init__.py b/esphome/components/homeassistant/sensor/__init__.py
index 6437476827..abee957fda 100644
--- a/esphome/components/homeassistant/sensor/__init__.py
+++ b/esphome/components/homeassistant/sensor/__init__.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import sensor
+from esphome.types import ConfigType
 
 from .. import (
     HOME_ASSISTANT_IMPORT_SCHEMA,
@@ -18,7 +19,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(HomeassistantSensor, accuracy_decimals=1).e
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     setup_home_assistant_entity(var, config)
diff --git a/esphome/components/homeassistant/switch/__init__.py b/esphome/components/homeassistant/switch/__init__.py
index c299a731f2..55854cd659 100644
--- a/esphome/components/homeassistant/switch/__init__.py
+++ b/esphome/components/homeassistant/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 from .. import (
     HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA,
@@ -36,7 +37,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_API_HOMEASSISTANT_SERVICES")
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/homeassistant/text_sensor/__init__.py b/esphome/components/homeassistant/text_sensor/__init__.py
index b59f9d23df..265250c695 100644
--- a/esphome/components/homeassistant/text_sensor/__init__.py
+++ b/esphome/components/homeassistant/text_sensor/__init__.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import text_sensor
+from esphome.types import ConfigType
 
 from .. import (
     HOME_ASSISTANT_IMPORT_SCHEMA,
@@ -18,7 +19,7 @@ CONFIG_SCHEMA = text_sensor.text_sensor_schema(HomeassistantTextSensor).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await text_sensor.new_text_sensor(config)
     await cg.register_component(var, config)
     setup_home_assistant_entity(var, config)
diff --git a/esphome/components/homeassistant/time/__init__.py b/esphome/components/homeassistant/time/__init__.py
index 05ca86a26e..146b8278ea 100644
--- a/esphome/components/homeassistant/time/__init__.py
+++ b/esphome/components/homeassistant/time/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import time as time_
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_TIMEZONE
+from esphome.types import ConfigType
 
 from .. import homeassistant_ns
 
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = time_.TIME_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await time_.register_time(var, config)
     await cg.register_component(var, config)
diff --git a/esphome/components/host/__init__.py b/esphome/components/host/__init__.py
index b6a3b8b615..c5846f5406 100644
--- a/esphome/components/host/__init__.py
+++ b/esphome/components/host/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
 )
 from esphome.core import CORE
 from esphome.platformio.toolchain import copy_ccache_script
+from esphome.types import ConfigType
 
 from .const import KEY_HOST
 
@@ -22,7 +23,7 @@ AUTO_LOAD = ["network", "preferences"]
 IS_TARGET_PLATFORM = True
 
 
-def set_core_data(config):
+def set_core_data(config: ConfigType) -> ConfigType:
     CORE.data[KEY_HOST] = {}
     CORE.data[KEY_CORE][KEY_TARGET_PLATFORM] = PLATFORM_HOST
     CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK] = "host"
@@ -40,7 +41,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_build_flag("-DUSE_HOST")
     cg.add_define("USE_NATIVE_64BIT_TIME")
     # The prefs file finds stored preferences by key, so key migration is possible
diff --git a/esphome/components/host/gpio.py b/esphome/components/host/gpio.py
index fcfb0b6c54..e39d35d077 100644
--- a/esphome/components/host/gpio.py
+++ b/esphome/components/host/gpio.py
@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -14,6 +15,8 @@ from esphome.const import (
     CONF_PULLDOWN,
     CONF_PULLUP,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from .const import host_ns
 
@@ -22,7 +25,7 @@ _LOGGER = logging.getLogger(__name__)
 HostGPIOPin = host_ns.class_("HostGPIOPin", cg.InternalGPIOPin)
 
 
-def _translate_pin(value):
+def _translate_pin(value: Any) -> int | str:
     if isinstance(value, dict) or value is None:
         raise cv.Invalid(
             "This variable only supports pin numbers, not full pin schemas "
@@ -41,7 +44,7 @@ def _translate_pin(value):
     return value
 
 
-def validate_gpio_pin(value):
+def validate_gpio_pin(value: Any) -> int | str:
     return _translate_pin(value)
 
 
@@ -53,7 +56,7 @@ HOST_PIN_SCHEMA = pins.gpio_base_schema(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register("host", HOST_PIN_SCHEMA)
-async def host_pin_to_code(config):
+async def host_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     num = config[CONF_NUMBER]
     cg.add(var.set_pin(num))
diff --git a/esphome/components/host/time/__init__.py b/esphome/components/host/time/__init__.py
index d9a2f1207c..6eb0cf954d 100644
--- a/esphome/components/host/time/__init__.py
+++ b/esphome/components/host/time/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import time as time_
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@clydebarrow"]
 
@@ -14,7 +15,7 @@ CONFIG_SCHEMA = time_.TIME_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await time_.register_time(var, config)
diff --git a/esphome/components/i2c/__init__.py b/esphome/components/i2c/__init__.py
index 94aad4d019..b053125446 100644
--- a/esphome/components/i2c/__init__.py
+++ b/esphome/components/i2c/__init__.py
@@ -1,6 +1,7 @@
 import logging
 import re
 import sys
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -52,9 +53,10 @@ from esphome.const import (
     PLATFORM_RP2,
     PlatformFramework,
 )
-from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.core import CORE, ID, CoroPriority, coroutine_with_priority
 from esphome.cpp_generator import MockObj
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 LOGGER = logging.getLogger(__name__)
 CODEOWNERS = ["@esphome/core"]
@@ -96,13 +98,13 @@ CONF_SCL_PULLUP_ENABLED = "scl_pullup_enabled"
 MULTI_CONF = True
 
 
-def validate_device(value):
+def validate_device(value: str) -> str:
     if not re.match(r"^/(?:[^/]+/)*[^/]+$", value):
         raise cv.Invalid("Device must be an absolute device path (e.g., /dev/i2c-0)")
     return value
 
 
-def _bus_declare_type(value):
+def _bus_declare_type(value: Any) -> ID:
     if CORE.is_esp32:
         return cv.declare_id(IDFI2CBus)(value)
     if CORE.using_arduino:
@@ -114,7 +116,7 @@ def _bus_declare_type(value):
     raise NotImplementedError
 
 
-def _rp2040_i2c_controller(pin):
+def _rp2040_i2c_controller(pin: int) -> int:
     """Return the I2C controller number (0 or 1) for a given RP2040/RP2350 GPIO pin.
 
     See RP2040 datasheet Table 2 (section 1.4.3, "GPIO Functions"):
@@ -125,7 +127,7 @@ def _rp2040_i2c_controller(pin):
     return (pin // 2) % 2
 
 
-def validate_config(config):
+def validate_config(config: ConfigType) -> ConfigType:
     if CORE.is_esp32:
         return cv.require_framework_version(
             esp_idf=cv.Version(5, 4, 2), esp32_arduino=cv.Version(3, 2, 1)
@@ -142,7 +144,7 @@ def validate_config(config):
     return config
 
 
-def validate_host_config(config):
+def validate_host_config(config: ConfigType) -> ConfigType:
     if CORE.is_host:
         # Host I2C is currently only supported on Linux
         if not sys.platform.lower().startswith("linux"):
@@ -229,7 +231,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate(config):
+def _final_validate(config: ConfigType) -> None:
     full_config = fv.full_config.get()[CONF_I2C]
     if CORE.using_zephyr and len(full_config) > 1:
         raise cv.Invalid("Second i2c is not implemented on Zephyr yet")
@@ -281,7 +283,7 @@ FINAL_VALIDATE_SCHEMA = _final_validate
 
 
 @coroutine_with_priority(CoroPriority.BUS)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(i2c_ns.using)
     cg.add_define("USE_I2C")
     if CORE.is_esp32:
@@ -358,7 +360,7 @@ async def to_code(config):
             cg.add(var.set_lp_mode(bool(config[CONF_LOW_POWER_MODE])))
 
 
-def i2c_device_schema(default_address):
+def i2c_device_schema(default_address: int | None) -> cv.Schema:
     """Create a schema for a i2c device.
 
     :param default_address: The default address of the i2c device, can be None to represent
@@ -375,7 +377,7 @@ def i2c_device_schema(default_address):
     return cv.Schema(schema)
 
 
-async def register_i2c_device(var, config):
+async def register_i2c_device(var: MockObj, config: ConfigType) -> None:
     """Register an i2c device with the given config.
 
     Sets the i2c bus to use and the i2c address.
@@ -390,11 +392,11 @@ async def register_i2c_device(var, config):
 def final_validate_device_schema(
     name: str,
     *,
-    min_frequency: cv.frequency = None,
-    max_frequency: cv.frequency = None,
-    min_timeout: cv.time_period = None,
-    max_timeout: cv.time_period = None,
-):
+    min_frequency: Any = None,
+    max_frequency: Any = None,
+    min_timeout: Any = None,
+    max_timeout: Any = None,
+) -> cv.Schema:
     hub_schema = {}
     if (min_frequency is not None) and (max_frequency is not None):
         hub_schema[cv.Required(CONF_FREQUENCY)] = cv.Range(
diff --git a/esphome/components/lock/__init__.py b/esphome/components/lock/__init__.py
index 0a8ad58bc2..a4a7b5237d 100644
--- a/esphome/components/lock/__init__.py
+++ b/esphome/components/lock/__init__.py
@@ -12,13 +12,14 @@ from esphome.const import (
     CONF_ON_UNLOCK,
     CONF_WEB_SERVER,
 )
-from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.core import CORE, ID, CoroPriority, coroutine_with_priority
 from esphome.core.entity_helpers import (
     entity_duplicate_validator,
     queue_entity_register,
     setup_entity,
 )
-from esphome.cpp_generator import MockObjClass
+from esphome.cpp_generator import MockObj, MockObjClass, TemplateArgsType
+from esphome.types import ConfigType, SafeExpType
 
 CODEOWNERS = ["@esphome/core"]
 IS_PLATFORM_COMPONENT = True
@@ -102,7 +103,7 @@ _CALLBACK_AUTOMATIONS = (
 
 
 @setup_entity("lock")
-async def _setup_lock_core(var, config):
+async def _setup_lock_core(var: MockObj, config: ConfigType) -> None:
     await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)
 
     if mqtt_id := config.get(CONF_MQTT_ID):
@@ -113,7 +114,7 @@ async def _setup_lock_core(var, config):
         await web_server.add_entity_config(var, web_server_config)
 
 
-async def register_lock(var, config):
+async def register_lock(var: MockObj, config: ConfigType) -> None:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     queue_entity_register("lock", config)
@@ -121,7 +122,7 @@ async def register_lock(var, config):
     await _setup_lock_core(var, config)
 
 
-async def new_lock(config, *args):
+async def new_lock(config: ConfigType, *args: SafeExpType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID], *args)
     await register_lock(var, config)
     return var
@@ -143,23 +144,38 @@ LOCK_ACTION_SCHEMA = maybe_simple_id(
 @automation.register_action(
     "lock.open", OpenAction, LOCK_ACTION_SCHEMA, synchronous=True
 )
-async def lock_action_to_code(config, action_id, template_arg, args):
+async def lock_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
 
 
 @automation.register_condition("lock.is_locked", LockCondition, LOCK_ACTION_SCHEMA)
-async def lock_is_on_to_code(config, condition_id, template_arg, args):
+async def lock_is_on_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(condition_id, template_arg, paren, True)
 
 
 @automation.register_condition("lock.is_unlocked", LockCondition, LOCK_ACTION_SCHEMA)
-async def lock_is_off_to_code(config, condition_id, template_arg, args):
+async def lock_is_off_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(condition_id, template_arg, paren, False)
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(lock_ns.using)

From 74fc2e367abb874d74c436d9961d7ff3d9981a11 Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Sat, 22 Aug 2026 15:42:53 +0000
Subject: [PATCH 044/155] Bump bundled esphome-device-builder to 1.12.4
 (#18651)

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4cde6505b3..9f27d51059 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN \
     -r /requirements.txt
 
 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.12.3
+RUN uv pip install --no-cache-dir esphome-device-builder==1.12.4
 
 RUN \
     platformio settings set enable_telemetry No \

From d119ad6c6078fd8fa3d2191c4d5e2b91fbc7a38e Mon Sep 17 00:00:00 2001
From: Oliver Kleinecke <okleinecke@web.de>
Date: Sat, 22 Aug 2026 17:47:46 +0200
Subject: [PATCH 045/155] [usb_uart] Extract non-final USBUartChannelBase from
 USBUartChannel (#17472)

Co-authored-by: p1ngb4ck <p@local>
---
 esphome/components/usb_uart/ch34x.cpp    |  2 +-
 esphome/components/usb_uart/cp210x.cpp   |  2 +-
 esphome/components/usb_uart/ft23xx.cpp   |  6 +--
 esphome/components/usb_uart/pl2303.cpp   |  2 +-
 esphome/components/usb_uart/usb_uart.cpp | 20 ++++----
 esphome/components/usb_uart/usb_uart.h   | 65 ++++++++++++++----------
 6 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/esphome/components/usb_uart/ch34x.cpp b/esphome/components/usb_uart/ch34x.cpp
index abfed74f94..00c5e0b069 100644
--- a/esphome/components/usb_uart/ch34x.cpp
+++ b/esphome/components/usb_uart/ch34x.cpp
@@ -95,7 +95,7 @@ void USBUartTypeCH34X::dump_config() {
   ESP_LOGCONFIG(TAG, "  CH34x chip: %s", this->chip_name_);
 }
 
-bool USBUartTypeCH34X::config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok,
+bool USBUartTypeCH34X::config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok,
                                    const uint8_t *response) {
   uint8_t cmd = 0xA1 + channel->index_;
   if (channel->index_ >= 2)
diff --git a/esphome/components/usb_uart/cp210x.cpp b/esphome/components/usb_uart/cp210x.cpp
index 2722ec8555..5551abe1a1 100644
--- a/esphome/components/usb_uart/cp210x.cpp
+++ b/esphome/components/usb_uart/cp210x.cpp
@@ -97,7 +97,7 @@ std::vector<CdcEps> USBUartTypeCP210X::parse_descriptors(usb_device_handle_t dev
   return cdc_devs;
 }
 
-bool USBUartTypeCP210X::config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok,
+bool USBUartTypeCP210X::config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok,
                                     const uint8_t *response) {
   // On reload, skip the one-time IFC_ENABLE step (the interface is already enabled).
   if (reload)
diff --git a/esphome/components/usb_uart/ft23xx.cpp b/esphome/components/usb_uart/ft23xx.cpp
index 79aa107d72..fcebf0fbd9 100644
--- a/esphome/components/usb_uart/ft23xx.cpp
+++ b/esphome/components/usb_uart/ft23xx.cpp
@@ -270,7 +270,7 @@ std::vector<CdcEps> USBUartTypeFT23XX::parse_descriptors(usb_device_handle_t dev
   return cdc_devs;
 }
 
-void USBUartTypeFT23XX::start_input(USBUartChannel *channel) {
+void USBUartTypeFT23XX::start_input(USBUartChannelBase *channel) {
   if (!channel->initialised_.load())
     return;
 
@@ -336,12 +336,12 @@ void USBUartTypeFT23XX::start_input(USBUartChannel *channel) {
   }
 }
 
-void USBUartTypeFT23XX::on_rx_overflow(USBUartChannel *channel) {
+void USBUartTypeFT23XX::on_rx_overflow(USBUartChannelBase *channel) {
   ESP_LOGW(TAG, "RX buffer overflow on channel %d, clearing to resync", channel->index_);
   channel->input_buffer_.clear();
 }
 
-bool USBUartTypeFT23XX::config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok,
+bool USBUartTypeFT23XX::config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok,
                                     const uint8_t *response) {
   // On reload (settings change on an open channel) skip the SIO reset; the FTDI set_termios
   // path only re-applies baud + line properties and does not re-assert DTR/RTS.
diff --git a/esphome/components/usb_uart/pl2303.cpp b/esphome/components/usb_uart/pl2303.cpp
index c56f43f75a..a9f7348331 100644
--- a/esphome/components/usb_uart/pl2303.cpp
+++ b/esphome/components/usb_uart/pl2303.cpp
@@ -226,7 +226,7 @@ static const Pl2303InitStep PL2303_INIT[] = {
 };
 static constexpr uint8_t PL2303_INIT_COUNT = sizeof(PL2303_INIT) / sizeof(PL2303_INIT[0]);
 
-bool USBUartTypePL2303::config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok,
+bool USBUartTypePL2303::config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok,
                                     const uint8_t *response) {
   bool is_legacy = (this->chip_type_ == PL2303_TYPE_H);
   bool is_hxn = (this->chip_type_ == PL2303_TYPE_HXN);
diff --git a/esphome/components/usb_uart/usb_uart.cpp b/esphome/components/usb_uart/usb_uart.cpp
index c289625f1a..cf66e4c369 100644
--- a/esphome/components/usb_uart/usb_uart.cpp
+++ b/esphome/components/usb_uart/usb_uart.cpp
@@ -136,7 +136,7 @@ size_t RingBuffer::pop(uint8_t *data, size_t len) {
   }
   return len;
 }
-void USBUartChannel::write_array(const uint8_t *data, size_t len) {
+void USBUartChannelBase::write_array(const uint8_t *data, size_t len) {
   if (!this->initialised_.load()) {
     ESP_LOGD(TAG, "Channel not initialised - write ignored");
     return;
@@ -170,7 +170,7 @@ void USBUartChannel::write_array(const uint8_t *data, size_t len) {
   this->parent_->start_output(this);
 }
 
-uart::UARTFlushResult USBUartChannel::flush() {
+uart::UARTFlushResult USBUartChannelBase::flush() {
   // Spin until the output queue is drained and the last USB transfer completes.
   // Safe to call from the main loop only.
   // The flush_timeout_ms_ timeout guards against a device that stops responding mid-flush;
@@ -186,14 +186,14 @@ uart::UARTFlushResult USBUartChannel::flush() {
   return uart::UARTFlushResult::UART_FLUSH_RESULT_SUCCESS;
 }
 
-bool USBUartChannel::peek_byte(uint8_t *data) {
+bool USBUartChannelBase::peek_byte(uint8_t *data) {
   if (this->input_buffer_.is_empty()) {
     return false;
   }
   *data = this->input_buffer_.peek();
   return true;
 }
-bool USBUartChannel::read_array(uint8_t *data, size_t len) {
+bool USBUartChannelBase::read_array(uint8_t *data, size_t len) {
   if (!this->initialised_.load()) {
     ESP_LOGV(TAG, "Channel not initialised - read ignored");
     return false;
@@ -277,7 +277,7 @@ void USBUartComponent::dump_config() {
                   YESNO(channel->dummy_receiver_));
   }
 }
-void USBUartComponent::start_input(USBUartChannel *channel) {
+void USBUartComponent::start_input(USBUartChannelBase *channel) {
   if (!channel->initialised_.load())
     return;
   // THREAD CONTEXT: Called from both USB task and main loop threads
@@ -346,7 +346,7 @@ void USBUartComponent::start_input(USBUartChannel *channel) {
   }
 }
 
-void USBUartComponent::start_output(USBUartChannel *channel) {
+void USBUartComponent::start_output(USBUartChannelBase *channel) {
   // THREAD CONTEXT: Called from both main loop and USB task threads.
   // The output_queue_ is a lock-free SPSC queue, so pop() is safe from either thread.
   // The output_started_ atomic flag is claimed via compare_exchange to guarantee that
@@ -491,7 +491,7 @@ void USBUartTypeCdcAcm::on_disconnected() {
   USBClient::on_disconnected();
 }
 
-bool USBUartTypeCdcAcm::config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok,
+bool USBUartTypeCdcAcm::config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok,
                                     const uint8_t *response) {
   static constexpr uint8_t CDC_REQUEST_TYPE = usb_host::USB_TYPE_CLASS | usb_host::USB_RECIP_INTERFACE;
   static constexpr uint8_t CDC_SET_LINE_CODING = 0x20;
@@ -537,7 +537,7 @@ void USBUartComponent::enable_channels() {
   this->start_config_(false);
 }
 
-void USBUartComponent::apply_channel_settings(USBUartChannel *channel) {
+void USBUartComponent::apply_channel_settings(USBUartChannelBase *channel) {
   if (this->cfg_active_) {
     // A config sequence is already running. Defer this reload until it finishes to preserve
     // the one-control-transfer-at-a-time guarantee (restarting mid-flight would let an
@@ -620,7 +620,7 @@ bool USBUartComponent::run_config_machine_() {
     this->cfg_ok_ = true;
   }
 
-  USBUartChannel *channel =
+  USBUartChannelBase *channel =
       this->cfg_single_ != nullptr
           ? this->cfg_single_
           : (this->cfg_channel_idx_ < this->channels_.size() ? this->channels_[this->cfg_channel_idx_] : nullptr);
@@ -664,7 +664,7 @@ bool USBUartComponent::run_config_machine_() {
   return true;
 }
 
-void USBUartChannel::load_settings(bool /*dump_config*/) {
+void USBUartChannelBase::load_settings(bool /*dump_config*/) {
   // The per-channel control transfers already log their values at debug level.
   this->parent_->apply_channel_settings(this);
 }
diff --git a/esphome/components/usb_uart/usb_uart.h b/esphome/components/usb_uart/usb_uart.h
index 5bb4c97796..00b34fb942 100644
--- a/esphome/components/usb_uart/usb_uart.h
+++ b/esphome/components/usb_uart/usb_uart.h
@@ -16,7 +16,7 @@ namespace esphome::usb_uart {
 
 class USBUartTypeCdcAcm;
 class USBUartComponent;
-class USBUartChannel;
+class USBUartChannelBase;
 class USBUartTypePL2303;
 
 static const char *const TAG = "usb_uart";
@@ -110,7 +110,7 @@ class RingBuffer {
 struct UsbDataChunk {
   uint8_t data[usb_host::USB_MAX_PACKET_SIZE];
   uint16_t length;
-  USBUartChannel *channel;
+  USBUartChannelBase *channel;
 
   // Required for EventPool - no cleanup needed for POD types
   void release() {}
@@ -126,7 +126,11 @@ struct UsbOutputChunk {
   void release() {}
 };
 
-class USBUartChannel final : public uart::UARTComponent, public Parented<USBUartComponent> {
+// Common, non-final base for all USB UART channel implementations.
+// Concrete channel types (USBUartChannel for CDC-style devices, vendor-specific
+// multiplexed channels like CH934X) derive from this and are themselves final,
+// per the "configurable classes are final" convention.
+class USBUartChannelBase : public uart::UARTComponent, public Parented<USBUartComponent> {
   friend class USBUartComponent;
   friend class USBUartTypeCdcAcm;
   friend class USBUartTypeCP210X;
@@ -139,7 +143,6 @@ class USBUartChannel final : public uart::UARTComponent, public Parented<USBUart
   // Computed as ceil(buffer_size / 64) + 1 in Python codegen; defaults to 5 (256 / 64 + 1).
   static constexpr uint8_t USB_OUTPUT_CHUNK_COUNT = USB_UART_OUTPUT_CHUNK_COUNT;
 
-  USBUartChannel(uint8_t index, uint16_t buffer_size) : input_buffer_(RingBuffer(buffer_size)), index_(index) {}
   void write_array(const uint8_t *data, size_t len) override;
   bool peek_byte(uint8_t *data) override;
   bool read_array(uint8_t *data, size_t len) override;
@@ -162,6 +165,8 @@ class USBUartChannel final : public uart::UARTComponent, public Parented<USBUart
   void set_rx_callback(std::function<void()> cb) { this->rx_callback_ = std::move(cb); }
 
  protected:
+  // Not directly instantiable; construct a concrete channel type instead.
+  USBUartChannelBase(uint8_t index, uint16_t buffer_size) : input_buffer_(RingBuffer(buffer_size)), index_(index) {}
   void check_logger_conflict() override {}
   // Larger structures first (8+ bytes)
   RingBuffer input_buffer_;
@@ -185,33 +190,40 @@ class USBUartChannel final : public uart::UARTComponent, public Parented<USBUart
   bool dummy_receiver_{};
 };
 
+// Concrete channel type for CDC-style USB serial devices (2 bulk endpoints per
+// channel). All shared behavior lives in USBUartChannelBase.
+class USBUartChannel final : public USBUartChannelBase {
+ public:
+  USBUartChannel(uint8_t index, uint16_t buffer_size) : USBUartChannelBase(index, buffer_size) {}
+};
+
 class USBUartComponent : public usb_host::USBClient {
  public:
   USBUartComponent(uint16_t vid, uint16_t pid) : usb_host::USBClient(vid, pid) {}
   void setup() override;
   void loop() override;
   void dump_config() override;
-  std::vector<USBUartChannel *> get_channels() { return this->channels_; }
+  std::vector<USBUartChannelBase *> get_channels() { return this->channels_; }
 
-  void add_channel(USBUartChannel *channel) { this->channels_.push_back(channel); }
+  void add_channel(USBUartChannelBase *channel) { this->channels_.push_back(channel); }
 
-  virtual void start_input(USBUartChannel *channel);
-  void start_output(USBUartChannel *channel);
+  virtual void start_input(USBUartChannelBase *channel);
+  void start_output(USBUartChannelBase *channel);
 
   // Begin configuring all channels (full initialisation). Called from on_connected().
   void enable_channels();
   // Re-apply line settings to a single, already-open channel (used by
-  // USBUartChannel::load_settings()).
-  void apply_channel_settings(USBUartChannel *channel);
+  // USBUartChannelBase::load_settings()).
+  void apply_channel_settings(USBUartChannelBase *channel);
 
   // Called from loop() when input_buffer_ has insufficient space for the incoming chunk.
   // Default is a no-op; override in device-specific subclasses that need resync on overflow.
-  virtual void on_rx_overflow(USBUartChannel *channel) {}
+  virtual void on_rx_overflow(USBUartChannelBase *channel) {}
 
   // Lock-free data transfer from USB task to main loop
   static constexpr int USB_DATA_QUEUE_SIZE = 32;
   LockFreeQueue<UsbDataChunk, USB_DATA_QUEUE_SIZE> usb_data_queue_;
-  // Pool sized to queue capacity (SIZE-1) — see USBUartChannel::output_pool_ comment.
+  // Pool sized to queue capacity (SIZE-1) — see USBUartChannelBase::output_pool_ comment.
   EventPool<UsbDataChunk, USB_DATA_QUEUE_SIZE - 1> chunk_pool_;
 
  protected:
@@ -231,18 +243,19 @@ class USBUartComponent : public usb_host::USBClient {
   // next control transfer via config_transfer_() and return true, or return false when the
   // channel has no more steps. reload=true ⇒ apply only baud/parity/stop/data (skip
   // enable/reset/DTR-RTS). ok/response carry the previous step's result and IN data.
-  virtual bool config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) = 0;
+  virtual bool config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok,
+                           const uint8_t *response) = 0;
   // Optional one-time device-level setup run before the per-channel phase on init only
   // (e.g. CH34x chip detection). Same contract as config_step_(). Default: no steps.
   virtual bool config_device_step(uint8_t step, bool ok, const uint8_t *response) { return false; }
 
-  std::vector<USBUartChannel *> channels_{};
+  std::vector<USBUartChannelBase *> channels_{};
 
   // Config state machine
-  USBUartChannel *cfg_single_{nullptr};          // non-null: reload of a single channel
-  USBUartChannel *cfg_pending_reload_{nullptr};  // reload requested while the machine was busy
-  std::atomic<bool> cfg_done_{false};            // synchronizes cfg_ok_/cfg_response_ across threads
-  uint8_t cfg_response_[8]{};                    // last IN transfer payload (for detection reads)
+  USBUartChannelBase *cfg_single_{nullptr};          // non-null: reload of a single channel
+  USBUartChannelBase *cfg_pending_reload_{nullptr};  // reload requested while the machine was busy
+  std::atomic<bool> cfg_done_{false};                // synchronizes cfg_ok_/cfg_response_ across threads
+  uint8_t cfg_response_[8]{};                        // last IN transfer payload (for detection reads)
   uint8_t cfg_channel_idx_{0};
   uint8_t cfg_step_{0};
   bool cfg_active_{false};
@@ -260,7 +273,7 @@ class USBUartTypeCdcAcm : public USBUartComponent {
   virtual std::vector<CdcEps> parse_descriptors(usb_device_handle_t dev_hdl);
   void on_connected() override;
   void on_disconnected() override;
-  bool config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) override;
+  bool config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) override;
 };
 
 class USBUartTypeCP210X : public USBUartTypeCdcAcm {
@@ -269,7 +282,7 @@ class USBUartTypeCP210X : public USBUartTypeCdcAcm {
 
  protected:
   std::vector<CdcEps> parse_descriptors(usb_device_handle_t dev_hdl) override;
-  bool config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) override;
+  bool config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) override;
 };
 class USBUartTypeCH34X : public USBUartTypeCdcAcm {
  public:
@@ -277,7 +290,7 @@ class USBUartTypeCH34X : public USBUartTypeCdcAcm {
   void dump_config() override;
 
  protected:
-  bool config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) override;
+  bool config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) override;
   bool config_device_step(uint8_t step, bool ok, const uint8_t *response) override;
   std::vector<CdcEps> parse_descriptors(usb_device_handle_t dev_hdl) override;
 
@@ -291,12 +304,12 @@ class USBUartTypeFT23XX : public USBUartTypeCdcAcm {
  public:
   USBUartTypeFT23XX(uint16_t vid, uint16_t pid) : USBUartTypeCdcAcm(vid, pid) {}
 
-  void start_input(USBUartChannel *channel) override;
-  void on_rx_overflow(USBUartChannel *channel) override;
+  void start_input(USBUartChannelBase *channel) override;
+  void on_rx_overflow(USBUartChannelBase *channel) override;
 
  protected:
   std::vector<CdcEps> parse_descriptors(usb_device_handle_t dev_hdl) override;
-  bool config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) override;
+  bool config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) override;
 
   uint8_t chip_type_{255};
 };
@@ -312,14 +325,14 @@ enum Pl2303ChipType : uint8_t {
 };
 
 class USBUartTypePL2303 : public USBUartTypeCdcAcm {
-  friend class USBUartChannel;
+  friend class USBUartChannelBase;
 
  public:
   USBUartTypePL2303(uint16_t vid, uint16_t pid) : USBUartTypeCdcAcm(vid, pid) {}
 
  protected:
   std::vector<CdcEps> parse_descriptors(usb_device_handle_t dev_hdl) override;
-  bool config_step(USBUartChannel *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) override;
+  bool config_step(USBUartChannelBase *channel, uint8_t step, bool reload, bool ok, const uint8_t *response) override;
 
   Pl2303ChipType chip_type_{PL2303_TYPE_UNKNOWN};
 };

From dcabaedff1b5adfb7d2070b7d1557e67d0eca8c0 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 18:59:24 -0500
Subject: [PATCH 046/155] [bk72xx_ble] Block BK7238 until the LibreTiny bonding
 partition fix lands (#18649)

---
 esphome/components/bk72xx_ble/__init__.py     | 30 +++++++++----------
 .../bk72xx_ble/config/test_bk7238.yaml        |  7 +++++
 .../bk72xx_ble/test_family_gate.py            |  1 +
 3 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 tests/component_tests/bk72xx_ble/config/test_bk7238.yaml

diff --git a/esphome/components/bk72xx_ble/__init__.py b/esphome/components/bk72xx_ble/__init__.py
index 81073c9b02..74b9cb5954 100644
--- a/esphome/components/bk72xx_ble/__init__.py
+++ b/esphome/components/bk72xx_ble/__init__.py
@@ -4,9 +4,12 @@ The platform analog of esp32_ble / rp2040_ble: owns the Beken BDK BLE stack
 bring-up and the controller BLE address. Consumers (bk72xx_ble_tracker) build
 on this component and contain no SDK calls of their own.
 
-Supported SoCs (BLE 5.x): BK7231N/BK7236 (BLE 5.1), BK7238/BK7252N/BK7253
-(BLE 5.2), and any future BLE-5.x SoC. Known non-5.x families are rejected in
-to_code; unknown families are capability-checked at compile time via
+Supported SoCs (BLE 5.x): BK7231N/BK7236 (BLE 5.1), BK7252N/BK7253 (BLE 5.2),
+and any future BLE-5.x SoC. BK7238 (BLE 5.2) is blocked for now: with BLE
+compiled in, the Beken SDK erases the bootloader flash sector at boot because
+LibreTiny's partition table has no BLE bonding entry (esphome#18646,
+libretiny-eu/libretiny#408). Known non-5.x families and BK7238 are rejected in
+to_code. Unknown families are capability-checked at compile time via
 `__has_include("app_ble.h")`, a header only on the BLE 5.x include path
 (ble_api.h ships for every SoC, so it cannot be the probe). A non-5.x build
 fails with a clear #error.
@@ -65,6 +68,14 @@ def _unsupported_family_message(family: str) -> str | None:
         )
     if family == FAMILY_BK7231Q:
         return "bk72xx_ble does not support BK7231Q: this SoC has no BLE"
+    if family == FAMILY_BK7238:
+        return (
+            "bk72xx_ble is disabled on BK7238: with BLE compiled in, the Beken SDK "
+            "erases the bootloader flash sector at boot and the device can no longer "
+            "start (see https://github.com/esphome/esphome/issues/18646); support "
+            "returns once the LibreTiny partition table fix "
+            "(libretiny-eu/libretiny#408) is released"
+        )
     return None
 
 
@@ -113,18 +124,7 @@ async def to_code(config: ConfigType) -> None:
     # BK7231N, but NOT on BK7238 (its BLE stack has no such symbol; the address is
     # derived from the WiFi MAC instead — the BDK's own fallback). Tell the C++
     # which path is available so it doesn't reference a missing symbol.
-    family = libretiny.get_libretiny_family()
-    if family == FAMILY_BK7231N:
+    if libretiny.get_libretiny_family() == FAMILY_BK7231N:
         cg.add_define("BK72XX_BLE_HAS_COMMON_BDADDR")
-    elif family == FAMILY_BK7238:
-        # ESPHome's LibreTiny disables BLE on BK7238 because the SDK can hang at
-        # WiFi STA startup when BLE init runs. This component re-enables BLE, so
-        # warn loudly: BK7238 is accepted but not hardware-verified and may be
-        # WiFi-unstable with BLE on.
-        _LOGGER.warning(
-            "bk72xx_ble on BK7238: enabling BLE is known to risk a WiFi STA startup "
-            "hang on this family and is not yet hardware-verified. Expect possible "
-            "instability."
-        )
 
     cg.add_define("USE_BK72XX_BLE")
diff --git a/tests/component_tests/bk72xx_ble/config/test_bk7238.yaml b/tests/component_tests/bk72xx_ble/config/test_bk7238.yaml
new file mode 100644
index 0000000000..0880cf69f5
--- /dev/null
+++ b/tests/component_tests/bk72xx_ble/config/test_bk7238.yaml
@@ -0,0 +1,7 @@
+esphome:
+  name: bk-family-gate-7238
+
+bk72xx:
+  board: generic-bk7238
+
+bk72xx_ble:
diff --git a/tests/component_tests/bk72xx_ble/test_family_gate.py b/tests/component_tests/bk72xx_ble/test_family_gate.py
index da67749bb3..86f3ef0039 100644
--- a/tests/component_tests/bk72xx_ble/test_family_gate.py
+++ b/tests/component_tests/bk72xx_ble/test_family_gate.py
@@ -16,6 +16,7 @@ from esphome.core import EsphomeError
         ("test_bk7231t.yaml", "BK7231T.*BLE 4.2"),
         ("test_bk7252.yaml", "BK7251.*BLE 4.2"),
         ("test_bk7231q.yaml", "BK7231Q.*no BLE"),
+        ("test_bk7238.yaml", "BK7238.*bootloader"),
     ],
 )
 def test_unsupported_family_rejected(

From c062d0c7171a1e576fdb0bd8864e374be51a707c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 20:57:13 -0500
Subject: [PATCH 047/155] [ota] Log prepare, upload, and total OTA timing in
 espota2 (#18582)

---
 esphome/espota2.py               | 18 ++++++++++++++++++
 tests/unit_tests/test_espota2.py | 28 ++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/esphome/espota2.py b/esphome/espota2.py
index 61e897f601..ca833f1816 100644
--- a/esphome/espota2.py
+++ b/esphome/espota2.py
@@ -460,8 +460,14 @@ def perform_ota(
         (upload_size >> 8) & 0xFF,
         (upload_size >> 0) & 0xFF,
     ]
+    # The device erases flash between receiving the size and acking the
+    # prepare, so this window shows the erase cost (near zero when the
+    # device erases lazily during the upload)
+    prepare_start = time.perf_counter()
     send_check(sock, upload_size_encoded, "binary size")
     receive_exactly(sock, 1, "update prepare result", RESPONSE_UPDATE_PREPARE_OK)
+    prepare_duration = time.perf_counter() - prepare_start
+    _LOGGER.info("Preparing for upload took %.2f seconds", prepare_duration)
 
     upload_md5 = hashlib.md5(upload_contents).hexdigest()
     _LOGGER.debug("MD5 of upload is %s", upload_md5)
@@ -528,11 +534,23 @@ def perform_ota(
     # reboots on its own; the exact commit point is not observable from
     # here, so treat everything past the data phase as non-retryable. A
     # re-upload could flash a device that already updated successfully.
+    commit_start = time.perf_counter()
     try:
         receive_exactly(sock, 1, "update receive result", RESPONSE_RECEIVE_OK)
         receive_exactly(sock, 1, "update end result", RESPONSE_UPDATE_END_OK)
     except OTANetworkError as err:
         raise _committed_error(err) from err
+    commit_duration = time.perf_counter() - commit_start
+
+    # Sum of the named windows so the breakdown is self consistent; connect,
+    # handshake, auth, and the one MD5 round trip are not included
+    _LOGGER.info(
+        "Update took %.2f seconds (prepare %.2f, upload %.2f, commit %.2f)",
+        prepare_duration + duration + commit_duration,
+        prepare_duration,
+        duration,
+        commit_duration,
+    )
 
     try:
         send_check(sock, RESPONSE_OK, "end acknowledgement")
diff --git a/tests/unit_tests/test_espota2.py b/tests/unit_tests/test_espota2.py
index db4a4b1117..e0e9185e1c 100644
--- a/tests/unit_tests/test_espota2.py
+++ b/tests/unit_tests/test_espota2.py
@@ -6,6 +6,8 @@ from collections.abc import Generator
 import gzip
 import hashlib
 import io
+import itertools
+import logging
 from pathlib import Path
 import socket
 import struct
@@ -53,8 +55,9 @@ def mock_sleep() -> Generator[Mock]:
 @pytest.fixture
 def mock_time(mock_sleep: Mock) -> Generator[None]:
     """Mock time-related functions for consistent testing."""
-    # Provide enough values for multiple calls (tests may call perform_ota multiple times)
-    with patch("time.perf_counter", side_effect=[0, 1, 0, 1, 0, 1]):
+    # Monotonically increasing, never exhausted regardless of how many timing
+    # windows perform_ota measures or how many times a test calls it
+    with patch("time.perf_counter", side_effect=itertools.count()):
         yield
 
 
@@ -372,7 +375,9 @@ def test_perform_ota_successful_md5_auth(
 
 
 @pytest.mark.usefixtures("mock_time")
-def test_perform_ota_no_auth(mock_socket: Mock, mock_file: io.BytesIO) -> None:
+def test_perform_ota_no_auth(
+    mock_socket: Mock, mock_file: io.BytesIO, caplog: pytest.LogCaptureFixture
+) -> None:
     """Test OTA without authentication."""
     recv_responses = [
         bytes([espota2.RESPONSE_OK]),  # First byte of version response
@@ -387,7 +392,14 @@ def test_perform_ota_no_auth(mock_socket: Mock, mock_file: io.BytesIO) -> None:
 
     mock_socket.recv.side_effect = recv_responses
 
-    espota2.perform_ota(mock_socket, None, mock_file, "test.bin")
+    # Distinct window lengths pin each duration to its label; exactly the 6
+    # expected perf_counter calls, so an unaccounted timing window raises
+    timings = [0.0, 2.0, 10.0, 15.0, 20.0, 27.0]
+    with (
+        patch("time.perf_counter", side_effect=timings),
+        caplog.at_level(logging.INFO),
+    ):
+        espota2.perform_ota(mock_socket, None, mock_file, "test.bin")
 
     # Should not send any auth-related data
     auth_calls = [
@@ -397,6 +409,14 @@ def test_perform_ota_no_auth(mock_socket: Mock, mock_file: io.BytesIO) -> None:
     ]
     assert len(auth_calls) == 0
 
+    # The timing summary is the observable output of the upload; exact strings
+    # pin each duration to its label
+    assert "Preparing for upload took 2.00 seconds" in caplog.text
+    assert (
+        "Update took 14.00 seconds (prepare 2.00, upload 5.00, commit 7.00)"
+        in caplog.text
+    )
+
 
 @pytest.mark.usefixtures("mock_time")
 def test_perform_ota_with_compression(mock_socket: Mock) -> None:

From 1f31e51446af7bf7d6a34c8dfc40861a9a7ce783 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 20:57:37 -0500
Subject: [PATCH 048/155] [esphome] Inline the trivial OTA port accessors
 (#18625)

---
 esphome/components/esphome/ota/ota_esphome.cpp | 2 --
 esphome/components/esphome/ota/ota_esphome.h   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/esphome/components/esphome/ota/ota_esphome.cpp b/esphome/components/esphome/ota/ota_esphome.cpp
index cab725f704..9cbb25b373 100644
--- a/esphome/components/esphome/ota/ota_esphome.cpp
+++ b/esphome/components/esphome/ota/ota_esphome.cpp
@@ -588,8 +588,6 @@ bool ESPHomeOTAComponent::writeall_(const uint8_t *buf, size_t len) {
 }
 
 float ESPHomeOTAComponent::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
-uint16_t ESPHomeOTAComponent::get_port() const { return this->port_; }
-void ESPHomeOTAComponent::set_port(uint16_t port) { this->port_ = port; }
 
 void ESPHomeOTAComponent::log_socket_error_(const LogString *msg) {
   ESP_LOGW(TAG, "Socket %s: errno %d", LOG_STR_ARG(msg), errno);
diff --git a/esphome/components/esphome/ota/ota_esphome.h b/esphome/components/esphome/ota/ota_esphome.h
index 0053ca6969..979e3f2d7d 100644
--- a/esphome/components/esphome/ota/ota_esphome.h
+++ b/esphome/components/esphome/ota/ota_esphome.h
@@ -39,14 +39,14 @@ class ESPHomeOTAComponent final : public ota::OTAComponent {
 #endif  // USE_OTA_PASSWORD
 
   /// Manually set the port OTA should listen on
-  void set_port(uint16_t port);
+  void set_port(uint16_t port) { this->port_ = port; }
 
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
   void loop() override;
 
-  uint16_t get_port() const;
+  uint16_t get_port() const { return this->port_; }
 
  protected:
   void handle_handshake_();

From 6aab523dd9e6c716d1f2f246598bbc786954ef0e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 20:57:58 -0500
Subject: [PATCH 049/155] [esp32_ble] Log connection parameter update results
 (#18607)

---
 esphome/components/esp32_ble/ble.cpp | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_ble/ble.cpp b/esphome/components/esp32_ble/ble.cpp
index e2d79173ff..6e6fb0e30d 100644
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -643,8 +643,28 @@ void ESP32BLE::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_pa
       App.wake_loop_threadsafe();
       return;
 
+    // Log the result of connection parameter updates: a peer can reject or
+    // never answer an update, and without this the link silently stays on the
+    // old parameters (visible only as unexplained supervision timeouts).
+    case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: {
+      if (param->update_conn_params.status != ESP_BT_STATUS_SUCCESS) {
+        char mac_s[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
+        format_mac_addr_upper(param->update_conn_params.bda, mac_s);
+        ESP_LOGW(TAG, "[%s] Conn param update failed, status=%d", mac_s, param->update_conn_params.status);
+      }
+#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
+      else {
+        char mac_s[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
+        format_mac_addr_upper(param->update_conn_params.bda, mac_s);
+        ESP_LOGV(TAG, "[%s] Conn params updated: interval=%u (x1.25ms) latency=%u timeout=%u (x10ms)", mac_s,
+                 param->update_conn_params.conn_int, param->update_conn_params.latency,
+                 param->update_conn_params.timeout);
+      }
+#endif
+      return;
+    }
+
     // Ignore these GAP events as they are not relevant for our use case
-    case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT:
     case ESP_GAP_BLE_SET_PKT_LENGTH_COMPLETE_EVT:
     case ESP_GAP_BLE_PHY_UPDATE_COMPLETE_EVT:       // BLE 5.0 PHY update complete
     case ESP_GAP_BLE_CHANNEL_SELECT_ALGORITHM_EVT:  // BLE 5.0 channel selection algorithm

From 14499223fd1e1560faf034747f39bd2b2c28f8a4 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 20:58:13 -0500
Subject: [PATCH 050/155] [esp8266] Don't report stale crash state after
 hardware WDT resets (#18597)

---
 esphome/components/esp8266/crash_handler.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/esphome/components/esp8266/crash_handler.cpp b/esphome/components/esp8266/crash_handler.cpp
index 91b0cf9082..dc79043f21 100644
--- a/esphome/components/esp8266/crash_handler.cpp
+++ b/esphome/components/esp8266/crash_handler.cpp
@@ -118,8 +118,6 @@ static const LogString *get_exception_cause(uint32_t cause) {
 }
 
 static const LogString *get_reset_reason(uint32_t reason) {
-  if (reason == REASON_WDT_RST)
-    return LOG_STR("Hardware WDT");
   if (reason == REASON_EXCEPTION_RST)
     return LOG_STR("Exception");
   if (reason == REASON_SOFT_WDT_RST)
@@ -162,13 +160,20 @@ void crash_handler_log() {
   if (!is_crash_reason(resetInfo.reason))
     return;
 
+  ESP_LOGE(TAG, "*** CRASH DETECTED ON PREVIOUS BOOT ***");
+  if (resetInfo.reason == REASON_WDT_RST) {
+    // A hardware WDT reset happens entirely in hardware: the postmortem hook
+    // never runs, so rst_info epc1/exccause and the RTC backtrace are
+    // leftovers from an earlier crash. Don't misattribute them (#18596).
+    ESP_LOGE(TAG, "  Reason: Hardware WDT (no crash state is recorded for hardware WDT resets)");
+    return;
+  }
+
   // Read and filter backtrace from RTC into stack-local buffer (no persistent RAM cost).
   // Both resetInfo and RTC data survive until the next reset, so this can be
   // called multiple times (logger init + API subscribe) with the same result.
   uint32_t backtrace[MAX_BACKTRACE];
   uint8_t bt_count = read_rtc_backtrace(backtrace, MAX_BACKTRACE);
-
-  ESP_LOGE(TAG, "*** CRASH DETECTED ON PREVIOUS BOOT ***");
   // GCC's ROM divide routine triggers IllegalInstruction (exccause=0) at specific
   // ROM addresses instead of IntegerDivideByZero (exccause=6). Patch to match
   // the Arduino core's postmortem handler behavior.

From 74bdf275d20ab138cd9950e4ee281a11c21b39cb Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 20:58:28 -0500
Subject: [PATCH 051/155] [core] Dump the main.cpp config comment with sorted
 keys (#18653)

---
 esphome/__main__.py           |  6 ++++--
 tests/unit_tests/test_main.py | 30 +++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index c1e05d2ea7..769b66ecc8 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -762,9 +762,11 @@ def _wrap_to_code(name, comp, yaml_util):
     async def wrapped(conf):
         cg.add(cg.LineComment(f"{name}:"))
         if comp.config_schema is not None:
-            conf_str = yaml_util.dump(conf)
+            # sort_keys: voluptuous fills defaults in set order, so an
+            # unsorted dump would churn main.cpp and relink every run
+            conf_str = yaml_util.dump(conf, sort_keys=True)
             conf_str = conf_str.replace("//", "")
-            # remove tailing \ to avoid multi-line comment warning
+            # remove trailing \ to avoid multi-line comment warning
             conf_str = conf_str.replace("\\\n", "\n")
             cg.add(cg.LineComment(indent(conf_str)))
         await coro(conf)
diff --git a/tests/unit_tests/test_main.py b/tests/unit_tests/test_main.py
index a40341e194..1cb710ca58 100644
--- a/tests/unit_tests/test_main.py
+++ b/tests/unit_tests/test_main.py
@@ -11,6 +11,7 @@ from pathlib import Path
 import re
 import sys
 import time
+from types import SimpleNamespace
 from typing import Any, Self
 from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
@@ -18,7 +19,7 @@ import pytest
 from pytest import CaptureFixture
 from zeroconf import ServiceStateChange
 
-from esphome import __main__ as main
+from esphome import __main__ as main, yaml_util
 from esphome.__main__ import (
     Purpose,
     _get_configured_xtal_freq,
@@ -29,6 +30,7 @@ from esphome.__main__ import (
     _unresolved_default_error,
     _validate_bootloader_binary,
     _validate_partition_table_binary,
+    _wrap_to_code,
     check_permissions,
     choose_upload_log_host,
     command_analyze_memory,
@@ -116,6 +118,7 @@ from esphome.espota2 import (
     OTA_TYPE_UPDATE_PARTITION_TABLE,
 )
 from esphome.platformio import toolchain
+from esphome.types import ConfigType
 from esphome.util import BootselResult, FlashImage
 from esphome.zeroconf import _await_discovery, discover_mdns_devices
 
@@ -7130,3 +7133,28 @@ def test_warn_source_tree_mismatch_falls_back_when_stat_fails(
 
     # Same tree, so the path comparison still finds them equal and stays silent
     assert not caplog.text
+
+
+@pytest.mark.asyncio
+async def test_wrap_to_code_comment_is_insertion_order_independent() -> None:
+    """The config comment dumps with sorted keys: voluptuous fills schema
+    defaults in set-iteration order, so an unsorted dump would churn
+    main.cpp and relink the firmware on every run."""
+    comments: list[str] = []
+
+    async def to_code(conf: ConfigType) -> None:
+        """Accept any config; only the wrapper's comment output matters."""
+
+    comp = SimpleNamespace(to_code=to_code, config_schema=object())
+    wrapped = _wrap_to_code("demo", comp, yaml_util)
+    with patch("esphome.codegen.add", side_effect=lambda st: comments.append(str(st))):
+        # Nested on purpose: the real churn lives in nested action configs,
+        # so sorting must apply at every mapping level
+        await wrapped({"beta": 1, "alpha": {"z": 1, "a": 2}})
+        first = "\n".join(comments)
+        comments.clear()
+        await wrapped({"alpha": {"a": 2, "z": 1}, "beta": 1})
+    second = "\n".join(comments)
+    assert first == second
+    assert second.index("alpha") < second.index("beta")
+    assert second.index("a: 2") < second.index("z: 1")

From 259e7182a350e16b1f70fe88a5bb0dff7fbfc546 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 20:59:55 -0500
Subject: [PATCH 052/155] [esp32] Exclude esp_gdbstub from the build by default
 (#18604)

---
 esphome/components/esp32/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index d6ed6d9399..501c2e525f 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -233,6 +233,7 @@ DEFAULT_EXCLUDED_IDF_COMPONENTS = (
     "esp_driver_touch_sens",  # Touch sensor driver - only needed by esp32_touch
     "esp_driver_twai",  # TWAI/CAN driver - only needed by esp32_can component
     "esp_eth",  # Ethernet driver - only needed by ethernet component
+    "esp_gdbstub",  # GDB stub panic handler - unused by ESPHome; bt pulls it back
     "esp_hid",  # HID host/device support - ESPHome doesn't implement HID functionality
     "esp_http_client",  # HTTP client - only needed by http_request component
     "esp_https_ota",  # ESP-IDF HTTPS OTA - ESPHome has its own OTA implementation

From a282cb095ec2dc4bb08e4109714b4d71768c4629 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:00:39 -0500
Subject: [PATCH 053/155] [ethernet] Inline the trivial EthernetComponent
 setters (#18618)

---
 .../ethernet/ethernet_component.cpp           |  8 ----
 .../components/ethernet/ethernet_component.h  | 48 +++++++++----------
 .../ethernet/ethernet_component_esp32.cpp     | 20 +-------
 .../ethernet/ethernet_component_rp2.cpp       |  7 ---
 4 files changed, 25 insertions(+), 58 deletions(-)

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 42cb0b3cfc..14a4fd660b 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -10,14 +10,6 @@ EthernetComponent *global_eth_component;  // NOLINT(cppcoreguidelines-avoid-non-
 
 EthernetComponent::EthernetComponent() { global_eth_component = this; }
 
-float EthernetComponent::get_setup_priority() const { return setup_priority::WIFI; }
-
-void EthernetComponent::set_type(EthernetType type) { this->type_ = type; }
-
-#ifdef USE_ETHERNET_MANUAL_IP
-void EthernetComponent::set_manual_ip(const ManualIP &manual_ip) { this->manual_ip_ = manual_ip; }
-#endif
-
 #ifdef USE_ETHERNET_IP_STATE_LISTENERS
 void EthernetComponent::notify_ip_state_listeners_() {
   auto ips = this->get_ip_addresses();
diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index 646e0af8e6..2da070b5e0 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -125,7 +125,7 @@ class EthernetComponent final : public Component {
   void setup() override;
   void loop() override;
   void dump_config() override;
-  float get_setup_priority() const override;
+  float get_setup_priority() const override { return setup_priority::ETHERNET; }
   void on_powerdown() override { powerdown(); }
   bool is_connected() { return this->state_ == EthernetComponentState::CONNECTED; }
 
@@ -146,9 +146,9 @@ class EthernetComponent final : public Component {
   esp_netif_t *get_esp_netif() { return this->eth_netif_; }
 #endif
 
-  void set_type(EthernetType type);
+  void set_type(EthernetType type) { this->type_ = type; }
 #ifdef USE_ETHERNET_MANUAL_IP
-  void set_manual_ip(const ManualIP &manual_ip);
+  void set_manual_ip(const ManualIP &manual_ip) { this->manual_ip_ = manual_ip; }
 #endif
   void set_fixed_mac(const std::array<uint8_t, MAC_ADDRESS_SIZE> &mac) { this->fixed_mac_ = mac; }
 
@@ -171,35 +171,35 @@ class EthernetComponent final : public Component {
   esp_eth_handle_t get_eth_handle() const { return this->eth_handle_; }
 
 #ifdef USE_ETHERNET_SPI
-  void set_clk_pin(uint8_t clk_pin);
-  void set_miso_pin(uint8_t miso_pin);
-  void set_mosi_pin(uint8_t mosi_pin);
-  void set_cs_pin(uint8_t cs_pin);
-  void set_interrupt_pin(uint8_t interrupt_pin);
-  void set_reset_pin(uint8_t reset_pin);
-  void set_clock_speed(int clock_speed);
-  void set_interface(spi_host_device_t interface);
+  void set_clk_pin(uint8_t clk_pin) { this->clk_pin_ = clk_pin; }
+  void set_miso_pin(uint8_t miso_pin) { this->miso_pin_ = miso_pin; }
+  void set_mosi_pin(uint8_t mosi_pin) { this->mosi_pin_ = mosi_pin; }
+  void set_cs_pin(uint8_t cs_pin) { this->cs_pin_ = cs_pin; }
+  void set_interrupt_pin(uint8_t interrupt_pin) { this->interrupt_pin_ = interrupt_pin; }
+  void set_reset_pin(uint8_t reset_pin) { this->reset_pin_ = reset_pin; }
+  void set_clock_speed(int clock_speed) { this->clock_speed_ = clock_speed; }
+  void set_interface(spi_host_device_t interface) { this->interface_ = interface; }
 #ifdef USE_ETHERNET_SPI_POLLING_SUPPORT
-  void set_polling_interval(uint32_t polling_interval);
+  void set_polling_interval(uint32_t polling_interval) { this->polling_interval_ = polling_interval; }
 #endif
 #else
-  void set_phy_addr(uint8_t phy_addr);
-  void set_power_pin(int power_pin);
-  void set_mdc_pin(uint8_t mdc_pin);
-  void set_mdio_pin(uint8_t mdio_pin);
-  void set_clk_pin(uint8_t clk_pin);
-  void set_clk_mode(emac_rmii_clock_mode_t clk_mode);
+  void set_phy_addr(uint8_t phy_addr) { this->phy_addr_ = phy_addr; }
+  void set_power_pin(int power_pin) { this->power_pin_ = power_pin; }
+  void set_mdc_pin(uint8_t mdc_pin) { this->mdc_pin_ = mdc_pin; }
+  void set_mdio_pin(uint8_t mdio_pin) { this->mdio_pin_ = mdio_pin; }
+  void set_clk_pin(uint8_t clk_pin) { this->clk_pin_ = clk_pin; }
+  void set_clk_mode(emac_rmii_clock_mode_t clk_mode) { this->clk_mode_ = clk_mode; }
   void add_phy_register(PHYRegister register_value);
 #endif  // USE_ETHERNET_SPI
 #endif  // USE_ESP32
 
 #ifdef USE_RP2
-  void set_clk_pin(uint8_t clk_pin);
-  void set_miso_pin(uint8_t miso_pin);
-  void set_mosi_pin(uint8_t mosi_pin);
-  void set_cs_pin(uint8_t cs_pin);
-  void set_interrupt_pin(int8_t interrupt_pin);
-  void set_reset_pin(int8_t reset_pin);
+  void set_clk_pin(uint8_t clk_pin) { this->clk_pin_ = clk_pin; }
+  void set_miso_pin(uint8_t miso_pin) { this->miso_pin_ = miso_pin; }
+  void set_mosi_pin(uint8_t mosi_pin) { this->mosi_pin_ = mosi_pin; }
+  void set_cs_pin(uint8_t cs_pin) { this->cs_pin_ = cs_pin; }
+  void set_interrupt_pin(int8_t interrupt_pin) { this->interrupt_pin_ = interrupt_pin; }
+  void set_reset_pin(int8_t reset_pin) { this->reset_pin_ = reset_pin; }
 #endif  // USE_RP2
 
 #ifdef USE_ETHERNET_IP_STATE_LISTENERS
diff --git a/esphome/components/ethernet/ethernet_component_esp32.cpp b/esphome/components/ethernet/ethernet_component_esp32.cpp
index 0220d6a19b..4af2d5f93c 100644
--- a/esphome/components/ethernet/ethernet_component_esp32.cpp
+++ b/esphome/components/ethernet/ethernet_component_esp32.cpp
@@ -908,25 +908,7 @@ void EthernetComponent::dump_connect_params_() {
 #endif /* USE_NETWORK_IPV6 */
 }
 
-#ifdef USE_ETHERNET_SPI
-void EthernetComponent::set_clk_pin(uint8_t clk_pin) { this->clk_pin_ = clk_pin; }
-void EthernetComponent::set_miso_pin(uint8_t miso_pin) { this->miso_pin_ = miso_pin; }
-void EthernetComponent::set_mosi_pin(uint8_t mosi_pin) { this->mosi_pin_ = mosi_pin; }
-void EthernetComponent::set_cs_pin(uint8_t cs_pin) { this->cs_pin_ = cs_pin; }
-void EthernetComponent::set_interrupt_pin(uint8_t interrupt_pin) { this->interrupt_pin_ = interrupt_pin; }
-void EthernetComponent::set_reset_pin(uint8_t reset_pin) { this->reset_pin_ = reset_pin; }
-void EthernetComponent::set_clock_speed(int clock_speed) { this->clock_speed_ = clock_speed; }
-void EthernetComponent::set_interface(spi_host_device_t interface) { this->interface_ = interface; }
-#ifdef USE_ETHERNET_SPI_POLLING_SUPPORT
-void EthernetComponent::set_polling_interval(uint32_t polling_interval) { this->polling_interval_ = polling_interval; }
-#endif
-#else
-void EthernetComponent::set_phy_addr(uint8_t phy_addr) { this->phy_addr_ = phy_addr; }
-void EthernetComponent::set_power_pin(int power_pin) { this->power_pin_ = power_pin; }
-void EthernetComponent::set_mdc_pin(uint8_t mdc_pin) { this->mdc_pin_ = mdc_pin; }
-void EthernetComponent::set_mdio_pin(uint8_t mdio_pin) { this->mdio_pin_ = mdio_pin; }
-void EthernetComponent::set_clk_pin(uint8_t clk_pin) { this->clk_pin_ = clk_pin; }
-void EthernetComponent::set_clk_mode(emac_rmii_clock_mode_t clk_mode) { this->clk_mode_ = clk_mode; }
+#ifndef USE_ETHERNET_SPI
 void EthernetComponent::add_phy_register(PHYRegister register_value) { this->phy_registers_.push_back(register_value); }
 #endif
 
diff --git a/esphome/components/ethernet/ethernet_component_rp2.cpp b/esphome/components/ethernet/ethernet_component_rp2.cpp
index 119e447689..7f4db4fab7 100644
--- a/esphome/components/ethernet/ethernet_component_rp2.cpp
+++ b/esphome/components/ethernet/ethernet_component_rp2.cpp
@@ -355,13 +355,6 @@ void EthernetComponent::dump_connect_params_() {
                 this->get_eth_mac_address_pretty_into_buffer(mac_buf));
 }
 
-void EthernetComponent::set_clk_pin(uint8_t clk_pin) { this->clk_pin_ = clk_pin; }
-void EthernetComponent::set_miso_pin(uint8_t miso_pin) { this->miso_pin_ = miso_pin; }
-void EthernetComponent::set_mosi_pin(uint8_t mosi_pin) { this->mosi_pin_ = mosi_pin; }
-void EthernetComponent::set_cs_pin(uint8_t cs_pin) { this->cs_pin_ = cs_pin; }
-void EthernetComponent::set_interrupt_pin(int8_t interrupt_pin) { this->interrupt_pin_ = interrupt_pin; }
-void EthernetComponent::set_reset_pin(int8_t reset_pin) { this->reset_pin_ = reset_pin; }
-
 void EthernetComponent::enable() {
   // RP2040 uses arduino-pico's LwipIntfDev which manages link state internally;
   // there is no clean enable/disable hook today. The YAML option is accepted on

From 0dc69aab1e3f6927cd6ee33804c69e2404a0728b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:00:49 -0500
Subject: [PATCH 054/155] [logger] Inline the trivial Logger accessors (#18619)

---
 esphome/components/logger/logger.cpp | 7 -------
 esphome/components/logger/logger.h   | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/esphome/components/logger/logger.cpp b/esphome/components/logger/logger.cpp
index 6527b6aa8c..bfc005070e 100644
--- a/esphome/components/logger/logger.cpp
+++ b/esphome/components/logger/logger.cpp
@@ -201,17 +201,10 @@ void Logger::process_messages_() {
 #endif  // USE_ESPHOME_TASK_LOG_BUFFER
 }
 
-void Logger::set_baud_rate(uint32_t baud_rate) { this->baud_rate_ = baud_rate; }
 #ifdef USE_LOGGER_RUNTIME_TAG_LEVELS
 void Logger::set_log_level(const char *tag, uint8_t log_level) { this->log_levels_[tag] = log_level; }
 #endif
 
-#if defined(USE_ESP32) || defined(USE_ESP8266) || defined(USE_RP2) || defined(USE_LIBRETINY) || defined(USE_ZEPHYR)
-UARTSelection Logger::get_uart() const { return this->uart_; }
-#endif
-
-float Logger::get_setup_priority() const { return setup_priority::BUS + 500.0f; }
-
 // Log level strings - packed into flash on ESP8266, indexed by log level (0-7)
 PROGMEM_STRING_TABLE(LogLevelStrings, "NONE", "ERROR", "WARN", "INFO", "CONFIG", "DEBUG", "VERBOSE", "VERY_VERBOSE");
 
diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index 69d8e6d32a..9c26814f7e 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -148,7 +148,7 @@ class Logger final : public Component {
   void loop() override;
 #endif
   /// Manually set the baud rate for serial, set to 0 to disable.
-  void set_baud_rate(uint32_t baud_rate);
+  void set_baud_rate(uint32_t baud_rate) { this->baud_rate_ = baud_rate; }
   uint32_t get_baud_rate() const { return baud_rate_; }
 #if defined(USE_ARDUINO) && !defined(USE_ESP32)
   Stream *get_hw_serial() const { return hw_serial_; }
@@ -163,7 +163,7 @@ class Logger final : public Component {
 #if defined(USE_ESP32) || defined(USE_ESP8266) || defined(USE_RP2) || defined(USE_LIBRETINY) || defined(USE_ZEPHYR)
   void set_uart_selection(UARTSelection uart_selection) { uart_ = uart_selection; }
   /// Get the UART used by the logger.
-  UARTSelection get_uart() const;
+  UARTSelection get_uart() const { return this->uart_; }
 #endif
 
   /// Set the default log level for this logger.
@@ -197,7 +197,7 @@ class Logger final : public Component {
   void add_level_listener(LoggerLevelListener *listener) { this->level_listeners_.push_back(listener); }
 #endif
 
-  float get_setup_priority() const override;
+  float get_setup_priority() const override { return setup_priority::BUS + 500.0f; }
 
   void log_vprintf_(uint8_t level, const char *tag, int line, const char *format, va_list args);  // NOLINT
 #ifdef USE_STORE_LOG_STR_IN_FLASH

From 4db16660242dc4db15bef9fd3ab2bc3b96ce8ed7 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:00:59 -0500
Subject: [PATCH 055/155] [light] Inline the trivial LightState accessors
 (#18620)

---
 esphome/components/light/esp_range_view.cpp |  2 --
 esphome/components/light/esp_range_view.h   |  3 +++
 esphome/components/light/light_state.cpp    | 18 -------------
 esphome/components/light/light_state.h      | 28 ++++++++++++---------
 4 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/esphome/components/light/esp_range_view.cpp b/esphome/components/light/esp_range_view.cpp
index 58d552031a..5d372983d9 100644
--- a/esphome/components/light/esp_range_view.cpp
+++ b/esphome/components/light/esp_range_view.cpp
@@ -13,8 +13,6 @@ ESPColorView ESPRangeView::operator[](int32_t index) const {
   index = interpret_index(index, this->size()) + this->begin_;
   return (*this->parent_)[index];
 }
-ESPRangeIterator ESPRangeView::begin() { return {*this, this->begin_}; }
-ESPRangeIterator ESPRangeView::end() { return {*this, this->end_}; }
 
 void ESPRangeView::set(const Color &color) {
   for (int32_t i = this->begin_; i < this->end_; i++) {
diff --git a/esphome/components/light/esp_range_view.h b/esphome/components/light/esp_range_view.h
index f5e4ebb83f..ec129bdf70 100644
--- a/esphome/components/light/esp_range_view.h
+++ b/esphome/components/light/esp_range_view.h
@@ -75,4 +75,7 @@ class ESPRangeIterator {
   int32_t i_;
 };
 
+inline ESPRangeIterator ESPRangeView::begin() { return {*this, this->begin_}; }
+inline ESPRangeIterator ESPRangeView::end() { return {*this, this->end_}; }
+
 }  // namespace esphome::light
diff --git a/esphome/components/light/light_state.cpp b/esphome/components/light/light_state.cpp
index 9d0181a05c..82c00e2382 100644
--- a/esphome/components/light/light_state.cpp
+++ b/esphome/components/light/light_state.cpp
@@ -157,8 +157,6 @@ void LightState::loop() {
   }
 }
 
-float LightState::get_setup_priority() const { return setup_priority::HARDWARE - 1.0f; }
-
 void LightState::publish_state() {
   if (this->remote_values_listeners_) {
     for (auto *listener : *this->remote_values_listeners_) {
@@ -194,25 +192,11 @@ void LightState::add_target_state_reached_listener(LightTargetStateReachedListen
   this->target_state_reached_listeners_->push_back(listener);
 }
 
-void LightState::set_default_transition_length(uint32_t default_transition_length) {
-  this->default_transition_length_ = default_transition_length;
-}
-uint32_t LightState::get_default_transition_length() const { return this->default_transition_length_; }
-void LightState::set_flash_transition_length(uint32_t flash_transition_length) {
-  this->flash_transition_length_ = flash_transition_length;
-}
-uint32_t LightState::get_flash_transition_length() const { return this->flash_transition_length_; }
-void LightState::set_gamma_correct(float gamma_correct) { this->gamma_correct_ = gamma_correct; }
-void LightState::set_restore_mode(LightRestoreMode restore_mode) { this->restore_mode_ = restore_mode; }
-void LightState::set_initial_state(void (*callback)(LightStateRTCState &)) { this->initial_state_callback_ = callback; }
-bool LightState::supports_effects() { return !this->effects_.empty(); }
-const FixedVector<LightEffect *> &LightState::get_effects() const { return this->effects_; }
 void LightState::add_effects(const std::initializer_list<LightEffect *> &effects) {
   // Called once from Python codegen during setup with all effects from YAML config
   this->effects_ = effects;
 }
 
-void LightState::current_values_as_binary(bool *binary) { this->current_values.as_binary(binary); }
 void LightState::current_values_as_brightness(float *brightness) {
   this->current_values.as_brightness(brightness);
   *brightness = this->gamma_correct_lut(*brightness);
@@ -333,8 +317,6 @@ float LightState::gamma_uncorrect_lut(float value) const {
 }
 #endif  // USE_LIGHT_GAMMA_LUT
 
-bool LightState::is_transformer_active() { return this->is_transformer_active_; }
-
 void LightState::start_effect_(uint32_t effect_index) {
   this->stop_effect_();
   if (effect_index == 0)
diff --git a/esphome/components/light/light_state.h b/esphome/components/light/light_state.h
index 5efc05358b..3a3f8fc368 100644
--- a/esphome/components/light/light_state.h
+++ b/esphome/components/light/light_state.h
@@ -109,7 +109,7 @@ class LightState : public EntityBase, public Component {
   void dump_config() override;
   void loop() override;
   /// Shortly after HARDWARE.
-  float get_setup_priority() const override;
+  float get_setup_priority() const override { return setup_priority::HARDWARE - 1.0f; }
 
   /** The current values of the light as outputted to the light.
    *
@@ -157,15 +157,19 @@ class LightState : public EntityBase, public Component {
   void add_target_state_reached_listener(LightTargetStateReachedListener *listener);
 
   /// Set the default transition length, i.e. the transition length when no transition is provided.
-  void set_default_transition_length(uint32_t default_transition_length);
-  uint32_t get_default_transition_length() const;
+  void set_default_transition_length(uint32_t default_transition_length) {
+    this->default_transition_length_ = default_transition_length;
+  }
+  uint32_t get_default_transition_length() const { return this->default_transition_length_; }
 
   /// Set the flash transition length
-  void set_flash_transition_length(uint32_t flash_transition_length);
-  uint32_t get_flash_transition_length() const;
+  void set_flash_transition_length(uint32_t flash_transition_length) {
+    this->flash_transition_length_ = flash_transition_length;
+  }
+  uint32_t get_flash_transition_length() const { return this->flash_transition_length_; }
 
   /// Set the gamma correction factor
-  void set_gamma_correct(float gamma_correct);
+  void set_gamma_correct(float gamma_correct) { this->gamma_correct_ = gamma_correct; }
   float get_gamma_correct() const { return this->gamma_correct_; }
 
 #ifdef USE_LIGHT_GAMMA_LUT
@@ -186,17 +190,17 @@ class LightState : public EntityBase, public Component {
 #endif  // USE_LIGHT_GAMMA_LUT
 
   /// Set the restore mode of this light
-  void set_restore_mode(LightRestoreMode restore_mode);
+  void set_restore_mode(LightRestoreMode restore_mode) { this->restore_mode_ = restore_mode; }
 
   /// Set a callback to populate the initial state defaults during setup.
   /// The callback is called once, then cleared. Values live in flash as code.
-  void set_initial_state(void (*callback)(LightStateRTCState &));
+  void set_initial_state(void (*callback)(LightStateRTCState &)) { this->initial_state_callback_ = callback; }
 
   /// Return whether the light has any effects that meet the trait requirements.
-  bool supports_effects();
+  bool supports_effects() const { return !this->effects_.empty(); }
 
   /// Get all effects for this light state.
-  const FixedVector<LightEffect *> &get_effects() const;
+  const FixedVector<LightEffect *> &get_effects() const { return this->effects_; }
 
   /// Add effects for this light state.
   void add_effects(const std::initializer_list<LightEffect *> &effects);
@@ -254,7 +258,7 @@ class LightState : public EntityBase, public Component {
   }
 
   /// The result of all the current_values_as_* methods have gamma correction applied.
-  void current_values_as_binary(bool *binary);
+  void current_values_as_binary(bool *binary) { this->current_values.as_binary(binary); }
 
   void current_values_as_brightness(float *brightness);
 
@@ -281,7 +285,7 @@ class LightState : public EntityBase, public Component {
    *   return;
    * }
    */
-  bool is_transformer_active();
+  bool is_transformer_active() const { return this->is_transformer_active_; }
 
  protected:
   friend LightOutput;

From 763a1d9371690543487037fa97a53d2bb2ea03a2 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:01:16 -0500
Subject: [PATCH 056/155] [select] Inline the trivial Select accessors (#18621)

---
 esphome/components/select/select.cpp        | 17 -----------------
 esphome/components/select/select.h          | 14 ++++++++------
 esphome/components/select/select_traits.cpp |  2 --
 esphome/components/select/select_traits.h   |  2 +-
 4 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/esphome/components/select/select.cpp b/esphome/components/select/select.cpp
index 17c6c811dd..05a0ee1ed9 100644
--- a/esphome/components/select/select.cpp
+++ b/esphome/components/select/select.cpp
@@ -8,8 +8,6 @@ namespace esphome::select {
 
 static const char *const TAG = "select";
 
-void Select::publish_state(const std::string &state) { this->publish_state(state.c_str()); }
-
 void Select::publish_state(const char *state) {
   auto index = this->index_of(state);
   if (index.has_value()) {
@@ -34,21 +32,6 @@ void Select::publish_state(size_t index) {
 #endif
 }
 
-StringRef Select::current_option() const {
-  return this->has_state() ? StringRef(this->option_at(this->active_index_)) : StringRef();
-}
-
-bool Select::has_option(const std::string &option) const { return this->index_of(option.c_str()).has_value(); }
-
-bool Select::has_option(const char *option) const { return this->index_of(option).has_value(); }
-
-bool Select::has_index(size_t index) const { return index < this->size(); }
-
-size_t Select::size() const {
-  const auto &options = traits.get_options();
-  return options.size();
-}
-
 optional<size_t> Select::index_of(const char *option, size_t len) const {
   const auto &options = traits.get_options();
   for (size_t i = 0; i < options.size(); i++) {
diff --git a/esphome/components/select/select.h b/esphome/components/select/select.h
index 34d9248523..2294f34e62 100644
--- a/esphome/components/select/select.h
+++ b/esphome/components/select/select.h
@@ -33,27 +33,29 @@ class Select : public EntityBase {
   Select() = default;
   ~Select() = default;
 
-  void publish_state(const std::string &state);
+  void publish_state(const std::string &state) { this->publish_state(state.c_str()); }
   void publish_state(const char *state);
   void publish_state(size_t index);
 
   /// Return the currently selected option, or empty StringRef if no state.
   /// The returned StringRef points to string literals from codegen (static storage).
   /// Traits are set once at startup and valid for the lifetime of the program.
-  StringRef current_option() const;
+  StringRef current_option() const {
+    return this->has_state() ? StringRef(this->option_at(this->active_index_)) : StringRef();
+  }
 
   /// Instantiate a SelectCall object to modify this select component's state.
   SelectCall make_call() { return SelectCall(this); }
 
   /// Return whether this select component contains the provided option.
-  bool has_option(const std::string &option) const;
-  bool has_option(const char *option) const;
+  bool has_option(const std::string &option) const { return this->index_of(option).has_value(); }
+  bool has_option(const char *option) const { return this->index_of(option).has_value(); }
 
   /// Return whether this select component contains the provided index offset.
-  bool has_index(size_t index) const;
+  bool has_index(size_t index) const { return index < this->size(); }
 
   /// Return the number of options in this select component.
-  size_t size() const;
+  size_t size() const { return this->traits.get_options().size(); }
 
   /// Find the (optional) index offset of the provided option value.
   optional<size_t> index_of(const char *option, size_t len) const;
diff --git a/esphome/components/select/select_traits.cpp b/esphome/components/select/select_traits.cpp
index ff52c0d85b..67a5118646 100644
--- a/esphome/components/select/select_traits.cpp
+++ b/esphome/components/select/select_traits.cpp
@@ -11,6 +11,4 @@ void SelectTraits::set_options(const FixedVector<const char *> &options) {
   }
 }
 
-const FixedVector<const char *> &SelectTraits::get_options() const { return this->options_; }
-
 }  // namespace esphome::select
diff --git a/esphome/components/select/select_traits.h b/esphome/components/select/select_traits.h
index 78a83e5944..e1b261bc96 100644
--- a/esphome/components/select/select_traits.h
+++ b/esphome/components/select/select_traits.h
@@ -9,7 +9,7 @@ class SelectTraits {
  public:
   void set_options(const std::initializer_list<const char *> &options);
   void set_options(const FixedVector<const char *> &options);
-  const FixedVector<const char *> &get_options() const;
+  const FixedVector<const char *> &get_options() const { return this->options_; }
 
  protected:
   FixedVector<const char *> options_;

From c60062c418b3a2e2fb841557d611bd0f341ae551 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:01:28 -0500
Subject: [PATCH 057/155] [sensor] Inline the trivial
 ExponentialMovingAverageFilter setters (#18622)

---
 esphome/components/sensor/filter.cpp | 2 --
 esphome/components/sensor/filter.h   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/esphome/components/sensor/filter.cpp b/esphome/components/sensor/filter.cpp
index 0105580d26..dbd6f4d34b 100644
--- a/esphome/components/sensor/filter.cpp
+++ b/esphome/components/sensor/filter.cpp
@@ -164,8 +164,6 @@ optional<float> ExponentialMovingAverageFilter::new_value(float value) {
   }
   return {};
 }
-void ExponentialMovingAverageFilter::set_send_every(uint16_t send_every) { this->send_every_ = send_every; }
-void ExponentialMovingAverageFilter::set_alpha(float alpha) { this->alpha_ = alpha; }
 
 // ThrottleAverageFilter
 ThrottleAverageFilter::ThrottleAverageFilter(uint32_t time_period) : time_period_(time_period) {}
diff --git a/esphome/components/sensor/filter.h b/esphome/components/sensor/filter.h
index b79bfa17d6..bc086e3805 100644
--- a/esphome/components/sensor/filter.h
+++ b/esphome/components/sensor/filter.h
@@ -239,8 +239,8 @@ class ExponentialMovingAverageFilter : public Filter {
 
   optional<float> new_value(float value) override;
 
-  void set_send_every(uint16_t send_every);
-  void set_alpha(float alpha);
+  void set_send_every(uint16_t send_every) { this->send_every_ = send_every; }
+  void set_alpha(float alpha) { this->alpha_ = alpha; }
 
  protected:
   float accumulator_{NAN};

From efc0a94112f93d25b9806a332310a877faebe6b9 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:01:42 -0500
Subject: [PATCH 058/155] [text_sensor] Inline the trivial TextSensor
 forwarding overloads (#18623)

---
 esphome/components/text_sensor/text_sensor.cpp | 8 --------
 esphome/components/text_sensor/text_sensor.h   | 8 +++++---
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/esphome/components/text_sensor/text_sensor.cpp b/esphome/components/text_sensor/text_sensor.cpp
index d2483619a6..17c606d253 100644
--- a/esphome/components/text_sensor/text_sensor.cpp
+++ b/esphome/components/text_sensor/text_sensor.cpp
@@ -18,10 +18,6 @@ void log_text_sensor(const char *tag, const char *prefix, const char *type, Text
   LOG_ENTITY_ICON(tag, prefix, *obj);
 }
 
-void TextSensor::publish_state(const std::string &state) { this->publish_state(state.data(), state.size()); }
-
-void TextSensor::publish_state(const char *state) { this->publish_state(state, strlen(state)); }
-
 void TextSensor::publish_state(const char *state, size_t len) {
 #ifdef USE_TEXT_SENSOR_FILTER
   if (this->filter_list_ == nullptr) {
@@ -91,10 +87,6 @@ const std::string &TextSensor::get_raw_state() const {
 #endif
   return this->state;  // No filters, raw == filtered
 }
-void TextSensor::internal_send_state_to_frontend(const std::string &state) {
-  this->internal_send_state_to_frontend(state.data(), state.size());
-}
-
 void TextSensor::internal_send_state_to_frontend(const char *state, size_t len) {
   // Only assign if changed to avoid heap allocation
   if (len != this->state.size() || memcmp(state, this->state.data(), len) != 0) {
diff --git a/esphome/components/text_sensor/text_sensor.h b/esphome/components/text_sensor/text_sensor.h
index aa48781f41..0e7364bf98 100644
--- a/esphome/components/text_sensor/text_sensor.h
+++ b/esphome/components/text_sensor/text_sensor.h
@@ -37,8 +37,8 @@ class TextSensor : public EntityBase {
   /// Returns the raw (pre-filter) state.
   const std::string &get_raw_state() const;
 
-  void publish_state(const std::string &state);
-  void publish_state(const char *state);
+  void publish_state(const std::string &state) { this->publish_state(state.data(), state.size()); }
+  void publish_state(const char *state) { this->publish_state(state, strlen(state)); }
   void publish_state(const char *state, size_t len);
 
 #ifdef USE_TEXT_SENSOR_FILTER
@@ -70,7 +70,9 @@ class TextSensor : public EntityBase {
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
 
-  void internal_send_state_to_frontend(const std::string &state);
+  void internal_send_state_to_frontend(const std::string &state) {
+    this->internal_send_state_to_frontend(state.data(), state.size());
+  }
   void internal_send_state_to_frontend(const char *state, size_t len);
 
  protected:

From 5c2286cc4a1ea1cd3392df32ec1dc27f4ca4a27b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:01:55 -0500
Subject: [PATCH 059/155] [climate] Inline the trivial visual override setters
 (#18624)

---
 esphome/components/climate/climate.cpp | 23 -----------------------
 esphome/components/climate/climate.h   | 21 ++++++++++++++++-----
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index b41ca4a540..0f01443bd0 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -511,29 +511,6 @@ ClimateTraits Climate::get_traits() {
   return traits;
 }
 
-#ifdef USE_CLIMATE_VISUAL_OVERRIDES
-void Climate::set_visual_min_temperature_override(float visual_min_temperature_override) {
-  this->visual_min_temperature_override_ = visual_min_temperature_override;
-}
-
-void Climate::set_visual_max_temperature_override(float visual_max_temperature_override) {
-  this->visual_max_temperature_override_ = visual_max_temperature_override;
-}
-
-void Climate::set_visual_temperature_step_override(float target, float current) {
-  this->visual_target_temperature_step_override_ = target;
-  this->visual_current_temperature_step_override_ = current;
-}
-
-void Climate::set_visual_min_humidity_override(float visual_min_humidity_override) {
-  this->visual_min_humidity_override_ = visual_min_humidity_override;
-}
-
-void Climate::set_visual_max_humidity_override(float visual_max_humidity_override) {
-  this->visual_max_humidity_override_ = visual_max_humidity_override;
-}
-#endif
-
 ClimateCall Climate::make_call() { return ClimateCall(this); }
 
 ClimateCall ClimateDeviceRestoreState::to_call(Climate *climate) {
diff --git a/esphome/components/climate/climate.h b/esphome/components/climate/climate.h
index 04f653a2b0..a906897235 100644
--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -228,11 +228,22 @@ class Climate : public EntityBase {
   ClimateTraits get_traits();
 
 #ifdef USE_CLIMATE_VISUAL_OVERRIDES
-  void set_visual_min_temperature_override(float visual_min_temperature_override);
-  void set_visual_max_temperature_override(float visual_max_temperature_override);
-  void set_visual_temperature_step_override(float target, float current);
-  void set_visual_min_humidity_override(float visual_min_humidity_override);
-  void set_visual_max_humidity_override(float visual_max_humidity_override);
+  void set_visual_min_temperature_override(float visual_min_temperature_override) {
+    this->visual_min_temperature_override_ = visual_min_temperature_override;
+  }
+  void set_visual_max_temperature_override(float visual_max_temperature_override) {
+    this->visual_max_temperature_override_ = visual_max_temperature_override;
+  }
+  void set_visual_temperature_step_override(float target, float current) {
+    this->visual_target_temperature_step_override_ = target;
+    this->visual_current_temperature_step_override_ = current;
+  }
+  void set_visual_min_humidity_override(float visual_min_humidity_override) {
+    this->visual_min_humidity_override_ = visual_min_humidity_override;
+  }
+  void set_visual_max_humidity_override(float visual_max_humidity_override) {
+    this->visual_max_humidity_override_ = visual_max_humidity_override;
+  }
 #endif
 
   /// Set the supported custom fan modes (stored on Climate, referenced by ClimateTraits).

From ce019f508d3a78a31e17bf71f98a70ef0d63419e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:02:04 -0500
Subject: [PATCH 060/155] [safe_mode] Inline the trivial set_safe_mode setters
 (#18626)

---
 esphome/components/safe_mode/button/safe_mode_button.cpp | 4 ----
 esphome/components/safe_mode/button/safe_mode_button.h   | 2 +-
 esphome/components/safe_mode/switch/safe_mode_switch.cpp | 4 ----
 esphome/components/safe_mode/switch/safe_mode_switch.h   | 2 +-
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/esphome/components/safe_mode/button/safe_mode_button.cpp b/esphome/components/safe_mode/button/safe_mode_button.cpp
index 04203854fb..982ecf8402 100644
--- a/esphome/components/safe_mode/button/safe_mode_button.cpp
+++ b/esphome/components/safe_mode/button/safe_mode_button.cpp
@@ -7,10 +7,6 @@ namespace esphome::safe_mode {
 
 static const char *const TAG = "safe_mode.button";
 
-void SafeModeButton::set_safe_mode(SafeModeComponent *safe_mode_component) {
-  this->safe_mode_component_ = safe_mode_component;
-}
-
 void SafeModeButton::press_action() {
   ESP_LOGI(TAG, "Restarting in safe mode");
   this->safe_mode_component_->set_safe_mode_pending(true);
diff --git a/esphome/components/safe_mode/button/safe_mode_button.h b/esphome/components/safe_mode/button/safe_mode_button.h
index 6012bb2aeb..035bd77802 100644
--- a/esphome/components/safe_mode/button/safe_mode_button.h
+++ b/esphome/components/safe_mode/button/safe_mode_button.h
@@ -9,7 +9,7 @@ namespace esphome::safe_mode {
 class SafeModeButton final : public button::Button, public Component {
  public:
   void dump_config() override;
-  void set_safe_mode(SafeModeComponent *safe_mode_component);
+  void set_safe_mode(SafeModeComponent *safe_mode_component) { this->safe_mode_component_ = safe_mode_component; }
 
  protected:
   SafeModeComponent *safe_mode_component_;
diff --git a/esphome/components/safe_mode/switch/safe_mode_switch.cpp b/esphome/components/safe_mode/switch/safe_mode_switch.cpp
index f513465db0..b4b9735757 100644
--- a/esphome/components/safe_mode/switch/safe_mode_switch.cpp
+++ b/esphome/components/safe_mode/switch/safe_mode_switch.cpp
@@ -7,10 +7,6 @@ namespace esphome::safe_mode {
 
 static const char *const TAG = "safe_mode.switch";
 
-void SafeModeSwitch::set_safe_mode(SafeModeComponent *safe_mode_component) {
-  this->safe_mode_component_ = safe_mode_component;
-}
-
 void SafeModeSwitch::write_state(bool state) {
   // Acknowledge
   this->publish_state(false);
diff --git a/esphome/components/safe_mode/switch/safe_mode_switch.h b/esphome/components/safe_mode/switch/safe_mode_switch.h
index cbd79cd520..cb48023f63 100644
--- a/esphome/components/safe_mode/switch/safe_mode_switch.h
+++ b/esphome/components/safe_mode/switch/safe_mode_switch.h
@@ -9,7 +9,7 @@ namespace esphome::safe_mode {
 class SafeModeSwitch final : public switch_::Switch, public Component {
  public:
   void dump_config() override;
-  void set_safe_mode(SafeModeComponent *safe_mode_component);
+  void set_safe_mode(SafeModeComponent *safe_mode_component) { this->safe_mode_component_ = safe_mode_component; }
 
  protected:
   SafeModeComponent *safe_mode_component_;

From dba3b287dd817b9ad68941b7fd1a8294bdc4a616 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:02:14 -0500
Subject: [PATCH 061/155] [api] Inline the trivial APIServer accessors (#18627)

---
 esphome/components/api/api_server.cpp | 10 ----------
 esphome/components/api/api_server.h   | 10 +++++-----
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index ef5b43d7b1..2d5f9e4155 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -423,12 +423,6 @@ void APIServer::send_infrared_rf_receive_event([[maybe_unused]] uint32_t device_
 API_DISPATCH_UPDATE(alarm_control_panel::AlarmControlPanel, alarm_control_panel)
 #endif
 
-float APIServer::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
-
-void APIServer::set_port(uint16_t port) { this->port_ = port; }
-
-void APIServer::set_batch_delay(uint16_t batch_delay) { this->batch_delay_ = batch_delay; }
-
 #ifdef USE_API_HOMEASSISTANT_SERVICES
 void APIServer::send_homeassistant_action(const HomeassistantActionRequest &call) {
   bool has_subscriber = false;
@@ -553,10 +547,6 @@ const std::vector<APIServer::HomeAssistantStateSubscription> &APIServer::get_sta
 }
 #endif
 
-uint16_t APIServer::get_port() const { return this->port_; }
-
-void APIServer::set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }
-
 #ifdef USE_API_NOISE
 bool APIServer::update_noise_psk_(const SavedNoisePsk &new_psk, const LogString *save_log_msg,
                                   const LogString *fail_log_msg, bool make_active) {
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 248b83a0ff..a58e42534b 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -51,8 +51,8 @@ class APIServer final : public Component,
  public:
   APIServer();
   void setup() override;
-  uint16_t get_port() const;
-  float get_setup_priority() const override;
+  uint16_t get_port() const { return this->port_; }
+  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
   void loop() override;
   void dump_config() override;
   void on_shutdown() override;
@@ -63,9 +63,9 @@ class APIServer final : public Component,
 #ifdef USE_CAMERA
   void on_camera_image(const std::shared_ptr<camera::CameraImage> &image) override;
 #endif
-  void set_port(uint16_t port);
-  void set_reboot_timeout(uint32_t reboot_timeout);
-  void set_batch_delay(uint16_t batch_delay);
+  void set_port(uint16_t port) { this->port_ = port; }
+  void set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }
+  void set_batch_delay(uint16_t batch_delay) { this->batch_delay_ = batch_delay; }
   uint16_t get_batch_delay() const { return batch_delay_; }
   void set_listen_backlog(uint8_t listen_backlog) { this->listen_backlog_ = listen_backlog; }
 

From 0e915e9b8bf709acd8b63258cfb6d7bd27b2a85b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:02:58 -0500
Subject: [PATCH 062/155] [core] Inline the ESPTime::strftime std::string
 overload (#18628)

---
 esphome/core/time.cpp | 2 --
 esphome/core/time.h   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/esphome/core/time.cpp b/esphome/core/time.cpp
index b6fc9b90ad..d1ba981e95 100644
--- a/esphome/core/time.cpp
+++ b/esphome/core/time.cpp
@@ -114,8 +114,6 @@ std::string ESPTime::strftime(const char *format) {
   return std::string(buf, len);
 }
 
-std::string ESPTime::strftime(const std::string &format) { return this->strftime(format.c_str()); }
-
 // Helper to parse exactly N digits, returns false if not enough digits
 static bool parse_digits(const char *&p, const char *end, int count, uint16_t &value) {
   value = 0;
diff --git a/esphome/core/time.h b/esphome/core/time.h
index 0b67b7b3fc..f58cf20b4e 100644
--- a/esphome/core/time.h
+++ b/esphome/core/time.h
@@ -71,7 +71,7 @@ struct ESPTime {
    * @warning This method can return "ERROR" when the underlying strftime() call fails or when the
    * output exceeds STRFTIME_BUFFER_SIZE bytes.
    */
-  std::string strftime(const std::string &format);
+  std::string strftime(const std::string &format) { return this->strftime(format.c_str()); }
 
   /// @copydoc strftime(const std::string &format)
   std::string strftime(const char *format);

From 3ef5a8e6a4cca3f061712c39a8757c8e1a001eb7 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:03:07 -0500
Subject: [PATCH 063/155] [water_heater] Inline the trivial visual override
 setters (#18629)

---
 esphome/components/water_heater/water_heater.cpp | 12 ------------
 esphome/components/water_heater/water_heater.h   | 12 +++++++++---
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/esphome/components/water_heater/water_heater.cpp b/esphome/components/water_heater/water_heater.cpp
index 9ee8faadee..9862253ad9 100644
--- a/esphome/components/water_heater/water_heater.cpp
+++ b/esphome/components/water_heater/water_heater.cpp
@@ -233,18 +233,6 @@ WaterHeaterTraits WaterHeater::get_traits() {
   return traits;
 }
 
-#ifdef USE_WATER_HEATER_VISUAL_OVERRIDES
-void WaterHeater::set_visual_min_temperature_override(float min_temperature_override) {
-  this->visual_min_temperature_override_ = min_temperature_override;
-}
-void WaterHeater::set_visual_max_temperature_override(float max_temperature_override) {
-  this->visual_max_temperature_override_ = max_temperature_override;
-}
-void WaterHeater::set_visual_target_temperature_step_override(float visual_target_temperature_step_override) {
-  this->visual_target_temperature_step_override_ = visual_target_temperature_step_override;
-}
-#endif
-
 // Water heater mode strings indexed by WaterHeaterMode enum (0-6): OFF, ECO, ELECTRIC, PERFORMANCE, HIGH_DEMAND,
 // HEAT_PUMP, GAS
 PROGMEM_STRING_TABLE(WaterHeaterModeStrings, "OFF", "ECO", "ELECTRIC", "PERFORMANCE", "HIGH_DEMAND", "HEAT_PUMP", "GAS",
diff --git a/esphome/components/water_heater/water_heater.h b/esphome/components/water_heater/water_heater.h
index 995b815440..1255a68595 100644
--- a/esphome/components/water_heater/water_heater.h
+++ b/esphome/components/water_heater/water_heater.h
@@ -217,9 +217,15 @@ class WaterHeater : public EntityBase {
   virtual WaterHeaterCallInternal make_call() = 0;
 
 #ifdef USE_WATER_HEATER_VISUAL_OVERRIDES
-  void set_visual_min_temperature_override(float min_temperature_override);
-  void set_visual_max_temperature_override(float max_temperature_override);
-  void set_visual_target_temperature_step_override(float visual_target_temperature_step_override);
+  void set_visual_min_temperature_override(float min_temperature_override) {
+    this->visual_min_temperature_override_ = min_temperature_override;
+  }
+  void set_visual_max_temperature_override(float max_temperature_override) {
+    this->visual_max_temperature_override_ = max_temperature_override;
+  }
+  void set_visual_target_temperature_step_override(float visual_target_temperature_step_override) {
+    this->visual_target_temperature_step_override_ = visual_target_temperature_step_override;
+  }
 #endif
   virtual void control(const WaterHeaterCall &call) = 0;
 

From cb4e55e4449b08dac696d38dc4314216a8c9b332 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:03:15 -0500
Subject: [PATCH 064/155] [cover] Inline the trivial Cover and CoverCall
 accessors (#18630)

---
 esphome/components/cover/cover.cpp | 7 -------
 esphome/components/cover/cover.h   | 8 ++++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/esphome/components/cover/cover.cpp b/esphome/components/cover/cover.cpp
index e98a555fe5..dc2db3bf32 100644
--- a/esphome/components/cover/cover.cpp
+++ b/esphome/components/cover/cover.cpp
@@ -135,10 +135,6 @@ CoverCall &CoverCall::set_stop(bool stop) {
   this->stop_ = stop;
   return *this;
 }
-bool CoverCall::get_stop() const { return this->stop_; }
-
-CoverCall Cover::make_call() { return {this}; }
-
 void Cover::publish_state(bool save) {
   this->position = clamp(this->position, 0.0f, 1.0f);
   this->tilt = clamp(this->tilt, 0.0f, 1.0f);
@@ -184,9 +180,6 @@ optional<CoverRestoreState> Cover::restore_state_() {
   return recovered;
 }
 
-bool Cover::is_fully_open() const { return this->position == COVER_OPEN; }
-bool Cover::is_fully_closed() const { return this->position == COVER_CLOSED; }
-
 CoverCall CoverRestoreState::to_call(Cover *cover) {
   auto call = cover->make_call();
   auto traits = cover->get_traits();
diff --git a/esphome/components/cover/cover.h b/esphome/components/cover/cover.h
index 9a75e68487..8bf45cfb57 100644
--- a/esphome/components/cover/cover.h
+++ b/esphome/components/cover/cover.h
@@ -50,7 +50,7 @@ class CoverCall {
   void perform();
 
   const optional<float> &get_position() const;
-  bool get_stop() const;
+  bool get_stop() const { return this->stop_; }
   const optional<float> &get_tilt() const;
   const optional<bool> &get_toggle() const;
 
@@ -123,7 +123,7 @@ class Cover : public EntityBase {
   float tilt{COVER_OPEN};
 
   /// Construct a new cover call used to control the cover.
-  CoverCall make_call();
+  CoverCall make_call() { return {this}; }
 
   template<typename F> void add_on_state_callback(F &&f) { this->state_callback_.add(std::forward<F>(f)); }
 
@@ -139,9 +139,9 @@ class Cover : public EntityBase {
   virtual CoverTraits get_traits() = 0;
 
   /// Helper method to check if the cover is fully open. Equivalent to comparing .position against 1.0
-  bool is_fully_open() const;
+  bool is_fully_open() const { return this->position == COVER_OPEN; }
   /// Helper method to check if the cover is fully closed. Equivalent to comparing .position against 0.0
-  bool is_fully_closed() const;
+  bool is_fully_closed() const { return this->position == COVER_CLOSED; }
 
  protected:
   friend CoverCall;

From fedb3ac5c1999f03eb4f47f1b63c2d23b37ed47f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:03:38 -0500
Subject: [PATCH 065/155] [fan] Inline the trivial Fan call helpers (#18631)

---
 esphome/components/fan/fan.cpp | 5 -----
 esphome/components/fan/fan.h   | 8 ++++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/esphome/components/fan/fan.cpp b/esphome/components/fan/fan.cpp
index 853bf94ffe..7dc0b5c6fe 100644
--- a/esphome/components/fan/fan.cpp
+++ b/esphome/components/fan/fan.cpp
@@ -153,11 +153,6 @@ void FanRestoreState::apply(Fan &fan) {
   fan.publish_state();
 }
 
-FanCall Fan::turn_on() { return this->make_call().set_state(true); }
-FanCall Fan::turn_off() { return this->make_call().set_state(false); }
-FanCall Fan::toggle() { return this->make_call().set_state(!this->state); }
-FanCall Fan::make_call() { return FanCall(*this); }
-
 const char *Fan::find_preset_mode_(const char *preset_mode) {
   return this->find_preset_mode_(preset_mode, preset_mode ? strlen(preset_mode) : 0);
 }
diff --git a/esphome/components/fan/fan.h b/esphome/components/fan/fan.h
index 3d731e6eb0..106e6e74cd 100644
--- a/esphome/components/fan/fan.h
+++ b/esphome/components/fan/fan.h
@@ -115,10 +115,10 @@ class Fan : public EntityBase {
   /// The current direction of the fan
   FanDirection direction{FanDirection::FORWARD};
 
-  FanCall turn_on();
-  FanCall turn_off();
-  FanCall toggle();
-  FanCall make_call();
+  FanCall turn_on() { return this->make_call().set_state(true); }
+  FanCall turn_off() { return this->make_call().set_state(false); }
+  FanCall toggle() { return this->make_call().set_state(!this->state); }
+  FanCall make_call() { return FanCall(*this); }
 
   /// Register a callback that will be called each time the state changes.
   template<typename F> void add_on_state_callback(F &&callback) {

From 832a738588e2d308e981c71a6620e894a2ac356d Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:03:51 -0500
Subject: [PATCH 066/155] [switch] Inline the trivial inverted accessors
 (#18632)

---
 esphome/components/switch/switch.cpp | 3 ---
 esphome/components/switch/switch.h   | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/esphome/components/switch/switch.cpp b/esphome/components/switch/switch.cpp
index abc7338a62..101a0b9ffa 100644
--- a/esphome/components/switch/switch.cpp
+++ b/esphome/components/switch/switch.cpp
@@ -69,9 +69,6 @@ void Switch::publish_state(bool state) {
 }
 bool Switch::assumed_state() { return false; }
 
-void Switch::set_inverted(bool inverted) { this->inverted_ = inverted; }
-bool Switch::is_inverted() const { return this->inverted_; }
-
 void log_switch(const char *tag, const char *prefix, const char *type, Switch *obj) {
   if (obj != nullptr) {
     // Prepare restore mode string
diff --git a/esphome/components/switch/switch.h b/esphome/components/switch/switch.h
index b7761cba0a..0564c3efd2 100644
--- a/esphome/components/switch/switch.h
+++ b/esphome/components/switch/switch.h
@@ -87,7 +87,7 @@ class Switch : public EntityBase {
    *
    * @param inverted Whether to invert this switch.
    */
-  void set_inverted(bool inverted);
+  void set_inverted(bool inverted) { this->inverted_ = inverted; }
 
   /** Set callback for state changes.
    *
@@ -117,7 +117,7 @@ class Switch : public EntityBase {
    */
   virtual bool assumed_state();
 
-  bool is_inverted() const;
+  bool is_inverted() const { return this->inverted_; }
 
   void set_restore_mode(SwitchRestoreMode restore_mode) { this->restore_mode = restore_mode; }
 

From ad1a4fca3653f4cc98da63abe7b66f434f7ee66c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:04:08 -0500
Subject: [PATCH 067/155] [version] Inline the trivial VersionTextSensor
 setters (#18633)

---
 esphome/components/version/version_text_sensor.cpp | 2 --
 esphome/components/version/version_text_sensor.h   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/esphome/components/version/version_text_sensor.cpp b/esphome/components/version/version_text_sensor.cpp
index 34c7aae6bc..15e6b0d088 100644
--- a/esphome/components/version/version_text_sensor.cpp
+++ b/esphome/components/version/version_text_sensor.cpp
@@ -48,8 +48,6 @@ void VersionTextSensor::setup() {
   version_str[sizeof(version_str) - 1] = '\0';
   this->publish_state(version_str);
 }
-void VersionTextSensor::set_hide_hash(bool hide_hash) { this->hide_hash_ = hide_hash; }
-void VersionTextSensor::set_hide_timestamp(bool hide_timestamp) { this->hide_timestamp_ = hide_timestamp; }
 void VersionTextSensor::dump_config() { LOG_TEXT_SENSOR("", "Version Text Sensor", this); }
 
 }  // namespace esphome::version
diff --git a/esphome/components/version/version_text_sensor.h b/esphome/components/version/version_text_sensor.h
index d2ca0ba6f6..96f72ad035 100644
--- a/esphome/components/version/version_text_sensor.h
+++ b/esphome/components/version/version_text_sensor.h
@@ -7,8 +7,8 @@ namespace esphome::version {
 
 class VersionTextSensor final : public text_sensor::TextSensor, public Component {
  public:
-  void set_hide_hash(bool hide_hash);
-  void set_hide_timestamp(bool hide_timestamp);
+  void set_hide_hash(bool hide_hash) { this->hide_hash_ = hide_hash; }
+  void set_hide_timestamp(bool hide_timestamp) { this->hide_timestamp_ = hide_timestamp; }
   void setup() override;
   void dump_config() override;
 

From ecb007da70a94f6605d01f8d775c27a639ae5e02 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:04:23 -0500
Subject: [PATCH 068/155] [deep_sleep] Inline the trivial DeepSleepComponent
 setters (#18634)

---
 esphome/components/deep_sleep/deep_sleep_component.cpp |  8 --------
 esphome/components/deep_sleep/deep_sleep_component.h   | 10 +++++-----
 esphome/components/deep_sleep/deep_sleep_esp32.cpp     |  6 ------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/esphome/components/deep_sleep/deep_sleep_component.cpp b/esphome/components/deep_sleep/deep_sleep_component.cpp
index e7ce70b60c..9a3e537e05 100644
--- a/esphome/components/deep_sleep/deep_sleep_component.cpp
+++ b/esphome/components/deep_sleep/deep_sleep_component.cpp
@@ -43,10 +43,6 @@ void DeepSleepComponent::loop() {
     this->begin_sleep();
 }
 
-void DeepSleepComponent::set_sleep_duration(uint32_t time_ms) { this->sleep_duration_ = uint64_t(time_ms) * 1000; }
-
-void DeepSleepComponent::set_run_duration(uint32_t time_ms) { this->run_duration_ = time_ms; }
-
 void DeepSleepComponent::begin_sleep(bool manual) {
   if (this->prevent_ && !manual) {
     this->next_enter_deep_sleep_ = true;
@@ -76,8 +72,4 @@ void DeepSleepComponent::begin_sleep(bool manual) {
 
 float DeepSleepComponent::get_setup_priority() const { return setup_priority::LATE; }
 
-void DeepSleepComponent::prevent_deep_sleep() { this->prevent_ = true; }
-
-void DeepSleepComponent::allow_deep_sleep() { this->prevent_ = false; }
-
 }  // namespace esphome::deep_sleep
diff --git a/esphome/components/deep_sleep/deep_sleep_component.h b/esphome/components/deep_sleep/deep_sleep_component.h
index a620d52a02..208f88d707 100644
--- a/esphome/components/deep_sleep/deep_sleep_component.h
+++ b/esphome/components/deep_sleep/deep_sleep_component.h
@@ -132,7 +132,7 @@ template<typename... Ts> class PreventDeepSleepAction;
 class DeepSleepComponent final : public Component {
  public:
   /// Set the duration in ms the component should sleep once it's in deep sleep mode.
-  void set_sleep_duration(uint32_t time_ms);
+  void set_sleep_duration(uint32_t time_ms) { this->sleep_duration_ = uint64_t(time_ms) * 1000; }
 #if defined(USE_ESP32)
   /** Set the pin to wake up to on the ESP32 once it's in deep sleep mode.
    * Use the inverted property to set the wakeup level.
@@ -157,7 +157,7 @@ class DeepSleepComponent final : public Component {
 #if !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3) && \
     !defined(USE_ESP32_VARIANT_ESP32C5) && !defined(USE_ESP32_VARIANT_ESP32C6) && \
     !defined(USE_ESP32_VARIANT_ESP32C61) && !defined(USE_ESP32_VARIANT_ESP32H2)
-  void set_touch_wakeup(bool touch_wakeup);
+  void set_touch_wakeup(bool touch_wakeup) { this->touch_wakeup_ = touch_wakeup; }
 #endif
 
   // Set the duration in ms for how long the code should run before entering
@@ -166,7 +166,7 @@ class DeepSleepComponent final : public Component {
 #endif  // USE_ESP32
 
   /// Set a duration in ms for how long the code should run before entering deep sleep mode.
-  void set_run_duration(uint32_t time_ms);
+  void set_run_duration(uint32_t time_ms) { this->run_duration_ = time_ms; }
 
   void setup() override;
   void dump_config() override;
@@ -176,8 +176,8 @@ class DeepSleepComponent final : public Component {
   /// Helper to enter deep sleep mode
   void begin_sleep(bool manual = false);
 
-  void prevent_deep_sleep();
-  void allow_deep_sleep();
+  void prevent_deep_sleep() { this->prevent_ = true; }
+  void allow_deep_sleep() { this->prevent_ = false; }
 
  protected:
   // Returns nullopt if no run duration is set. Otherwise, returns the run
diff --git a/esphome/components/deep_sleep/deep_sleep_esp32.cpp b/esphome/components/deep_sleep/deep_sleep_esp32.cpp
index f64e1f37e1..3fa1a1f1ed 100644
--- a/esphome/components/deep_sleep/deep_sleep_esp32.cpp
+++ b/esphome/components/deep_sleep/deep_sleep_esp32.cpp
@@ -74,12 +74,6 @@ void DeepSleepComponent::set_wakeup_pin_mode(WakeupPinMode wakeup_pin_mode) {
 void DeepSleepComponent::set_ext1_wakeup(Ext1Wakeup ext1_wakeup) { this->ext1_wakeup_ = ext1_wakeup; }
 #endif
 
-#if !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3) && \
-    !defined(USE_ESP32_VARIANT_ESP32C5) && !defined(USE_ESP32_VARIANT_ESP32C6) && \
-    !defined(USE_ESP32_VARIANT_ESP32C61) && !defined(USE_ESP32_VARIANT_ESP32H2)
-void DeepSleepComponent::set_touch_wakeup(bool touch_wakeup) { this->touch_wakeup_ = touch_wakeup; }
-#endif
-
 void DeepSleepComponent::set_run_duration(WakeupCauseToRunDuration wakeup_cause_to_run_duration) {
   wakeup_cause_to_run_duration_ = wakeup_cause_to_run_duration;
 }

From 5a9f06e584ac8e771f9aaca53ae85574f5d7776b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:04:41 -0500
Subject: [PATCH 069/155] [thermostat] Inline the trivial ThermostatClimate
 setters and getters (#18635)

---
 .../thermostat/thermostat_climate.cpp         |  95 --------------
 .../thermostat/thermostat_climate.h           | 116 +++++++++++-------
 2 files changed, 74 insertions(+), 137 deletions(-)

diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
index 2390a96337..c10eb5b9f5 100644
--- a/esphome/components/thermostat/thermostat_climate.cpp
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -76,11 +76,6 @@ void ThermostatClimate::loop() {
   }
 }
 
-float ThermostatClimate::cool_deadband() { return this->cooling_deadband_; }
-float ThermostatClimate::cool_overrun() { return this->cooling_overrun_; }
-float ThermostatClimate::heat_deadband() { return this->heating_deadband_; }
-float ThermostatClimate::heat_overrun() { return this->heating_overrun_; }
-
 void ThermostatClimate::refresh() {
   this->switch_to_mode_(this->mode, false);
   this->switch_to_action_(this->compute_action_(), false);
@@ -121,8 +116,6 @@ bool ThermostatClimate::fan_mode_change_delayed() {
 
 climate::ClimateAction ThermostatClimate::delayed_climate_action() { return this->compute_action_(true); }
 
-climate::ClimateFanMode ThermostatClimate::locked_fan_mode() { return this->prev_fan_mode_; }
-
 bool ThermostatClimate::hysteresis_valid() {
   if ((this->supports_cool_ || (this->supports_fan_only_ && this->supports_fan_only_cooling_)) &&
       (std::isnan(this->cooling_deadband_) || std::isnan(this->cooling_overrun_)))
@@ -1286,10 +1279,6 @@ bool ThermostatClimate::change_preset_internal_(const ThermostatClimateTargetTem
   return something_changed;
 }
 
-void ThermostatClimate::set_preset_config(std::initializer_list<PresetEntry> presets) {
-  this->preset_config_ = presets;
-}
-
 void ThermostatClimate::set_custom_preset_config(std::initializer_list<CustomPresetEntry> presets) {
   this->custom_preset_config_ = presets;
   // Populate Climate base class custom presets vector
@@ -1317,19 +1306,6 @@ void ThermostatClimate::set_default_preset(const char *custom_preset) {
 
 void ThermostatClimate::set_default_preset(climate::ClimatePreset preset) { this->default_preset_ = preset; }
 
-void ThermostatClimate::set_on_boot_restore_from(thermostat::OnBootRestoreFrom on_boot_restore_from) {
-  this->on_boot_restore_from_ = on_boot_restore_from;
-}
-void ThermostatClimate::set_set_point_minimum_differential(float differential) {
-  this->set_point_minimum_differential_ = differential;
-}
-void ThermostatClimate::set_cool_deadband(float deadband) { this->cooling_deadband_ = deadband; }
-void ThermostatClimate::set_cool_overrun(float overrun) { this->cooling_overrun_ = overrun; }
-void ThermostatClimate::set_heat_deadband(float deadband) { this->heating_deadband_ = deadband; }
-void ThermostatClimate::set_heat_overrun(float overrun) { this->heating_overrun_ = overrun; }
-void ThermostatClimate::set_supplemental_cool_delta(float delta) { this->supplemental_cool_delta_ = delta; }
-void ThermostatClimate::set_supplemental_heat_delta(float delta) { this->supplemental_heat_delta_ = delta; }
-
 void ThermostatClimate::set_timer_duration_in_sec_(ThermostatClimateTimerIndex timer_index, uint32_t time) {
   uint32_t new_duration_ms = 1000 * (time < this->min_timer_duration_ ? this->min_timer_duration_ : time);
 
@@ -1389,80 +1365,9 @@ void ThermostatClimate::set_heating_minimum_run_time_in_sec(uint32_t time) {
 void ThermostatClimate::set_idle_minimum_time_in_sec(uint32_t time) {
   this->set_timer_duration_in_sec_(thermostat::THERMOSTAT_TIMER_IDLE_ON, time);
 }
-void ThermostatClimate::set_sensor(sensor::Sensor *sensor) { this->sensor_ = sensor; }
-void ThermostatClimate::set_humidity_sensor(sensor::Sensor *humidity_sensor) {
-  this->humidity_sensor_ = humidity_sensor;
-}
 void ThermostatClimate::set_humidity_hysteresis(float humidity_hysteresis) {
   this->humidity_hysteresis_ = std::clamp<float>(humidity_hysteresis, 0.0f, 100.0f);
 }
-void ThermostatClimate::set_use_startup_delay(bool use_startup_delay) { this->use_startup_delay_ = use_startup_delay; }
-void ThermostatClimate::set_supports_heat_cool(bool supports_heat_cool) {
-  this->supports_heat_cool_ = supports_heat_cool;
-}
-void ThermostatClimate::set_supports_auto(bool supports_auto) { this->supports_auto_ = supports_auto; }
-void ThermostatClimate::set_supports_cool(bool supports_cool) { this->supports_cool_ = supports_cool; }
-void ThermostatClimate::set_supports_dry(bool supports_dry) { this->supports_dry_ = supports_dry; }
-void ThermostatClimate::set_supports_fan_only(bool supports_fan_only) { this->supports_fan_only_ = supports_fan_only; }
-void ThermostatClimate::set_supports_fan_only_action_uses_fan_mode_timer(
-    bool supports_fan_only_action_uses_fan_mode_timer) {
-  this->supports_fan_only_action_uses_fan_mode_timer_ = supports_fan_only_action_uses_fan_mode_timer;
-}
-void ThermostatClimate::set_supports_fan_only_cooling(bool supports_fan_only_cooling) {
-  this->supports_fan_only_cooling_ = supports_fan_only_cooling;
-}
-void ThermostatClimate::set_supports_fan_with_cooling(bool supports_fan_with_cooling) {
-  this->supports_fan_with_cooling_ = supports_fan_with_cooling;
-}
-void ThermostatClimate::set_supports_fan_with_heating(bool supports_fan_with_heating) {
-  this->supports_fan_with_heating_ = supports_fan_with_heating;
-}
-void ThermostatClimate::set_supports_heat(bool supports_heat) { this->supports_heat_ = supports_heat; }
-void ThermostatClimate::set_supports_fan_mode_on(bool supports_fan_mode_on) {
-  this->supports_fan_mode_on_ = supports_fan_mode_on;
-}
-void ThermostatClimate::set_supports_fan_mode_off(bool supports_fan_mode_off) {
-  this->supports_fan_mode_off_ = supports_fan_mode_off;
-}
-void ThermostatClimate::set_supports_fan_mode_auto(bool supports_fan_mode_auto) {
-  this->supports_fan_mode_auto_ = supports_fan_mode_auto;
-}
-void ThermostatClimate::set_supports_fan_mode_low(bool supports_fan_mode_low) {
-  this->supports_fan_mode_low_ = supports_fan_mode_low;
-}
-void ThermostatClimate::set_supports_fan_mode_medium(bool supports_fan_mode_medium) {
-  this->supports_fan_mode_medium_ = supports_fan_mode_medium;
-}
-void ThermostatClimate::set_supports_fan_mode_high(bool supports_fan_mode_high) {
-  this->supports_fan_mode_high_ = supports_fan_mode_high;
-}
-void ThermostatClimate::set_supports_fan_mode_middle(bool supports_fan_mode_middle) {
-  this->supports_fan_mode_middle_ = supports_fan_mode_middle;
-}
-void ThermostatClimate::set_supports_fan_mode_focus(bool supports_fan_mode_focus) {
-  this->supports_fan_mode_focus_ = supports_fan_mode_focus;
-}
-void ThermostatClimate::set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse) {
-  this->supports_fan_mode_diffuse_ = supports_fan_mode_diffuse;
-}
-void ThermostatClimate::set_supports_fan_mode_quiet(bool supports_fan_mode_quiet) {
-  this->supports_fan_mode_quiet_ = supports_fan_mode_quiet;
-}
-void ThermostatClimate::set_supports_swing_mode_both(bool supports_swing_mode_both) {
-  this->supports_swing_mode_both_ = supports_swing_mode_both;
-}
-void ThermostatClimate::set_supports_swing_mode_off(bool supports_swing_mode_off) {
-  this->supports_swing_mode_off_ = supports_swing_mode_off;
-}
-void ThermostatClimate::set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal) {
-  this->supports_swing_mode_horizontal_ = supports_swing_mode_horizontal;
-}
-void ThermostatClimate::set_supports_swing_mode_vertical(bool supports_swing_mode_vertical) {
-  this->supports_swing_mode_vertical_ = supports_swing_mode_vertical;
-}
-void ThermostatClimate::set_supports_two_points(bool supports_two_points) {
-  this->supports_two_points_ = supports_two_points;
-}
 void ThermostatClimate::set_supports_dehumidification(bool supports_dehumidification) {
   this->supports_dehumidification_ = supports_dehumidification;
   if (supports_dehumidification) {
diff --git a/esphome/components/thermostat/thermostat_climate.h b/esphome/components/thermostat/thermostat_climate.h
index f30659a8a6..4dc2a74d8e 100644
--- a/esphome/components/thermostat/thermostat_climate.h
+++ b/esphome/components/thermostat/thermostat_climate.h
@@ -93,14 +93,16 @@ class ThermostatClimate final : public climate::Climate, public Component {
 
   void set_default_preset(const char *custom_preset);
   void set_default_preset(climate::ClimatePreset preset);
-  void set_on_boot_restore_from(OnBootRestoreFrom on_boot_restore_from);
-  void set_set_point_minimum_differential(float differential);
-  void set_cool_deadband(float deadband);
-  void set_cool_overrun(float overrun);
-  void set_heat_deadband(float deadband);
-  void set_heat_overrun(float overrun);
-  void set_supplemental_cool_delta(float delta);
-  void set_supplemental_heat_delta(float delta);
+  void set_on_boot_restore_from(thermostat::OnBootRestoreFrom on_boot_restore_from) {
+    this->on_boot_restore_from_ = on_boot_restore_from;
+  }
+  void set_set_point_minimum_differential(float differential) { this->set_point_minimum_differential_ = differential; }
+  void set_cool_deadband(float deadband) { this->cooling_deadband_ = deadband; }
+  void set_cool_overrun(float overrun) { this->cooling_overrun_ = overrun; }
+  void set_heat_deadband(float deadband) { this->heating_deadband_ = deadband; }
+  void set_heat_overrun(float overrun) { this->heating_overrun_ = overrun; }
+  void set_supplemental_cool_delta(float delta) { this->supplemental_cool_delta_ = delta; }
+  void set_supplemental_heat_delta(float delta) { this->supplemental_heat_delta_ = delta; }
   void set_cooling_maximum_run_time_in_sec(uint32_t time);
   void set_heating_maximum_run_time_in_sec(uint32_t time);
   void set_cooling_minimum_off_time_in_sec(uint32_t time);
@@ -111,39 +113,69 @@ class ThermostatClimate final : public climate::Climate, public Component {
   void set_heating_minimum_off_time_in_sec(uint32_t time);
   void set_heating_minimum_run_time_in_sec(uint32_t time);
   void set_idle_minimum_time_in_sec(uint32_t time);
-  void set_sensor(sensor::Sensor *sensor);
-  void set_humidity_sensor(sensor::Sensor *humidity_sensor);
+  void set_sensor(sensor::Sensor *sensor) { this->sensor_ = sensor; }
+  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { this->humidity_sensor_ = humidity_sensor; }
   void set_humidity_hysteresis(float humidity_hysteresis);
-  void set_use_startup_delay(bool use_startup_delay);
-  void set_supports_auto(bool supports_auto);
-  void set_supports_heat_cool(bool supports_heat_cool);
-  void set_supports_cool(bool supports_cool);
-  void set_supports_dry(bool supports_dry);
-  void set_supports_fan_only(bool supports_fan_only);
-  void set_supports_fan_only_action_uses_fan_mode_timer(bool fan_only_action_uses_fan_mode_timer);
-  void set_supports_fan_only_cooling(bool supports_fan_only_cooling);
-  void set_supports_fan_with_cooling(bool supports_fan_with_cooling);
-  void set_supports_fan_with_heating(bool supports_fan_with_heating);
-  void set_supports_heat(bool supports_heat);
-  void set_supports_fan_mode_on(bool supports_fan_mode_on);
-  void set_supports_fan_mode_off(bool supports_fan_mode_off);
-  void set_supports_fan_mode_auto(bool supports_fan_mode_auto);
-  void set_supports_fan_mode_low(bool supports_fan_mode_low);
-  void set_supports_fan_mode_medium(bool supports_fan_mode_medium);
-  void set_supports_fan_mode_high(bool supports_fan_mode_high);
-  void set_supports_fan_mode_middle(bool supports_fan_mode_middle);
-  void set_supports_fan_mode_focus(bool supports_fan_mode_focus);
-  void set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse);
-  void set_supports_fan_mode_quiet(bool supports_fan_mode_quiet);
-  void set_supports_swing_mode_both(bool supports_swing_mode_both);
-  void set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal);
-  void set_supports_swing_mode_off(bool supports_swing_mode_off);
-  void set_supports_swing_mode_vertical(bool supports_swing_mode_vertical);
+  void set_use_startup_delay(bool use_startup_delay) { this->use_startup_delay_ = use_startup_delay; }
+  void set_supports_auto(bool supports_auto) { this->supports_auto_ = supports_auto; }
+  void set_supports_heat_cool(bool supports_heat_cool) { this->supports_heat_cool_ = supports_heat_cool; }
+  void set_supports_cool(bool supports_cool) { this->supports_cool_ = supports_cool; }
+  void set_supports_dry(bool supports_dry) { this->supports_dry_ = supports_dry; }
+  void set_supports_fan_only(bool supports_fan_only) { this->supports_fan_only_ = supports_fan_only; }
+  void set_supports_fan_only_action_uses_fan_mode_timer(bool supports_fan_only_action_uses_fan_mode_timer) {
+    this->supports_fan_only_action_uses_fan_mode_timer_ = supports_fan_only_action_uses_fan_mode_timer;
+  }
+  void set_supports_fan_only_cooling(bool supports_fan_only_cooling) {
+    this->supports_fan_only_cooling_ = supports_fan_only_cooling;
+  }
+  void set_supports_fan_with_cooling(bool supports_fan_with_cooling) {
+    this->supports_fan_with_cooling_ = supports_fan_with_cooling;
+  }
+  void set_supports_fan_with_heating(bool supports_fan_with_heating) {
+    this->supports_fan_with_heating_ = supports_fan_with_heating;
+  }
+  void set_supports_heat(bool supports_heat) { this->supports_heat_ = supports_heat; }
+  void set_supports_fan_mode_on(bool supports_fan_mode_on) { this->supports_fan_mode_on_ = supports_fan_mode_on; }
+  void set_supports_fan_mode_off(bool supports_fan_mode_off) { this->supports_fan_mode_off_ = supports_fan_mode_off; }
+  void set_supports_fan_mode_auto(bool supports_fan_mode_auto) {
+    this->supports_fan_mode_auto_ = supports_fan_mode_auto;
+  }
+  void set_supports_fan_mode_low(bool supports_fan_mode_low) { this->supports_fan_mode_low_ = supports_fan_mode_low; }
+  void set_supports_fan_mode_medium(bool supports_fan_mode_medium) {
+    this->supports_fan_mode_medium_ = supports_fan_mode_medium;
+  }
+  void set_supports_fan_mode_high(bool supports_fan_mode_high) {
+    this->supports_fan_mode_high_ = supports_fan_mode_high;
+  }
+  void set_supports_fan_mode_middle(bool supports_fan_mode_middle) {
+    this->supports_fan_mode_middle_ = supports_fan_mode_middle;
+  }
+  void set_supports_fan_mode_focus(bool supports_fan_mode_focus) {
+    this->supports_fan_mode_focus_ = supports_fan_mode_focus;
+  }
+  void set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse) {
+    this->supports_fan_mode_diffuse_ = supports_fan_mode_diffuse;
+  }
+  void set_supports_fan_mode_quiet(bool supports_fan_mode_quiet) {
+    this->supports_fan_mode_quiet_ = supports_fan_mode_quiet;
+  }
+  void set_supports_swing_mode_both(bool supports_swing_mode_both) {
+    this->supports_swing_mode_both_ = supports_swing_mode_both;
+  }
+  void set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal) {
+    this->supports_swing_mode_horizontal_ = supports_swing_mode_horizontal;
+  }
+  void set_supports_swing_mode_off(bool supports_swing_mode_off) {
+    this->supports_swing_mode_off_ = supports_swing_mode_off;
+  }
+  void set_supports_swing_mode_vertical(bool supports_swing_mode_vertical) {
+    this->supports_swing_mode_vertical_ = supports_swing_mode_vertical;
+  }
   void set_supports_dehumidification(bool supports_dehumidification);
   void set_supports_humidification(bool supports_humidification);
-  void set_supports_two_points(bool supports_two_points);
+  void set_supports_two_points(bool supports_two_points) { this->supports_two_points_ = supports_two_points; }
 
-  void set_preset_config(std::initializer_list<PresetEntry> presets);
+  void set_preset_config(std::initializer_list<PresetEntry> presets) { this->preset_config_ = presets; }
   void set_custom_preset_config(std::initializer_list<CustomPresetEntry> presets);
 
   Trigger<> *get_cool_action_trigger();
@@ -181,10 +213,10 @@ class ThermostatClimate final : public climate::Climate, public Component {
   Trigger<> *get_humidity_control_humidify_action_trigger();
   Trigger<> *get_humidity_control_off_action_trigger();
   /// Get current hysteresis values
-  float cool_deadband();
-  float cool_overrun();
-  float heat_deadband();
-  float heat_overrun();
+  float cool_deadband() { return this->cooling_deadband_; }
+  float cool_overrun() { return this->cooling_overrun_; }
+  float heat_deadband() { return this->heating_deadband_; }
+  float heat_overrun() { return this->heating_overrun_; }
   /// Call triggers based on updated climate states (modes/actions)
   void refresh();
   /// Returns true if a climate action/fan mode transition is being delayed
@@ -193,7 +225,7 @@ class ThermostatClimate final : public climate::Climate, public Component {
   /// Returns the climate action that is being delayed (check climate_action_change_delayed(), first!)
   climate::ClimateAction delayed_climate_action();
   /// Returns the fan mode that is locked in (check fan_mode_change_delayed(), first!)
-  climate::ClimateFanMode locked_fan_mode();
+  climate::ClimateFanMode locked_fan_mode() { return this->prev_fan_mode_; }
   /// Set point and hysteresis validation
   bool hysteresis_valid();               // returns true if valid
   bool humidity_hysteresis_valid();      // returns true if valid

From 78240c9a46f63fb6e7778f2b2e5720765e7a8bd7 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:04:57 -0500
Subject: [PATCH 070/155] [sprinkler] Inline the trivial Sprinkler accessors
 (#18636)

---
 esphome/components/sprinkler/sprinkler.cpp | 43 ---------------------
 esphome/components/sprinkler/sprinkler.h   | 44 +++++++++++++---------
 2 files changed, 27 insertions(+), 60 deletions(-)

diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp
index 336123a472..2edceb76a5 100644
--- a/esphome/components/sprinkler/sprinkler.cpp
+++ b/esphome/components/sprinkler/sprinkler.cpp
@@ -211,8 +211,6 @@ uint32_t SprinklerValveOperator::time_remaining() {
   return 0;  // run completed
 }
 
-SprinklerState SprinklerValveOperator::state() { return this->state_; }
-
 switch_::Switch *SprinklerValveOperator::pump_switch() {
   if ((this->controller_ == nullptr) || (this->valve_ == nullptr)) {
     return nullptr;
@@ -288,11 +286,8 @@ SprinklerValveRunRequest::SprinklerValveRunRequest(size_t valve_number, uint32_t
                                                    SprinklerValveOperator *valve_op)
     : valve_number_(valve_number), run_duration_(run_duration), valve_op_(valve_op) {}
 
-bool SprinklerValveRunRequest::has_request() { return this->has_valve_; }
 bool SprinklerValveRunRequest::has_valve_operator() { return !(this->valve_op_ == nullptr); }
 
-void SprinklerValveRunRequest::set_request_from(SprinklerValveRunRequestOrigin origin) { this->origin_ = origin; }
-
 void SprinklerValveRunRequest::set_run_duration(uint32_t run_duration) { this->run_duration_ = run_duration; }
 
 void SprinklerValveRunRequest::set_valve(size_t valve_number) {
@@ -317,8 +312,6 @@ void SprinklerValveRunRequest::reset() {
 
 uint32_t SprinklerValveRunRequest::run_duration() { return this->run_duration_; }
 
-size_t SprinklerValveRunRequest::valve() { return this->valve_number_; }
-
 optional<size_t> SprinklerValveRunRequest::valve_as_opt() {
   if (this->has_valve_) {
     return this->valve_number_;
@@ -328,8 +321,6 @@ optional<size_t> SprinklerValveRunRequest::valve_as_opt() {
 
 SprinklerValveOperator *SprinklerValveRunRequest::valve_operator() { return this->valve_op_; }
 
-SprinklerValveRunRequestOrigin SprinklerValveRunRequest::request_is_from() { return this->origin_; }
-
 Sprinkler::Sprinkler() : Sprinkler("") {}
 Sprinkler::Sprinkler(const char *name) : name_(name) {
   // The `name` is stored for dump_config logging
@@ -414,18 +405,6 @@ void Sprinkler::set_controller_main_switch(SprinklerControllerSwitch *controller
   this->sprinkler_turn_on_automation_->add_actions({sprinkler_resumeorstart_action_.get()});
 }
 
-void Sprinkler::set_controller_auto_adv_switch(SprinklerControllerSwitch *auto_adv_switch) {
-  this->auto_adv_sw_ = auto_adv_switch;
-}
-
-void Sprinkler::set_controller_queue_enable_switch(SprinklerControllerSwitch *queue_enable_switch) {
-  this->queue_enable_sw_ = queue_enable_switch;
-}
-
-void Sprinkler::set_controller_reverse_switch(SprinklerControllerSwitch *reverse_switch) {
-  this->reverse_sw_ = reverse_switch;
-}
-
 void Sprinkler::set_controller_standby_switch(SprinklerControllerSwitch *standby_switch) {
   this->standby_sw_ = standby_switch;
 
@@ -434,14 +413,6 @@ void Sprinkler::set_controller_standby_switch(SprinklerControllerSwitch *standby
   this->sprinkler_standby_turn_on_automation_->add_actions({sprinkler_standby_shutdown_action_.get()});
 }
 
-void Sprinkler::set_controller_multiplier_number(SprinklerControllerNumber *multiplier_number) {
-  this->multiplier_number_ = multiplier_number;
-}
-
-void Sprinkler::set_controller_repeat_number(SprinklerControllerNumber *repeat_number) {
-  this->repeat_number_ = repeat_number;
-}
-
 void Sprinkler::configure_valve_switch(size_t valve_number, switch_::Switch *valve_switch, uint32_t run_duration) {
   if (this->is_a_valid_valve(valve_number)) {
     this->valve_[valve_number].valve_switch = valve_switch;
@@ -498,10 +469,6 @@ void Sprinkler::set_multiplier(const optional<float> multiplier) {
   call.perform();
 }
 
-void Sprinkler::set_next_prev_ignore_disabled_valves(bool ignore_disabled) {
-  this->next_prev_ignore_disabled_ = ignore_disabled;
-}
-
 void Sprinkler::set_pump_start_delay(uint32_t start_delay) {
   this->start_delay_is_valve_delay_ = false;
   this->start_delay_ = start_delay;
@@ -522,10 +489,6 @@ void Sprinkler::set_valve_stop_delay(uint32_t stop_delay) {
   this->stop_delay_ = stop_delay;
 }
 
-void Sprinkler::set_pump_switch_off_during_valve_open_delay(bool pump_switch_off_during_valve_open_delay) {
-  this->pump_switch_off_during_valve_open_delay_ = pump_switch_off_during_valve_open_delay;
-}
-
 void Sprinkler::set_valve_open_delay(const uint32_t valve_open_delay) {
   if (valve_open_delay > 0) {
     this->valve_overlap_ = false;
@@ -945,8 +908,6 @@ optional<size_t> Sprinkler::active_valve() {
   return this->active_req_.valve_as_opt();
 }
 
-optional<size_t> Sprinkler::paused_valve() { return this->paused_valve_; }
-
 optional<size_t> Sprinkler::queued_valve() {
   if (!this->queued_valves_.empty()) {
     return this->queued_valves_.back().valve_number;
@@ -954,10 +915,6 @@ optional<size_t> Sprinkler::queued_valve() {
   return nullopt;
 }
 
-optional<size_t> Sprinkler::manual_valve() { return this->manual_valve_; }
-
-size_t Sprinkler::number_of_valves() { return this->valve_.size(); }
-
 bool Sprinkler::is_a_valid_valve(const size_t valve_number) { return (valve_number < this->number_of_valves()); }
 
 bool Sprinkler::pump_in_use(switch_::Switch *pump_switch) {
diff --git a/esphome/components/sprinkler/sprinkler.h b/esphome/components/sprinkler/sprinkler.h
index bd610f7ad3..2499a0a591 100644
--- a/esphome/components/sprinkler/sprinkler.h
+++ b/esphome/components/sprinkler/sprinkler.h
@@ -124,9 +124,9 @@ class SprinklerValveOperator {
   void set_stop_delay(uint32_t stop_delay, bool stop_delay_is_valve_delay);
   void start();
   void stop();
-  uint32_t run_duration();         // returns the desired run duration in seconds
-  uint32_t time_remaining();       // returns seconds remaining (does not include stop_delay_)
-  SprinklerState state();          // returns the valve's state/status
+  uint32_t run_duration();    // returns the desired run duration in seconds
+  uint32_t time_remaining();  // returns seconds remaining (does not include stop_delay_)
+  SprinklerState state() { return this->state_; }
   switch_::Switch *pump_switch();  // returns this SprinklerValveOperator's pump switch
 
  protected:
@@ -152,18 +152,18 @@ class SprinklerValveRunRequest {
  public:
   SprinklerValveRunRequest();
   SprinklerValveRunRequest(size_t valve_number, uint32_t run_duration, SprinklerValveOperator *valve_op);
-  bool has_request();
+  bool has_request() { return this->has_valve_; }
   bool has_valve_operator();
-  void set_request_from(SprinklerValveRunRequestOrigin origin);
+  void set_request_from(SprinklerValveRunRequestOrigin origin) { this->origin_ = origin; }
   void set_run_duration(uint32_t run_duration);
   void set_valve(size_t valve_number);
   void set_valve_operator(SprinklerValveOperator *valve_op);
   void reset();
   uint32_t run_duration();
-  size_t valve();
+  size_t valve() { return this->valve_number_; }
   optional<size_t> valve_as_opt();
   SprinklerValveOperator *valve_operator();
-  SprinklerValveRunRequestOrigin request_is_from();
+  SprinklerValveRunRequestOrigin request_is_from() { return this->origin_; }
 
  protected:
   bool has_valve_{false};
@@ -189,14 +189,20 @@ class Sprinkler final : public Component {
 
   /// configure important controller switches
   void set_controller_main_switch(SprinklerControllerSwitch *controller_switch);
-  void set_controller_auto_adv_switch(SprinklerControllerSwitch *auto_adv_switch);
-  void set_controller_queue_enable_switch(SprinklerControllerSwitch *queue_enable_switch);
-  void set_controller_reverse_switch(SprinklerControllerSwitch *reverse_switch);
+  void set_controller_auto_adv_switch(SprinklerControllerSwitch *auto_adv_switch) {
+    this->auto_adv_sw_ = auto_adv_switch;
+  }
+  void set_controller_queue_enable_switch(SprinklerControllerSwitch *queue_enable_switch) {
+    this->queue_enable_sw_ = queue_enable_switch;
+  }
+  void set_controller_reverse_switch(SprinklerControllerSwitch *reverse_switch) { this->reverse_sw_ = reverse_switch; }
   void set_controller_standby_switch(SprinklerControllerSwitch *standby_switch);
 
   /// configure important controller number components
-  void set_controller_multiplier_number(SprinklerControllerNumber *multiplier_number);
-  void set_controller_repeat_number(SprinklerControllerNumber *repeat_number);
+  void set_controller_multiplier_number(SprinklerControllerNumber *multiplier_number) {
+    this->multiplier_number_ = multiplier_number;
+  }
+  void set_controller_repeat_number(SprinklerControllerNumber *repeat_number) { this->repeat_number_ = repeat_number; }
 
   /// configure a valve's switch object and run duration. run_duration is time in seconds.
   void configure_valve_switch(size_t valve_number, switch_::Switch *valve_switch, uint32_t run_duration);
@@ -214,7 +220,9 @@ class Sprinkler final : public Component {
   void set_multiplier(optional<float> multiplier);
 
   /// enable/disable skipping of disabled valves by the next and previous actions
-  void set_next_prev_ignore_disabled_valves(bool ignore_disabled);
+  void set_next_prev_ignore_disabled_valves(bool ignore_disabled) {
+    this->next_prev_ignore_disabled_ = ignore_disabled;
+  }
 
   /// set how long the pump should start after the valve (when the pump is starting)
   void set_pump_start_delay(uint32_t start_delay);
@@ -230,7 +238,9 @@ class Sprinkler final : public Component {
 
   /// if pump_switch_off_during_valve_open_delay is true, the controller will switch off the pump during the
   ///  valve_open_delay interval
-  void set_pump_switch_off_during_valve_open_delay(bool pump_switch_off_during_valve_open_delay);
+  void set_pump_switch_off_during_valve_open_delay(bool pump_switch_off_during_valve_open_delay) {
+    this->pump_switch_off_during_valve_open_delay_ = pump_switch_off_during_valve_open_delay;
+  }
 
   /// set how long the controller should wait to open/switch on the valve after it becomes active
   void set_valve_open_delay(uint32_t valve_open_delay);
@@ -335,17 +345,17 @@ class Sprinkler final : public Component {
   optional<size_t> active_valve();
 
   /// returns the number of the valve that is paused, if any. check with 'has_value()'
-  optional<size_t> paused_valve();
+  optional<size_t> paused_valve() { return this->paused_valve_; }
 
   /// returns the number of the next valve in the queue, if any. check with 'has_value()'
   optional<size_t> queued_valve();
 
   /// returns the number of the valve that is manually selected, if any. check with 'has_value()'
   ///  this is set by next_valve() and previous_valve() when manual_selection_delay_ > 0
-  optional<size_t> manual_valve();
+  optional<size_t> manual_valve() { return this->manual_valve_; }
 
   /// returns the number of valves the controller is configured with
-  size_t number_of_valves();
+  size_t number_of_valves() { return this->valve_.size(); }
 
   /// returns true if valve number is valid
   bool is_a_valid_valve(size_t valve_number);

From 47156c9a5b5c517df04bb4c943a63a407435205a Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:05:39 -0500
Subject: [PATCH 071/155] [mqtt] Inline the trivial MQTT client, component and
 sensor accessors (#18637)

---
 esphome/components/mqtt/mqtt_client.cpp    |  8 --------
 esphome/components/mqtt/mqtt_client.h      | 12 ++++++------
 esphome/components/mqtt/mqtt_component.cpp |  4 ----
 esphome/components/mqtt/mqtt_component.h   |  4 ++--
 esphome/components/mqtt/mqtt_sensor.cpp    |  2 --
 esphome/components/mqtt/mqtt_sensor.h      |  4 ++--
 6 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/esphome/components/mqtt/mqtt_client.cpp b/esphome/components/mqtt/mqtt_client.cpp
index ab665e2579..1127c36dc6 100644
--- a/esphome/components/mqtt/mqtt_client.cpp
+++ b/esphome/components/mqtt/mqtt_client.cpp
@@ -668,9 +668,7 @@ void MQTTClientComponent::on_message(const std::string &topic, const std::string
 // Setters
 void MQTTClientComponent::disable_log_message() { this->log_message_.topic = ""; }
 bool MQTTClientComponent::is_log_message_enabled() const { return !this->log_message_.topic.empty(); }
-void MQTTClientComponent::set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }
 void MQTTClientComponent::register_mqtt_component(MQTTComponent *component) { this->children_.push_back(component); }
-void MQTTClientComponent::set_log_level(int level) { this->log_level_ = level; }
 void MQTTClientComponent::set_keep_alive(uint16_t keep_alive_s) { this->mqtt_backend_.set_keep_alive(keep_alive_s); }
 void MQTTClientComponent::set_log_message_template(MQTTMessage &&message) { this->log_message_ = std::move(message); }
 const MQTTDiscoveryInfo &MQTTClientComponent::get_discovery_info() const { return this->discovery_info_; }
@@ -683,10 +681,6 @@ void MQTTClientComponent::set_topic_prefix(const std::string &topic_prefix, cons
   }
 }
 const std::string &MQTTClientComponent::get_topic_prefix() const { return this->topic_prefix_; }
-void MQTTClientComponent::set_publish_nan_as_none(bool publish_nan_as_none) {
-  this->publish_nan_as_none_ = publish_nan_as_none;
-}
-bool MQTTClientComponent::is_publish_nan_as_none() const { return this->publish_nan_as_none_; }
 void MQTTClientComponent::disable_birth_message() {
   this->birth_message_.topic = "";
   this->recalculate_availability_();
@@ -766,8 +760,6 @@ MQTTClientComponent *global_mqtt_client = nullptr;  // NOLINT(cppcoreguidelines-
 
 // MQTTMessageTrigger
 MQTTMessageTrigger::MQTTMessageTrigger(std::string topic) : topic_(std::move(topic)) {}
-void MQTTMessageTrigger::set_qos(uint8_t qos) { this->qos_ = qos; }
-void MQTTMessageTrigger::set_payload(const std::string &payload) { this->payload_ = payload; }
 void MQTTMessageTrigger::setup() {
   global_mqtt_client->subscribe(
       this->topic_,
diff --git a/esphome/components/mqtt/mqtt_client.h b/esphome/components/mqtt/mqtt_client.h
index f741be561c..fe0966e725 100644
--- a/esphome/components/mqtt/mqtt_client.h
+++ b/esphome/components/mqtt/mqtt_client.h
@@ -159,7 +159,7 @@ class MQTTClientComponent final : public Component {
 
   /// Manually set the topic used for logging.
   void set_log_message_template(MQTTMessage &&message);
-  void set_log_level(int level);
+  void set_log_level(int level) { this->log_level_ = level; }
   /// Get the topic used for logging. Defaults to "<topic_prefix>/debug" and the value is cached for speed.
   void disable_log_message();
   bool is_log_message_enabled() const;
@@ -241,7 +241,7 @@ class MQTTClientComponent final : public Component {
 
   void check_connected();
 
-  void set_reboot_timeout(uint32_t reboot_timeout);
+  void set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }
 
   void register_mqtt_component(MQTTComponent *component);
 
@@ -262,8 +262,8 @@ class MQTTClientComponent final : public Component {
   void set_on_disconnect(mqtt_on_disconnect_callback_t &&callback);
 
   // Publish None state instead of NaN for Home Assistant
-  void set_publish_nan_as_none(bool publish_nan_as_none);
-  bool is_publish_nan_as_none() const;
+  void set_publish_nan_as_none(bool publish_nan_as_none) { this->publish_nan_as_none_ = publish_nan_as_none; }
+  bool is_publish_nan_as_none() const { return this->publish_nan_as_none_; }
 
   void set_wait_for_connection(bool wait_for_connection) { this->wait_for_connection_ = wait_for_connection; }
 
@@ -344,8 +344,8 @@ class MQTTMessageTrigger final : public Trigger<std::string>, public Component {
  public:
   explicit MQTTMessageTrigger(std::string topic);
 
-  void set_qos(uint8_t qos);
-  void set_payload(const std::string &payload);
+  void set_qos(uint8_t qos) { this->qos_ = qos; }
+  void set_payload(const std::string &payload) { this->payload_ = payload; }
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
diff --git a/esphome/components/mqtt/mqtt_component.cpp b/esphome/components/mqtt/mqtt_component.cpp
index 3bbc1cdfa3..18a759725f 100644
--- a/esphome/components/mqtt/mqtt_component.cpp
+++ b/esphome/components/mqtt/mqtt_component.cpp
@@ -340,10 +340,6 @@ bool MQTTComponent::send_discovery_() {
   // NOLINTEND(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
-uint8_t MQTTComponent::get_qos() const { return this->qos_; }
-
-bool MQTTComponent::get_retain() const { return this->retain_; }
-
 bool MQTTComponent::is_discovery_enabled() const {
   return this->discovery_enabled_ && global_mqtt_client->is_discovery_enabled();
 }
diff --git a/esphome/components/mqtt/mqtt_component.h b/esphome/components/mqtt/mqtt_component.h
index 7983e04870..b4ae624404 100644
--- a/esphome/components/mqtt/mqtt_component.h
+++ b/esphome/components/mqtt/mqtt_component.h
@@ -108,11 +108,11 @@ class MQTTComponent : public Component {
 
   /// Set QOS for state messages.
   void set_qos(uint8_t qos);
-  uint8_t get_qos() const;
+  uint8_t get_qos() const { return this->qos_; }
 
   /// Set whether state message should be retained.
   void set_retain(bool retain);
-  bool get_retain() const;
+  bool get_retain() const { return this->retain_; }
 
   /// Disable discovery. Sets friendly name to "".
   void disable_discovery();
diff --git a/esphome/components/mqtt/mqtt_sensor.cpp b/esphome/components/mqtt/mqtt_sensor.cpp
index c66465dd16..1c0625d1c9 100644
--- a/esphome/components/mqtt/mqtt_sensor.cpp
+++ b/esphome/components/mqtt/mqtt_sensor.cpp
@@ -39,8 +39,6 @@ uint32_t MQTTSensorComponent::get_expire_after() const {
     return *this->expire_after_;
   return 0;
 }
-void MQTTSensorComponent::set_expire_after(uint32_t expire_after) { this->expire_after_ = expire_after; }
-void MQTTSensorComponent::disable_expire_after() { this->expire_after_ = 0; }
 
 void MQTTSensorComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
   // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
diff --git a/esphome/components/mqtt/mqtt_sensor.h b/esphome/components/mqtt/mqtt_sensor.h
index 1d5ee8095c..a56963d9c1 100644
--- a/esphome/components/mqtt/mqtt_sensor.h
+++ b/esphome/components/mqtt/mqtt_sensor.h
@@ -22,9 +22,9 @@ class MQTTSensorComponent final : public mqtt::MQTTComponent {
   explicit MQTTSensorComponent(sensor::Sensor *sensor);
 
   /// Setup an expiry, 0 disables it
-  void set_expire_after(uint32_t expire_after);
+  void set_expire_after(uint32_t expire_after) { this->expire_after_ = expire_after; }
   /// Disable Home Assistant value expiry.
-  void disable_expire_after();
+  void disable_expire_after() { this->expire_after_ = 0; }
 
   void send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) override;
 

From a30238aab6de17a67d1624291db47e325935ac79 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:05:51 -0500
Subject: [PATCH 072/155] [wireguard] Inline the trivial Wireguard setters
 (#18638)

---
 esphome/components/wireguard/wireguard.cpp | 21 ---------------------
 esphome/components/wireguard/wireguard.h   | 18 +++++++++---------
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/esphome/components/wireguard/wireguard.cpp b/esphome/components/wireguard/wireguard.cpp
index b4641894db..2f07344d3b 100644
--- a/esphome/components/wireguard/wireguard.cpp
+++ b/esphome/components/wireguard/wireguard.cpp
@@ -178,25 +178,6 @@ time_t Wireguard::get_latest_handshake() const {
   return result;
 }
 
-void Wireguard::set_keepalive(const uint16_t seconds) { this->keepalive_ = seconds; }
-void Wireguard::set_reboot_timeout(const uint32_t seconds) { this->reboot_timeout_ = seconds; }
-void Wireguard::set_srctime(time::RealTimeClock *srctime) { this->srctime_ = srctime; }
-
-#ifdef USE_BINARY_SENSOR
-void Wireguard::set_status_sensor(binary_sensor::BinarySensor *sensor) { this->status_sensor_ = sensor; }
-void Wireguard::set_enabled_sensor(binary_sensor::BinarySensor *sensor) { this->enabled_sensor_ = sensor; }
-#endif
-
-#ifdef USE_SENSOR
-void Wireguard::set_handshake_sensor(sensor::Sensor *sensor) { this->handshake_sensor_ = sensor; }
-#endif
-
-#ifdef USE_TEXT_SENSOR
-void Wireguard::set_address_sensor(text_sensor::TextSensor *sensor) { this->address_sensor_ = sensor; }
-#endif
-
-void Wireguard::disable_auto_proceed() { this->proceed_allowed_ = false; }
-
 void Wireguard::enable() {
   this->enabled_ = true;
   ESP_LOGI(TAG, "Enabled");
@@ -218,8 +199,6 @@ void Wireguard::publish_enabled_state() {
 #endif
 }
 
-bool Wireguard::is_enabled() { return this->enabled_; }
-
 void Wireguard::start_connection_() {
   if (!this->enabled_) {
     ESP_LOGV(TAG, "Disabled, cannot start connection");
diff --git a/esphome/components/wireguard/wireguard.h b/esphome/components/wireguard/wireguard.h
index 1fda802415..c9c2feb7ae 100644
--- a/esphome/components/wireguard/wireguard.h
+++ b/esphome/components/wireguard/wireguard.h
@@ -63,25 +63,25 @@ class Wireguard final : public PollingComponent {
   /// Prevent accidental use of std::string which would dangle
   void set_allowed_ips(std::initializer_list<std::tuple<std::string, std::string>> ips) = delete;
 
-  void set_keepalive(uint16_t seconds);
-  void set_reboot_timeout(uint32_t seconds);
-  void set_srctime(time::RealTimeClock *srctime);
+  void set_keepalive(const uint16_t seconds) { this->keepalive_ = seconds; }
+  void set_reboot_timeout(const uint32_t seconds) { this->reboot_timeout_ = seconds; }
+  void set_srctime(time::RealTimeClock *srctime) { this->srctime_ = srctime; }
 
 #ifdef USE_BINARY_SENSOR
-  void set_status_sensor(binary_sensor::BinarySensor *sensor);
-  void set_enabled_sensor(binary_sensor::BinarySensor *sensor);
+  void set_status_sensor(binary_sensor::BinarySensor *sensor) { this->status_sensor_ = sensor; }
+  void set_enabled_sensor(binary_sensor::BinarySensor *sensor) { this->enabled_sensor_ = sensor; }
 #endif
 
 #ifdef USE_SENSOR
-  void set_handshake_sensor(sensor::Sensor *sensor);
+  void set_handshake_sensor(sensor::Sensor *sensor) { this->handshake_sensor_ = sensor; }
 #endif
 
 #ifdef USE_TEXT_SENSOR
-  void set_address_sensor(text_sensor::TextSensor *sensor);
+  void set_address_sensor(text_sensor::TextSensor *sensor) { this->address_sensor_ = sensor; }
 #endif
 
   /// Block the setup step until peer is connected.
-  void disable_auto_proceed();
+  void disable_auto_proceed() { this->proceed_allowed_ = false; }
 
   /// Enable the WireGuard component.
   void enable();
@@ -93,7 +93,7 @@ class Wireguard final : public PollingComponent {
   void publish_enabled_state();
 
   /// Return if the WireGuard component is or is not enabled.
-  bool is_enabled();
+  bool is_enabled() { return this->enabled_; }
 
   bool is_peer_up() const;
   time_t get_latest_handshake() const;

From b83ce91528c4c99043e0dee42b0e28ce24375c0f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:06:03 -0500
Subject: [PATCH 073/155] [display] Inline the trivial DisplayPage setters and
 page navigation helpers (#18639)

---
 esphome/components/display/display.cpp | 6 ------
 esphome/components/display/display.h   | 9 ++++++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/esphome/components/display/display.cpp b/esphome/components/display/display.cpp
index 115adf503a..c2d45dbb60 100644
--- a/esphome/components/display/display.cpp
+++ b/esphome/components/display/display.cpp
@@ -685,9 +685,6 @@ void Display::show_page(DisplayPage *page) {
   }
 }
 
-void Display::show_next_page() { this->page_->show_next(); }
-void Display::show_prev_page() { this->page_->show_prev(); }
-
 void Display::do_update_() {
   if (this->auto_clear_enabled_) {
     this->clear();
@@ -892,9 +889,6 @@ void DisplayPage::show_prev() {
   this->prev_->show();
 }
 
-void DisplayPage::set_parent(Display *parent) { this->parent_ = parent; }
-void DisplayPage::set_prev(DisplayPage *prev) { this->prev_ = prev; }
-void DisplayPage::set_next(DisplayPage *next) { this->next_ = next; }
 const display_writer_t &DisplayPage::get_writer() const { return this->writer_; }
 
 const LogString *text_align_to_string(TextAlign textalign) {
diff --git a/esphome/components/display/display.h b/esphome/components/display/display.h
index 3a136937f6..a9ffda422d 100644
--- a/esphome/components/display/display.h
+++ b/esphome/components/display/display.h
@@ -802,9 +802,9 @@ class DisplayPage final {
   void show();
   void show_next();
   void show_prev();
-  void set_parent(Display *parent);
-  void set_prev(DisplayPage *prev);
-  void set_next(DisplayPage *next);
+  void set_parent(Display *parent) { this->parent_ = parent; }
+  void set_prev(DisplayPage *prev) { this->prev_ = prev; }
+  void set_next(DisplayPage *next) { this->next_ = next; }
   const display_writer_t &get_writer() const;
 
  protected:
@@ -814,6 +814,9 @@ class DisplayPage final {
   DisplayPage *next_{nullptr};
 };
 
+inline void Display::show_next_page() { this->page_->show_next(); }
+inline void Display::show_prev_page() { this->page_->show_prev(); }
+
 template<typename... Ts> class DisplayPageShowAction final : public Action<Ts...> {
  public:
   TEMPLATABLE_VALUE(DisplayPage *, page)

From a63c3bc0c7f9eab2b08def454b89223480fcf9ad Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:06:31 -0500
Subject: [PATCH 074/155] [valve] Inline the trivial Valve and ValveCall
 accessors (#18641)

---
 esphome/components/valve/valve.cpp | 7 -------
 esphome/components/valve/valve.h   | 8 ++++----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/esphome/components/valve/valve.cpp b/esphome/components/valve/valve.cpp
index 8fccd1e6d6..d8fb18b1b7 100644
--- a/esphome/components/valve/valve.cpp
+++ b/esphome/components/valve/valve.cpp
@@ -120,10 +120,6 @@ ValveCall &ValveCall::set_stop(bool stop) {
   this->stop_ = stop;
   return *this;
 }
-bool ValveCall::get_stop() const { return this->stop_; }
-
-ValveCall Valve::make_call() { return {this}; }
-
 void Valve::publish_state(bool save) {
   this->position = clamp(this->position, 0.0f, 1.0f);
 
@@ -162,9 +158,6 @@ optional<ValveRestoreState> Valve::restore_state_() {
   return recovered;
 }
 
-bool Valve::is_fully_open() const { return this->position == VALVE_OPEN; }
-bool Valve::is_fully_closed() const { return this->position == VALVE_CLOSED; }
-
 ValveCall ValveRestoreState::to_call(Valve *valve) {
   auto call = valve->make_call();
   call.set_position(this->position);
diff --git a/esphome/components/valve/valve.h b/esphome/components/valve/valve.h
index c6cdf07096..183680e5e4 100644
--- a/esphome/components/valve/valve.h
+++ b/esphome/components/valve/valve.h
@@ -47,7 +47,7 @@ class ValveCall {
   void perform();
 
   const optional<float> &get_position() const;
-  bool get_stop() const;
+  bool get_stop() const { return this->stop_; }
   const optional<bool> &get_toggle() const;
 
  protected:
@@ -114,7 +114,7 @@ class Valve : public EntityBase {
   float position;
 
   /// Construct a new valve call used to control the valve.
-  ValveCall make_call();
+  ValveCall make_call() { return {this}; }
 
   template<typename F> void add_on_state_callback(F &&f) { this->state_callback_.add(std::forward<F>(f)); }
 
@@ -130,9 +130,9 @@ class Valve : public EntityBase {
   virtual ValveTraits get_traits() = 0;
 
   /// Helper method to check if the valve is fully open. Equivalent to comparing .position against 1.0
-  bool is_fully_open() const;
+  bool is_fully_open() const { return this->position == VALVE_OPEN; }
   /// Helper method to check if the valve is fully closed. Equivalent to comparing .position against 0.0
-  bool is_fully_closed() const;
+  bool is_fully_closed() const { return this->position == VALVE_CLOSED; }
 
  protected:
   friend ValveCall;

From 435d5226838d8f2818d637f1a284f4f85c214295 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:06:47 -0500
Subject: [PATCH 075/155] [text] Inline the trivial Text publish_state
 forwarding overloads (#18642)

---
 esphome/components/text/text.cpp | 4 ----
 esphome/components/text/text.h   | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/esphome/components/text/text.cpp b/esphome/components/text/text.cpp
index 032ea468e6..a1df6286c7 100644
--- a/esphome/components/text/text.cpp
+++ b/esphome/components/text/text.cpp
@@ -8,10 +8,6 @@ namespace esphome::text {
 
 static const char *const TAG = "text";
 
-void Text::publish_state(const std::string &state) { this->publish_state(state.data(), state.size()); }
-
-void Text::publish_state(const char *state) { this->publish_state(state, strlen(state)); }
-
 void Text::publish_state(const char *state, size_t len) {
   this->set_has_state(true);
   // Only assign if changed to avoid heap allocation
diff --git a/esphome/components/text/text.h b/esphome/components/text/text.h
index eb6a68f998..54afb8db8f 100644
--- a/esphome/components/text/text.h
+++ b/esphome/components/text/text.h
@@ -23,8 +23,8 @@ class Text : public EntityBase {
   std::string state;
   TextTraits traits;
 
-  void publish_state(const std::string &state);
-  void publish_state(const char *state);
+  void publish_state(const std::string &state) { this->publish_state(state.data(), state.size()); }
+  void publish_state(const char *state) { this->publish_state(state, strlen(state)); }
   void publish_state(const char *state, size_t len);
 
   /// Instantiate a TextCall object to modify this text component's state.

From 01ad424d12bc6c376e695084c078e9cb8d5c54fd Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:07:03 -0500
Subject: [PATCH 076/155] [datetime] Inline the trivial make_call helpers
 (#18643)

---
 esphome/components/datetime/date_entity.cpp     | 2 --
 esphome/components/datetime/date_entity.h       | 2 ++
 esphome/components/datetime/datetime_entity.cpp | 2 --
 esphome/components/datetime/datetime_entity.h   | 2 ++
 esphome/components/datetime/time_entity.cpp     | 2 --
 esphome/components/datetime/time_entity.h       | 2 ++
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/esphome/components/datetime/date_entity.cpp b/esphome/components/datetime/date_entity.cpp
index 997aec3f69..b99b89259f 100644
--- a/esphome/components/datetime/date_entity.cpp
+++ b/esphome/components/datetime/date_entity.cpp
@@ -37,8 +37,6 @@ void DateEntity::publish_state() {
 #endif
 }
 
-DateCall DateEntity::make_call() { return DateCall(this); }
-
 void DateCall::validate_() {
   if (this->year_.has_value() && (this->year_ < 1970 || this->year_ > 3000)) {
     ESP_LOGE(TAG, "Year must be between 1970 and 3000");
diff --git a/esphome/components/datetime/date_entity.h b/esphome/components/datetime/date_entity.h
index 9b86c12228..93ce1411f8 100644
--- a/esphome/components/datetime/date_entity.h
+++ b/esphome/components/datetime/date_entity.h
@@ -96,6 +96,8 @@ class DateCall {
   optional<uint8_t> day_;
 };
 
+inline DateCall DateEntity::make_call() { return DateCall(this); }
+
 template<typename... Ts> class DateSetAction final : public Action<Ts...>, public Parented<DateEntity> {
  public:
   TEMPLATABLE_VALUE(ESPTime, date)
diff --git a/esphome/components/datetime/datetime_entity.cpp b/esphome/components/datetime/datetime_entity.cpp
index a8e00d6eb3..8f180fd081 100644
--- a/esphome/components/datetime/datetime_entity.cpp
+++ b/esphome/components/datetime/datetime_entity.cpp
@@ -53,8 +53,6 @@ void DateTimeEntity::publish_state() {
 #endif
 }
 
-DateTimeCall DateTimeEntity::make_call() { return DateTimeCall(this); }
-
 ESPTime DateTimeEntity::state_as_esptime() const {
   ESPTime obj;
   obj.year = this->year_;
diff --git a/esphome/components/datetime/datetime_entity.h b/esphome/components/datetime/datetime_entity.h
index 159e4ccc6f..fec620b5ba 100644
--- a/esphome/components/datetime/datetime_entity.h
+++ b/esphome/components/datetime/datetime_entity.h
@@ -121,6 +121,8 @@ class DateTimeCall {
   optional<uint8_t> second_;
 };
 
+inline DateTimeCall DateTimeEntity::make_call() { return DateTimeCall(this); }
+
 template<typename... Ts> class DateTimeSetAction final : public Action<Ts...>, public Parented<DateTimeEntity> {
  public:
   TEMPLATABLE_VALUE(ESPTime, datetime)
diff --git a/esphome/components/datetime/time_entity.cpp b/esphome/components/datetime/time_entity.cpp
index 1cc9eaf2fb..da4c9eb31e 100644
--- a/esphome/components/datetime/time_entity.cpp
+++ b/esphome/components/datetime/time_entity.cpp
@@ -33,8 +33,6 @@ void TimeEntity::publish_state() {
 #endif
 }
 
-TimeCall TimeEntity::make_call() { return TimeCall(this); }
-
 void TimeCall::validate_() {
   if (this->hour_.has_value() && this->hour_ > 23) {
     ESP_LOGE(TAG, "Hour must be between 0 and 23");
diff --git a/esphome/components/datetime/time_entity.h b/esphome/components/datetime/time_entity.h
index 643f4bd176..736e26f4a7 100644
--- a/esphome/components/datetime/time_entity.h
+++ b/esphome/components/datetime/time_entity.h
@@ -98,6 +98,8 @@ class TimeCall {
   optional<uint8_t> second_;
 };
 
+inline TimeCall TimeEntity::make_call() { return TimeCall(this); }
+
 template<typename... Ts> class TimeSetAction final : public Action<Ts...>, public Parented<TimeEntity> {
  public:
   TEMPLATABLE_VALUE(ESPTime, time)

From f24b731f9510815fe164e975b7e4a4f4605cd45e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:07:14 -0500
Subject: [PATCH 077/155] [infrared] Inline the trivial make_call helper
 (#18644)

---
 esphome/components/infrared/infrared.cpp | 2 --
 esphome/components/infrared/infrared.h   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/esphome/components/infrared/infrared.cpp b/esphome/components/infrared/infrared.cpp
index 9b97995a96..5a909738c6 100644
--- a/esphome/components/infrared/infrared.cpp
+++ b/esphome/components/infrared/infrared.cpp
@@ -75,8 +75,6 @@ void Infrared::dump_config() {
                 YESNO(this->traits_.get_supports_receiver()));
 }
 
-InfraredCall Infrared::make_call() { return InfraredCall(this); }
-
 void Infrared::control(const InfraredCall &call) {
   if (this->transmitter_ == nullptr) {
     ESP_LOGW(TAG, "No transmitter configured");
diff --git a/esphome/components/infrared/infrared.h b/esphome/components/infrared/infrared.h
index 6d91c97cce..b6863e37ce 100644
--- a/esphome/components/infrared/infrared.h
+++ b/esphome/components/infrared/infrared.h
@@ -134,7 +134,7 @@ class Infrared : public Component, public EntityBase, public remote_base::Remote
   const InfraredTraits &get_traits() const { return this->traits_; }
 
   /// Create a call object for transmitting
-  InfraredCall make_call();
+  InfraredCall make_call() { return InfraredCall(this); }
 
   /// Get capability flags for this infrared instance
   uint32_t get_capability_flags() const;

From f0651e5c9b2ae24c33256819dd78eedce73c45a0 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:07:34 -0500
Subject: [PATCH 078/155] [radio_frequency] Inline the trivial make_call helper
 (#18645)

---
 esphome/components/radio_frequency/radio_frequency.cpp | 2 --
 esphome/components/radio_frequency/radio_frequency.h   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/esphome/components/radio_frequency/radio_frequency.cpp b/esphome/components/radio_frequency/radio_frequency.cpp
index 3e0a905737..61e7feb9af 100644
--- a/esphome/components/radio_frequency/radio_frequency.cpp
+++ b/esphome/components/radio_frequency/radio_frequency.cpp
@@ -81,8 +81,6 @@ void RadioFrequency::dump_config() {
   }
 }
 
-RadioFrequencyCall RadioFrequency::make_call() { return RadioFrequencyCall(this); }
-
 uint32_t RadioFrequency::get_capability_flags() const {
   uint32_t flags = 0;
   if (this->traits_.get_supports_transmitter())
diff --git a/esphome/components/radio_frequency/radio_frequency.h b/esphome/components/radio_frequency/radio_frequency.h
index 7dfd2dd77e..8782c255f0 100644
--- a/esphome/components/radio_frequency/radio_frequency.h
+++ b/esphome/components/radio_frequency/radio_frequency.h
@@ -157,7 +157,7 @@ class RadioFrequency : public Component, public EntityBase, public remote_base::
   const RadioFrequencyTraits &get_traits() const { return this->traits_; }
 
   /// Create a call object for transmitting
-  RadioFrequencyCall make_call();
+  RadioFrequencyCall make_call() { return RadioFrequencyCall(this); }
 
   /// Get capability flags for this radio frequency instance
   uint32_t get_capability_flags() const;

From cd536817876caff90c750fa9e17b2bdbb181034f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:51:39 -0500
Subject: [PATCH 079/155] [wifi] Inline the remaining trivial WiFiAP and
 WiFiComponent accessors (#18617)

---
 esphome/components/wifi/wifi_component.cpp | 38 ------------------
 esphome/components/wifi/wifi_component.h   | 46 +++++++++++-----------
 2 files changed, 24 insertions(+), 60 deletions(-)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 5ed5fc9094..b8a31f97a3 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -618,8 +618,6 @@ static const char *eap_phase2_to_str(esp_eap_ttls_phase2_types type) {
 }
 #endif
 
-float WiFiComponent::get_setup_priority() const { return setup_priority::WIFI; }
-
 void WiFiComponent::setup() {
   this->wifi_pre_setup_();
 
@@ -931,10 +929,6 @@ void WiFiComponent::loop() {
 
 WiFiComponent::WiFiComponent() { global_wifi_component = this; }
 
-#ifdef USE_WIFI_11KV_SUPPORT
-void WiFiComponent::set_btm(bool btm) { this->btm_ = btm; }
-void WiFiComponent::set_rrm(bool rrm) { this->rrm_ = rrm; }
-#endif
 network::IPAddresses WiFiComponent::get_ip_addresses() {
   if (this->has_sta())
     return this->wifi_sta_ip_addresses();
@@ -1327,8 +1321,6 @@ void WiFiComponent::disable() {
   this->wifi_mode_(false, false);
 }
 
-bool WiFiComponent::is_disabled() { return this->state_ == WIFI_COMPONENT_STATE_DISABLED; }
-
 void WiFiComponent::start_scanning() {
   this->action_started_ = millis();
   ESP_LOGD(TAG, "Starting scan");
@@ -2196,7 +2188,6 @@ void WiFiComponent::retry_connect() {
   }
 }
 
-void WiFiComponent::set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }
 void WiFiComponent::set_power_save_mode(WiFiPowerSaveMode power_save) {
   this->power_save_ = power_save;
 #if defined(USE_ESP32) && defined(USE_WIFI_RUNTIME_POWER_SAVE)
@@ -2204,8 +2195,6 @@ void WiFiComponent::set_power_save_mode(WiFiPowerSaveMode power_save) {
 #endif
 }
 
-void WiFiComponent::set_passive_scan(bool passive) { this->passive_scan_ = passive; }
-
 bool WiFiComponent::is_captive_portal_active_() {
 #ifdef USE_CAPTIVE_PORTAL
   return captive_portal::global_captive_portal != nullptr && captive_portal::global_captive_portal->is_active();
@@ -2324,33 +2313,6 @@ void WiFiComponent::save_fast_connect_settings_(const bssid_t &bssid, uint8_t ch
 }
 #endif
 
-void WiFiAP::set_ssid(const std::string &ssid) { this->ssid_ = CompactString(ssid.c_str(), ssid.size()); }
-void WiFiAP::set_ssid(const char *ssid) { this->ssid_ = CompactString(ssid, strlen(ssid)); }
-void WiFiAP::set_bssid(const bssid_t &bssid) { this->bssid_ = bssid; }
-void WiFiAP::clear_bssid() { this->bssid_ = {}; }
-void WiFiAP::set_password(const std::string &password) {
-  this->password_ = CompactString(password.c_str(), password.size());
-}
-void WiFiAP::set_password(const char *password) { this->password_ = CompactString(password, strlen(password)); }
-#ifdef USE_WIFI_WPA2_EAP
-void WiFiAP::set_eap(optional<EAPAuth> eap_auth) { this->eap_ = std::move(eap_auth); }
-#endif
-void WiFiAP::set_channel(uint8_t channel) { this->channel_ = channel; }
-void WiFiAP::clear_channel() { this->channel_ = 0; }
-#ifdef USE_WIFI_MANUAL_IP
-void WiFiAP::set_manual_ip(optional<ManualIP> manual_ip) { this->manual_ip_ = manual_ip; }
-#endif
-void WiFiAP::set_hidden(bool hidden) { this->hidden_ = hidden; }
-const bssid_t &WiFiAP::get_bssid() const { return this->bssid_; }
-bool WiFiAP::has_bssid() const { return this->bssid_ != bssid_t{}; }
-#ifdef USE_WIFI_WPA2_EAP
-const optional<EAPAuth> &WiFiAP::get_eap() const { return this->eap_; }
-#endif
-#ifdef USE_WIFI_MANUAL_IP
-const optional<ManualIP> &WiFiAP::get_manual_ip() const { return this->manual_ip_; }
-#endif
-bool WiFiAP::get_hidden() const { return this->hidden_; }
-
 WiFiScanResult::WiFiScanResult(const bssid_t &bssid, const char *ssid, size_t ssid_len, uint8_t channel, int8_t rssi,
                                bool with_auth, bool is_hidden)
     : bssid_(bssid),
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index c54fbc004b..07d4ff23c6 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -21,6 +21,7 @@
 #include <span>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 #ifdef USE_LIBRETINY
@@ -261,38 +262,38 @@ class WiFiAP {
   friend class WiFiScanResult;
 
  public:
-  void set_ssid(const std::string &ssid);
-  void set_ssid(const char *ssid);
+  void set_ssid(const std::string &ssid) { this->ssid_ = CompactString(ssid.c_str(), ssid.size()); }
+  void set_ssid(const char *ssid) { this->set_ssid(StringRef(ssid)); }
   void set_ssid(StringRef ssid) { this->ssid_ = CompactString(ssid.c_str(), ssid.size()); }
-  void set_bssid(const bssid_t &bssid);
-  void clear_bssid();
-  void set_password(const std::string &password);
-  void set_password(const char *password);
+  void set_bssid(const bssid_t &bssid) { this->bssid_ = bssid; }
+  void clear_bssid() { this->bssid_ = {}; }
+  void set_password(const std::string &password) { this->password_ = CompactString(password.c_str(), password.size()); }
+  void set_password(const char *password) { this->set_password(StringRef(password)); }
   void set_password(StringRef password) { this->password_ = CompactString(password.c_str(), password.size()); }
 #ifdef USE_WIFI_WPA2_EAP
-  void set_eap(optional<EAPAuth> eap_auth);
+  void set_eap(optional<EAPAuth> eap_auth) { this->eap_ = std::move(eap_auth); }
 #endif  // USE_WIFI_WPA2_EAP
-  void set_channel(uint8_t channel);
-  void clear_channel();
+  void set_channel(uint8_t channel) { this->channel_ = channel; }
+  void clear_channel() { this->channel_ = 0; }
   void set_priority(int8_t priority) { priority_ = priority; }
 #ifdef USE_WIFI_MANUAL_IP
-  void set_manual_ip(optional<ManualIP> manual_ip);
+  void set_manual_ip(optional<ManualIP> manual_ip) { this->manual_ip_ = manual_ip; }
 #endif
-  void set_hidden(bool hidden);
+  void set_hidden(bool hidden) { this->hidden_ = hidden; }
   StringRef get_ssid() const { return this->ssid_.ref(); }
   StringRef get_password() const { return this->password_.ref(); }
-  const bssid_t &get_bssid() const;
-  bool has_bssid() const;
+  const bssid_t &get_bssid() const { return this->bssid_; }
+  bool has_bssid() const { return this->bssid_ != bssid_t{}; }
 #ifdef USE_WIFI_WPA2_EAP
-  const optional<EAPAuth> &get_eap() const;
+  const optional<EAPAuth> &get_eap() const { return this->eap_; }
 #endif  // USE_WIFI_WPA2_EAP
   uint8_t get_channel() const { return this->channel_; }
   bool has_channel() const { return this->channel_ != 0; }
   int8_t get_priority() const { return priority_; }
 #ifdef USE_WIFI_MANUAL_IP
-  const optional<ManualIP> &get_manual_ip() const;
+  const optional<ManualIP> &get_manual_ip() const { return this->manual_ip_; }
 #endif
-  bool get_hidden() const;
+  bool get_hidden() const { return this->hidden_; }
 
  protected:
   CompactString ssid_;
@@ -442,6 +443,7 @@ class WiFiComponent final : public Component {
   void set_sta(const WiFiAP &ap);
   // Returns a copy of the currently selected AP configuration
   WiFiAP get_sta() const;
+  // init_sta/add_sta kept out of line: inlining them into the generated setup() grows flash
   void init_sta(size_t count);
   void add_sta(const WiFiAP &ap);
   void clear_sta();
@@ -461,7 +463,7 @@ class WiFiComponent final : public Component {
 
   void enable();
   void disable();
-  bool is_disabled();
+  bool is_disabled() { return this->state_ == WIFI_COMPONENT_STATE_DISABLED; }
   void start_scanning();
   void check_scanning_finished();
   void start_connecting(const WiFiAP &ap);
@@ -472,7 +474,7 @@ class WiFiComponent final : public Component {
 
   void retry_connect();
 
-  void set_reboot_timeout(uint32_t reboot_timeout);
+  void set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }
 
   bool is_connected() const { return this->connected_; }
 
@@ -492,7 +494,7 @@ class WiFiComponent final : public Component {
   void set_phy_mode(WiFi8266PhyMode phy_mode) { this->phy_mode_ = phy_mode; }
 #endif
 
-  void set_passive_scan(bool passive);
+  void set_passive_scan(bool passive) { this->passive_scan_ = passive; }
 
   void save_wifi_sta(const std::string &ssid, const std::string &password);
   void save_wifi_sta(const char *ssid, const char *password);
@@ -506,7 +508,7 @@ class WiFiComponent final : public Component {
   void dump_config() override;
   void restart_adapter();
   /// WIFI setup_priority.
-  float get_setup_priority() const override;
+  float get_setup_priority() const override { return setup_priority::WIFI; }
   /// Reconnect WiFi if required.
   void loop() override;
 
@@ -515,8 +517,8 @@ class WiFiComponent final : public Component {
   bool is_ap_active() const { return this->ap_started_; }
 
 #ifdef USE_WIFI_11KV_SUPPORT
-  void set_btm(bool btm);
-  void set_rrm(bool rrm);
+  void set_btm(bool btm) { this->btm_ = btm; }
+  void set_rrm(bool rrm) { this->rrm_ = rrm; }
 #endif
 
   network::IPAddress get_dns_address(int num);

From 5b3a6c05bf40a5776da603d422495e345363da3b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 21:59:47 -0500
Subject: [PATCH 080/155] [core] Remove deprecated esp_log_vprintf_
 flash-string overload (#18377)

---
 esphome/core/log.cpp | 10 ----------
 esphome/core/log.h   |  5 -----
 2 files changed, 15 deletions(-)

diff --git a/esphome/core/log.cpp b/esphome/core/log.cpp
index 0da457adec..9fcddfeff6 100644
--- a/esphome/core/log.cpp
+++ b/esphome/core/log.cpp
@@ -60,16 +60,6 @@ void HOT esp_log_vprintf_(int level, const char *tag, int line, const char *form
 #endif
 }
 
-#ifdef USE_STORE_LOG_STR_IN_FLASH
-// Remove before 2026.9.0
-void HOT esp_log_vprintf_(int level, const char *tag, int line, const __FlashStringHelper *format, va_list args) {
-#ifdef USE_LOGGER
-  ESPHOME_DEBUG_ASSERT(logger::global_logger != nullptr);
-  logger::global_logger->log_vprintf_(static_cast<uint8_t>(level), tag, line, format, args);
-#endif
-}
-#endif
-
 #ifdef USE_ESP32
 int HOT esp_idf_log_vprintf_(const char *format, va_list args) {  // NOLINT
 #ifdef USE_LOGGER
diff --git a/esphome/core/log.h b/esphome/core/log.h
index 72e06cabac..272e516808 100644
--- a/esphome/core/log.h
+++ b/esphome/core/log.h
@@ -68,11 +68,6 @@ void esp_log_printf_(int level, const char *tag, int line, const char *format, .
 void esp_log_printf_(int level, const char *tag, int line, const __FlashStringHelper *format, ...);
 #endif
 void esp_log_vprintf_(int level, const char *tag, int line, const char *format, va_list args);  // NOLINT
-#ifdef USE_STORE_LOG_STR_IN_FLASH
-// Remove before 2026.9.0
-__attribute__((deprecated("Use esp_log_printf_() instead. Removed in 2026.9.0."))) void esp_log_vprintf_(
-    int level, const char *tag, int line, const __FlashStringHelper *format, va_list args);
-#endif
 #if defined(USE_ESP32)
 int esp_idf_log_vprintf_(const char *format, va_list args);  // NOLINT
 #endif

From ab45ab316a0190cf898e436a345e2a20a5f15c42 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 22:00:02 -0500
Subject: [PATCH 081/155] [core] Remove deprecated entity_base getters (#18375)

---
 esphome/core/entity_base.cpp | 40 -------------------------------
 esphome/core/entity_base.h   | 46 ------------------------------------
 2 files changed, 86 deletions(-)

diff --git a/esphome/core/entity_base.cpp b/esphome/core/entity_base.cpp
index fc6ac503b5..21a5fc3706 100644
--- a/esphome/core/entity_base.cpp
+++ b/esphome/core/entity_base.cpp
@@ -80,24 +80,6 @@ const char *EntityBase::get_device_class_to([[maybe_unused]] std::span<char, MAX
 #endif
 }
 
-#ifndef USE_ESP8266
-// Deprecated device class accessors — not available on ESP8266 (rodata is RAM)
-StringRef EntityBase::get_device_class_ref() const {
-#ifdef USE_ENTITY_DEVICE_CLASS
-  return StringRef(entity_device_class_lookup(this->device_class_idx_));
-#else
-  return StringRef(entity_device_class_lookup(0));
-#endif
-}
-std::string EntityBase::get_device_class() const {
-#ifdef USE_ENTITY_DEVICE_CLASS
-  return std::string(entity_device_class_lookup(this->device_class_idx_));
-#else
-  return std::string(entity_device_class_lookup(0));
-#endif
-}
-#endif  // !USE_ESP8266
-
 // Entity unit of measurement (from index)
 StringRef EntityBase::get_unit_of_measurement_ref() const {
 #ifdef USE_ENTITY_UNIT_OF_MEASUREMENT
@@ -106,10 +88,6 @@ StringRef EntityBase::get_unit_of_measurement_ref() const {
   return StringRef(entity_uom_lookup(0));
 #endif
 }
-std::string EntityBase::get_unit_of_measurement() const {
-  return std::string(this->get_unit_of_measurement_ref().c_str());
-}
-
 // Entity icon — buffer-based API for PROGMEM safety on ESP8266
 const char *EntityBase::get_icon_to([[maybe_unused]] std::span<char, MAX_ICON_LENGTH> buffer) const {
 #ifdef USE_ENTITY_ICON
@@ -129,24 +107,6 @@ const char *EntityBase::get_icon_to([[maybe_unused]] std::span<char, MAX_ICON_LE
 #endif
 }
 
-#ifndef USE_ESP8266
-// Deprecated icon accessors — not available on ESP8266 (rodata is RAM)
-StringRef EntityBase::get_icon_ref() const {
-#ifdef USE_ENTITY_ICON
-  return StringRef(entity_icon_lookup(this->icon_idx_));
-#else
-  return StringRef(entity_icon_lookup(0));
-#endif
-}
-std::string EntityBase::get_icon() const {
-#ifdef USE_ENTITY_ICON
-  return std::string(entity_icon_lookup(this->icon_idx_));
-#else
-  return std::string(entity_icon_lookup(0));
-#endif
-}
-#endif  // !USE_ESP8266
-
 // Calculate Object ID Hash directly from name using snake_case + sanitize
 void EntityBase::calc_object_id_() {
   this->object_id_hash_ = fnv1_hash_object_id(this->name_.c_str(), this->name_.size());
diff --git a/esphome/core/entity_base.h b/esphome/core/entity_base.h
index 5f2e173d8d..f38e30bf52 100644
--- a/esphome/core/entity_base.h
+++ b/esphome/core/entity_base.h
@@ -109,60 +109,14 @@ class EntityBase {
   // On ESP8266: copies from PROGMEM to buffer, returns buffer pointer.
   const char *get_device_class_to(std::span<char, MAX_DEVICE_CLASS_LENGTH> buffer) const;
 
-#ifdef USE_ESP8266
-  // On ESP8266, rodata is RAM. Device classes are in PROGMEM and cannot be accessed
-  // directly as const char*. Use get_device_class_to() with a stack buffer instead.
-  template<typename T = int> StringRef get_device_class_ref() const {
-    static_assert(sizeof(T) == 0, "get_device_class_ref() unavailable on ESP8266 (rodata is RAM). "
-                                  "Use get_device_class_to() with a stack buffer.");
-    return StringRef("");
-  }
-  template<typename T = int> std::string get_device_class() const {
-    static_assert(sizeof(T) == 0, "get_device_class() unavailable on ESP8266 (rodata is RAM). "
-                                  "Use get_device_class_to() with a stack buffer.");
-    return "";
-  }
-#else
-  // Deprecated: use get_device_class_to() instead. Device classes are in PROGMEM.
-  ESPDEPRECATED("Use get_device_class_to() instead. Will be removed in ESPHome 2026.9.0", "2026.3.0")
-  StringRef get_device_class_ref() const;
-  ESPDEPRECATED("Use get_device_class_to() instead. Will be removed in ESPHome 2026.9.0", "2026.3.0")
-  std::string get_device_class() const;
-#endif
   // Get unit of measurement as StringRef (from packed index)
   StringRef get_unit_of_measurement_ref() const;
-  /// Get the unit of measurement as std::string (deprecated, prefer get_unit_of_measurement_ref())
-  ESPDEPRECATED("Use get_unit_of_measurement_ref() instead for better performance (avoids string copy). Will be "
-                "removed in ESPHome 2026.9.0",
-                "2026.3.0")
-  std::string get_unit_of_measurement() const;
 
   // Get this entity's icon into a stack buffer.
   // On ESP32: returns pointer to PROGMEM string directly (buffer unused).
   // On ESP8266: copies from PROGMEM to buffer, returns buffer pointer.
   const char *get_icon_to(std::span<char, MAX_ICON_LENGTH> buffer) const;
 
-#ifdef USE_ESP8266
-  // On ESP8266, rodata is RAM. Icons are in PROGMEM and cannot be accessed
-  // directly as const char*. Use get_icon_to() with a stack buffer instead.
-  template<typename T = int> StringRef get_icon_ref() const {
-    static_assert(sizeof(T) == 0,
-                  "get_icon_ref() unavailable on ESP8266 (rodata is RAM). Use get_icon_to() with a stack buffer.");
-    return StringRef("");
-  }
-  template<typename T = int> std::string get_icon() const {
-    static_assert(sizeof(T) == 0,
-                  "get_icon() unavailable on ESP8266 (rodata is RAM). Use get_icon_to() with a stack buffer.");
-    return "";
-  }
-#else
-  // Deprecated: use get_icon_to() instead. Icons are in PROGMEM.
-  ESPDEPRECATED("Use get_icon_to() instead. Will be removed in ESPHome 2026.9.0", "2026.3.0")
-  StringRef get_icon_ref() const;
-  ESPDEPRECATED("Use get_icon_to() instead. Will be removed in ESPHome 2026.9.0", "2026.3.0")
-  std::string get_icon() const;
-#endif
-
 #ifdef USE_DEVICES
   // Get this entity's device id
   uint32_t get_device_id() const {

From b115813fbe2880a3e7ffbc2e4725e208c589d97b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 22:00:17 -0500
Subject: [PATCH 082/155] [esp32] Report abort and task watchdog panics
 correctly in crash handler (#18575)

---
 esphome/components/esp32/crash_handler.cpp | 61 +++++++++++++++++++---
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/esphome/components/esp32/crash_handler.cpp b/esphome/components/esp32/crash_handler.cpp
index b61dad7386..6f65243aaa 100644
--- a/esphome/components/esp32/crash_handler.cpp
+++ b/esphome/components/esp32/crash_handler.cpp
@@ -124,6 +124,15 @@ static uint8_t IRAM_ATTR capture_riscv_backtrace(RvExcFrame *frame, uint32_t *ou
 // Version is uint32_t because it would be padded to 4 bytes anyway before the next
 // uint32_t field, so we use the full width rather than wasting 3 bytes of padding.
 static constexpr uint32_t CRASH_DATA_VERSION = 4;
+#if CONFIG_IDF_TARGET_ARCH_XTENSA
+// EXCCAUSE is a 6-bit register; larger recorded values mean the frame's
+// cause/vaddr slots were never written (not a real exception frame).
+static constexpr uint32_t XTENSA_EXCCAUSE_COUNT = XCHAL_EXCCAUSE_NUM;
+#elif CONFIG_IDF_TARGET_ARCH_RISCV
+// Synchronous mcause exception codes are small and have no interrupt bit;
+// anything else in a non-pseudo record is a stale slot.
+static constexpr uint32_t RISCV_EXCEPTION_CAUSE_COUNT = 32;
+#endif
 struct RawCrashData {
   uint32_t version;
   uint32_t magic;
@@ -198,10 +207,28 @@ void crash_handler_clear() {
   s_raw_crash_data.magic = 0;
 }
 
+// Whether the cause slot was written by a real exception frame.
+static bool cause_slot_was_written() {
+#if CONFIG_IDF_TARGET_ARCH_XTENSA
+  return s_raw_crash_data.cause < XTENSA_EXCCAUSE_COUNT;
+#else
+  return s_raw_crash_data.cause < RISCV_EXCEPTION_CAUSE_COUNT;
+#endif
+}
+
 // Look up the exception cause as a human-readable string.
 // Tables mirror ESP-IDF's panic_arch_fill_info() which uses local static arrays
 // not exposed via any public API.
 static const char *get_exception_reason() {
+  uint8_t exception = s_raw_crash_data.exception;
+  if (exception == PANIC_EXCEPTION_ABORT || exception == PANIC_EXCEPTION_TWDT) {
+    // Abort-class panics carry no cause register
+    return nullptr;
+  }
+  if (!cause_slot_was_written()) {
+    // Garbage from old-build or corrupt records; report just the type
+    return nullptr;
+  }
 #if CONFIG_IDF_TARGET_ARCH_XTENSA
   if (s_raw_crash_data.pseudo_excause) {
     // SoC-level panic: watchdog, cache error, etc.
@@ -354,10 +381,11 @@ static const char *const FAULT_ADDR_REG = "MTVAL";
 static const char *const FAULT_ADDR_REG_LOWER = "mtval";
 #endif
 
-// Whether the fault address is meaningful — real CPU faults only, not
-// aborts/watchdogs or SoC-level pseudo exceptions.
+// Whether the fault address is meaningful: real CPU faults with a validly
+// written frame only.
 static bool has_fault_addr() {
-  return s_raw_crash_data.exception == PANIC_EXCEPTION_FAULT && !s_raw_crash_data.pseudo_excause;
+  return s_raw_crash_data.exception == PANIC_EXCEPTION_FAULT && !s_raw_crash_data.pseudo_excause &&
+         cause_slot_was_written();
 }
 
 // The record was captured by a different firmware build (it survives soft
@@ -458,6 +486,10 @@ void crash_handler_log() {
 // into NOINIT memory before the normal panic handler runs.
 //
 extern "C" {
+// Set by IDF's task watchdog (task_wdt.c, no header) before it simulates an
+// abort; weak so builds without the task watchdog still link.
+extern bool g_twdt_isr __attribute__((weak));
+
 // NOLINTBEGIN(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp,readability-identifier-naming)
 // Names are mandated by the --wrap linker mechanism
 extern void __real_esp_panic_handler(panic_info_t *info);
@@ -470,6 +502,14 @@ void IRAM_ATTR __wrap_esp_panic_handler(panic_info_t *info) {
   s_raw_crash_data.exception = (uint8_t) info->exception;
   s_raw_crash_data.pseudo_excause = info->pseudo_excause ? 1 : 0;
   s_raw_crash_data.crashed_core = (uint8_t) info->core;
+  if (g_panic_abort) {
+    // IDF reclassifies to ABORT only inside esp_panic_handler(), after this
+    // wrapper captured info->exception; correct it here. TWDT is our own
+    // distinction (IDF never assigns PANIC_EXCEPTION_TWDT). The abort text is
+    // not stored; the symbolized backtrace already identifies the site.
+    bool is_twdt = &g_twdt_isr != nullptr && g_twdt_isr;
+    s_raw_crash_data.exception = (uint8_t) (is_twdt ? PANIC_EXCEPTION_TWDT : PANIC_EXCEPTION_ABORT);
+  }
   // Zero unconditionally so a null frame doesn't leave stale .noinit data from a previous boot
   s_raw_crash_data.cause = 0;
   s_raw_crash_data.fault_addr = 0;
@@ -487,8 +527,12 @@ void IRAM_ATTR __wrap_esp_panic_handler(panic_info_t *info) {
   // Xtensa: walk the backtrace using the public API
   if (info->frame != nullptr) {
     auto *xt_frame = (XtExcFrame *) info->frame;
-    s_raw_crash_data.cause = xt_frame->exccause;
-    s_raw_crash_data.fault_addr = xt_frame->excvaddr;
+    if (!g_panic_abort) {
+      // Abort-class frames carry no useful cause/vaddr: TWDT task snapshots
+      // never wrote them and abort() traps describe only the synthetic trap.
+      s_raw_crash_data.cause = xt_frame->exccause;
+      s_raw_crash_data.fault_addr = xt_frame->excvaddr;
+    }
     s_raw_crash_data.backtrace_count = walk_xtensa_backtrace(xt_frame, s_raw_crash_data.backtrace, MAX_BACKTRACE);
   }
 
@@ -510,8 +554,11 @@ void IRAM_ATTR __wrap_esp_panic_handler(panic_info_t *info) {
   // RISC-V: capture MEPC + RA, then scan stack for code addresses
   if (info->frame != nullptr) {
     auto *rv_frame = (RvExcFrame *) info->frame;
-    s_raw_crash_data.cause = rv_frame->mcause;
-    s_raw_crash_data.fault_addr = rv_frame->mtval;
+    if (!g_panic_abort) {
+      // See the Xtensa branch: abort-class frames carry no valid cause/vaddr.
+      s_raw_crash_data.cause = rv_frame->mcause;
+      s_raw_crash_data.fault_addr = rv_frame->mtval;
+    }
     s_raw_crash_data.backtrace_count =
         capture_riscv_backtrace(rv_frame, s_raw_crash_data.backtrace, MAX_BACKTRACE, &s_raw_crash_data.reg_frame_count);
   }

From f3cdefce210b9b418da3487ff57c1421bb779137 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 22:00:38 -0500
Subject: [PATCH 083/155] [wifi] Remove deprecated wifi_ssid() (#18378)

---
 esphome/components/wifi/wifi_component.h             |  3 ---
 esphome/components/wifi/wifi_component_esp8266.cpp   | 10 ----------
 esphome/components/wifi/wifi_component_esp_idf.cpp   | 12 ------------
 esphome/components/wifi/wifi_component_libretiny.cpp |  1 -
 esphome/components/wifi/wifi_component_pico_w.cpp    |  1 -
 5 files changed, 27 deletions(-)

diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index 07d4ff23c6..ada7be4ba4 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -552,9 +552,6 @@ class WiFiComponent final : public Component {
   void set_sta_priority(bssid_t bssid, int8_t priority);
 
   network::IPAddresses wifi_sta_ip_addresses();
-  // Remove before 2026.9.0
-  ESPDEPRECATED("Use wifi_ssid_to() instead. Removed in 2026.9.0", "2026.3.0")
-  std::string wifi_ssid();
   /// Write SSID to buffer without heap allocation.
   /// Returns pointer to buffer, or empty string if not connected.
   const char *wifi_ssid_to(std::span<char, SSID_BUFFER_SIZE> buffer);
diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index acaa94b13c..005d655d88 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -944,16 +944,6 @@ bssid_t WiFiComponent::wifi_bssid() {
   }
   return bssid;
 }
-std::string WiFiComponent::wifi_ssid() {
-  struct station_config conf {};
-  if (!wifi_station_get_config(&conf)) {
-    return "";
-  }
-  // conf.ssid is uint8[32], not null-terminated if full
-  auto *ssid_s = reinterpret_cast<const char *>(conf.ssid);
-  size_t len = strnlen(ssid_s, sizeof(conf.ssid));
-  return {ssid_s, len};
-}
 const char *WiFiComponent::wifi_ssid_to(std::span<char, SSID_BUFFER_SIZE> buffer) {
   struct station_config conf {};
   if (!wifi_station_get_config(&conf)) {
diff --git a/esphome/components/wifi/wifi_component_esp_idf.cpp b/esphome/components/wifi/wifi_component_esp_idf.cpp
index 24cb060edb..32d46887b6 100644
--- a/esphome/components/wifi/wifi_component_esp_idf.cpp
+++ b/esphome/components/wifi/wifi_component_esp_idf.cpp
@@ -1237,18 +1237,6 @@ bssid_t WiFiComponent::wifi_bssid() {
   std::copy(info.bssid, info.bssid + 6, bssid.begin());
   return bssid;
 }
-std::string WiFiComponent::wifi_ssid() {
-  wifi_ap_record_t info{};
-  esp_err_t err = esp_wifi_sta_get_ap_info(&info);
-  if (err != ESP_OK) {
-    // Very verbose only: this is expected during dump_config() before connection is established (PR #9823)
-    ESP_LOGVV(TAG, "esp_wifi_sta_get_ap_info failed: %s", esp_err_to_name(err));
-    return "";
-  }
-  auto *ssid_s = reinterpret_cast<const char *>(info.ssid);
-  size_t len = strnlen(ssid_s, sizeof(info.ssid));
-  return {ssid_s, len};
-}
 const char *WiFiComponent::wifi_ssid_to(std::span<char, SSID_BUFFER_SIZE> buffer) {
   wifi_ap_record_t info{};
   esp_err_t err = esp_wifi_sta_get_ap_info(&info);
diff --git a/esphome/components/wifi/wifi_component_libretiny.cpp b/esphome/components/wifi/wifi_component_libretiny.cpp
index 66c397a8ad..e3c08416e8 100644
--- a/esphome/components/wifi/wifi_component_libretiny.cpp
+++ b/esphome/components/wifi/wifi_component_libretiny.cpp
@@ -762,7 +762,6 @@ bssid_t WiFiComponent::wifi_bssid() {
   }
   return bssid;
 }
-std::string WiFiComponent::wifi_ssid() { return WiFi.SSID().c_str(); }
 const char *WiFiComponent::wifi_ssid_to(std::span<char, SSID_BUFFER_SIZE> buffer) {
 #ifdef USE_BK72XX
   LinkStatusTypeDef link_status{};
diff --git a/esphome/components/wifi/wifi_component_pico_w.cpp b/esphome/components/wifi/wifi_component_pico_w.cpp
index 69af9e9a4e..325bcf2652 100644
--- a/esphome/components/wifi/wifi_component_pico_w.cpp
+++ b/esphome/components/wifi/wifi_component_pico_w.cpp
@@ -265,7 +265,6 @@ bssid_t WiFiComponent::wifi_bssid() {
     bssid[i] = raw_bssid[i];
   return bssid;
 }
-std::string WiFiComponent::wifi_ssid() { return WiFi.SSID().c_str(); }
 const char *WiFiComponent::wifi_ssid_to(std::span<char, SSID_BUFFER_SIZE> buffer) {
   // TODO: Find direct CYW43 API to avoid Arduino String allocation
   String ssid = WiFi.SSID();

From 8899713ef97229f881ab8694802ef03a9290c65a Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 22:00:53 -0500
Subject: [PATCH 084/155] [core] Remove deprecated gamma_correct and
 gamma_uncorrect (#18376)

---
 esphome/core/helpers.cpp | 17 -----------------
 esphome/core/helpers.h   |  9 ---------
 2 files changed, 26 deletions(-)

diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index a276020be4..ded8051df8 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -723,23 +723,6 @@ bool base64_decode_int32_vector(const std::string &base64, std::vector<int32_t>
 
 // Colors
 
-float gamma_correct(float value, float gamma) {
-  if (value <= 0.0f)
-    return 0.0f;
-  if (gamma <= 0.0f)
-    return value;
-
-  return powf(value, gamma);  // NOLINT - deprecated, removal 2026.9.0
-}
-float gamma_uncorrect(float value, float gamma) {
-  if (value <= 0.0f)
-    return 0.0f;
-  if (gamma <= 0.0f)
-    return value;
-
-  return powf(value, 1 / gamma);  // NOLINT - deprecated, removal 2026.9.0
-}
-
 void rgb_to_hsv(float red, float green, float blue, int &hue, float &saturation, float &value) {
   float max_color_value = std::max({red, green, blue});
   float min_color_value = std::min({red, green, blue});
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 5a9c120b84..b13d92ccce 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -1646,15 +1646,6 @@ bool base64_decode_int32_vector(const std::string &base64, std::vector<int32_t>
 /// @name Colors
 ///@{
 
-/// Applies gamma correction of \p gamma to \p value.
-// Remove before 2026.9.0
-ESPDEPRECATED("Use LightState::gamma_correct_lut() instead. Removed in 2026.9.0.", "2026.3.0")
-float gamma_correct(float value, float gamma);
-/// Reverts gamma correction of \p gamma to \p value.
-// Remove before 2026.9.0
-ESPDEPRECATED("Use LightState::gamma_uncorrect_lut() instead. Removed in 2026.9.0.", "2026.3.0")
-float gamma_uncorrect(float value, float gamma);
-
 /// Convert \p red, \p green and \p blue (all 0-1) values to \p hue (0-360), \p saturation (0-1) and \p value (0-1).
 void rgb_to_hsv(float red, float green, float blue, int &hue, float &saturation, float &value);
 /// Convert \p hue (0-360), \p saturation (0-1) and \p value (0-1) to \p red, \p green and \p blue (all 0-1).

From 160d8b8f0ccdb5362daf2b144131fe5e35355991 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 22:02:05 -0500
Subject: [PATCH 085/155] [web_server_idf] Remove deprecated
 AsyncWebServerRequest::url() (#18382)

---
 esphome/components/web_server_idf/web_server_idf.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/esphome/components/web_server_idf/web_server_idf.h b/esphome/components/web_server_idf/web_server_idf.h
index baa55898bb..6469b4c564 100644
--- a/esphome/components/web_server_idf/web_server_idf.h
+++ b/esphome/components/web_server_idf/web_server_idf.h
@@ -117,12 +117,6 @@ class AsyncWebServerRequest {
   /// Write URL (without query string) to buffer, returns StringRef pointing to buffer.
   /// URL is decoded (e.g., %20 -> space).
   StringRef url_to(std::span<char, URL_BUF_SIZE> buffer) const;
-  // Remove before 2026.9.0
-  ESPDEPRECATED("Use url_to() instead. Removed in 2026.9.0", "2026.3.0")
-  std::string url() const {
-    char buffer[URL_BUF_SIZE];
-    return std::string(this->url_to(buffer));
-  }
   // NOLINTNEXTLINE(readability-identifier-naming)
   size_t contentLength() const { return this->req_->content_len; }
 

From b2440cb655f794ec7a2d3e83f87fea0d99fc8ed8 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 22:02:22 -0500
Subject: [PATCH 086/155] [modbus] Remove deprecated waiting_for_response()
 (#18381)

---
 esphome/components/modbus/modbus.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/esphome/components/modbus/modbus.h b/esphome/components/modbus/modbus.h
index bb303c43a8..e5cbba88ec 100644
--- a/esphome/components/modbus/modbus.h
+++ b/esphome/components/modbus/modbus.h
@@ -618,9 +618,6 @@ class ModbusClientDevice {
   inline void clear_tx_queue_for_address() { this->parent_->clear_tx_queue_for_address(this->address_); }
   inline void clear_tx_queue_for_device() { this->parent_->clear_tx_queue_for_device(this); }
 
-  // If more than one device is connected block sending a new command before a response is received
-  ESPDEPRECATED("Use ready_for_immediate_send() instead. Removed in 2026.9.0", "2026.3.0")
-  bool waiting_for_response() { return !this->ready_for_immediate_send(); }
   bool ready_for_immediate_send() { return this->parent_->tx_buffer_empty() && !this->parent_->tx_blocked(); }
 
  protected:

From 02da5c6484ecc478f80617ed956c9337dd42f653 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 22:02:41 -0500
Subject: [PATCH 087/155] [ethernet] Remove deprecated
 get_eth_mac_address_pretty() (#18379)

---
 esphome/components/ethernet/ethernet_component.h         | 3 ---
 esphome/components/ethernet/ethernet_component_esp32.cpp | 5 -----
 esphome/components/ethernet/ethernet_component_rp2.cpp   | 5 -----
 3 files changed, 13 deletions(-)

diff --git a/esphome/components/ethernet/ethernet_component.h b/esphome/components/ethernet/ethernet_component.h
index 2da070b5e0..1482e7a828 100644
--- a/esphome/components/ethernet/ethernet_component.h
+++ b/esphome/components/ethernet/ethernet_component.h
@@ -159,9 +159,6 @@ class EthernetComponent final : public Component {
   const char *get_use_address() const { return this->use_address_; }
   void set_use_address(const char *use_address) { this->use_address_ = use_address; }
   void get_eth_mac_address_raw(uint8_t *mac);
-  // Remove before 2026.9.0
-  ESPDEPRECATED("Use get_eth_mac_address_pretty_into_buffer() instead. Removed in 2026.9.0", "2026.3.0")
-  std::string get_eth_mac_address_pretty();
   const char *get_eth_mac_address_pretty_into_buffer(std::span<char, MAC_ADDRESS_PRETTY_BUFFER_SIZE> buf);
   eth_duplex_t get_duplex_mode();
   eth_speed_t get_link_speed();
diff --git a/esphome/components/ethernet/ethernet_component_esp32.cpp b/esphome/components/ethernet/ethernet_component_esp32.cpp
index 4af2d5f93c..069478e70c 100644
--- a/esphome/components/ethernet/ethernet_component_esp32.cpp
+++ b/esphome/components/ethernet/ethernet_component_esp32.cpp
@@ -928,11 +928,6 @@ void EthernetComponent::get_eth_mac_address_raw(uint8_t *mac) {
   ESPHL_ERROR_CHECK(err, "ETH_CMD_G_MAC error");
 }
 
-std::string EthernetComponent::get_eth_mac_address_pretty() {
-  char buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
-  return std::string(this->get_eth_mac_address_pretty_into_buffer(buf));
-}
-
 const char *EthernetComponent::get_eth_mac_address_pretty_into_buffer(
     std::span<char, MAC_ADDRESS_PRETTY_BUFFER_SIZE> buf) {
   uint8_t mac[MAC_ADDRESS_SIZE];
diff --git a/esphome/components/ethernet/ethernet_component_rp2.cpp b/esphome/components/ethernet/ethernet_component_rp2.cpp
index 7f4db4fab7..94d84cc891 100644
--- a/esphome/components/ethernet/ethernet_component_rp2.cpp
+++ b/esphome/components/ethernet/ethernet_component_rp2.cpp
@@ -249,11 +249,6 @@ void EthernetComponent::get_eth_mac_address_raw(uint8_t *mac) {
   }
 }
 
-std::string EthernetComponent::get_eth_mac_address_pretty() {
-  char buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
-  return std::string(this->get_eth_mac_address_pretty_into_buffer(buf));
-}
-
 const char *EthernetComponent::get_eth_mac_address_pretty_into_buffer(
     std::span<char, MAC_ADDRESS_PRETTY_BUFFER_SIZE> buf) {
   uint8_t mac[MAC_ADDRESS_SIZE];

From d1f065671eab8fcfd25dae8106beedbcc0499452 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 22:21:04 -0500
Subject: [PATCH 088/155] [http_request] Abort OTA backend when update fails
 before first write (#18581)

---
 .../http_request/ota/ota_http_request.cpp       | 17 +++++++++--------
 .../http_request/ota/ota_http_request.h         |  3 +--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/esphome/components/http_request/ota/ota_http_request.cpp b/esphome/components/http_request/ota/ota_http_request.cpp
index 8893b96c65..7e7594c3c3 100644
--- a/esphome/components/http_request/ota/ota_http_request.cpp
+++ b/esphome/components/http_request/ota/ota_http_request.cpp
@@ -64,8 +64,9 @@ void OtaHttpRequestComponent::flash() {
   }
 }
 
-void OtaHttpRequestComponent::cleanup_(ota::OTABackendPtr backend, const std::shared_ptr<HttpContainer> &container) {
-  if (this->update_started_) {
+void OtaHttpRequestComponent::cleanup_(ota::OTABackendPtr backend, const std::shared_ptr<HttpContainer> &container,
+                                       bool abort_backend) {
+  if (abort_backend) {
     ESP_LOGV(TAG, "Aborting OTA backend");
     backend->abort();
   }
@@ -106,7 +107,8 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
   auto error_code = backend->begin(container->content_length);
   if (error_code != ota::OTA_RESPONSE_OK) {
     ESP_LOGW(TAG, "backend->begin error: %d", error_code);
-    this->cleanup_(std::move(backend), container);
+    // Nothing to abort: begin() failed, so no OTA handle was opened
+    this->cleanup_(std::move(backend), container, /*abort_backend=*/false);
     return error_code;
   }
 
@@ -140,7 +142,7 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
       } else {
         ESP_LOGE(TAG, "Error reading data: %d", bufsize_or_error);
       }
-      this->cleanup_(std::move(backend), container);
+      this->cleanup_(std::move(backend), container, /*abort_backend=*/true);
       return OTA_CONNECTION_ERROR;
     }
 
@@ -150,14 +152,13 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
       md5_receive.add(buf, bufsize_or_error);
 
       // write bytes to OTA backend
-      this->update_started_ = true;
       error_code = backend->write(buf, bufsize_or_error);
       if (error_code != ota::OTA_RESPONSE_OK) {
         // error code explanation available at
         // https://github.com/esphome/esphome/blob/dev/esphome/components/ota/ota_backend.h
         ESP_LOGE(TAG, "Error code (%02X) writing binary data to flash at offset %d and size %d", error_code,
                  container->get_bytes_read() - bufsize_or_error, container->content_length);
-        this->cleanup_(std::move(backend), container);
+        this->cleanup_(std::move(backend), container, /*abort_backend=*/true);
         return error_code;
       }
     }
@@ -181,7 +182,7 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
   this->md5_computed_ = md5_receive_str;
   if (strncmp(this->md5_computed_.c_str(), this->md5_expected_.c_str(), MD5_SIZE) != 0) {
     ESP_LOGE(TAG, "MD5 computed: %s - Aborting due to MD5 mismatch", this->md5_computed_.c_str());
-    this->cleanup_(std::move(backend), container);
+    this->cleanup_(std::move(backend), container, /*abort_backend=*/true);
     return ota::OTA_RESPONSE_ERROR_MD5_MISMATCH;
   } else {
     backend->set_update_md5(md5_receive_str);
@@ -197,7 +198,7 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
   error_code = backend->end();
   if (error_code != ota::OTA_RESPONSE_OK) {
     ESP_LOGW(TAG, "Error ending update! error_code: %d", error_code);
-    this->cleanup_(std::move(backend), container);
+    this->cleanup_(std::move(backend), container, /*abort_backend=*/true);
     return error_code;
   }
 
diff --git a/esphome/components/http_request/ota/ota_http_request.h b/esphome/components/http_request/ota/ota_http_request.h
index a706331d9a..9bb748f175 100644
--- a/esphome/components/http_request/ota/ota_http_request.h
+++ b/esphome/components/http_request/ota/ota_http_request.h
@@ -38,7 +38,7 @@ class OtaHttpRequestComponent final : public ota::OTAComponent, public Parented<
   void flash();
 
  protected:
-  void cleanup_(ota::OTABackendPtr backend, const std::shared_ptr<HttpContainer> &container);
+  void cleanup_(ota::OTABackendPtr backend, const std::shared_ptr<HttpContainer> &container, bool abort_backend);
   uint8_t do_ota_();
   std::string get_url_with_auth_(const std::string &url);
   bool http_get_md5_();
@@ -51,7 +51,6 @@ class OtaHttpRequestComponent final : public ota::OTAComponent, public Parented<
   std::string username_{};
   std::string url_{};
   int status_ = -1;
-  bool update_started_ = false;
   static const uint16_t HTTP_RECV_BUFFER = 256;  // the firmware GET chunk size
 };
 

From e697a40fda84887373d1ab3ba77bb3af64da8560 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 09:04:06 -0500
Subject: [PATCH 089/155] [core] Register the OTA component in dummy_main like
 its siblings (#18666)

---
 tests/dummy_main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/dummy_main.cpp b/tests/dummy_main.cpp
index 6fa0c08aa3..228d54ef01 100644
--- a/tests/dummy_main.cpp
+++ b/tests/dummy_main.cpp
@@ -29,6 +29,7 @@ void setup() {
 
   auto *ota = new esphome::ESPHomeOTAComponent();  // NOLINT
   ota->set_port(8266);
+  App.register_component_(ota);
 
   App.setup();
 }

From 33484108a982678208a9619d03e67d691df49f03 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 09:04:24 -0500
Subject: [PATCH 090/155] [core] Replace a damaged existing file in
 write_file_if_changed (#18665)

---
 esphome/helpers.py               | 13 ++++++++++++-
 tests/unit_tests/test_helpers.py | 25 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/esphome/helpers.py b/esphome/helpers.py
index 9b2a461ccd..7aa1a9a88c 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -552,7 +552,18 @@ def write_file_if_changed(path: Path, text: str) -> bool:
     """
     src_content = None
     if path.is_file():
-        src_content = read_file(path)
+        try:
+            src_content = path.read_text(encoding="utf-8")
+        except UnicodeDecodeError as err:
+            # Replace a damaged file rather than abort the regeneration that
+            # fixes it; an OSError may hide an intact file, so it still raises
+            _LOGGER.warning("Replacing damaged file %s: %s", path, err)
+            with suppress(OSError):
+                path.unlink(missing_ok=True)
+        except OSError as err:
+            from esphome.core import EsphomeError
+
+            raise EsphomeError(f"Error reading file {path}: {err}") from err
     if src_content == text:
         return False
     write_file(path, text)
diff --git a/tests/unit_tests/test_helpers.py b/tests/unit_tests/test_helpers.py
index 6e00e5b80f..eaa7d5a8dc 100644
--- a/tests/unit_tests/test_helpers.py
+++ b/tests/unit_tests/test_helpers.py
@@ -253,6 +253,31 @@ class Test_write_file_if_changed:
 
         assert dst.read_text() == text
 
+    def test_damaged_existing_file_is_replaced(
+        self, tmp_path: Path, caplog: pytest.LogCaptureFixture
+    ):
+        """A non-UTF-8 existing file is logged and overwritten."""
+        dst = tmp_path / "generated.txt"
+        dst.write_bytes(b"\xff\xfe")
+
+        assert helpers.write_file_if_changed(dst, "fresh content") is True
+
+        assert dst.read_text(encoding="utf-8") == "fresh content"
+        assert "Replacing damaged file" in caplog.text
+
+    def test_unreadable_existing_file_still_raises(self, tmp_path: Path):
+        """An OSError on the comparison read still raises EsphomeError."""
+        dst = tmp_path / "generated.txt"
+        dst.write_text("intact")
+
+        with (
+            patch.object(Path, "read_text", side_effect=OSError("permission denied")),
+            pytest.raises(EsphomeError, match="Error reading file"),
+        ):
+            helpers.write_file_if_changed(dst, "fresh content")
+
+        assert dst.exists()
+
     def test_dst_does_not_exist(self, tmp_path: Path):
         text = "A files are unique.\n"
         dst = tmp_path / "file-a.txt"

From e7574a574b6d5e2303df20edb73e64474ef23113 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 09:04:48 -0500
Subject: [PATCH 091/155] [ota] Restore lazy flash erase for ESP32 OTA with 64
 KiB block erase (#18580)

---
 .../components/esphome/ota/ota_esphome.cpp    |  2 +-
 esphome/components/ota/ota_backend.h          | 13 +++
 .../components/ota/ota_backend_esp_idf.cpp    | 86 +++++++++++++++----
 esphome/components/ota/ota_backend_esp_idf.h  | 19 +++-
 .../components/ota/ota_bootloader_esp_idf.cpp | 11 ++-
 .../components/ota/ota_signature_esp_idf.cpp  |  2 +-
 tests/components/ota/test_erase_ahead.cpp     | 41 +++++++++
 7 files changed, 153 insertions(+), 21 deletions(-)
 create mode 100644 tests/components/ota/test_erase_ahead.cpp

diff --git a/esphome/components/esphome/ota/ota_esphome.cpp b/esphome/components/esphome/ota/ota_esphome.cpp
index 9cbb25b373..74f84b71fb 100644
--- a/esphome/components/esphome/ota/ota_esphome.cpp
+++ b/esphome/components/esphome/ota/ota_esphome.cpp
@@ -398,7 +398,7 @@ void ESPHomeOTAComponent::handle_data_() {
   this->notify_state_(ota::OTA_STARTED, 0.0f, 0);
 #endif
 
-  // begin() may block for a few seconds while it locks flash.
+  // begin() returns quickly; flash sectors are erased incrementally during write().
   error_code = this->backend_->begin(ota_size, ota_type);
   if (error_code != ota::OTA_RESPONSE_OK)
     goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
diff --git a/esphome/components/ota/ota_backend.h b/esphome/components/ota/ota_backend.h
index aa93df60a5..1c24fc320a 100644
--- a/esphome/components/ota/ota_backend.h
+++ b/esphome/components/ota/ota_backend.h
@@ -66,6 +66,19 @@ enum OTAResponseTypes {
  */
 bool version_is_older(const char *candidate, const char *reference);
 
+// 64 KiB flash block; the erase granularity the ESP-IDF backend erases ahead with.
+static constexpr size_t OTA_BLOCK_ERASE_SIZE = 64 * 1024;
+
+/** Target erased watermark for lazy block erase-ahead.
+ *
+ * Rounds the write end offset up to a block boundary, clamped to the partition
+ * size. Platform-independent so the arithmetic is host-testable.
+ */
+constexpr size_t next_erase_end(size_t write_end, size_t partition_size) {
+  const size_t rounded = (write_end + OTA_BLOCK_ERASE_SIZE - 1) & ~(OTA_BLOCK_ERASE_SIZE - 1);
+  return rounded < partition_size ? rounded : partition_size;
+}
+
 enum OTAState {
   OTA_COMPLETED = 0,
   OTA_STARTED,
diff --git a/esphome/components/ota/ota_backend_esp_idf.cpp b/esphome/components/ota/ota_backend_esp_idf.cpp
index eb23ad82dd..f33f37bbeb 100644
--- a/esphome/components/ota/ota_backend_esp_idf.cpp
+++ b/esphome/components/ota/ota_backend_esp_idf.cpp
@@ -7,7 +7,7 @@
 #include "esphome/core/log.h"
 
 #include <esp_ota_ops.h>
-#include <esp_task_wdt.h>
+#include <sdkconfig.h>
 #include <spi_flash_mmap.h>
 #ifdef USE_OTA_DOWNGRADE_PROTECTION
 #include <esp_app_desc.h>
@@ -60,27 +60,38 @@ OTAResponseTypes IDFOTABackend::begin(size_t image_size, ota::OTAType ota_type)
     return OTA_RESPONSE_ERROR_NO_UPDATE_PARTITION;
   }
 
-  // esp_ota_begin() erases the destination region, which blocks loopTask and
-  // scales with the erase size -- a fixed watchdog overruns on large OTA slots.
-  // An unknown size (0, e.g. web_server uploads) erases the whole partition, so
-  // budget against the bytes actually erased. ~10ms/KiB (conservative
-  // ~100 KiB/s erase) over a 15s floor; panic stays on so a stuck erase still
-  // resets rather than hanging forever.
-  size_t erase_size = image_size;
-  if (erase_size == 0 || erase_size > this->partition_->size) {
-    erase_size = this->partition_->size;
+  // Both lazy-erase paths below replace esp_ota_begin()'s blocking full erase.
+  // Size check replaces the one that erase performed (0 = unknown size,
+  // e.g. web_server uploads).
+  if (image_size != 0 && image_size > this->partition_->size) {
+    return OTA_RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE;
   }
-  const uint32_t erase_budget_ms = 15000 + (erase_size >> 10) * 10;
-  watchdog::WatchdogManager watchdog(erase_budget_ms);
-  esp_err_t err = esp_ota_begin(this->partition_, image_size, &this->update_handle_);
+  this->written_ = 0;
+  esp_err_t err;
+#ifdef USE_OTA_BLOCK_ERASE_AHEAD
+  this->erased_end_ = 0;
+  // Unlike esp_ota_begin(), esp_ota_resume() does not reject a running app in
+  // ESP_OTA_IMG_PENDING_VERIFY; that state is unreachable here because the app
+  // was marked valid at boot (esp32/hal.cpp) or just above under USE_OTA_ROLLBACK.
+  // erase_size 0 (!= OTA_WITH_SEQUENTIAL_WRITES) means no erase; erase_ahead_() handles it
+  err = esp_ota_resume(this->partition_, 0, 0, &this->update_handle_);
+#if defined(CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE) && ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 5, 0)
+  // esp_ota_begin() does this on IDF 5.5+; esp_ota_resume() does not. Prevents
+  // booting a half-written slot after a crash mid-OTA. Not available on the
+  // 5.3.3/5.4.2 backports, whose esp_ota_begin() did not invalidate either.
+  if (err == ESP_OK) {
+    esp_ota_invalidate_inactive_ota_data_slot();
+  }
+#endif
+#else
+  err = esp_ota_begin(this->partition_, OTA_WITH_SEQUENTIAL_WRITES, &this->update_handle_);
+#endif
 
   if (err != ESP_OK) {
-    ESP_LOGE(TAG, "esp_ota_begin failed (err=0x%X)", err);
+    ESP_LOGE(TAG, "OTA begin failed (err=0x%X)", err);
     esp_ota_abort(this->update_handle_);
     this->update_handle_ = 0;
-    if (err == ESP_ERR_INVALID_SIZE) {
-      return OTA_RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE;
-    } else if (err == ESP_ERR_FLASH_OP_TIMEOUT || err == ESP_ERR_FLASH_OP_FAIL) {
+    if (err == ESP_ERR_FLASH_OP_TIMEOUT || err == ESP_ERR_FLASH_OP_FAIL) {
       return OTA_RESPONSE_ERROR_WRITING_FLASH;
     } else if (err == ESP_ERR_OTA_PARTITION_CONFLICT) {
       // This error appears with 1 factory and 1 ota partition
@@ -120,6 +131,17 @@ OTAResponseTypes IDFOTABackend::write(uint8_t *data, size_t len) {
   if (!this->is_app_or_bootloader_update_()) {
     return OTA_RESPONSE_ERROR_UNSUPPORTED_OTA_TYPE;
   }
+#endif
+  // Overflow can only happen on unknown-size uploads (web_server); known
+  // sizes were rejected in begin().
+  if (this->written_ + len > this->partition_->size) {
+    return OTA_RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE;
+  }
+#ifdef USE_OTA_BLOCK_ERASE_AHEAD
+  OTAResponseTypes erase_result = this->erase_ahead_(len);
+  if (erase_result != OTA_RESPONSE_OK) {
+    return erase_result;
+  }
 #endif
   esp_err_t err = esp_ota_write(this->update_handle_, data, len);
   this->md5_.add(data, len);
@@ -127,14 +149,40 @@ OTAResponseTypes IDFOTABackend::write(uint8_t *data, size_t len) {
     ESP_LOGE(TAG, "esp_ota_write failed (err=0x%X)", err);
     if (err == ESP_ERR_OTA_VALIDATE_FAILED) {
       return OTA_RESPONSE_ERROR_MAGIC;
+    } else if (err == ESP_ERR_INVALID_SIZE) {
+      // Sequential-writes fallback: IDF's lazy erase reports overflow here
+      return OTA_RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE;
     } else if (err == ESP_ERR_FLASH_OP_TIMEOUT || err == ESP_ERR_FLASH_OP_FAIL) {
       return OTA_RESPONSE_ERROR_WRITING_FLASH;
     }
     return OTA_RESPONSE_ERROR_UNKNOWN;
   }
+  this->written_ += len;
   return OTA_RESPONSE_OK;
 }
 
+#ifdef USE_OTA_BLOCK_ERASE_AHEAD
+OTAResponseTypes IDFOTABackend::erase_ahead_(size_t len) {
+  const size_t end = this->written_ + len;
+  if (this->erased_end_ >= end) {
+    return OTA_RESPONSE_OK;
+  }
+  // Round up to a block boundary, clamped to the partition end; IDF splits the
+  // range into 64 KiB block erases where aligned, sector erases elsewhere.
+  const size_t erase_to = next_erase_end(end, this->partition_->size);
+  // A block erase is one uninterruptible flash op (typically ~150 ms, seconds
+  // on aged flash) and the transfer loop may not have fed the WDT for ~1s.
+  watchdog::WatchdogManager watchdog(15000);
+  esp_err_t err = esp_partition_erase_range(this->partition_, this->erased_end_, erase_to - this->erased_end_);
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "esp_partition_erase_range failed (err=0x%X)", err);
+    return err == ESP_ERR_INVALID_SIZE ? OTA_RESPONSE_ERROR_ESP32_NOT_ENOUGH_SPACE : OTA_RESPONSE_ERROR_WRITING_FLASH;
+  }
+  this->erased_end_ = erase_to;
+  return OTA_RESPONSE_OK;
+}
+#endif
+
 OTAResponseTypes IDFOTABackend::end() {
   if (this->md5_set_) {
     this->md5_.calculate();
@@ -226,6 +274,10 @@ void IDFOTABackend::abort() {
   // or not an update is in flight.
   esp_ota_abort(this->update_handle_);
   this->update_handle_ = 0;
+  this->written_ = 0;
+#ifdef USE_OTA_BLOCK_ERASE_AHEAD
+  this->erased_end_ = 0;
+#endif
 }
 
 }  // namespace esphome::ota
diff --git a/esphome/components/ota/ota_backend_esp_idf.h b/esphome/components/ota/ota_backend_esp_idf.h
index 9dffd5429e..c991f896e8 100644
--- a/esphome/components/ota/ota_backend_esp_idf.h
+++ b/esphome/components/ota/ota_backend_esp_idf.h
@@ -5,8 +5,18 @@
 #include "esphome/components/md5/md5.h"
 #include "esphome/core/defines.h"
 
+#include <esp_idf_version.h>
 #include <esp_ota_ops.h>
 
+// esp_ota_resume() (IDF 5.4.2+, backported to 5.3.3) provides a no-erase OTA
+// handle, letting write() block-erase 64 KiB ahead of the write cursor
+// (~4x faster than the per-sector lazy erase of OTA_WITH_SEQUENTIAL_WRITES,
+// used as fallback on older IDF).
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 2) || \
+    (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 3) && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0))
+#define USE_OTA_BLOCK_ERASE_AHEAD
+#endif
+
 namespace esphome::ota {
 
 #ifdef USE_OTA_PARTITIONS
@@ -54,6 +64,9 @@ class IDFOTABackend final {
 #endif
 
  private:
+#ifdef USE_OTA_BLOCK_ERASE_AHEAD
+  OTAResponseTypes erase_ahead_(size_t len);
+#endif
 #ifdef USE_OTA_SIGNED_VERIFICATION_MULTI_KEY
   // Accept an image signed by any key the running app trusts (up to 3 blocks),
   // so rotation and backup keys work. Fails closed. Covers app and bootloader.
@@ -62,7 +75,11 @@ class IDFOTABackend final {
   // Keep md5_ first since its digest_ is alignas(32) on DMA-SHA variants; md5_set_ stays last so buf_ packs tightly.
   md5::MD5Digest md5_{};
   esp_ota_handle_t update_handle_{0};
-  const esp_partition_t *partition_;
+  const esp_partition_t *partition_{nullptr};
+  size_t written_{0};  // Bytes handed to esp_ota_write()
+#ifdef USE_OTA_BLOCK_ERASE_AHEAD
+  size_t erased_end_{0};  // Erased up to this partition offset; must stay >= written_
+#endif
   char expected_bin_md5_[32];
   bool md5_set_{false};
 #ifdef USE_OTA_PARTITIONS
diff --git a/esphome/components/ota/ota_bootloader_esp_idf.cpp b/esphome/components/ota/ota_bootloader_esp_idf.cpp
index 57b5529350..5a83d92689 100644
--- a/esphome/components/ota/ota_bootloader_esp_idf.cpp
+++ b/esphome/components/ota/ota_bootloader_esp_idf.cpp
@@ -1,6 +1,7 @@
 #ifdef USE_ESP32
 #include "ota_backend_esp_idf.h"
 
+#include "esphome/components/watchdog/watchdog.h"
 #include "esphome/core/defines.h"
 
 #ifdef USE_OTA_PARTITIONS
@@ -69,12 +70,20 @@ OTAResponseTypes IDFOTABackend::setup_bootloader_staging_() {
     return OTA_RESPONSE_ERROR_BOOTLOADER_VERIFY;
   }
   // Erase full size of the bootloader partition in the staging partition
-  // to avoid copying old data to the bootloader partition later
+  // to avoid copying old data to the bootloader partition later. Up to
+  // ESP_BOOTLOADER_SIZE of blocking erase; widen the WDT for its duration.
+  watchdog::WatchdogManager watchdog(15000);
   esp_err_t err = esp_partition_erase_range(this->partition_, 0, this->bootloader_part_->size);
   if (err != ESP_OK) {
     ESP_LOGW(TAG, "esp_partition_erase_range failed (err=0x%X)", err);
     // No critical error, don't return
   }
+#ifdef USE_OTA_BLOCK_ERASE_AHEAD
+  if (err == ESP_OK) {
+    // Skip re-erasing the pre-erased staging region in erase_ahead_()
+    this->erased_end_ = this->bootloader_part_->size;
+  }
+#endif
   err = esp_ota_set_final_partition(this->update_handle_, this->bootloader_part_, false);
   if (err != ESP_OK) {
     esp_ota_abort(this->update_handle_);
diff --git a/esphome/components/ota/ota_signature_esp_idf.cpp b/esphome/components/ota/ota_signature_esp_idf.cpp
index 71dcc0eb83..501d6ac241 100644
--- a/esphome/components/ota/ota_signature_esp_idf.cpp
+++ b/esphome/components/ota/ota_signature_esp_idf.cpp
@@ -211,7 +211,7 @@ bool rsa_pss_verify(uint8_t *block, const uint8_t *digest) {
 bool IDFOTABackend::verify_signed_image_(const esp_partition_t *incoming) {
   // Verification re-hashes the full image (after esp_ota_end already did one
   // pass), which can approach the task WDT budget on a large app. Extend it for
-  // the duration, mirroring the erase budget in begin().
+  // the duration, scaled to the image size over a 15 s floor.
   const uint32_t verify_budget_ms = 15000 + (incoming->size >> 10) * 10;
   watchdog::WatchdogManager watchdog(verify_budget_ms);
 
diff --git a/tests/components/ota/test_erase_ahead.cpp b/tests/components/ota/test_erase_ahead.cpp
new file mode 100644
index 0000000000..f84dd8a85d
--- /dev/null
+++ b/tests/components/ota/test_erase_ahead.cpp
@@ -0,0 +1,41 @@
+// Pins the lazy erase-ahead arithmetic used by the ESP-IDF OTA backend: the
+// erased watermark must always cover the write end, stay 64 KiB block-aligned
+// until the clamp, and never exceed the partition.
+
+#include <gtest/gtest.h>
+
+#include "esphome/components/ota/ota_backend.h"
+
+namespace esphome::ota::testing {
+
+static constexpr size_t BLOCK = 64 * 1024;
+static constexpr size_t PART = 1835008;  // 0x1C0000, a real app slot size
+
+TEST(NextEraseEnd, FirstWriteRoundsUpToOneBlock) { EXPECT_EQ(next_erase_end(1024, PART), BLOCK); }
+
+TEST(NextEraseEnd, ExactBlockBoundaryDoesNotOverErase) { EXPECT_EQ(next_erase_end(BLOCK, PART), BLOCK); }
+
+TEST(NextEraseEnd, StraddlingWriteCoversNextBlock) { EXPECT_EQ(next_erase_end(BLOCK + 1, PART), 2 * BLOCK); }
+
+TEST(NextEraseEnd, ClampsToPartitionEnd) {
+  // Partition sizes are sector multiples but not always block multiples
+  constexpr size_t part = 27 * BLOCK + 4096;
+  EXPECT_EQ(next_erase_end(27 * BLOCK + 1, part), part);
+  EXPECT_EQ(next_erase_end(part, part), part);
+}
+
+// Bootloader staging seeds erased_end_ mid-block (e.g. 0x8000); the target for
+// a write past that seed must still cover the write end.
+TEST(NextEraseEnd, MidBlockSeedStillCovered) { EXPECT_EQ(next_erase_end(0x8000 + 1024, PART), BLOCK); }
+
+TEST(NextEraseEnd, SweepAlwaysCoversWriteEndWithinPartition) {
+  for (size_t end = 1; end <= PART; end += 4093) {
+    const size_t erased = next_erase_end(end, PART);
+    ASSERT_GE(erased, end);
+    ASSERT_LE(erased, PART);
+    // Block-aligned unless clamped at the partition end
+    ASSERT_TRUE(erased == PART || erased % BLOCK == 0);
+  }
+}
+
+}  // namespace esphome::ota::testing

From cf31c08a5cc0b92c667966bf5abc55e9c0b502e8 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 09:05:04 -0500
Subject: [PATCH 092/155] [core] Skip copying entity automation and filter
 sources when unused (#18602)

---
 esphome/components/binary_sensor/__init__.py  | 18 +++++++++
 .../components/binary_sensor/automation.cpp   | 12 ++++++
 esphome/components/esp32/__init__.py          |  8 ++++
 esphome/components/esp32/gpio.cpp             |  7 +++-
 esphome/components/esp32/gpio.py              |  1 +
 esphome/components/ota/__init__.py            | 38 +++++++++----------
 esphome/components/sensor/__init__.py         |  6 +++
 esphome/components/text_sensor/__init__.py    |  6 +++
 esphome/components/uptime/sensor/__init__.py  | 11 ++----
 esphome/config_helpers.py                     | 25 ++++++++++++
 esphome/core/defines.h                        |  3 ++
 tests/components/binary_sensor/common.yaml    | 16 ++++++++
 tests/unit_tests/test_config_helpers.py       | 24 ++++++++++++
 13 files changed, 145 insertions(+), 30 deletions(-)

diff --git a/esphome/components/binary_sensor/__init__.py b/esphome/components/binary_sensor/__init__.py
index 5800e0bd9e..1ab6f7103f 100644
--- a/esphome/components/binary_sensor/__init__.py
+++ b/esphome/components/binary_sensor/__init__.py
@@ -5,6 +5,7 @@ from esphome.automation import Condition, maybe_simple_id
 import esphome.codegen as cg
 from esphome.components import mqtt, web_server, zigbee
 from esphome.components.const import CONF_ON_STATE_CHANGE
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_DELAY,
@@ -560,6 +561,11 @@ _CALLBACK_AUTOMATIONS = (
 async def _build_binary_sensor_automations(var, config):
     await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)
 
+    if config.get(CONF_ON_CLICK) or config.get(CONF_ON_DOUBLE_CLICK):
+        cg.add_define("USE_BINARY_SENSOR_CLICK_TRIGGER")
+    if config.get(CONF_ON_MULTI_CLICK):
+        cg.add_define("USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER")
+
     for conf in config.get(CONF_ON_CLICK, []):
         trigger = cg.new_Pvariable(
             conf[CONF_TRIGGER_ID], var, conf[CONF_MIN_LENGTH], conf[CONF_MAX_LENGTH]
@@ -673,3 +679,15 @@ async def to_code(config):
 async def binary_sensor_invalidate_state_to_code(config, action_id, template_arg, args):
     paren = await cg.get_variable(config[CONF_ID])
     return cg.new_Pvariable(action_id, template_arg, paren)
+
+
+# automation.cpp only implements the click/double_click/multi_click triggers
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {
+        "automation.cpp": (
+            "USE_BINARY_SENSOR_CLICK_TRIGGER",
+            "USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER",
+        ),
+        "filter.cpp": "USE_BINARY_SENSOR_FILTER",
+    }
+)
diff --git a/esphome/components/binary_sensor/automation.cpp b/esphome/components/binary_sensor/automation.cpp
index b13e4a88dd..1a3c1f7536 100644
--- a/esphome/components/binary_sensor/automation.cpp
+++ b/esphome/components/binary_sensor/automation.cpp
@@ -1,8 +1,13 @@
+#include "esphome/core/defines.h"
+#if defined(USE_BINARY_SENSOR_CLICK_TRIGGER) || defined(USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER)
+
 #include "automation.h"
 #include "esphome/core/log.h"
 
 namespace esphome::binary_sensor {
 
+#ifdef USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER
+
 static const char *const TAG = "binary_sensor.automation";
 
 // MultiClickTrigger timeout IDs.
@@ -120,6 +125,9 @@ void MultiClickTriggerBase::trigger_() {
   this->trigger();
 }
 
+#endif  // USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER
+
+#ifdef USE_BINARY_SENSOR_CLICK_TRIGGER
 bool match_interval(uint32_t min_length, uint32_t max_length, uint32_t length) {
   if (max_length == 0) {
     return length >= min_length;
@@ -127,4 +135,8 @@ bool match_interval(uint32_t min_length, uint32_t max_length, uint32_t length) {
     return length >= min_length && length <= max_length;
   }
 }
+#endif  // USE_BINARY_SENSOR_CLICK_TRIGGER
+
 }  // namespace esphome::binary_sensor
+
+#endif  // USE_BINARY_SENSOR_CLICK_TRIGGER || USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER
diff --git a/esphome/components/esp32/__init__.py b/esphome/components/esp32/__init__.py
index 501c2e525f..cde0cfd68b 100644
--- a/esphome/components/esp32/__init__.py
+++ b/esphome/components/esp32/__init__.py
@@ -12,6 +12,7 @@ from typing import Any
 from esphome import yaml_util
 import esphome.codegen as cg
 from esphome.components.const import CONF_ENABLE_OTA_DOWNGRADE_PROTECTION
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ADVANCED,
@@ -3451,3 +3452,10 @@ def process_stacktrace(config, line, backtrace_state):
             _decode_pc(config, addr.group())
 
     return backtrace_state
+
+
+# gpio.cpp only implements ESP32InternalGPIOPin and its ISR helpers, which
+# are instantiated solely by the pin schema codegen (esp32_pin_to_code)
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {"gpio.cpp": "USE_ESP32_INTERNAL_GPIO"}
+)
diff --git a/esphome/components/esp32/gpio.cpp b/esphome/components/esp32/gpio.cpp
index 4b53d3a172..74665f3126 100644
--- a/esphome/components/esp32/gpio.cpp
+++ b/esphome/components/esp32/gpio.cpp
@@ -1,4 +1,7 @@
-#ifdef USE_ESP32
+#include "esphome/core/defines.h"
+// Also defines the core ISRInternalGPIOPin methods; those are only reachable
+// via ESP32InternalGPIOPin::to_isr(), so the same define gates both safely.
+#if defined(USE_ESP32) && defined(USE_ESP32_INTERNAL_GPIO)
 
 #include "gpio.h"
 #include "esphome/core/log.h"
@@ -204,4 +207,4 @@ void IRAM_ATTR ISRInternalGPIOPin::pin_mode(gpio::Flags flags) {
 
 }  // namespace esphome
 
-#endif  // USE_ESP32
+#endif  // USE_ESP32 && USE_ESP32_INTERNAL_GPIO
diff --git a/esphome/components/esp32/gpio.py b/esphome/components/esp32/gpio.py
index 321dd3d498..98aac209ec 100644
--- a/esphome/components/esp32/gpio.py
+++ b/esphome/components/esp32/gpio.py
@@ -257,6 +257,7 @@ ESP32_PIN_SCHEMA = cv.All(
 
 @pins.PIN_SCHEMA_REGISTRY.register(PLATFORM_ESP32, ESP32_PIN_SCHEMA)
 async def esp32_pin_to_code(config):
+    cg.add_define("USE_ESP32_INTERNAL_GPIO")
     var = cg.new_Pvariable(config[CONF_ID])
     num = config[CONF_NUMBER]
     cg.add(var.set_pin(getattr(gpio_num_t, f"GPIO_NUM_{num}")))
diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index 5240db9e8f..a2e6953a16 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -1,6 +1,9 @@
 from esphome import automation
 import esphome.codegen as cg
-from esphome.config_helpers import filter_source_files_from_platform
+from esphome.config_helpers import (
+    filter_source_files_from_defines,
+    filter_source_files_from_platform,
+)
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ESPHOME,
@@ -171,24 +174,17 @@ _filter_backend_source_files = filter_source_files_from_platform(
 )
 
 
+# USE_OTA_SIGNED_VERIFICATION_MULTI_KEY is set only on ESP32/IDF;
+# USE_OTA_PARTITIONS is set by the esphome OTA platform when
+# allow_partition_access is enabled.
+_filter_define_source_files = filter_source_files_from_defines(
+    {
+        "ota_signature_esp_idf.cpp": "USE_OTA_SIGNED_VERIFICATION_MULTI_KEY",
+        "ota_bootloader_esp_idf.cpp": "USE_OTA_PARTITIONS",
+        "ota_partitions_esp_idf.cpp": "USE_OTA_PARTITIONS",
+    }
+)
+
+
 def FILTER_SOURCE_FILES() -> list[str]:
-    files = _filter_backend_source_files()
-    # ota_signature_esp_idf.cpp implements multi-key OTA signature verification,
-    # compiled only when the esp32 component enables it (external RSA signed
-    # OTA sets USE_OTA_SIGNED_VERIFICATION_MULTI_KEY). The define is set only on
-    # ESP32/IDF, so this also excludes the file on every other platform. Filter
-    # it out otherwise so the (otherwise fully #ifdef'd-out) file isn't opened
-    # and parsed on every build.
-    if not any(
-        define.name == "USE_OTA_SIGNED_VERIFICATION_MULTI_KEY"
-        for define in CORE.defines
-    ):
-        files.append("ota_signature_esp_idf.cpp")
-    # ota_bootloader_esp_idf.cpp and ota_partitions_esp_idf.cpp are fully
-    # #ifdef'd on USE_OTA_PARTITIONS (set by the esphome OTA platform when
-    # allow_partition_access is enabled). Filter them out otherwise for the
-    # same reason as above.
-    if not any(define.name == "USE_OTA_PARTITIONS" for define in CORE.defines):
-        files.append("ota_bootloader_esp_idf.cpp")
-        files.append("ota_partitions_esp_idf.cpp")
-    return files
+    return _filter_backend_source_files() + _filter_define_source_files()
diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 6ad76046a1..79d4ce5e0c 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -5,6 +5,7 @@ from esphome import automation
 import esphome.codegen as cg
 from esphome.components import mqtt, web_server, zigbee
 from esphome.components.const import CONF_B_CONSTANT
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ABOVE,
@@ -1303,3 +1304,8 @@ def _lstsq(a, b):
 @coroutine_with_priority(CoroPriority.CORE)
 async def to_code(config):
     cg.add_global(sensor_ns.using)
+
+
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {"filter.cpp": "USE_SENSOR_FILTER"}
+)
diff --git a/esphome/components/text_sensor/__init__.py b/esphome/components/text_sensor/__init__.py
index a3f4999a8f..29399a51b7 100644
--- a/esphome/components/text_sensor/__init__.py
+++ b/esphome/components/text_sensor/__init__.py
@@ -1,6 +1,7 @@
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import mqtt, web_server
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_DEVICE_CLASS,
@@ -256,3 +257,8 @@ async def text_sensor_state_to_code(config, condition_id, template_arg, args):
     templ = await cg.templatable(config[CONF_STATE], args, cg.std_string)
     cg.add(var.set_state(templ))
     return var
+
+
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {"filter.cpp": "USE_TEXT_SENSOR_FILTER"}
+)
diff --git a/esphome/components/uptime/sensor/__init__.py b/esphome/components/uptime/sensor/__init__.py
index debeb41444..dd76bb5a87 100644
--- a/esphome/components/uptime/sensor/__init__.py
+++ b/esphome/components/uptime/sensor/__init__.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import sensor, time
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_TIME_ID,
@@ -10,7 +11,6 @@ from esphome.const import (
     STATE_CLASS_TOTAL_INCREASING,
     UNIT_SECOND,
 )
-from esphome.core import CORE
 
 uptime_ns = cg.esphome_ns.namespace("uptime")
 UptimeSecondsSensor = uptime_ns.class_(
@@ -62,9 +62,6 @@ async def to_code(config):
         cg.add(var.set_time(time_id))
 
 
-def FILTER_SOURCE_FILES() -> list[str]:
-    # uptime_timestamp_sensor.cpp is fully #ifdef'd on USE_TIME; skip it
-    # when no time component is configured.
-    if not any(define.name == "USE_TIME" for define in CORE.defines):
-        return ["uptime_timestamp_sensor.cpp"]
-    return []
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {"uptime_timestamp_sensor.cpp": "USE_TIME"}
+)
diff --git a/esphome/config_helpers.py b/esphome/config_helpers.py
index c82c2b3dbe..60bed1537e 100644
--- a/esphome/config_helpers.py
+++ b/esphome/config_helpers.py
@@ -151,6 +151,31 @@ def filter_source_files_from_platform(
     return filter_source_files
 
 
+def filter_source_files_from_defines(
+    files_map: dict[str, str | tuple[str, ...]],
+) -> Callable[[], list[str]]:
+    """Helper to build a FILTER_SOURCE_FILES function from a define mapping.
+
+    Args:
+        files_map: Dict mapping filename to the define name (or tuple of
+            define names) that keeps the file in the build; the file is
+            excluded when none of its defines is set for the current config.
+
+    Returns:
+        Function that returns the files to exclude for the current config.
+    """
+
+    def filter_source_files() -> list[str]:
+        defines = {define.name for define in CORE.defines}
+        return [
+            filename
+            for filename, needed in files_map.items()
+            if defines.isdisjoint((needed,) if isinstance(needed, str) else needed)
+        ]
+
+    return filter_source_files
+
+
 def get_logger_level() -> str:
     """Get the configured logger level.
 
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index bb4960aec7..20aca3776f 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -43,7 +43,9 @@
 #define USE_ALARM_CONTROL_PANEL
 #define USE_AREAS
 #define USE_BINARY_SENSOR
+#define USE_BINARY_SENSOR_CLICK_TRIGGER
 #define USE_BINARY_SENSOR_FILTER
+#define USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER
 #define USE_BLE_DEVICE_IRK
 #define USE_BUTTON
 #define USE_CAMERA
@@ -281,6 +283,7 @@
 // ESP32-specific feature flags
 #ifdef USE_ESP32
 #define USE_ESP32_CRASH_HANDLER
+#define USE_ESP32_INTERNAL_GPIO
 #define USE_MQTT_IDF_ENQUEUE
 #define USE_ESPHOME_TASK_LOG_BUFFER
 #define ESPHOME_TASK_LOG_BUFFER_SIZE 768
diff --git a/tests/components/binary_sensor/common.yaml b/tests/components/binary_sensor/common.yaml
index 4f4cf6ea59..d0a16cc99c 100644
--- a/tests/components/binary_sensor/common.yaml
+++ b/tests/components/binary_sensor/common.yaml
@@ -136,3 +136,19 @@ binary_sensor:
         invalid_cooldown: 2s
         then:
           - logger.log: "Click with custom cooldown"
+
+  # Test on_click and on_double_click (compiles match_interval via
+  # USE_BINARY_SENSOR_CLICK_TRIGGER)
+  - platform: template
+    id: click_triggers
+    name: "Click Triggers"
+    on_click:
+      min_length: 50ms
+      max_length: 350ms
+      then:
+        - logger.log: "Clicked"
+    on_double_click:
+      min_length: 50ms
+      max_length: 350ms
+      then:
+        - logger.log: "Double clicked"
diff --git a/tests/unit_tests/test_config_helpers.py b/tests/unit_tests/test_config_helpers.py
index 88913c0f23..e53016dfc3 100644
--- a/tests/unit_tests/test_config_helpers.py
+++ b/tests/unit_tests/test_config_helpers.py
@@ -6,6 +6,7 @@ from unittest.mock import patch
 import pytest
 
 from esphome.config_helpers import (
+    filter_source_files_from_defines,
     filter_source_files_from_platform,
     frameworks_for_platforms,
     get_logger_level,
@@ -18,6 +19,7 @@ from esphome.const import (
     KEY_TARGET_PLATFORM,
     PlatformFramework,
 )
+from esphome.core import Define
 
 
 def test_filter_source_files_from_platform_esp32() -> None:
@@ -148,3 +150,25 @@ def test_frameworks_for_platforms_derives_and_rejects_unknown() -> None:
     }
     with pytest.raises(ValueError, match="unknown platform"):
         frameworks_for_platforms(["esp32", "not_a_platform"])
+
+
+def test_filter_source_files_from_defines() -> None:
+    """Files are excluded unless one of their defines is set."""
+    files_map: dict[str, str | tuple[str, ...]] = {
+        "filter.cpp": "USE_SENSOR_FILTER",
+        "automation.cpp": ("USE_CLICK", "USE_MULTI_CLICK"),
+    }
+    filter_func: Callable[[], list[str]] = filter_source_files_from_defines(files_map)
+
+    with patch("esphome.config_helpers.CORE") as mock_core:
+        mock_core.defines = {Define("USE_SENSOR_FILTER")}
+        assert filter_func() == ["automation.cpp"]
+
+        mock_core.defines = {Define("USE_MULTI_CLICK")}
+        assert filter_func() == ["filter.cpp"]
+
+        mock_core.defines = {Define("USE_SENSOR_FILTER"), Define("USE_CLICK")}
+        assert filter_func() == []
+
+        mock_core.defines = set()
+        assert sorted(filter_func()) == ["automation.cpp", "filter.cpp"]

From f741c274d577f748afc31b9156b1daecca9392cc Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Sun, 23 Aug 2026 15:55:42 +0000
Subject: [PATCH 093/155] Bump aioesphomeapi from 45.13.1 to 46.0.0 (#18683)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 3362e43239..822eebc1f2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pyserial==3.5
 platformio==6.1.19
 esptool==5.3.1
 click==8.3.3
-aioesphomeapi==45.13.1
+aioesphomeapi==46.0.0
 aiohappyeyeballs==2.7.1  # Happy Eyeballs for requests downloads; already pulled in by aioesphomeapi
 zeroconf==0.150.0
 puremagic==2.2.0

From 4efd30834575606ffc878549d7c4626c79e5eba4 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 11:26:55 -0500
Subject: [PATCH 094/155] [tests] Fix flaky pty log probe test on macOS
 (#18681)

---
 tests/unit_tests/test_log.py | 48 +++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/tests/unit_tests/test_log.py b/tests/unit_tests/test_log.py
index 194b38209b..40e3aa6d22 100644
--- a/tests/unit_tests/test_log.py
+++ b/tests/unit_tests/test_log.py
@@ -1,5 +1,4 @@
 from collections.abc import Generator
-import errno
 import io
 import logging
 import os
@@ -178,37 +177,34 @@ def _run_probe_on_pty(
     output = b""
     deadline = time.monotonic() + 60
     try:
-        try:
-            proc = subprocess.Popen(
-                _probe_command(fixture_path),
-                stdout=follower,
-                stderr=follower if stderr_to_pty else subprocess.PIPE,
-                stdin=follower,
-                env=probe_env,
-            )
-        finally:
-            os.close(follower)
-        while True:
-            timeout = deadline - time.monotonic()
-            if timeout <= 0 or not select.select([controller], [], [], timeout)[0]:
-                pytest.fail(f"pty probe produced no EOF in time; got {output!r}")
-            try:
-                chunk = os.read(controller, 1024)
-            except OSError as err:
-                # macOS raises EIO once the child closes its end of the pty;
-                # anything else is a real failure, not end-of-stream.
-                if err.errno != errno.EIO:
-                    raise
-                break
-            if not chunk:
-                break
+        proc = subprocess.Popen(
+            _probe_command(fixture_path),
+            stdout=follower,
+            stderr=follower if stderr_to_pty else subprocess.PIPE,
+            stdin=follower,
+            env=probe_env,
+        )
+        # The parent keeps the follower open until the child has exited and
+        # the controller is drained: macOS discards buffered pty output once
+        # the last follower closes, so closing it early loses the probe's
+        # output whenever the child finishes before the first read.
+        while proc.poll() is None:
+            if time.monotonic() > deadline:
+                pytest.fail(f"pty probe did not exit in time; got {output!r}")
+            if select.select([controller], [], [], 0.01)[0]:
+                output += os.read(controller, 4096)
+        # Everything the child wrote is already buffered, so drain without waiting.
+        while select.select([controller], [], [], 0)[0] and (
+            chunk := os.read(controller, 4096)
+        ):
             output += chunk
         stderr_text = ""
         if proc.stderr is not None:
             stderr_text = proc.stderr.read().decode(errors="replace")
             proc.stderr.close()
-        assert proc.wait(60) == 0, stderr_text
+        assert proc.returncode == 0, stderr_text
     finally:
+        os.close(follower)
         os.close(controller)
         if proc is not None and proc.poll() is None:
             proc.kill()

From dde6906f980ecff7dedf08f289edf97b6e9ef5ba Mon Sep 17 00:00:00 2001
From: Bonne Eggleston <bonne@exciton.com.au>
Date: Sun, 23 Aug 2026 11:01:34 -0700
Subject: [PATCH 095/155] [modbus_client] Add continuous option to the read and
 send actions (#18542)

Co-authored-by: Claude <noreply@anthropic.com>
---
 esphome/components/modbus/__init__.py         | 79 ++++++++++++++++++-
 esphome/components/modbus/modbus.cpp          | 23 +++---
 esphome/components/modbus/modbus.h            | 48 +++++++----
 esphome/components/modbus_client/__init__.py  | 70 +++++++++++++---
 .../components/modbus_client/modbus_client.h  | 40 ++++++++--
 .../modbus_client/test_modbus_client.py       | 31 +++++++-
 .../modbus/modbus_client_hub_test.cpp         | 40 +++++-----
 tests/components/modbus_client/common.yaml    |  5 ++
 8 files changed, 261 insertions(+), 75 deletions(-)

diff --git a/esphome/components/modbus/__init__.py b/esphome/components/modbus/__init__.py
index a98591c6bc..89ffc7facf 100644
--- a/esphome/components/modbus/__init__.py
+++ b/esphome/components/modbus/__init__.py
@@ -1,17 +1,23 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Literal
+from typing import Any, Literal, NamedTuple
 
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_DISABLE_CRC, CONF_FLOW_CONTROL_PIN, CONF_ID
+from esphome.const import (
+    CONF_ADDRESS,
+    CONF_CONTINUOUS,
+    CONF_DISABLE_CRC,
+    CONF_FLOW_CONTROL_PIN,
+    CONF_ID,
+)
 from esphome.cpp_generator import MockObj
 from esphome.cpp_helpers import gpio_pin_expression
 import esphome.final_validate as fv
-from esphome.types import ConfigType
+from esphome.types import ConfigType, TemplateArgsType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -48,6 +54,73 @@ CONF_TURNAROUND_TIME = "turnaround_time"
 
 MODBUS_ROLES = ["client", "server"]
 
+
+class _CommandOption(NamedTuple):
+    """One per-command option forwarded to the hub (modbus::CommandOptions)."""
+
+    conf_key: str
+    field: str  # the C++ field, and so the set_<field>() setter name
+    validator: Any  # the static (non-templatable) validator for the key
+    cpp_type: Any  # the C++ type the value is generated as
+    default: Any
+
+
+# Per-direction command options. Single-sourcing the schema and the setter generation here keeps
+# them from drifting; the C++ side must add the matching field per the rules documented on
+# CommandOptions (modbus.h).
+_COMMAND_OPTIONS: dict[str, list[_CommandOption]] = {
+    "read": [_CommandOption(CONF_CONTINUOUS, "continuous", cv.boolean, bool, False)],
+    "write": [],
+}
+
+
+def _command_options(direction: str) -> list[_CommandOption]:
+    try:
+        return _COMMAND_OPTIONS[direction]
+    except KeyError:
+        raise ValueError(f"unknown command-options direction {direction!r}") from None
+
+
+def command_options_schema(
+    *, direction: Literal["read", "write"], templatable: bool = False
+) -> dict[cv.Optional, Any]:
+    """Schema fragment for the per-command options a component forwards to the hub
+    (modbus::CommandOptions). Extend this into any schema that queues commands. Keys are
+    direction-specific so a schema never offers an option the hub would strip (e.g.
+    continuous on a write); the write side has no options yet. For actions (templatable=True the
+    keys also accept lambdas), register the values with register_templatable_command_options().
+    """
+    return {
+        cv.Optional(option.conf_key, default=option.default): (
+            cv.templatable(option.validator) if templatable else option.validator
+        )
+        for option in _command_options(direction)
+    }
+
+
+async def register_templatable_command_options(
+    var: MockObj, config: ConfigType, args: TemplateArgsType, direction: str
+) -> None:
+    """Generate the set_<option>() calls for the given direction's command options present in config.
+    Pass the same direction the action's command_options_schema() used, so the keys generated match
+    the ones the schema offered - a write action never emits a read option's setter. Options the
+    schema did not add are simply absent. The consumer's C++ class declares a matching
+    TEMPLATABLE_VALUE per option (e.g. TEMPLATABLE_VALUE(bool, continuous)).
+    """
+    for option in _command_options(direction):
+        if option.conf_key not in config:
+            continue
+        value = config[option.conf_key]
+        # Skip codegen when the value is its C++ zero (TemplatableFn::value() returns T{} when
+        # unset): behaviourally identical, and saves a thunk plus a setup() call per action.
+        if cg.is_template(value) or value != type(value)():
+            cg.add(
+                getattr(var, f"set_{option.field}")(
+                    await cg.templatable(value, args, option.cpp_type)
+                )
+            )
+
+
 CONFIG_SCHEMA = cv.typed_schema(
     {
         "client": cv.Schema(
diff --git a/esphome/components/modbus/modbus.cpp b/esphome/components/modbus/modbus.cpp
index e4bd51ad5a..e83ffb2708 100644
--- a/esphome/components/modbus/modbus.cpp
+++ b/esphome/components/modbus/modbus.cpp
@@ -146,7 +146,7 @@ bool ModbusClientHub::tx_buffer_empty() {
   // other states are mid-transaction or owed bookkeeping, not queued sends - and a READY continuous
   // poll does not count either, since it ranks below every one-shot, so a new send goes out first.
   for (const auto &cmd : this->tx_buffer_) {
-    if (cmd.state == FrameState::READY && !cmd.continuous)
+    if (cmd.state == FrameState::READY && !cmd.options.continuous)
       return false;
   }
   return true;
@@ -946,7 +946,7 @@ bool ModbusDeviceCommand::notify_retired() {
 bool ModbusDeviceCommand::response(std::span<const uint8_t> response_pdu) {
   this->state = this->state == FrameState::WAITING_RETIRED ? FrameState::RETIRED : FrameState::RECEIVED_RESPONSE;
   // A continuous poll is never consumed by its own response; a one-shot consumes one request here.
-  if (!this->continuous)
+  if (!this->options.continuous)
     this->decrement_pending();
   if (this->device == nullptr)
     return false;
@@ -1070,15 +1070,12 @@ bool ModbusClientHub::queue_pdu(uint8_t address, std::span<const uint8_t> pdu, M
     return false;
   }
 
+  // Normalize the caller's options in place (the param is a by-value copy) so everything stored or
+  // merged below carries effective options, never the raw request.
   // continuous is ignored for every mutating code (re-writing a value forever is never intended).
-  const bool mutates = priority == CommandPriority::WRITE;
-  bool continuous = false;
-  if (options.continuous) {
-    if (mutates) {
-      ESP_LOGV(TAG, "continuous is ignored for a mutating function (0x%X, address %" PRIu8 ")", pdu[0], address);
-    } else {
-      continuous = true;
-    }
+  if (options.continuous && priority == CommandPriority::WRITE) {
+    ESP_LOGW(TAG, "continuous is ignored for a mutating function (0x%X, address %" PRIu8 ")", pdu[0], address);
+    options.continuous = false;
   }
 
   // A duplicate of a live entry with the same owner is not queued twice; it resolves against that
@@ -1104,10 +1101,10 @@ bool ModbusClientHub::queue_pdu(uint8_t address, std::span<const uint8_t> pdu, M
       }
       return false;  // dropped: no entry, no callbacks - the refusal is the return value
     }
-    if (continuous) {
+    if (options.continuous) {
       item.make_continuous(true);
       ESP_LOGV(TAG, "Frame already active for %" PRIu8 ", now polled continuously", address);
-    } else if (item.continuous) {
+    } else if (item.options.continuous) {
       // A one-shot duplicate downgrades the poll to a one-shot: it runs one more cycle to serve this
       // request, then stops (mirrors continuous incoming converting a one-shot the other way).
       item.make_continuous(false);
@@ -1140,7 +1137,7 @@ bool ModbusClientHub::queue_pdu(uint8_t address, std::span<const uint8_t> pdu, M
 #endif
   ESP_LOGV(TAG, "Adding frame to tx queue: %" PRIu8 ":%s", address,
            format_hex_pretty_to(hex_buf, pdu.data(), pdu.size()));
-  this->tx_buffer_.emplace_back(device, address, pdu, continuous, this->next_seq_++);
+  this->tx_buffer_.emplace_back(device, address, pdu, options, this->next_seq_++);
   return true;
 }
 
diff --git a/esphome/components/modbus/modbus.h b/esphome/components/modbus/modbus.h
index e5cbba88ec..e766ff04cc 100644
--- a/esphome/components/modbus/modbus.h
+++ b/esphome/components/modbus/modbus.h
@@ -118,6 +118,14 @@ enum class FrameState : uint8_t {
 };
 
 // Per-command send options. Append-only; pass via designated initializers ({.continuous = true}).
+// The queue entry stores this struct whole, so a new field arrives at the queue with no plumbing -
+// but it arrives inert. Every new field must define three rules before it does anything:
+//   1. normalization in queue_pdu() (is it valid for this function code? e.g. continuous is
+//      stripped for mutating codes),
+//   2. a merge rule for when a duplicate send absorbs into a live entry (continuous
+//      upgrades/downgrades via make_continuous(); a new field needs its own answer),
+//   3. teardown: retire() resets the whole struct; silent_retire() leaves it, relying on the sweep
+//      to erase the entry.
 struct CommandOptions {
   // A continuous poll lives in the queue until cancelled or failed; ignored for mutating codes.
   bool continuous{false};
@@ -126,26 +134,29 @@ struct CommandOptions {
 struct ModbusDeviceCommand {
   ModbusClientDevice *device;
   ModbusFrame frame;
-  FrameState state{FrameState::READY};
-  // A continuous poll is a subscription: pending fixed at 1, removed only by cancellation or failure.
-  bool continuous{false};
-  // Accepted requests this entry stands for, capped at max_pending(); drains one terminal each.
-  uint8_t pending{1};
   // Place-in-line stamp (hub's free-running counter); selection takes the oldest for round-robin
-  // fairness within a class. Meant to wrap.
+  // fairness within a class. Meant to wrap. Declared ahead of the byte fields so the tail packs
+  // densely and a growing CommandOptions eats trailing padding before enlarging the struct.
   uint16_t seq{0};
+  FrameState state{FrameState::READY};
+  // Accepted requests this entry stands for, capped at max_pending(); drains one terminal each.
+  // A continuous poll is a subscription: pending fixed at 1, removed only by cancellation or failure.
+  uint8_t pending{1};
+  // The entry's LIVE effective options, not a record of the caller's request: queue_pdu() normalizes
+  // before storing, duplicate absorption mutates continuous via make_continuous(), and retire() resets
+  // the struct (silent_retire() leaves it, relying on the sweep to erase the entry). See the
+  // CommandOptions comment for the rules a new field must define.
+  CommandOptions options;
 
-  // Build a command from a PDU span (caller bounds it to MAX_PDU_SIZE); fully initialized here.
+  // Build a command from a PDU span (caller bounds it to MAX_PDU_SIZE) and pre-normalized options;
+  // fully initialized here.
   ModbusDeviceCommand(ModbusClientDevice *device, uint8_t address, std::span<const uint8_t> pdu,
-                      bool continuous = false, uint16_t seq = 0)
-      : device(device),
-        frame(address, pdu.data(), static_cast<uint16_t>(pdu.size())),
-        continuous(continuous),
-        seq(seq) {}
+                      CommandOptions options = {}, uint16_t seq = 0)
+      : device(device), frame(address, pdu.data(), static_cast<uint16_t>(pdu.size())), seq(seq), options(options) {}
 
   // Transmit ordering class, derived (never stored): a continuous poll ranks below every one-shot.
   CommandPriority priority() const {
-    return this->continuous ? CommandPriority::CONTINUOUS : classify(this->frame.pdu()[0]);
+    return this->options.continuous ? CommandPriority::CONTINUOUS : classify(this->frame.pdu()[0]);
   }
   // Wire-derived class: mutating codes rank WRITE; exception-flagged codes are excluded.
   static CommandPriority classify(uint8_t function_code) {
@@ -161,7 +172,7 @@ struct ModbusDeviceCommand {
   uint8_t max_pending() const {
     const uint8_t fc = this->frame.pdu()[0];
     const bool requeueable = !helpers::is_function_code_exception(fc) && helpers::is_function_code_read_only(fc);
-    return (requeueable && !this->continuous) ? 2 : 1;
+    return (requeueable && !this->options.continuous) ? 2 : 1;
   }
   // Device-scoped clear: detach with no callback (device-less, pending 0). An entry still waiting for
   // a response keeps its state as a reply-ignoring shell that resolves silently; any other goes RETIRED.
@@ -196,11 +207,11 @@ struct ModbusDeviceCommand {
   // retroactively inflating that no-op.
   void make_continuous(bool continuous) {
     if (continuous) {
-      this->continuous = true;
+      this->options.continuous = true;
       this->pending = 1;
     } else {
       this->increment_pending();
-      this->continuous = false;
+      this->options.continuous = false;
     }
   }
   // Address-scoped clear: keep pending and device so the sweep delivers one on_not_sent() per un-run
@@ -218,7 +229,7 @@ struct ModbusDeviceCommand {
     } else if (!this->waiting_state()) {  // an already-retired shell stays put; off the wire -> RETIRED
       this->state = FrameState::RETIRED;
     }
-    this->continuous = false;
+    this->options = {};  // reset every option so a future field is torn down without editing here
   }
 
   // True while the entry is still waiting for a response; the erase pass exempts these even at pending 0.
@@ -253,6 +264,9 @@ struct ModbusDeviceCommand {
   bool notify_retired();
 
   /// True if this command carries the same wire frame (address + PDU) as the given one.
+  /// Cancellation matches the exact frame, not the action instance: a continuous poll whose
+  /// start_address (or other field) is templated produces one poll per distinct frame, and a later
+  /// cancel built from different argument values will not reach the polls it does not byte-match.
   bool same_frame(uint8_t address, std::span<const uint8_t> pdu) const {
     const auto own_pdu = this->frame.pdu();
     return own_pdu.size() == pdu.size() && this->frame.address() == address &&
diff --git a/esphome/components/modbus_client/__init__.py b/esphome/components/modbus_client/__init__.py
index bb113d649c..48d7c1df4f 100644
--- a/esphome/components/modbus_client/__init__.py
+++ b/esphome/components/modbus_client/__init__.py
@@ -7,6 +7,7 @@ from esphome.components import modbus
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ADDRESS,
+    CONF_CONTINUOUS,
     CONF_COUNT,
     CONF_ID,
     CONF_ON_ERROR,
@@ -156,16 +157,45 @@ _ACTION_BASE_SCHEMA = cv.Schema(
     }
 )
 
-MODBUS_CLIENT_SEND_SCHEMA = _ACTION_BASE_SCHEMA.extend(
-    {
-        cv.Required(CONF_PDU): cv.templatable(
-            cv.All(
-                cv.ensure_list(cv.hex_uint8_t),
-                cv.Length(min=1, max=modbus.MAX_PDU_SIZE),
-            )
-        ),
-        cv.Optional(CONF_ON_RESPONSE): _handler_schema(),
-    }
+# The write codes recognised by modbus::helpers::is_function_code_write() - keep in sync. 0x17
+# (read/write multiple) is included: it mutates, so the hub treats it as a write despite its read half.
+_WRITE_FUNCTION_CODES = frozenset({0x05, 0x06, 0x0F, 0x10, 0x16, 0x17})
+
+
+def _no_continuous_on_write(config: ConfigType) -> ConfigType:
+    """Reject `continuous: true` on a static write PDU: continuous polling only applies to reads.
+    Only the fully-static case is decidable here; the hub strips the flag from mutating PDUs at
+    runtime, so a templated pdu or continuous falls through to that backstop."""
+    pdu = config[CONF_PDU]
+    if (
+        isinstance(pdu, list)
+        and config.get(CONF_CONTINUOUS) is True
+        # Masking the exception bit (0x90 -> 0x10) makes this check stricter than the runtime hub,
+        # whose classify() treats an exception-flagged code as a read and leaves continuous in place.
+        and pdu[0] & 0x7F in _WRITE_FUNCTION_CODES
+    ):
+        raise cv.Invalid(
+            f"'{CONF_CONTINUOUS}: true' does not apply to a write PDU (function code "
+            f"0x{pdu[0]:02X}); continuous polling only applies to reads",
+            path=[CONF_CONTINUOUS],
+        )
+    return config
+
+
+MODBUS_CLIENT_SEND_SCHEMA = cv.All(
+    _ACTION_BASE_SCHEMA.extend(
+        {
+            cv.Required(CONF_PDU): cv.templatable(
+                cv.All(
+                    cv.ensure_list(cv.hex_uint8_t),
+                    cv.Length(min=1, max=modbus.MAX_PDU_SIZE),
+                )
+            ),
+            **modbus.command_options_schema(direction="read", templatable=True),
+            cv.Optional(CONF_ON_RESPONSE): _handler_schema(),
+        }
+    ),
+    _no_continuous_on_write,
 )
 
 
@@ -174,6 +204,7 @@ async def register_client_action(
     config: ConfigType,
     args: TemplateArgsType,
     response_args: TemplateArgsType,
+    command_direction: str = "read",
 ) -> cg.MockObj:
     """Wire the shared action plumbing: hub parent, templated device address, outcome triggers.
 
@@ -235,6 +266,12 @@ async def register_client_action(
         await automation.build_automation(
             var.get_not_sent_trigger(), [(_PDU_SPAN, "request")], not_sent_conf
         )
+    # Wire any command options the action's schema opted into (e.g. continuous on reads). Pass the
+    # matching direction so a write action never generates a read option's setter; the write side
+    # has no options yet, so this is a no-op there.
+    await modbus.register_templatable_command_options(
+        var, config, args, command_direction
+    )
     return var
 
 
@@ -318,6 +355,7 @@ def _read_schema(max_count: int) -> cv.All:
                 cv.Optional(CONF_COUNT, default=1): cv.templatable(
                     cv.int_range(min=1, max=max_count)
                 ),
+                **modbus.command_options_schema(direction="read", templatable=True),
             }
         ),
         _no_address_overflow(CONF_COUNT),
@@ -379,7 +417,9 @@ async def read_input_registers_to_code(config, action_id, template_arg, args):
 async def _write_single_to_code(config, action_id, template_arg, args, value_type):
     var = cg.new_Pvariable(action_id, template_arg)
     cg.add(var.set_value(await cg.templatable(config[CONF_VALUE], args, value_type)))
-    return await register_client_action(var, config, args, [])
+    return await register_client_action(
+        var, config, args, [], command_direction="write"
+    )
 
 
 @automation.register_action(
@@ -458,7 +498,9 @@ async def write_multiple_registers_to_code(config, action_id, template_arg, args
         arr_id = ID(f"{action_id}_values", is_declaration=True, type=cg.uint16)
         arr = cg.static_const_array(arr_id, cg.ArrayInitializer(*values))
         cg.add(var.set_values_static(arr, len(values)))
-    return await register_client_action(var, config, args, [])
+    return await register_client_action(
+        var, config, args, [], command_direction="write"
+    )
 
 
 @automation.register_action(
@@ -482,7 +524,9 @@ async def write_multiple_coils_to_code(config, action_id, template_arg, args):
         arr_id = ID(f"{action_id}_values", is_declaration=True, type=cg.uint8)
         arr = cg.static_const_array(arr_id, cg.ArrayInitializer(*packed))
         cg.add(var.set_values_static(arr, len(values)))
-    return await register_client_action(var, config, args, [])
+    return await register_client_action(
+        var, config, args, [], command_direction="write"
+    )
 
 
 # Read/write multiple registers (FC 0x17) writes one register block and reads another in a single
diff --git a/esphome/components/modbus_client/modbus_client.h b/esphome/components/modbus_client/modbus_client.h
index 20dc1a4745..03744239a9 100644
--- a/esphome/components/modbus_client/modbus_client.h
+++ b/esphome/components/modbus_client/modbus_client.h
@@ -68,8 +68,8 @@ template<typename... Ts> class ClientActionBase : public Action<Ts...>, public m
   /// resolves through on_sent() alone), so resolve refusals here via on_not_sent.
   /// Takes a span, not a PduBuffer: the builders return right-sized buffers (a read PDU is 5 bytes), and
   /// a PduBuffer parameter would widen each one to the 253-byte maximum just to cross the call.
-  void send_or_resolve_(std::span<const uint8_t> pdu) {
-    if (!this->queue_pdu(pdu))
+  void send_or_resolve_(std::span<const uint8_t> pdu, modbus::CommandOptions options = {}) {
+    if (!this->queue_pdu(pdu, options))
       this->on_not_sent(pdu);
   }
 
@@ -80,6 +80,26 @@ template<typename... Ts> class ClientActionBase : public Action<Ts...>, public m
   retry_func_t retry_func_{nullptr};
 };
 
+/// The read-side per-command options (modbus::CommandOptions), declared once for every action that
+/// sends a read. Each option is templatable, so it cannot be built in Python the way modbus_controller
+/// builds its static struct; declaring the values here instead of per action means a new read option
+/// costs one TEMPLATABLE_VALUE plus one field below, and every read action picks it up.
+/// The read/write split mirrors _COMMAND_OPTIONS in the modbus component's Python
+/// (command_options_schema(direction="read") adds exactly these keys). When a write-side option
+/// arrives it gets a WriteCommandOptions twin, so write actions never carry read-only members.
+template<typename... Ts> class ReadCommandOptions {
+ public:
+  // Poll: re-queue after each success until downgraded (replay with false) or failed. The hub strips
+  // it for mutating function codes at the door (see modbus::CommandOptions).
+  TEMPLATABLE_VALUE(bool, continuous)
+
+ protected:
+  /// The options for this send, with every templatable value resolved against the action's arguments.
+  modbus::CommandOptions command_options_(const Ts &...x) const {
+    return {.continuous = this->continuous_.value(x...)};
+  }
+};
+
 /// modbus_client.send: fire a raw PDU (function code + data; the hub adds address and CRC). The reply is
 /// delivered raw - on_response(request, response) - deliberately bypassing the typed dispatch, so
 /// non-standard/custom transactions pass through untouched.
@@ -87,7 +107,8 @@ template<typename... Ts> class ClientActionBase : public Action<Ts...>, public m
 /// modbus::helpers::create_*_pdu() builders and return it directly (smaller builder results convert).
 /// A PduBuffer drops bytes past modbus::MAX_PDU_SIZE without reporting it (the hub's oversize check
 /// cannot fire - that limit is the capacity), so an over-long lambda-built PDU is silently truncated.
-template<typename... Ts> class ModbusClientSendAction : public ClientActionBase<Ts...> {
+template<typename... Ts>
+class ModbusClientSendAction : public ClientActionBase<Ts...>, public ReadCommandOptions<Ts...> {
  public:
   TEMPLATABLE_VALUE(modbus::helpers::PduBuffer, pdu)
 
@@ -95,7 +116,7 @@ template<typename... Ts> class ModbusClientSendAction : public ClientActionBase<
     return &this->response_trigger_;
   }
 
-  void play(const Ts &...x) override { this->send_or_resolve_(this->pdu_.value(x...)); }
+  void play(const Ts &...x) override { this->send_or_resolve_(this->pdu_.value(x...), this->command_options_(x...)); }
 
   void on_response(std::span<const uint8_t> request_pdu, std::span<const uint8_t> response_pdu) override {
     this->response_trigger_.trigger(request_pdu, response_pdu);
@@ -140,7 +161,8 @@ template<typename... Ts> class TypedClientActionBase : public ClientActionBase<T
 
 /// modbus_client.read_holding_registers / read_input_registers: on_response delivers the registers in
 /// host byte order as `values` (only valid for the duration of the trigger).
-template<typename... Ts> class ReadRegistersAction : public TypedClientActionBase<Ts...> {
+template<typename... Ts>
+class ReadRegistersAction : public TypedClientActionBase<Ts...>, public ReadCommandOptions<Ts...> {
  public:
   explicit ReadRegistersAction(bool holding) : holding_(holding) {}
   TEMPLATABLE_VALUE(uint16_t, start_address)
@@ -152,7 +174,8 @@ template<typename... Ts> class ReadRegistersAction : public TypedClientActionBas
     const auto function_code =
         this->holding_ ? modbus::FunctionCode::READ_HOLDING_REGISTERS : modbus::FunctionCode::READ_INPUT_REGISTERS;
     this->send_or_resolve_(
-        modbus::helpers::create_read_pdu(function_code, this->start_address_.value(x...), this->count_.value(x...)));
+        modbus::helpers::create_read_pdu(function_code, this->start_address_.value(x...), this->count_.value(x...)),
+        this->command_options_(x...));
   }
   void on_read_registers(modbus::EntityType entity_type, uint16_t start_address, std::span<const uint16_t> registers,
                          modbus::ResponseStatus status) override {
@@ -167,7 +190,7 @@ template<typename... Ts> class ReadRegistersAction : public TypedClientActionBas
 
 /// modbus_client.read_coils / read_discrete_inputs: on_response delivers the bits as a PackedBits view
 /// (bit 0 = the bit at start_address; only valid for the duration of the trigger).
-template<typename... Ts> class ReadBitsAction : public TypedClientActionBase<Ts...> {
+template<typename... Ts> class ReadBitsAction : public TypedClientActionBase<Ts...>, public ReadCommandOptions<Ts...> {
  public:
   explicit ReadBitsAction(bool coils) : coils_(coils) {}
   TEMPLATABLE_VALUE(uint16_t, start_address)
@@ -179,7 +202,8 @@ template<typename... Ts> class ReadBitsAction : public TypedClientActionBase<Ts.
     const auto function_code =
         this->coils_ ? modbus::FunctionCode::READ_COILS : modbus::FunctionCode::READ_DISCRETE_INPUTS;
     this->send_or_resolve_(
-        modbus::helpers::create_read_pdu(function_code, this->start_address_.value(x...), this->count_.value(x...)));
+        modbus::helpers::create_read_pdu(function_code, this->start_address_.value(x...), this->count_.value(x...)),
+        this->command_options_(x...));
   }
   void on_read_bits(modbus::EntityType entity_type, uint16_t start_address, modbus::PackedBits bits,
                     modbus::ResponseStatus status) override {
diff --git a/tests/component_tests/modbus_client/test_modbus_client.py b/tests/component_tests/modbus_client/test_modbus_client.py
index 7966048dd7..cab944d825 100644
--- a/tests/component_tests/modbus_client/test_modbus_client.py
+++ b/tests/component_tests/modbus_client/test_modbus_client.py
@@ -16,7 +16,13 @@ from esphome.components.modbus_client import (
     CONFIG_SCHEMA,
     MODBUS_CLIENT_SEND_SCHEMA,
 )
-from esphome.const import CONF_ADDRESS, CONF_ID, CONF_ON_ERROR, CONF_ON_RESPONSE
+from esphome.const import (
+    CONF_ADDRESS,
+    CONF_CONTINUOUS,
+    CONF_ID,
+    CONF_ON_ERROR,
+    CONF_ON_RESPONSE,
+)
 from esphome.core import Lambda
 from esphome.types import ConfigType
 
@@ -118,6 +124,29 @@ def test_on_no_response_retry_lambda_accepted() -> None:
     )
 
 
+def test_continuous_on_write_pdu_rejected() -> None:
+    """A literal write-code PDU with continuous: true is rejected at config time (reads only)."""
+    with pytest.raises(cv.Invalid, match="does not apply to a write PDU"):
+        MODBUS_CLIENT_SEND_SCHEMA(
+            {
+                CONF_ADDRESS: 0x01,
+                CONF_PDU: [0x06, 0x00, 0x01, 0x00, 0x0A],
+                CONF_CONTINUOUS: True,
+            }
+        )
+
+
+def test_continuous_on_read_pdu_accepted() -> None:
+    """A literal read-code PDU with continuous: true is fine - continuous polling applies to reads."""
+    MODBUS_CLIENT_SEND_SCHEMA(
+        {
+            CONF_ADDRESS: 0x01,
+            CONF_PDU: [0x03, 0x00, 0x10, 0x00, 0x01],
+            CONF_CONTINUOUS: True,
+        }
+    )
+
+
 # The standalone component block. The compile fixtures cover the accepted shapes end to end; these pin
 # the parts a fixture cannot express - a rejection, and a module flag whose absence breaks other
 # components rather than this one.
diff --git a/tests/components/modbus/modbus_client_hub_test.cpp b/tests/components/modbus/modbus_client_hub_test.cpp
index 43c81bbf34..026df34bcc 100644
--- a/tests/components/modbus/modbus_client_hub_test.cpp
+++ b/tests/components/modbus/modbus_client_hub_test.cpp
@@ -322,14 +322,14 @@ TEST(ModbusClientHubPriority, ContinuousReadRequeuesOnSuccessOnly) {
 
   device.read_holding_registers(0x100, 2, {.continuous = true});
   ASSERT_EQ(hub.queued_frames(), 1u);
-  EXPECT_TRUE(hub.queued(0).continuous);
+  EXPECT_TRUE(hub.queued(0).options.continuous);
   hub.force_send_next();
 
   // A matching successful response cycles the continuous entry back to READY.
   const uint8_t ok_response[] = {0x03, 0x04, 0x00, 0x2A, 0x01, 0x00};
   hub.receive_frame_for_test(0x02, ok_response);
   ASSERT_EQ(hub.queued_frames(), 1u);
-  EXPECT_TRUE(hub.queued(0).continuous);
+  EXPECT_TRUE(hub.queued(0).options.continuous);
 
   // An exception response ends the poll.
   hub.force_send_next();
@@ -346,13 +346,13 @@ TEST(ModbusClientHubPriority, RetriedContinuousReadStaysContinuous) {
 
   device.read_holding_registers(0x100, 2, {.continuous = true});
   ASSERT_EQ(hub.queued_frames(), 1u);
-  ASSERT_TRUE(hub.queued(0).continuous);
+  ASSERT_TRUE(hub.queued(0).options.continuous);
   hub.force_send_next();
 
   hub.timeout_waiting();  // no response -> device requests retry
 
   ASSERT_EQ(hub.queued_frames(), 1u);
-  EXPECT_TRUE(hub.queued(0).continuous);  // the retried poll stays continuous
+  EXPECT_TRUE(hub.queued(0).options.continuous);  // the retried poll stays continuous
 }
 
 // A one-shot duplicate downgrades a continuous poll to a one-shot (the mirror of a continuous
@@ -363,16 +363,16 @@ TEST(ModbusClientHubPriority, DuplicateSendDowngradesContinuous) {
 
   device.read_holding_registers(0x100, 2, {.continuous = true});
   ASSERT_EQ(hub.queued_frames(), 1u);
-  ASSERT_TRUE(hub.queued(0).continuous);
+  ASSERT_TRUE(hub.queued(0).options.continuous);
 
   device.read_holding_registers(0x100, 2);  // one-shot duplicate downgrades the poll
   ASSERT_EQ(hub.queued_frames(), 1u);
-  EXPECT_FALSE(hub.queued(0).continuous);
+  EXPECT_FALSE(hub.queued(0).options.continuous);
   EXPECT_EQ(hub.queued(0).pending, 1u);
 
   // It runs one more cycle to serve the request, then stops - not re-queued as a poll.
   hub.force_send_next();
-  EXPECT_FALSE(hub.waiting_command().continuous);
+  EXPECT_FALSE(hub.waiting_command().options.continuous);
   const uint8_t ok_response[] = {0x03, 0x04, 0x00, 0x2A, 0x01, 0x00};
   hub.receive_frame_for_test(0x02, ok_response);
   EXPECT_EQ(hub.queued_frames(), 0u);
@@ -407,16 +407,16 @@ TEST(ModbusClientHubPriority, DowngradeAfterTerminalKeepsRequestAlive) {
 
   device.read_holding_registers(0x100, 2, {.continuous = true});
   ASSERT_EQ(hub.queued_frames(), 1u);
-  ASSERT_TRUE(hub.queued(0).continuous);
+  ASSERT_TRUE(hub.queued(0).options.continuous);
 
   hub.force_send_next();
   const uint8_t exception_response[] = {0x83, 0x02};
   hub.receive_frame_for_test(0x02, exception_response);  // exception ends the poll; on_error re-sends
 
-  EXPECT_EQ(device.error_count_, 1);       // one terminal delivered so far
-  ASSERT_EQ(hub.queued_frames(), 1u);      // the re-send survived the sweep instead of being erased
-  EXPECT_FALSE(hub.queued(0).continuous);  // downgraded to a one-shot
-  EXPECT_EQ(hub.queued(0).pending, 1u);    // debt restored so the request runs
+  EXPECT_EQ(device.error_count_, 1);               // one terminal delivered so far
+  ASSERT_EQ(hub.queued_frames(), 1u);              // the re-send survived the sweep instead of being erased
+  EXPECT_FALSE(hub.queued(0).options.continuous);  // downgraded to a one-shot
+  EXPECT_EQ(hub.queued(0).pending, 1u);            // debt restored so the request runs
 
   // And it runs to its own terminal - a good response this time - then the entry is gone.
   hub.force_send_next();
@@ -434,18 +434,18 @@ TEST(ModbusClientHubPriority, ContinuousRequestUpgradesQueuedDuplicate) {
 
   device.read_holding_registers(0x100, 2);
   ASSERT_EQ(hub.queued_frames(), 1u);
-  ASSERT_FALSE(hub.queued(0).continuous);
+  ASSERT_FALSE(hub.queued(0).options.continuous);
 
   device.read_holding_registers(0x100, 2, {.continuous = true});
   ASSERT_EQ(hub.queued_frames(), 1u);
-  EXPECT_TRUE(hub.queued(0).continuous);
+  EXPECT_TRUE(hub.queued(0).options.continuous);
 
   // And it behaves as a poll from here: success cycles it back to READY.
   hub.force_send_next();
   const uint8_t ok_response[] = {0x03, 0x04, 0x00, 0x2A, 0x01, 0x00};
   hub.receive_frame_for_test(0x02, ok_response);
   ASSERT_EQ(hub.queued_frames(), 1u);
-  EXPECT_TRUE(hub.queued(0).continuous);
+  EXPECT_TRUE(hub.queued(0).options.continuous);
 }
 
 // The transmit order is one key with three levels: writes, then one-shot reads, then continuous
@@ -473,7 +473,7 @@ TEST(ModbusClientHubPriority, WritesThenOneShotReadsThenContinuousPolls) {
   EXPECT_EQ(hub.waiting_command().frame.pdu()[1], 0x02);  // then the one-shot read
   hub.timeout_waiting();
   hub.force_send_next();
-  EXPECT_TRUE(hub.waiting_command().continuous);  // and the poll takes what is left
+  EXPECT_TRUE(hub.waiting_command().options.continuous);  // and the poll takes what is left
 }
 
 // continuous is ignored for writes: the frame still sends at WRITE priority, once.
@@ -485,7 +485,7 @@ TEST(ModbusClientHubPriority, ContinuousIgnoredForWrites) {
   device.queue_pdu(write_pdu, {.continuous = true});
   ASSERT_EQ(hub.queued_frames(), 1u);
   EXPECT_EQ(hub.queued(0).priority(), CommandPriority::WRITE);
-  EXPECT_FALSE(hub.queued(0).continuous);
+  EXPECT_FALSE(hub.queued(0).options.continuous);
 }
 
 // A queued continuous poll does not count against immediate-send readiness: it ranks below every
@@ -496,7 +496,7 @@ TEST(ModbusClientHubPriority, ContinuousPollDoesNotBlockImmediateSend) {
 
   EXPECT_TRUE(hub.tx_buffer_empty());  // nothing queued
   device.read_holding_registers(0x100, 2, {.continuous = true});
-  ASSERT_TRUE(hub.queued(0).continuous);
+  ASSERT_TRUE(hub.queued(0).options.continuous);
   EXPECT_TRUE(hub.tx_buffer_empty());  // a READY continuous poll still leaves room to send now
 
   device.read_holding_registers(0x200, 2);  // a one-shot does count
@@ -1878,8 +1878,8 @@ TEST(ModbusClientHubPriority, ResendFromOnResponseAbsorbsIntoCompletingCommand)
   const uint8_t ok_response[] = {0x03, 0x04, 0x00, 0x2A, 0x01, 0x00};
   hub.receive_frame_for_test(0x02, ok_response);  // handler re-sends the identical frame mid-completion
 
-  ASSERT_EQ(hub.queued_frames(), 1u);      // absorbed into the same entry, not a fresh twin
-  EXPECT_FALSE(hub.queued(0).continuous);  // the one-shot re-send downgraded the poll
+  ASSERT_EQ(hub.queued_frames(), 1u);              // absorbed into the same entry, not a fresh twin
+  EXPECT_FALSE(hub.queued(0).options.continuous);  // the one-shot re-send downgraded the poll
 }
 
 // An exception-flagged function code is never silently re-sendable, even though the read check
diff --git a/tests/components/modbus_client/common.yaml b/tests/components/modbus_client/common.yaml
index bce2149fbf..76f7479a5c 100644
--- a/tests/components/modbus_client/common.yaml
+++ b/tests/components/modbus_client/common.yaml
@@ -51,6 +51,7 @@ button:
       # A pdu lambda can hand-assemble bytes or return a modbus::helpers::create_*_pdu() builder result.
       - modbus_client.send:
           address: 0x01
+          continuous: true
           pdu: !lambda "return modbus::helpers::create_read_pdu(modbus::FunctionCode::READ_HOLDING_REGISTERS, 0x0010, 1);"
       - modbus_client.send:
           address: !lambda "return 1;"
@@ -91,6 +92,7 @@ button:
           address: !lambda "return 1;"
           start_address: 0x10
           count: 2
+          continuous: true
           on_response:
             then:
               - lambda: 'ESP_LOGI("modbus_client.test", "first=%u n=%u", values[0], (unsigned) values.size());'
@@ -98,6 +100,7 @@ button:
             then:
               - logger.log: "typed read timeout"
       - modbus_client.read_input_registers:
+          continuous: !lambda "return false;"
           address: 0x01
           start_address: 0x20
           on_custom_response:
@@ -113,12 +116,14 @@ button:
           address: 0x01
           start_address: 0x03
           count: 16
+          continuous: true
           on_response:
             then:
               - lambda: 'ESP_LOGI("modbus_client.test", "coil0=%d n=%u", bits[0], (unsigned) bits.size());'
       - modbus_client.read_discrete_inputs:
           address: 0x01
           start_address: 0x00
+          continuous: true
           on_error:
             then:
               - lambda: 'ESP_LOGW("modbus_client.test", "fc 0x%X exception %d", request.empty() ? 0 : request[0], (int) exception_code);'

From 2c32ac22212a8854d09672d4cb9606d71081832b Mon Sep 17 00:00:00 2001
From: Boris Krivonog <boris.krivonog@inova.si>
Date: Sun, 23 Aug 2026 21:40:08 +0200
Subject: [PATCH 096/155] [mitsubishi_cn105] Mark configurable classes as final
 (#18272)

---
 .../components/mitsubishi_cn105/automation.h  |   6 +-
 .../mitsubishi_cn105_climate.cpp              |  83 ++------
 .../mitsubishi_cn105_climate.h                |  13 +-
 .../mitsubishi_cn105_component.h              |   2 +-
 .../mitsubishi_cn105_swing_mode_manager.h     |  86 +++++++++
 .../mitsubishi_cn105_vane_select_vertical.h   |   6 +-
 .../mitsubishi_cn105_climate_tests.cpp        | 180 ++++--------------
 ...subishi_cn105_swing_mode_manager_tests.cpp |  99 ++++++++++
 tests/components/mitsubishi_cn105/common.h    |  22 ---
 .../mitsubishi_cn105_component_tests.cpp      |  21 +-
 ...bishi_cn105_vane_select_vertical_tests.cpp |  33 ++--
 11 files changed, 278 insertions(+), 273 deletions(-)
 create mode 100644 esphome/components/mitsubishi_cn105/mitsubishi_cn105_swing_mode_manager.h
 create mode 100644 tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_swing_mode_manager_tests.cpp

diff --git a/esphome/components/mitsubishi_cn105/automation.h b/esphome/components/mitsubishi_cn105/automation.h
index 2fc6ba3c32..f9ca3a47e6 100644
--- a/esphome/components/mitsubishi_cn105/automation.h
+++ b/esphome/components/mitsubishi_cn105/automation.h
@@ -9,7 +9,7 @@
 namespace esphome::mitsubishi_cn105 {
 
 template<typename... Ts>
-class SetRemoteTemperatureAction : public Action<Ts...>, public Parented<MitsubishiCN105Component> {
+class SetRemoteTemperatureAction final : public Action<Ts...>, public Parented<MitsubishiCN105Component> {
  public:
   TEMPLATABLE_VALUE(float, temperature)
 
@@ -17,12 +17,12 @@ class SetRemoteTemperatureAction : public Action<Ts...>, public Parented<Mitsubi
 };
 
 template<typename... Ts>
-class ClearRemoteTemperatureAction : public Action<Ts...>, public Parented<MitsubishiCN105Component> {
+class ClearRemoteTemperatureAction final : public Action<Ts...>, public Parented<MitsubishiCN105Component> {
  public:
   void play(const Ts &...x) override { this->parent_->clear_remote_temperature(); }
 };
 
-template<typename... Ts> class VaneControlAction : public Action<Ts...> {
+template<typename... Ts> class VaneControlAction final : public Action<Ts...> {
  public:
   using ApplyFn = void (*)(VaneCall &, const std::remove_cvref_t<Ts> &...);
 
diff --git a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.cpp b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.cpp
index 17ff6d34ca..53b8c21de6 100644
--- a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.cpp
+++ b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.cpp
@@ -74,7 +74,7 @@ climate::ClimateTraits MitsubishiCN105Climate::traits() {
     traits.add_supported_fan_mode(p.second);
   }
 
-  traits.set_supported_swing_modes(this->supported_swing_modes_);
+  traits.set_supported_swing_modes(this->swing_mode_manager_.supported_swing_modes());
 
   const bool use_fahrenheit = this->parent_->get_temperature_mapping().get_use_fahrenheit();
   traits.set_temperature_unit(use_fahrenheit ? TemperatureUnit::FAHRENHEIT : TemperatureUnit::CELSIUS);
@@ -109,33 +109,11 @@ void MitsubishiCN105Climate::control(const climate::ClimateCall &call) {
   }
 
   if (const auto swing_mode = call.get_swing_mode()) {
-    auto vane = this->last_non_swing_vane_mode_;
-    auto wide = this->last_non_swing_wide_vane_mode_;
-
-    switch (*swing_mode) {
-      case climate::CLIMATE_SWING_BOTH:
-        vane = MitsubishiCN105::VaneMode::SWING;
-        wide = MitsubishiCN105::WideVaneMode::SWING;
-        break;
-
-      case climate::CLIMATE_SWING_VERTICAL:
-        vane = MitsubishiCN105::VaneMode::SWING;
-        break;
-
-      case climate::CLIMATE_SWING_HORIZONTAL:
-        wide = MitsubishiCN105::WideVaneMode::SWING;
-        break;
-
-      case climate::CLIMATE_SWING_OFF:
-      default:
-        break;
+    if (const auto vane = this->swing_mode_manager_.vane_from(*swing_mode)) {
+      this->parent_->set_vane_mode(*vane);
     }
-
-    if (this->supported_swing_modes_.count(climate::CLIMATE_SWING_VERTICAL)) {
-      this->parent_->set_vane_mode(vane);
-    }
-    if (this->supported_swing_modes_.count(climate::CLIMATE_SWING_HORIZONTAL)) {
-      this->parent_->set_wide_vane_mode(wide);
+    if (const auto wide = this->swing_mode_manager_.wide_vane_from(*swing_mode)) {
+      this->parent_->set_wide_vane_mode(*wide);
     }
   }
 
@@ -166,64 +144,39 @@ void MitsubishiCN105Climate::apply_values_() {
     ESP_LOGD(TAG, "Unable to map fan mode");
   }
 
-  if (!this->supported_swing_modes_.empty()) {
-    bool vertical_swinging = false;
-    bool horizontal_swinging = false;
-
-    if (this->supported_swing_modes_.count(climate::CLIMATE_SWING_VERTICAL)) {
-      if (status.vane_mode == MitsubishiCN105::VaneMode::SWING) {
-        vertical_swinging = true;
-      } else if (status.vane_mode != MitsubishiCN105::VaneMode::UNKNOWN) {
-        this->last_non_swing_vane_mode_ = status.vane_mode;
-      }
-    }
-
-    if (this->supported_swing_modes_.count(climate::CLIMATE_SWING_HORIZONTAL)) {
-      if (status.wide_vane_mode == MitsubishiCN105::WideVaneMode::SWING) {
-        horizontal_swinging = true;
-      } else if (status.wide_vane_mode != MitsubishiCN105::WideVaneMode::UNKNOWN) {
-        this->last_non_swing_wide_vane_mode_ = status.wide_vane_mode;
-      }
-    }
-
-    if (vertical_swinging && horizontal_swinging) {
-      this->swing_mode = climate::CLIMATE_SWING_BOTH;
-    } else if (vertical_swinging) {
-      this->swing_mode = climate::CLIMATE_SWING_VERTICAL;
-    } else if (horizontal_swinging) {
-      this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;
-    } else {
-      this->swing_mode = climate::CLIMATE_SWING_OFF;
-    }
+  if (const auto swing_mode =
+          this->swing_mode_manager_.update_and_get_swing_mode(status.vane_mode, status.wide_vane_mode)) {
+    this->swing_mode = *swing_mode;
   }
 
   this->publish_state();
 }
 
 void MitsubishiCN105Climate::set_supported_swing_mode(climate::ClimateSwingMode mode) {
-  this->supported_swing_modes_.clear();
+  climate::ClimateSwingModeMask supported_swing_modes;
   switch (mode) {
     case climate::CLIMATE_SWING_VERTICAL:
-      this->supported_swing_modes_.insert(climate::CLIMATE_SWING_OFF);
-      this->supported_swing_modes_.insert(climate::CLIMATE_SWING_VERTICAL);
+      supported_swing_modes.insert(climate::CLIMATE_SWING_OFF);
+      supported_swing_modes.insert(climate::CLIMATE_SWING_VERTICAL);
       break;
 
     case climate::CLIMATE_SWING_HORIZONTAL:
-      this->supported_swing_modes_.insert(climate::CLIMATE_SWING_OFF);
-      this->supported_swing_modes_.insert(climate::CLIMATE_SWING_HORIZONTAL);
+      supported_swing_modes.insert(climate::CLIMATE_SWING_OFF);
+      supported_swing_modes.insert(climate::CLIMATE_SWING_HORIZONTAL);
       break;
 
     case climate::CLIMATE_SWING_BOTH:
-      this->supported_swing_modes_.insert(climate::CLIMATE_SWING_OFF);
-      this->supported_swing_modes_.insert(climate::CLIMATE_SWING_VERTICAL);
-      this->supported_swing_modes_.insert(climate::CLIMATE_SWING_HORIZONTAL);
-      this->supported_swing_modes_.insert(climate::CLIMATE_SWING_BOTH);
+      supported_swing_modes.insert(climate::CLIMATE_SWING_OFF);
+      supported_swing_modes.insert(climate::CLIMATE_SWING_VERTICAL);
+      supported_swing_modes.insert(climate::CLIMATE_SWING_HORIZONTAL);
+      supported_swing_modes.insert(climate::CLIMATE_SWING_BOTH);
       break;
 
     case climate::CLIMATE_SWING_OFF:
     default:
       break;
   }
+  this->swing_mode_manager_.set_supported_swing_modes(supported_swing_modes);
 }
 
 }  // namespace esphome::mitsubishi_cn105
diff --git a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.h b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.h
index 5341c2d2d9..cea76278ab 100644
--- a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.h
+++ b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.h
@@ -6,10 +6,13 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/components/climate/climate.h"
+#include "mitsubishi_cn105_swing_mode_manager.h"
 
 namespace esphome::mitsubishi_cn105 {
 
-class MitsubishiCN105Climate : public climate::Climate, public Component, public Parented<MitsubishiCN105Component> {
+class MitsubishiCN105Climate final : public climate::Climate,
+                                     public Component,
+                                     public Parented<MitsubishiCN105Component> {
  public:
   void setup() override;
   void dump_config() override;
@@ -25,14 +28,12 @@ class MitsubishiCN105Climate : public climate::Climate, public Component, public
  protected:
   void apply_values_();
 
-  climate::ClimateSwingModeMask supported_swing_modes_{};
-  MitsubishiCN105::VaneMode last_non_swing_vane_mode_{MitsubishiCN105::VaneMode::AUTO};
-  MitsubishiCN105::WideVaneMode last_non_swing_wide_vane_mode_{MitsubishiCN105::WideVaneMode::CENTER};
+  SwingModeManager swing_mode_manager_;
 };
 
 // Legacy climate action compatibility. Remove in 2027.2.0.
 template<typename... Ts>
-class LegacySetRemoteTemperatureAction : public Action<Ts...>, public Parented<MitsubishiCN105Climate> {
+class LegacySetRemoteTemperatureAction final : public Action<Ts...>, public Parented<MitsubishiCN105Climate> {
  public:
   TEMPLATABLE_VALUE(float, temperature)
 
@@ -41,7 +42,7 @@ class LegacySetRemoteTemperatureAction : public Action<Ts...>, public Parented<M
 
 // Legacy climate action compatibility. Remove in 2027.2.0.
 template<typename... Ts>
-class LegacyClearRemoteTemperatureAction : public Action<Ts...>, public Parented<MitsubishiCN105Climate> {
+class LegacyClearRemoteTemperatureAction final : public Action<Ts...>, public Parented<MitsubishiCN105Climate> {
  public:
   void play(const Ts &...x) override { this->parent_->clear_remote_temperature(); }
 };
diff --git a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.h b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.h
index 508a15e6d5..aa9bfe0d8c 100644
--- a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.h
+++ b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_component.h
@@ -80,7 +80,7 @@ struct VaneCall {
   MitsubishiCN105Component *parent_;
 };
 
-class MitsubishiCN105Component : public Component, public uart::UARTDevice {
+class MitsubishiCN105Component final : public Component, public uart::UARTDevice {
  public:
   explicit MitsubishiCN105Component() : hp_(*this) {}
 
diff --git a/esphome/components/mitsubishi_cn105/mitsubishi_cn105_swing_mode_manager.h b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_swing_mode_manager.h
new file mode 100644
index 0000000000..20f54f0bbb
--- /dev/null
+++ b/esphome/components/mitsubishi_cn105/mitsubishi_cn105_swing_mode_manager.h
@@ -0,0 +1,86 @@
+#pragma once
+
+#include <optional>
+
+#include "esphome/components/climate/climate.h"
+#include "mitsubishi_cn105.h"
+
+namespace esphome::mitsubishi_cn105 {
+
+class SwingModeManager final {
+ public:
+  const climate::ClimateSwingModeMask &supported_swing_modes() const { return this->supported_swing_modes_; }
+  void set_supported_swing_modes(const climate::ClimateSwingModeMask &supported_swing_modes) {
+    this->supported_swing_modes_ = supported_swing_modes;
+  }
+
+  std::optional<MitsubishiCN105::VaneMode> vane_from(climate::ClimateSwingMode swing_mode) const {
+    if (!this->supported_swing_modes_.count(climate::CLIMATE_SWING_VERTICAL)) {
+      return std::nullopt;
+    }
+
+    switch (swing_mode) {
+      case climate::CLIMATE_SWING_BOTH:
+      case climate::CLIMATE_SWING_VERTICAL:
+        return MitsubishiCN105::VaneMode::SWING;
+      default:
+        return this->last_non_swing_vane_mode_;
+    }
+  }
+
+  std::optional<MitsubishiCN105::WideVaneMode> wide_vane_from(climate::ClimateSwingMode swing_mode) const {
+    if (!this->supported_swing_modes_.count(climate::CLIMATE_SWING_HORIZONTAL)) {
+      return std::nullopt;
+    }
+
+    switch (swing_mode) {
+      case climate::CLIMATE_SWING_BOTH:
+      case climate::CLIMATE_SWING_HORIZONTAL:
+        return MitsubishiCN105::WideVaneMode::SWING;
+      default:
+        return this->last_non_swing_wide_vane_mode_;
+    }
+  }
+
+  std::optional<climate::ClimateSwingMode> update_and_get_swing_mode(MitsubishiCN105::VaneMode vane_mode,
+                                                                     MitsubishiCN105::WideVaneMode wide_vane_mode) {
+    if (this->supported_swing_modes_.empty()) {
+      return std::nullopt;
+    }
+
+    bool vertical_swinging = false;
+    bool horizontal_swinging = false;
+    if (this->supported_swing_modes_.count(climate::CLIMATE_SWING_VERTICAL)) {
+      if (vane_mode == MitsubishiCN105::VaneMode::SWING) {
+        vertical_swinging = true;
+      } else if (vane_mode != MitsubishiCN105::VaneMode::UNKNOWN) {
+        this->last_non_swing_vane_mode_ = vane_mode;
+      }
+    }
+    if (this->supported_swing_modes_.count(climate::CLIMATE_SWING_HORIZONTAL)) {
+      if (wide_vane_mode == MitsubishiCN105::WideVaneMode::SWING) {
+        horizontal_swinging = true;
+      } else if (wide_vane_mode != MitsubishiCN105::WideVaneMode::UNKNOWN) {
+        this->last_non_swing_wide_vane_mode_ = wide_vane_mode;
+      }
+    }
+
+    if (vertical_swinging && horizontal_swinging) {
+      return climate::CLIMATE_SWING_BOTH;
+    }
+    if (vertical_swinging) {
+      return climate::CLIMATE_SWING_VERTICAL;
+    }
+    if (horizontal_swinging) {
+      return climate::CLIMATE_SWING_HORIZONTAL;
+    }
+    return climate::CLIMATE_SWING_OFF;
+  }
+
+ private:
+  climate::ClimateSwingModeMask supported_swing_modes_{};
+  MitsubishiCN105::VaneMode last_non_swing_vane_mode_{MitsubishiCN105::VaneMode::AUTO};
+  MitsubishiCN105::WideVaneMode last_non_swing_wide_vane_mode_{MitsubishiCN105::WideVaneMode::CENTER};
+};
+
+}  // namespace esphome::mitsubishi_cn105
diff --git a/esphome/components/mitsubishi_cn105/select/mitsubishi_cn105_vane_select_vertical.h b/esphome/components/mitsubishi_cn105/select/mitsubishi_cn105_vane_select_vertical.h
index 76977d59d7..656b78b487 100644
--- a/esphome/components/mitsubishi_cn105/select/mitsubishi_cn105_vane_select_vertical.h
+++ b/esphome/components/mitsubishi_cn105/select/mitsubishi_cn105_vane_select_vertical.h
@@ -7,9 +7,9 @@
 
 namespace esphome::mitsubishi_cn105 {
 
-class MitsubishiCN105VerticalVaneDirectionSelect : public select::Select,
-                                                   public Component,
-                                                   public Parented<MitsubishiCN105Component> {
+class MitsubishiCN105VerticalVaneDirectionSelect final : public select::Select,
+                                                         public Component,
+                                                         public Parented<MitsubishiCN105Component> {
  public:
   void setup() override;
   void publish_vane_state(MitsubishiCN105::VaneMode mode);
diff --git a/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp b/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp
index b91252c9fa..669345f576 100644
--- a/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp
+++ b/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp
@@ -2,10 +2,19 @@
 #include <utility>
 #include "../common.h"
 
+#include "esphome/components/mitsubishi_cn105/mitsubishi_cn105_climate.h"
+
 namespace esphome::mitsubishi_cn105::testing {
 
+struct MitsubishiCN105ClimateTestContext {
+  MitsubishiCN105Component component;
+  MitsubishiCN105Climate sut;
+
+  MitsubishiCN105ClimateTestContext() { this->sut.set_parent(&this->component); }
+};
+
 TEST(MitsubishiCN105ClimateTests, CelsiusTemperatureMappingAndTraitsMatchExpectedValues) {
-  TestableMitsubishiCN105Climate sut;
+  MitsubishiCN105ClimateTestContext context;
   const auto mapping = TemperatureMapping();
 
   for (int temperature = 16; temperature <= 31; ++temperature) {
@@ -13,7 +22,7 @@ TEST(MitsubishiCN105ClimateTests, CelsiusTemperatureMappingAndTraitsMatchExpecte
     EXPECT_EQ(mapping.from_mitsubishi(temperature), temperature);
   }
 
-  const auto traits = sut.traits();
+  const auto traits = context.sut.traits();
   EXPECT_EQ(traits.get_temperature_unit(), TemperatureUnit::CELSIUS);
   EXPECT_FLOAT_EQ(traits.get_visual_min_temperature(), 16.0f);
   EXPECT_FLOAT_EQ(traits.get_visual_max_temperature(), 31.0f);
@@ -22,10 +31,10 @@ TEST(MitsubishiCN105ClimateTests, CelsiusTemperatureMappingAndTraitsMatchExpecte
 }
 
 TEST(MitsubishiCN105ClimateTests, FahrenheitTemperatureMappingAndTraitsMatchExpectedValues) {
-  TestableMitsubishiCN105Climate sut;
+  MitsubishiCN105ClimateTestContext context;
   auto mapping = TemperatureMapping();
   mapping.set_use_fahrenheit(true);
-  sut.set_use_fahrenheit(true);
+  context.component.set_use_fahrenheit(true);
 
   const std::array cases{
       std::pair{61, 16.0f}, std::pair{62, 16.5f}, std::pair{63, 17.0f}, std::pair{64, 17.5f}, std::pair{65, 18.0f},
@@ -40,7 +49,7 @@ TEST(MitsubishiCN105ClimateTests, FahrenheitTemperatureMappingAndTraitsMatchExpe
     EXPECT_FLOAT_EQ(mapping.to_mitsubishi(fahrenheit), mitsubishi_celsius);
     EXPECT_FLOAT_EQ(mapping.from_mitsubishi(mitsubishi_celsius), fahrenheit);
   }
-  const auto traits = sut.traits();
+  const auto traits = context.sut.traits();
   EXPECT_EQ(traits.get_temperature_unit(), TemperatureUnit::FAHRENHEIT);
   EXPECT_FLOAT_EQ(traits.get_visual_min_temperature(), 61.0f);
   EXPECT_FLOAT_EQ(traits.get_visual_max_temperature(), 88.0f);
@@ -63,163 +72,44 @@ TEST(MitsubishiCN105ClimateTests, FahrenheitTemperatureMappingUsesLinearConversi
 }
 
 TEST(MitsubishiCN105ClimateTests, SupportedSwingModeOffLeavesTraitsEmpty) {
-  TestableMitsubishiCN105Climate sut;
+  MitsubishiCN105ClimateTestContext context;
 
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_OFF);
+  context.sut.set_supported_swing_mode(climate::CLIMATE_SWING_OFF);
 
-  EXPECT_FALSE(sut.traits().get_supports_swing_modes());
+  EXPECT_FALSE(context.sut.traits().get_supports_swing_modes());
 }
 
 TEST(MitsubishiCN105ClimateTests, SupportedSwingModeVerticalExposesOffAndVertical) {
-  TestableMitsubishiCN105Climate sut;
+  MitsubishiCN105ClimateTestContext context;
 
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_VERTICAL);
+  context.sut.set_supported_swing_mode(climate::CLIMATE_SWING_VERTICAL);
 
-  EXPECT_TRUE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_OFF));
-  EXPECT_TRUE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_VERTICAL));
-  EXPECT_FALSE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_HORIZONTAL));
-  EXPECT_FALSE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_BOTH));
+  EXPECT_TRUE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_OFF));
+  EXPECT_TRUE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_VERTICAL));
+  EXPECT_FALSE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_HORIZONTAL));
+  EXPECT_FALSE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_BOTH));
 }
 
 TEST(MitsubishiCN105ClimateTests, SupportedSwingModeHorizontalExposesOffAndHorizontal) {
-  TestableMitsubishiCN105Climate sut;
+  MitsubishiCN105ClimateTestContext context;
 
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_HORIZONTAL);
+  context.sut.set_supported_swing_mode(climate::CLIMATE_SWING_HORIZONTAL);
 
-  EXPECT_TRUE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_OFF));
-  EXPECT_FALSE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_VERTICAL));
-  EXPECT_TRUE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_HORIZONTAL));
-  EXPECT_FALSE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_BOTH));
+  EXPECT_TRUE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_OFF));
+  EXPECT_FALSE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_VERTICAL));
+  EXPECT_TRUE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_HORIZONTAL));
+  EXPECT_FALSE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_BOTH));
 }
 
 TEST(MitsubishiCN105ClimateTests, SupportedSwingModeBothExposesAllExpectedModes) {
-  TestableMitsubishiCN105Climate sut;
+  MitsubishiCN105ClimateTestContext context;
 
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_BOTH);
+  context.sut.set_supported_swing_mode(climate::CLIMATE_SWING_BOTH);
 
-  EXPECT_TRUE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_OFF));
-  EXPECT_TRUE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_VERTICAL));
-  EXPECT_TRUE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_HORIZONTAL));
-  EXPECT_TRUE(sut.traits().supports_swing_mode(climate::CLIMATE_SWING_BOTH));
-}
-
-TEST(MitsubishiCN105ClimateTests, ApplyValuesMapsVerticalSwingWhenSupported) {
-  TestableMitsubishiCN105Climate sut;
-
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_VERTICAL);
-
-  sut.status().vane_mode = MitsubishiCN105::VaneMode::SWING;
-  sut.status().wide_vane_mode = MitsubishiCN105::WideVaneMode::CENTER;
-
-  sut.apply_values_();
-
-  EXPECT_EQ(sut.swing_mode, climate::CLIMATE_SWING_VERTICAL);
-}
-
-TEST(MitsubishiCN105ClimateTests, ApplyValuesMapsHorizontalSwingWhenSupported) {
-  TestableMitsubishiCN105Climate sut;
-
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_HORIZONTAL);
-
-  sut.status().vane_mode = MitsubishiCN105::VaneMode::AUTO;
-  sut.status().wide_vane_mode = MitsubishiCN105::WideVaneMode::SWING;
-
-  sut.apply_values_();
-
-  EXPECT_EQ(sut.swing_mode, climate::CLIMATE_SWING_HORIZONTAL);
-}
-
-TEST(MitsubishiCN105ClimateTests, ApplyValuesMapsBothSwingWhenSupported) {
-  TestableMitsubishiCN105Climate sut;
-
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_BOTH);
-
-  sut.status().vane_mode = MitsubishiCN105::VaneMode::SWING;
-  sut.status().wide_vane_mode = MitsubishiCN105::WideVaneMode::SWING;
-
-  sut.apply_values_();
-
-  EXPECT_EQ(sut.swing_mode, climate::CLIMATE_SWING_BOTH);
-}
-
-TEST(MitsubishiCN105ClimateTests, ApplyValuesMapsSwingOffWhenNoSwingActive) {
-  TestableMitsubishiCN105Climate sut;
-
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_BOTH);
-
-  sut.status().vane_mode = MitsubishiCN105::VaneMode::POSITION_3;
-  sut.status().wide_vane_mode = MitsubishiCN105::WideVaneMode::CENTER;
-
-  sut.apply_values_();
-
-  EXPECT_EQ(sut.swing_mode, climate::CLIMATE_SWING_OFF);
-}
-
-TEST(MitsubishiCN105ClimateTests, ApplyValuesRemembersLastNonSwingPositions) {
-  TestableMitsubishiCN105Climate sut;
-
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_BOTH);
-
-  sut.status().vane_mode = MitsubishiCN105::VaneMode::POSITION_4;
-  sut.status().wide_vane_mode = MitsubishiCN105::WideVaneMode::RIGHT;
-
-  sut.apply_values_();
-
-  EXPECT_EQ(sut.last_non_swing_vane_mode_, MitsubishiCN105::VaneMode::POSITION_4);
-  EXPECT_EQ(sut.last_non_swing_wide_vane_mode_, MitsubishiCN105::WideVaneMode::RIGHT);
-
-  sut.status().vane_mode = MitsubishiCN105::VaneMode::SWING;
-  sut.status().wide_vane_mode = MitsubishiCN105::WideVaneMode::SWING;
-
-  sut.apply_values_();
-
-  EXPECT_EQ(sut.last_non_swing_vane_mode_, MitsubishiCN105::VaneMode::POSITION_4);
-  EXPECT_EQ(sut.last_non_swing_wide_vane_mode_, MitsubishiCN105::WideVaneMode::RIGHT);
-  EXPECT_EQ(sut.swing_mode, climate::CLIMATE_SWING_BOTH);
-}
-
-TEST(MitsubishiCN105ClimateTests, ApplyValuesDoesNotOverwriteRememberedPositionWithUnknownValues) {
-  TestableMitsubishiCN105Climate sut;
-
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_BOTH);
-
-  sut.last_non_swing_vane_mode_ = MitsubishiCN105::VaneMode::POSITION_2;
-  sut.last_non_swing_wide_vane_mode_ = MitsubishiCN105::WideVaneMode::LEFT;
-
-  sut.status().vane_mode = MitsubishiCN105::VaneMode::UNKNOWN;
-  sut.status().wide_vane_mode = MitsubishiCN105::WideVaneMode::UNKNOWN;
-
-  sut.apply_values_();
-
-  EXPECT_EQ(sut.last_non_swing_vane_mode_, MitsubishiCN105::VaneMode::POSITION_2);
-  EXPECT_EQ(sut.last_non_swing_wide_vane_mode_, MitsubishiCN105::WideVaneMode::LEFT);
-  EXPECT_EQ(sut.swing_mode, climate::CLIMATE_SWING_OFF);
-}
-
-TEST(MitsubishiCN105ClimateTests, ApplyValuesIgnoresUnsupportedVerticalSwingState) {
-  TestableMitsubishiCN105Climate sut;
-
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_HORIZONTAL);
-
-  sut.status().vane_mode = MitsubishiCN105::VaneMode::SWING;
-  sut.status().wide_vane_mode = MitsubishiCN105::WideVaneMode::CENTER;
-
-  sut.apply_values_();
-
-  EXPECT_EQ(sut.swing_mode, climate::CLIMATE_SWING_OFF);
-}
-
-TEST(MitsubishiCN105ClimateTests, ApplyValuesIgnoresUnsupportedHorizontalSwingState) {
-  TestableMitsubishiCN105Climate sut;
-
-  sut.set_supported_swing_mode(climate::CLIMATE_SWING_VERTICAL);
-
-  sut.status().vane_mode = MitsubishiCN105::VaneMode::AUTO;
-  sut.status().wide_vane_mode = MitsubishiCN105::WideVaneMode::SWING;
-
-  sut.apply_values_();
-
-  EXPECT_EQ(sut.swing_mode, climate::CLIMATE_SWING_OFF);
+  EXPECT_TRUE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_OFF));
+  EXPECT_TRUE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_VERTICAL));
+  EXPECT_TRUE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_HORIZONTAL));
+  EXPECT_TRUE(context.sut.traits().supports_swing_mode(climate::CLIMATE_SWING_BOTH));
 }
 
 }  // namespace esphome::mitsubishi_cn105::testing
diff --git a/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_swing_mode_manager_tests.cpp b/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_swing_mode_manager_tests.cpp
new file mode 100644
index 0000000000..ab3048b874
--- /dev/null
+++ b/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_swing_mode_manager_tests.cpp
@@ -0,0 +1,99 @@
+#include "../common.h"
+
+#include "esphome/components/mitsubishi_cn105/mitsubishi_cn105_swing_mode_manager.h"
+
+namespace esphome::mitsubishi_cn105::testing {
+
+static SwingModeManager make_swing_mode_manager(std::initializer_list<climate::ClimateSwingMode> supported_modes) {
+  SwingModeManager manager;
+  climate::ClimateSwingModeMask supported_swing_modes;
+  for (const auto mode : supported_modes)
+    supported_swing_modes.insert(mode);
+  manager.set_supported_swing_modes(supported_swing_modes);
+  return manager;
+}
+
+TEST(SwingModeManagerTests, StatusMapsVerticalSwingWhenSupported) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL});
+  EXPECT_EQ(manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::SWING, MitsubishiCN105::WideVaneMode::CENTER),
+            std::optional{climate::CLIMATE_SWING_VERTICAL});
+}
+
+TEST(SwingModeManagerTests, StatusMapsHorizontalSwingWhenSupported) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_HORIZONTAL});
+  EXPECT_EQ(manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::AUTO, MitsubishiCN105::WideVaneMode::SWING),
+            std::optional{climate::CLIMATE_SWING_HORIZONTAL});
+}
+
+TEST(SwingModeManagerTests, StatusMapsBothSwingWhenSupported) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL,
+                                          climate::CLIMATE_SWING_HORIZONTAL, climate::CLIMATE_SWING_BOTH});
+  EXPECT_EQ(manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::SWING, MitsubishiCN105::WideVaneMode::SWING),
+            std::optional{climate::CLIMATE_SWING_BOTH});
+}
+
+TEST(SwingModeManagerTests, StatusMapsSwingOffWhenNoSwingActive) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL,
+                                          climate::CLIMATE_SWING_HORIZONTAL, climate::CLIMATE_SWING_BOTH});
+  EXPECT_EQ(
+      manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::POSITION_3, MitsubishiCN105::WideVaneMode::CENTER),
+      std::optional{climate::CLIMATE_SWING_OFF});
+}
+
+TEST(SwingModeManagerTests, RemembersLastNonSwingPositions) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL,
+                                          climate::CLIMATE_SWING_HORIZONTAL, climate::CLIMATE_SWING_BOTH});
+  manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::POSITION_4, MitsubishiCN105::WideVaneMode::RIGHT);
+  manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::SWING, MitsubishiCN105::WideVaneMode::SWING);
+  EXPECT_EQ(manager.vane_from(climate::CLIMATE_SWING_OFF), std::optional{MitsubishiCN105::VaneMode::POSITION_4});
+  EXPECT_EQ(manager.wide_vane_from(climate::CLIMATE_SWING_OFF), std::optional{MitsubishiCN105::WideVaneMode::RIGHT});
+}
+
+TEST(SwingModeManagerTests, UnknownValuesDoNotOverwriteRememberedPositions) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL,
+                                          climate::CLIMATE_SWING_HORIZONTAL, climate::CLIMATE_SWING_BOTH});
+  manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::POSITION_2, MitsubishiCN105::WideVaneMode::LEFT);
+  manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::UNKNOWN, MitsubishiCN105::WideVaneMode::UNKNOWN);
+  EXPECT_EQ(manager.vane_from(climate::CLIMATE_SWING_OFF), std::optional{MitsubishiCN105::VaneMode::POSITION_2});
+  EXPECT_EQ(manager.wide_vane_from(climate::CLIMATE_SWING_OFF), std::optional{MitsubishiCN105::WideVaneMode::LEFT});
+}
+
+TEST(SwingModeManagerTests, UnsupportedVerticalSwingStateIsIgnored) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_HORIZONTAL});
+  EXPECT_EQ(manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::SWING, MitsubishiCN105::WideVaneMode::CENTER),
+            std::optional{climate::CLIMATE_SWING_OFF});
+}
+
+TEST(SwingModeManagerTests, UnsupportedHorizontalSwingStateIsIgnored) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL});
+  EXPECT_EQ(manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::AUTO, MitsubishiCN105::WideVaneMode::SWING),
+            std::optional{climate::CLIMATE_SWING_OFF});
+}
+
+TEST(SwingModeManagerTests, SwingModeFromReturnsNulloptWhenNoSwingModesSupported) {
+  auto manager = make_swing_mode_manager({});
+  EXPECT_FALSE(manager.update_and_get_swing_mode(MitsubishiCN105::VaneMode::SWING, MitsubishiCN105::WideVaneMode::SWING)
+                   .has_value());
+}
+
+TEST(SwingModeManagerTests, VaneFromSwingModeReturnsNulloptWhenVerticalUnsupported) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_HORIZONTAL});
+  EXPECT_FALSE(manager.vane_from(climate::CLIMATE_SWING_VERTICAL).has_value());
+}
+
+TEST(SwingModeManagerTests, WideVaneFromSwingModeReturnsNulloptWhenHorizontalUnsupported) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL});
+  EXPECT_FALSE(manager.wide_vane_from(climate::CLIMATE_SWING_HORIZONTAL).has_value());
+}
+
+TEST(SwingModeManagerTests, VaneAndWideVaneFromSwingModeMapSwingModes) {
+  auto manager = make_swing_mode_manager({climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL,
+                                          climate::CLIMATE_SWING_HORIZONTAL, climate::CLIMATE_SWING_BOTH});
+  EXPECT_EQ(manager.vane_from(climate::CLIMATE_SWING_VERTICAL), std::optional{MitsubishiCN105::VaneMode::SWING});
+  EXPECT_EQ(manager.vane_from(climate::CLIMATE_SWING_BOTH), std::optional{MitsubishiCN105::VaneMode::SWING});
+  EXPECT_EQ(manager.wide_vane_from(climate::CLIMATE_SWING_HORIZONTAL),
+            std::optional{MitsubishiCN105::WideVaneMode::SWING});
+  EXPECT_EQ(manager.wide_vane_from(climate::CLIMATE_SWING_BOTH), std::optional{MitsubishiCN105::WideVaneMode::SWING});
+}
+
+}  // namespace esphome::mitsubishi_cn105::testing
diff --git a/tests/components/mitsubishi_cn105/common.h b/tests/components/mitsubishi_cn105/common.h
index ee287d2548..6029327e9a 100644
--- a/tests/components/mitsubishi_cn105/common.h
+++ b/tests/components/mitsubishi_cn105/common.h
@@ -64,26 +64,4 @@ class TestableMitsubishiCN105 : public MitsubishiCN105 {
   void set_current_time(uint32_t ms) { test_loop_time_ms = ms; }
 };
 
-class TestableMitsubishiCN105Climate : public MitsubishiCN105Climate {
- public:
-  TestableMitsubishiCN105Climate() { this->set_parent(&this->component_); }
-
-  using MitsubishiCN105Climate::apply_values_;
-  using MitsubishiCN105Climate::last_non_swing_vane_mode_;
-  using MitsubishiCN105Climate::last_non_swing_wide_vane_mode_;
-
-  MitsubishiCN105::Status &status() { return const_cast<MitsubishiCN105::Status &>(this->component_.status()); }
-  void set_use_fahrenheit(bool value) { this->component_.set_use_fahrenheit(value); }
-
- protected:
-  MitsubishiCN105Component component_;
-};
-
-class TestableMitsubishiCN105Component : public MitsubishiCN105Component {
- public:
-  MitsubishiCN105::Status &mutable_status() { return const_cast<MitsubishiCN105::Status &>(this->status()); }
-
-  void notify_status() { this->status_callback_.call(); }
-};
-
 }  // namespace esphome::mitsubishi_cn105::testing
diff --git a/tests/components/mitsubishi_cn105/mitsubishi_cn105_component_tests.cpp b/tests/components/mitsubishi_cn105/mitsubishi_cn105_component_tests.cpp
index c957759223..928d4123f6 100644
--- a/tests/components/mitsubishi_cn105/mitsubishi_cn105_component_tests.cpp
+++ b/tests/components/mitsubishi_cn105/mitsubishi_cn105_component_tests.cpp
@@ -3,7 +3,7 @@
 namespace esphome::mitsubishi_cn105::testing {
 
 TEST(MitsubishiCN105ComponentTests, PublishesVaneStateForEveryValidSnapshot) {
-  TestableMitsubishiCN105Component hub;
+  MitsubishiCN105Component hub;
   size_t callback_count = 0;
   std::optional<VerticalVaneMode> callback_direction;
   hub.add_on_vane_state_callback([&](const VaneState &state) {
@@ -11,8 +11,9 @@ TEST(MitsubishiCN105ComponentTests, PublishesVaneStateForEveryValidSnapshot) {
     callback_direction = state.vertical.direction;
   });
 
-  hub.mutable_status().room_temperature = 20.0f;
-  hub.mutable_status().vane_mode = MitsubishiCN105::VaneMode::POSITION_4;
+  hub.set_telemetry_request_min_interval(SCHEDULER_DONT_RUN);
+  hub.set_target_temperature(20.0f);
+  hub.set_vane_mode(MitsubishiCN105::VaneMode::POSITION_4);
   hub.publish_status();
 
   EXPECT_EQ(callback_count, 1);
@@ -25,7 +26,7 @@ TEST(MitsubishiCN105ComponentTests, PublishesVaneStateForEveryValidSnapshot) {
 }
 
 TEST(MitsubishiCN105ComponentTests, PublishesUnknownVaneState) {
-  TestableMitsubishiCN105Component hub;
+  MitsubishiCN105Component hub;
   size_t status_callback_count = 0;
   size_t vane_callback_count = 0;
   std::optional<VerticalVaneMode> callback_direction;
@@ -35,15 +36,16 @@ TEST(MitsubishiCN105ComponentTests, PublishesUnknownVaneState) {
     callback_direction = state.vertical.direction;
   });
 
-  hub.mutable_status().room_temperature = 20.0f;
-  hub.mutable_status().vane_mode = MitsubishiCN105::VaneMode::UNKNOWN;
+  hub.set_telemetry_request_min_interval(SCHEDULER_DONT_RUN);
+  hub.set_target_temperature(20.0f);
+  ASSERT_EQ(hub.status().vane_mode, MitsubishiCN105::VaneMode::UNKNOWN);
   hub.publish_status();
 
   EXPECT_EQ(status_callback_count, 1);
   EXPECT_EQ(vane_callback_count, 1);
   EXPECT_EQ(callback_direction, std::optional{VERTICAL_VANE_MODE_UNKNOWN});
 
-  hub.mutable_status().vane_mode = MitsubishiCN105::VaneMode::POSITION_4;
+  hub.set_vane_mode(MitsubishiCN105::VaneMode::POSITION_4);
   hub.publish_status();
 
   EXPECT_EQ(status_callback_count, 2);
@@ -52,7 +54,7 @@ TEST(MitsubishiCN105ComponentTests, PublishesUnknownVaneState) {
 }
 
 TEST(MitsubishiCN105ComponentTests, VaneCallAppliesVerticalDirection) {
-  TestableMitsubishiCN105Component hub;
+  MitsubishiCN105Component hub;
 
   auto call = hub.make_vane_call();
   call.vertical.set_direction(VERTICAL_VANE_MODE_POSITION_5);
@@ -62,12 +64,11 @@ TEST(MitsubishiCN105ComponentTests, VaneCallAppliesVerticalDirection) {
 }
 
 TEST(MitsubishiCN105ComponentTests, VaneControlActionAppliesConfiguredFields) {
-  TestableMitsubishiCN105Component hub;
+  MitsubishiCN105Component hub;
   VaneControlAction<> action(&hub, [](VaneCall &call) { call.vertical.set_direction(VERTICAL_VANE_MODE_SWING); });
 
   action.play();
 
   EXPECT_EQ(hub.status().vane_mode, MitsubishiCN105::VaneMode::SWING);
 }
-
 }  // namespace esphome::mitsubishi_cn105::testing
diff --git a/tests/components/mitsubishi_cn105/select/mitsubishi_cn105_vane_select_vertical_tests.cpp b/tests/components/mitsubishi_cn105/select/mitsubishi_cn105_vane_select_vertical_tests.cpp
index 1f928e3bf4..55ae1d6c92 100644
--- a/tests/components/mitsubishi_cn105/select/mitsubishi_cn105_vane_select_vertical_tests.cpp
+++ b/tests/components/mitsubishi_cn105/select/mitsubishi_cn105_vane_select_vertical_tests.cpp
@@ -3,14 +3,9 @@
 
 namespace esphome::mitsubishi_cn105::testing {
 
-class TestableMitsubishiCN105VerticalVaneDirectionSelect : public MitsubishiCN105VerticalVaneDirectionSelect {
- public:
-  using MitsubishiCN105VerticalVaneDirectionSelect::control;
-};
-
 struct VerticalVaneDirectionSelectTestContext {
-  TestableMitsubishiCN105Component hub;
-  TestableMitsubishiCN105VerticalVaneDirectionSelect select;
+  MitsubishiCN105Component hub;
+  MitsubishiCN105VerticalVaneDirectionSelect select;
 
   VerticalVaneDirectionSelectTestContext() {
     this->select.traits.set_options({"Auto", "1", "2", "3", "4", "5", "Swing"});
@@ -31,13 +26,15 @@ TEST(MitsubishiCN105VerticalVaneDirectionSelectTests, MapsIndexesToVaneModes) {
 
   for (size_t i = 0; i < expected_modes.size(); ++i) {
     SCOPED_TRACE(i);
-    ctx.select.control(i);
+    ctx.select.make_call().set_index(i).perform();
     EXPECT_EQ(ctx.hub.status().vane_mode, expected_modes[i]);
   }
 }
 
 TEST(MitsubishiCN105VerticalVaneDirectionSelectTests, PublishesIncomingVaneModes) {
   VerticalVaneDirectionSelectTestContext ctx;
+  ctx.hub.set_telemetry_request_min_interval(SCHEDULER_DONT_RUN);
+  ctx.hub.set_target_temperature(20.0f);
 
   constexpr std::array modes{
       MitsubishiCN105::VaneMode::AUTO,       MitsubishiCN105::VaneMode::POSITION_1,
@@ -48,13 +45,12 @@ TEST(MitsubishiCN105VerticalVaneDirectionSelectTests, PublishesIncomingVaneModes
 
   for (size_t i = 0; i < modes.size(); ++i) {
     SCOPED_TRACE(i);
-    ctx.hub.mutable_status().vane_mode = modes[i];
-    ctx.hub.notify_status();
+    ctx.hub.set_vane_mode(modes[i]);
+    ctx.hub.publish_status();
     EXPECT_EQ(ctx.select.active_index(), std::optional{i});
   }
 
-  ctx.hub.mutable_status().vane_mode = MitsubishiCN105::VaneMode::UNKNOWN;
-  ctx.hub.notify_status();
+  ctx.select.publish_vane_state(MitsubishiCN105::VaneMode::UNKNOWN);
   EXPECT_EQ(ctx.select.active_index(), std::optional{modes.size() - 1});
 }
 
@@ -64,14 +60,15 @@ TEST(MitsubishiCN105VerticalVaneDirectionSelectTests, ControlPublishesSelectAndC
   climate_entity.set_parent(&ctx.hub);
   climate_entity.set_supported_swing_mode(climate::CLIMATE_SWING_VERTICAL);
 
-  ctx.hub.mutable_status().room_temperature = 20.0f;
+  ctx.hub.set_telemetry_request_min_interval(SCHEDULER_DONT_RUN);
+  ctx.hub.set_target_temperature(20.0f);
   climate_entity.setup();
 
-  ctx.select.control(6);
+  ctx.select.make_call().set_index(6).perform();
   EXPECT_EQ(ctx.select.active_index(), std::optional<size_t>{6});
   EXPECT_EQ(climate_entity.swing_mode, climate::CLIMATE_SWING_VERTICAL);
 
-  ctx.select.control(3);
+  ctx.select.make_call().set_index(3).perform();
   EXPECT_EQ(ctx.select.active_index(), std::optional<size_t>{3});
   EXPECT_EQ(climate_entity.swing_mode, climate::CLIMATE_SWING_OFF);
 }
@@ -82,7 +79,8 @@ TEST(MitsubishiCN105VerticalVaneDirectionSelectTests, ClimateControlPublishesSel
   climate_entity.set_parent(&ctx.hub);
   climate_entity.set_supported_swing_mode(climate::CLIMATE_SWING_VERTICAL);
 
-  ctx.hub.mutable_status().room_temperature = 20.0f;
+  ctx.hub.set_telemetry_request_min_interval(SCHEDULER_DONT_RUN);
+  ctx.hub.set_target_temperature(20.0f);
   climate_entity.setup();
 
   climate_entity.make_call().set_swing_mode(climate::CLIMATE_SWING_VERTICAL).perform();
@@ -95,10 +93,9 @@ TEST(MitsubishiCN105VerticalVaneDirectionSelectTests, ClimateControlPublishesSel
 TEST(MitsubishiCN105VerticalVaneDirectionSelectTests, BeforeInitializationDoesNotPublishSelectState) {
   VerticalVaneDirectionSelectTestContext ctx;
 
-  ctx.select.control(3);
+  ctx.select.make_call().set_index(3).perform();
 
   EXPECT_EQ(ctx.hub.status().vane_mode, MitsubishiCN105::VaneMode::POSITION_3);
   EXPECT_FALSE(ctx.select.has_state());
 }
-
 }  // namespace esphome::mitsubishi_cn105::testing

From d84293931ba1bfe3583fd574d19a4bf3943aa373 Mon Sep 17 00:00:00 2001
From: guillempages <guillempages@users.noreply.github.com>
Date: Sun, 23 Aug 2026 21:58:01 +0200
Subject: [PATCH 097/155] [online_image] Support image format auto-detection
 (#16337)

Co-authored-by: J. Nick Koston <nick@koston.org>
Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Co-authored-by: J. Nick Koston <nick@home-assistant.io>
---
 .../http_request/http_request_idf.cpp         |   3 +
 esphome/components/online_image/image.py      |  13 +-
 .../components/online_image/online_image.cpp  |  52 +++++-
 esphome/components/runtime_image/__init__.py  |  27 ++-
 .../components/runtime_image/image_format.h   |   3 +-
 .../runtime_image/runtime_image.cpp           |  18 +-
 .../components/runtime_image/runtime_image.h  |   4 +-
 tests/components/online_image/common.yaml     |   5 +
 .../runtime_image/test_decoder_reuse.cpp      |  68 +++++---
 ...ine_image_auto_detects_image_bmp_mime.yaml |  28 ++++
 ...uto_detects_redirected_image_bmp_mime.yaml |  28 ++++
 .../fixtures/online_image_bmp.yaml            |   5 +-
 tests/integration/online_image_utils.py       | 158 ++++++++++++++++++
 ...nline_image_auto_detects_image_bmp_mime.py |  71 ++++++++
 ..._auto_detects_redirected_image_bmp_mime.py |  71 ++++++++
 tests/integration/test_online_image_bmp.py    |  63 +------
 16 files changed, 513 insertions(+), 104 deletions(-)
 create mode 100644 tests/integration/fixtures/online_image_auto_detects_image_bmp_mime.yaml
 create mode 100644 tests/integration/fixtures/online_image_auto_detects_redirected_image_bmp_mime.yaml
 create mode 100644 tests/integration/online_image_utils.py
 create mode 100644 tests/integration/test_online_image_auto_detects_image_bmp_mime.py
 create mode 100644 tests/integration/test_online_image_auto_detects_redirected_image_bmp_mime.py

diff --git a/esphome/components/http_request/http_request_idf.cpp b/esphome/components/http_request/http_request_idf.cpp
index ddff954950..470ed332f1 100644
--- a/esphome/components/http_request/http_request_idf.cpp
+++ b/esphome/components/http_request/http_request_idf.cpp
@@ -196,6 +196,9 @@ std::shared_ptr<HttpContainer> HttpRequestIDF::perform(const std::string &url, c
       }
 
       container->feed_wdt();
+      // IDF is the only backend reusing the container across redirect hops;
+      // drop the previous hop's headers (Arduino/host collect only the final response)
+      container->response_headers_.clear();
       container->content_length = esp_http_client_fetch_headers(client);
       container->set_chunked(esp_http_client_is_chunked_response(client));
       container->feed_wdt();
diff --git a/esphome/components/online_image/image.py b/esphome/components/online_image/image.py
index ae785d17f9..3e9517937e 100644
--- a/esphome/components/online_image/image.py
+++ b/esphome/components/online_image/image.py
@@ -4,8 +4,16 @@ from esphome.components import runtime_image
 from esphome.components.const import CONF_REQUEST_HEADERS
 from esphome.components.http_request import CONF_HTTP_REQUEST_ID, HttpRequestComponent
 from esphome.components.image import CONF_TRANSPARENCY, add_metadata
+from esphome.components.runtime_image import IMAGE_FORMATS
 import esphome.config_validation as cv
-from esphome.const import CONF_BUFFER_SIZE, CONF_ID, CONF_ON_ERROR, CONF_TYPE, CONF_URL
+from esphome.const import (
+    CONF_BUFFER_SIZE,
+    CONF_FORMAT,
+    CONF_ID,
+    CONF_ON_ERROR,
+    CONF_TYPE,
+    CONF_URL,
+)
 from esphome.core import ID, Lambda
 from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
@@ -31,7 +39,6 @@ ReleaseImageAction = online_image_ns.class_(
     "OnlineImageReleaseAction", automation.Action, cg.Parented.template(OnlineImage)
 )
 
-
 ONLINE_IMAGE_SCHEMA = (
     runtime_image.runtime_image_schema(OnlineImage)
     .extend(
@@ -39,6 +46,8 @@ ONLINE_IMAGE_SCHEMA = (
             # Online Image specific options
             cv.GenerateID(CONF_HTTP_REQUEST_ID): cv.use_id(HttpRequestComponent),
             cv.Required(CONF_URL): cv.url,
+            # AUTO (Content-Type detection) is online_image specific; not in the shared registry
+            cv.Required(CONF_FORMAT): cv.one_of(*IMAGE_FORMATS, "AUTO", upper=True),
             cv.Optional(CONF_BUFFER_SIZE, default=65536): cv.int_range(256, 65536),
             cv.Optional(CONF_REQUEST_HEADERS): cv.All(
                 cv.Schema({cv.string: cv.templatable(cv.string)})
diff --git a/esphome/components/online_image/online_image.cpp b/esphome/components/online_image/online_image.cpp
index fe4f727cd6..a2662ff0e3 100644
--- a/esphome/components/online_image/online_image.cpp
+++ b/esphome/components/online_image/online_image.cpp
@@ -1,9 +1,11 @@
 #include "online_image.h"
 #include "esphome/components/runtime_image/image_decoder.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include <algorithm>
 
 static const char *const TAG = "online_image";
+static const char *const CONTENT_TYPE_HEADER_NAME = "content-type";
 static const char *const ETAG_HEADER_NAME = "etag";
 static const char *const IF_NONE_MATCH_HEADER_NAME = "if-none-match";
 static const char *const LAST_MODIFIED_HEADER_NAME = "last-modified";
@@ -62,7 +64,8 @@ void OnlineImage::update() {
 
   // Add Accept header based on image format
   const char *accept_mime_type;
-  switch (this->get_format()) {
+  runtime_image::ImageFormat format = this->get_format();
+  switch (format) {
 #ifdef USE_RUNTIME_IMAGE_BMP
     case runtime_image::BMP:
       accept_mime_type = "image/bmp,*/*;q=0.8";
@@ -89,8 +92,8 @@ void OnlineImage::update() {
     headers.push_back(http_request::Header{header.first, header.second.value()});
   }
 
-  this->downloader_ = this->parent_->get(this->url_, headers, {ETAG_HEADER_NAME, LAST_MODIFIED_HEADER_NAME});
-
+  this->downloader_ =
+      this->parent_->get(this->url_, headers, {ETAG_HEADER_NAME, LAST_MODIFIED_HEADER_NAME, CONTENT_TYPE_HEADER_NAME});
   if (this->downloader_ == nullptr) {
     ESP_LOGE(TAG, "Download failed.");
     this->end_connection_();
@@ -115,17 +118,54 @@ void OnlineImage::update() {
 
   ESP_LOGD(TAG, "Starting download");
   size_t total_size = this->downloader_->content_length;
+  ESP_LOGV(TAG, "Content-Length: %zu", total_size);
+
+  if (format == runtime_image::AUTO) {
+    // Try to auto-detect format from Content-Type header
+    auto content_type_header = this->downloader_->get_response_header(CONTENT_TYPE_HEADER_NAME);
+    const char *content_type = content_type_header.c_str();
+    ESP_LOGV(TAG, "Content-Type: %s", content_type);
+    // Includes aliases seen from real servers (older IIS, CDNs, S3)
+    if (str_contains_ignore_case(content_type, "image/bmp") ||
+        str_contains_ignore_case(content_type, "image/x-ms-bmp") ||
+        str_contains_ignore_case(content_type, "image/x-bmp")) {
+      format = runtime_image::BMP;
+    } else if (str_contains_ignore_case(content_type, "image/jpeg") ||
+               str_contains_ignore_case(content_type, "image/jpg")) {
+      format = runtime_image::JPEG;
+    } else if (str_contains_ignore_case(content_type, "image/png") ||
+               str_contains_ignore_case(content_type, "image/x-png")) {
+      format = runtime_image::PNG;
+    } else if (str_contains_ignore_case(content_type, "image/")) {
+      ESP_LOGW(TAG, "Unsupported image type: '%s'", content_type);
+      this->end_connection_();
+      this->download_error_callback_.call();
+      return;
+    } else {
+      // TODO: implement auto-detection in runtime_image by sniffing the first few bytes of the image data
+      if (content_type_header.empty()) {
+        ESP_LOGW(TAG, "Server sent no Content-Type header; cannot determine image format. Set `format:` explicitly");
+      } else {
+        ESP_LOGE(TAG, "Could not determine image format from Content-Type: '%s'. Set `format:` explicitly",
+                 content_type);
+      }
+      this->end_connection_();
+      this->download_error_callback_.call();
+      return;
+    }
+  }
+  ESP_LOGD(TAG, "Using image format: %d", format);
 
   // Initialize decoder with the known format
-  if (!this->begin_decode(total_size)) {
-    ESP_LOGE(TAG, "Failed to initialize decoder for format %d", this->get_format());
+  if (!this->begin_decode(total_size, format)) {
+    ESP_LOGE(TAG, "Failed to initialize decoder for format %d", format);
     this->end_connection_();
     this->download_error_callback_.call();
     return;
   }
 
   // JPEG requires the complete image in the download buffer before decoding
-  if (this->get_format() == runtime_image::JPEG && total_size > this->download_buffer_.size()) {
+  if (format == runtime_image::JPEG && total_size > this->download_buffer_.size()) {
     this->download_buffer_.resize(total_size);
   }
 
diff --git a/esphome/components/runtime_image/__init__.py b/esphome/components/runtime_image/__init__.py
index 3c130a7d75..0d4345db5b 100644
--- a/esphome/components/runtime_image/__init__.py
+++ b/esphome/components/runtime_image/__init__.py
@@ -58,6 +58,18 @@ class Format:
         """Add defines and libraries needed for this format."""
 
 
+class AUTOFormat(Format):
+    """AUTO format - detect from MIME type."""
+
+    def __init__(self):
+        super().__init__("AUTO", None)
+
+    def actions(self) -> None:
+        # dict.fromkeys dedupes the JPG/JPEG alias so each format runs once
+        for image_format in dict.fromkeys(IMAGE_FORMATS.values()):
+            image_format.actions()
+
+
 class BMPFormat(Format):
     """BMP format decoder configuration."""
 
@@ -102,18 +114,25 @@ class PNGFormat(Format):
         cg.add_library("pngle", "1.1.0")
 
 
-# Registry of available formats
+# Decodable formats only; platforms that support runtime detection accept
+# "AUTO" in their own schema and get_format() resolves it
+_JPEG_FORMAT = JPEGFormat()
 IMAGE_FORMATS = {
     "BMP": BMPFormat(),
-    "JPEG": JPEGFormat(),
+    "JPEG": _JPEG_FORMAT,
+    "JPG": _JPEG_FORMAT,  # Alias for JPEG
     "PNG": PNGFormat(),
-    "JPG": JPEGFormat(),  # Alias for JPEG
 }
 
+AUTO_FORMAT = AUTOFormat()
+
 
 def get_format(format_name: str) -> Format | None:
     """Get a format instance by name."""
-    return IMAGE_FORMATS.get(format_name.upper())
+    name = format_name.upper()
+    if name == "AUTO":
+        return AUTO_FORMAT
+    return IMAGE_FORMATS.get(name)
 
 
 def enable_format(format_name: str) -> Format | None:
diff --git a/esphome/components/runtime_image/image_format.h b/esphome/components/runtime_image/image_format.h
index 524e52d7bc..ca6e0782b9 100644
--- a/esphome/components/runtime_image/image_format.h
+++ b/esphome/components/runtime_image/image_format.h
@@ -6,7 +6,8 @@ namespace esphome::runtime_image {
  * @brief Image format types that can be decoded dynamically.
  */
 enum ImageFormat {
-  /** Automatically detect from data. Not implemented yet. */
+  /** Format is supplied per decode, e.g. detected from the Content-Type header
+   *  by online_image; sniffing the image data is not implemented. */
   AUTO,
   /** JPEG format. */
   JPEG,
diff --git a/esphome/components/runtime_image/runtime_image.cpp b/esphome/components/runtime_image/runtime_image.cpp
index e269f7d8f3..254624caf4 100644
--- a/esphome/components/runtime_image/runtime_image.cpp
+++ b/esphome/components/runtime_image/runtime_image.cpp
@@ -171,22 +171,27 @@ void RuntimeImage::draw(int x, int y, display::Display *display, Color color_on,
   // If no image is loaded and no placeholder, nothing to draw
 }
 
-bool RuntimeImage::begin_decode(size_t expected_size) {
+bool RuntimeImage::begin_decode(size_t expected_size, ImageFormat format) {
   if (this->is_decoding()) {
     ESP_LOGW(TAG, "Decoding already in progress");
     return false;
   }
 
+  if (format == AUTO && this->format_ != AUTO) {
+    // Fall back to the configured format before the reuse check below
+    format = this->format_;
+  }
+
   // An idle decoder for a different format cannot be reused
-  if (this->decoder_ != nullptr && this->decoder_->get_format() != this->format_) {
-    ESP_LOGD(TAG, "Decoder format mismatch: current: %d, new: %d", this->decoder_->get_format(), this->format_);
+  if (this->decoder_ != nullptr && this->decoder_->get_format() != format) {
+    ESP_LOGD(TAG, "Decoder format mismatch: current: %d, new: %d", this->decoder_->get_format(), format);
     this->decoder_ = nullptr;
   }
 
   if (!this->decoder_) {
-    this->decoder_ = this->create_decoder_(this->format_);
+    this->decoder_ = this->create_decoder_(format);
     if (!this->decoder_) {
-      ESP_LOGE(TAG, "Failed to create decoder for format %d", this->format_);
+      ESP_LOGE(TAG, "Failed to create decoder for format %d", format);
       return false;
     }
   }
@@ -364,6 +369,9 @@ std::unique_ptr<ImageDecoder> RuntimeImage::create_decoder_(ImageFormat format)
     case PNG:
       return make_unique<PngDecoder>(this);
 #endif
+    case AUTO:
+      ESP_LOGE(TAG, "Image format could not be determined; set `format:` explicitly in the configuration");
+      return nullptr;
     default:
       ESP_LOGE(TAG, "Unsupported image format: %d", format);
       return nullptr;
diff --git a/esphome/components/runtime_image/runtime_image.h b/esphome/components/runtime_image/runtime_image.h
index cfac253fdb..55d5c0ae86 100644
--- a/esphome/components/runtime_image/runtime_image.h
+++ b/esphome/components/runtime_image/runtime_image.h
@@ -62,9 +62,10 @@ class RuntimeImage : public image::Image {
    * @brief Begin decoding an image.
    *
    * @param expected_size Optional hint about the expected data size.
+   * @param format The image format to decode (defaults to AUTO, which uses the value set at construction).
    * @return true if decoder was successfully initialized.
    */
-  bool begin_decode(size_t expected_size = 0);
+  bool begin_decode(size_t expected_size = 0, ImageFormat format = AUTO);
 
   /**
    * @brief Feed data to the decoder.
@@ -103,6 +104,7 @@ class RuntimeImage : public image::Image {
   /**
    * @brief Get the image format.
    */
+  /// Configured format; a format resolved per decode lives on the active decoder
   ImageFormat get_format() const { return this->format_; }
 
   /**
diff --git a/tests/components/online_image/common.yaml b/tests/components/online_image/common.yaml
index f71cf63de9..85901287c7 100644
--- a/tests/components/online_image/common.yaml
+++ b/tests/components/online_image/common.yaml
@@ -57,6 +57,11 @@ image:
     url: http://www.faqs.org/images/library.jpg
     format: JPG
     type: RGB565
+  - platform: online_image
+    id: online_auto_image
+    url: http://www.faqs.org/images/library.jpg
+    format: AUTO
+    type: RGB565
 
 # Check the set_url action
 esphome:
diff --git a/tests/components/runtime_image/test_decoder_reuse.cpp b/tests/components/runtime_image/test_decoder_reuse.cpp
index 87e77b00be..9c2d00b747 100644
--- a/tests/components/runtime_image/test_decoder_reuse.cpp
+++ b/tests/components/runtime_image/test_decoder_reuse.cpp
@@ -77,18 +77,12 @@ class TestableRuntimeImage : public RuntimeImage {
       : RuntimeImage(format, image::IMAGE_TYPE_RGB, image::TRANSPARENCY_OPAQUE, nullptr, false, 0, 0) {}
 
   ImageDecoder *decoder() { return this->decoder_.get(); }
-
-  /// Simulates the state a dynamic-format producer (PR #16337) would leave behind:
-  /// a cached decoder whose format no longer matches the image's format.
-  /// TODO: once #16337 adds a public way to change the format, drive the mismatch
-  /// through it and delete this seam.
-  void plant_decoder(ImageFormat format) { this->decoder_ = this->create_decoder_(format); }
 };
 
 /// Runs one full decode session. Returns true when every stage succeeded.
-static bool decode_all(TestableRuntimeImage &img, const uint8_t *data, size_t len) {
+static bool decode_all(TestableRuntimeImage &img, const uint8_t *data, size_t len, ImageFormat format = AUTO) {
   std::vector<uint8_t> buffer(data, data + len);  // feed_data needs mutable bytes
-  if (!img.begin_decode(len)) {
+  if (!img.begin_decode(len, format)) {
     return false;
   }
   size_t offset = 0;
@@ -203,25 +197,51 @@ TEST(RuntimeImageDecoder, ChunkedFeedDecodesLikeDownloadLoop) {
 }
 
 TEST(RuntimeImageDecoder, FormatSwitchEvictsMismatchedDecoder) {
-  // PNG image holding a stale BMP decoder: begin_decode must evict and recreate.
-  TestableRuntimeImage png_img(PNG);
-  png_img.plant_decoder(BMP);
-  ASSERT_NE(png_img.decoder(), nullptr);
-  ASSERT_EQ(png_img.decoder()->get_format(), BMP);
+  // Drive the format switch through begin_decode()'s format parameter, the way
+  // a dynamic-format producer (online_image MIME detection) does.
+  TestableRuntimeImage img(AUTO);
 
-  ASSERT_TRUE(decode_all(png_img, PNG_RGB, sizeof(PNG_RGB)));
-  EXPECT_EQ(png_img.decoder()->get_format(), PNG);
-  expect_pixels(png_img, PNG_RGB_EXPECTED);
+  ASSERT_TRUE(decode_all(img, BMP_24BPP, sizeof(BMP_24BPP), BMP));
+  ASSERT_NE(img.decoder(), nullptr);
+  ASSERT_EQ(img.decoder()->get_format(), BMP);
+  expect_pixels(img, BMP_24BPP_EXPECTED);
 
-  // And the other direction: BMP image holding a stale PNG decoder.
-  TestableRuntimeImage bmp_img(BMP);
-  bmp_img.plant_decoder(PNG);
-  ASSERT_NE(bmp_img.decoder(), nullptr);
-  ASSERT_EQ(bmp_img.decoder()->get_format(), PNG);
+  // Same explicit format again: the decoder must stay warm.
+  ImageDecoder *bmp_decoder = img.decoder();
+  ASSERT_TRUE(decode_all(img, BMP_8BPP, sizeof(BMP_8BPP), BMP));
+  expect_pixels(img, BMP_8BPP_EXPECTED);
+  EXPECT_EQ(img.decoder(), bmp_decoder);
 
-  ASSERT_TRUE(decode_all(bmp_img, BMP_24BPP, sizeof(BMP_24BPP)));
-  EXPECT_EQ(bmp_img.decoder()->get_format(), BMP);
-  expect_pixels(bmp_img, BMP_24BPP_EXPECTED);
+  // Different format: the stale decoder must be evicted and recreated.
+  ASSERT_TRUE(decode_all(img, PNG_RGB, sizeof(PNG_RGB), PNG));
+  EXPECT_EQ(img.decoder()->get_format(), PNG);
+  expect_pixels(img, PNG_RGB_EXPECTED);
+
+  // And back again.
+  ASSERT_TRUE(decode_all(img, BMP_24BPP, sizeof(BMP_24BPP), BMP));
+  EXPECT_EQ(img.decoder()->get_format(), BMP);
+  expect_pixels(img, BMP_24BPP_EXPECTED);
+}
+
+TEST(RuntimeImageDecoder, AutoFormatFallsBackToConfiguredAndKeepsDecoderWarm) {
+  // With a configured format, an AUTO begin_decode() must resolve to the
+  // configured format before the reuse check instead of evicting the decoder.
+  TestableRuntimeImage img(BMP);
+
+  ASSERT_TRUE(decode_all(img, BMP_24BPP, sizeof(BMP_24BPP), AUTO));
+  ImageDecoder *first = img.decoder();
+  ASSERT_NE(first, nullptr);
+  EXPECT_EQ(first->get_format(), BMP);
+
+  ASSERT_TRUE(decode_all(img, BMP_24BPP, sizeof(BMP_24BPP), AUTO));
+  expect_pixels(img, BMP_24BPP_EXPECTED);
+  EXPECT_EQ(img.decoder(), first) << "AUTO must not evict the configured-format decoder";
+}
+
+TEST(RuntimeImageDecoder, AutoWithoutConfiguredFormatFails) {
+  // Neither a configured format nor an explicit one: there is nothing to decode with.
+  TestableRuntimeImage img(AUTO);
+  EXPECT_FALSE(img.begin_decode(64));
 }
 
 TEST(RuntimeImageDecoder, ReleaseKeepsDecoderWarm) {
diff --git a/tests/integration/fixtures/online_image_auto_detects_image_bmp_mime.yaml b/tests/integration/fixtures/online_image_auto_detects_image_bmp_mime.yaml
new file mode 100644
index 0000000000..95e42b6755
--- /dev/null
+++ b/tests/integration/fixtures/online_image_auto_detects_image_bmp_mime.yaml
@@ -0,0 +1,28 @@
+esphome:
+  name: online-image-bmp
+
+host:
+
+http_request:
+
+display:
+
+image:
+  - platform: online_image
+    url: http://127.0.0.1:HTTP_PORT/foo.bmp
+    format: AUTO
+    id: myimg
+    type: RGB
+    on_download_finished:
+      logger.log:
+        format: "download finished. cache hit: %u"
+        args: [cached]
+
+api:
+  actions:
+    - action: fetch_image
+      then:
+        - component.update: myimg
+
+logger:
+  level: DEBUG
diff --git a/tests/integration/fixtures/online_image_auto_detects_redirected_image_bmp_mime.yaml b/tests/integration/fixtures/online_image_auto_detects_redirected_image_bmp_mime.yaml
new file mode 100644
index 0000000000..837be776f1
--- /dev/null
+++ b/tests/integration/fixtures/online_image_auto_detects_redirected_image_bmp_mime.yaml
@@ -0,0 +1,28 @@
+esphome:
+  name: online-image-bmp
+
+host:
+
+http_request:
+
+display:
+
+image:
+  - platform: online_image
+    url: http://127.0.0.1:HTTP_PORT/foo.bmp
+    id: myimg
+    format: AUTO
+    type: RGB
+    on_download_finished:
+      logger.log:
+        format: "download finished. cache hit: %u"
+        args: [cached]
+
+api:
+  actions:
+    - action: fetch_image
+      then:
+        - component.update: myimg
+
+logger:
+  level: DEBUG
diff --git a/tests/integration/fixtures/online_image_bmp.yaml b/tests/integration/fixtures/online_image_bmp.yaml
index e36514e9ae..2cd0658b56 100644
--- a/tests/integration/fixtures/online_image_bmp.yaml
+++ b/tests/integration/fixtures/online_image_bmp.yaml
@@ -7,8 +7,9 @@ http_request:
 
 display:
 
-online_image:
-  - url: http://127.0.0.1:HTTP_PORT/foo.bmp
+image:
+  - platform: online_image
+    url: http://127.0.0.1:HTTP_PORT/foo.bmp
     id: myimg
     format: BMP
     type: RGB
diff --git a/tests/integration/online_image_utils.py b/tests/integration/online_image_utils.py
new file mode 100644
index 0000000000..02f0023cb5
--- /dev/null
+++ b/tests/integration/online_image_utils.py
@@ -0,0 +1,158 @@
+"""Shared fixture server and log helpers for the online_image integration tests."""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Callable
+import re
+
+# black 8x8 RGB BMP, generated with
+#   from PIL import Image
+#   from io import BytesIO
+#   b = BytesIO()
+#   img = Image.new("RGB", (8, 8))
+#   img.save(b, format="BMP")
+#   b.getvalue()
+BMP_IMAGE = b"BM\xf6\x00\x00\x00\x00\x00\x00\x006\x00\x00\x00(\x00\x00\x00\x08\x00\x00\x00\x08\x00\x00\x00\x01\x00\x18\x00\x00\x00\x00\x00\xc0\x00\x00\x00\xc4\x0e\x00\x00\xc4\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+LEN_BMP_IMAGE = len(BMP_IMAGE)
+
+
+async def wait_for_download(
+    downloaded_bytes_future: asyncio.Future,
+    server_error_future: asyncio.Future,
+) -> int:
+    """Await the downloaded byte count, raising a server handler error first."""
+    await asyncio.wait(
+        {downloaded_bytes_future, server_error_future},
+        return_when=asyncio.FIRST_COMPLETED,
+    )
+    if server_error_future.done() and (exc := server_error_future.exception()):
+        raise exc
+    # Retrieve a late teardown error so asyncio does not log it at GC
+    server_error_future.add_done_callback(lambda f: f.exception())
+    return downloaded_bytes_future.result()
+
+
+def make_download_watcher(
+    downloaded_bytes_future: asyncio.Future,
+    download_finished_future: asyncio.Future,
+) -> Callable[[str], None]:
+    """Build a line callback resolving the futures from the device log."""
+
+    def check_output(line: str) -> None:
+        if (
+            match := re.search(r"Image fully downloaded, (\d+) bytes", line)
+        ) and not downloaded_bytes_future.done():
+            downloaded_bytes_future.set_result(int(match.group(1)))
+        if "download finished" in line and not download_finished_future.done():
+            download_finished_future.set_result(True)
+
+    return check_output
+
+
+def handle_http(
+    http_request_future,
+    content_type: str = "text/plain",
+    *,
+    request_path: str = "/foo.bmp",
+    request_line_consumed: bool = False,
+    server_error_future: asyncio.Future | None = None,
+):
+    async def handler(reader, writer):
+        try:
+            # Only read the request line if it hasn't been consumed by a caller
+            if not request_line_consumed:
+                async with asyncio.timeout(1.0):
+                    data = await reader.readuntil(b"\r\n")
+
+                expected_request = f"GET {request_path} HTTP/1.1\r\n".encode()
+                assert data[: len(expected_request)] == expected_request
+
+            async with asyncio.timeout(1.0):
+                await reader.readuntil(b"\r\n\r\n")
+
+            if not http_request_future.done():
+                http_request_future.set_result(True)
+
+            http_response = [
+                b"HTTP/1.1 200 OK",
+                b"Content-Length: %d" % LEN_BMP_IMAGE,
+                f"Content-Type: {content_type}".encode(),
+                b"Connection: close",
+                b"",
+                b"",
+            ]
+            writer.write(b"\r\n".join(http_response))
+            await writer.drain()
+
+            writer.write(BMP_IMAGE)
+
+            await writer.drain()
+        except Exception as exc:
+            if server_error_future is not None and not server_error_future.done():
+                server_error_future.set_exception(exc)
+            if not http_request_future.done():
+                http_request_future.set_exception(exc)
+            raise
+        finally:
+            writer.close()
+
+    return handler
+
+
+def handle_http_redirect(
+    http_request_future, final_request_future, server_error_future, port_holder
+):
+    async def handler(reader, writer):
+        try:
+            async with asyncio.timeout(1.0):
+                request = await reader.readuntil(b"\r\n")
+
+            if (
+                request[: len(b"GET /foo.bmp HTTP/1.1\r\n")]
+                == b"GET /foo.bmp HTTP/1.1\r\n"
+            ):
+                if not http_request_future.done():
+                    http_request_future.set_result(True)
+                async with asyncio.timeout(1.0):
+                    await reader.readuntil(b"\r\n\r\n")
+
+                http_response = [
+                    b"HTTP/1.1 302 Found",
+                    f"Location: http://127.0.0.1:{port_holder['port']}/final.bmp".encode(),
+                    b"Content-Type: text/html",
+                    b"Content-Length: 0",
+                    b"Connection: close",
+                    b"",
+                    b"",
+                ]
+                writer.write(b"\r\n".join(http_response))
+                await writer.drain()
+                return
+
+            assert (
+                request[: len(b"GET /final.bmp HTTP/1.1\r\n")]
+                == b"GET /final.bmp HTTP/1.1\r\n"
+            )
+            if not final_request_future.done():
+                final_request_future.set_result(True)
+            await handle_http(
+                final_request_future,
+                "image/bmp",
+                request_path="/final.bmp",
+                request_line_consumed=True,
+                server_error_future=server_error_future,
+            )(reader, writer)
+        except Exception as exc:
+            # Route handler failures to the dedicated error future so they're not silently lost
+            if not server_error_future.done():
+                server_error_future.set_exception(exc)
+            if not http_request_future.done():
+                http_request_future.set_exception(exc)
+            if not final_request_future.done():
+                final_request_future.set_exception(exc)
+            raise
+        finally:
+            writer.close()
+
+    return handler
diff --git a/tests/integration/test_online_image_auto_detects_image_bmp_mime.py b/tests/integration/test_online_image_auto_detects_image_bmp_mime.py
new file mode 100644
index 0000000000..3d2f6afd95
--- /dev/null
+++ b/tests/integration/test_online_image_auto_detects_image_bmp_mime.py
@@ -0,0 +1,71 @@
+"""Test that online_image AUTO format detection reads the Content-Type header."""
+
+from __future__ import annotations
+
+import asyncio
+
+import pytest
+
+from .online_image_utils import (
+    LEN_BMP_IMAGE,
+    handle_http,
+    make_download_watcher,
+    wait_for_download,
+)
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+
+@pytest.mark.asyncio
+async def test_online_image_auto_detects_image_bmp_mime(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+) -> None:
+    """AUTO format detection should honor the final response MIME type without explicit format."""
+    loop = asyncio.get_running_loop()
+    http_request_future = loop.create_future()
+    server_error_future = loop.create_future()
+    download_finished_future = loop.create_future()
+    downloaded_bytes_future = loop.create_future()
+
+    check_output = make_download_watcher(
+        downloaded_bytes_future, download_finished_future
+    )
+
+    server = await asyncio.start_server(
+        handle_http(
+            http_request_future,
+            "image/bmp",
+            server_error_future=server_error_future,
+        ),
+        "127.0.0.1",
+        0,
+    )
+    http_server_port = server.sockets[0].getsockname()[1]
+
+    config = yaml_config.replace("HTTP_PORT", str(http_server_port))
+
+    async with (
+        server,
+        run_compiled(config, line_callback=check_output),
+        api_client_connected() as client,
+    ):
+        device_info = await client.device_info()
+        assert device_info is not None
+        assert device_info.name == "online-image-bmp"
+
+        _, services = await client.list_entities_services()
+        request_service = next((s for s in services if s.name == "fetch_image"), None)
+        assert request_service is not None
+
+        await client.execute_service(request_service, {})
+
+        async with asyncio.timeout(0.1):
+            await http_request_future
+
+        async with asyncio.timeout(0.5):
+            numbytes = await wait_for_download(
+                downloaded_bytes_future, server_error_future
+            )
+            assert numbytes == LEN_BMP_IMAGE
+            await download_finished_future
diff --git a/tests/integration/test_online_image_auto_detects_redirected_image_bmp_mime.py b/tests/integration/test_online_image_auto_detects_redirected_image_bmp_mime.py
new file mode 100644
index 0000000000..3fe28ac413
--- /dev/null
+++ b/tests/integration/test_online_image_auto_detects_redirected_image_bmp_mime.py
@@ -0,0 +1,71 @@
+"""Test that AUTO format detection uses the final Content-Type after redirects."""
+
+from __future__ import annotations
+
+import asyncio
+
+import pytest
+
+from .online_image_utils import (
+    LEN_BMP_IMAGE,
+    handle_http_redirect,
+    make_download_watcher,
+    wait_for_download,
+)
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+
+@pytest.mark.asyncio
+async def test_online_image_auto_detects_redirected_image_bmp_mime(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+) -> None:
+    """Redirect hops should not leave the 302 HTML Content-Type in place for the final image."""
+    loop = asyncio.get_running_loop()
+    http_request_future = loop.create_future()
+    final_request_future = loop.create_future()
+    server_error_future = loop.create_future()
+    download_finished_future = loop.create_future()
+    downloaded_bytes_future = loop.create_future()
+
+    check_output = make_download_watcher(
+        downloaded_bytes_future, download_finished_future
+    )
+
+    port_holder = {}
+    server = await asyncio.start_server(
+        handle_http_redirect(
+            http_request_future, final_request_future, server_error_future, port_holder
+        ),
+        "127.0.0.1",
+        0,
+    )
+    port_holder["port"] = server.sockets[0].getsockname()[1]
+
+    config = yaml_config.replace("HTTP_PORT", str(port_holder["port"]))
+
+    async with (
+        server,
+        run_compiled(config, line_callback=check_output),
+        api_client_connected() as client,
+    ):
+        device_info = await client.device_info()
+        assert device_info is not None
+        assert device_info.name == "online-image-bmp"
+
+        _, services = await client.list_entities_services()
+        request_service = next((s for s in services if s.name == "fetch_image"), None)
+        assert request_service is not None
+
+        await client.execute_service(request_service, {})
+
+        async with asyncio.timeout(0.1):
+            await http_request_future
+        async with asyncio.timeout(0.5):
+            await final_request_future
+            numbytes = await wait_for_download(
+                downloaded_bytes_future, server_error_future
+            )
+            assert numbytes == LEN_BMP_IMAGE
+            await download_finished_future
diff --git a/tests/integration/test_online_image_bmp.py b/tests/integration/test_online_image_bmp.py
index 7c32154fdd..871a97b753 100644
--- a/tests/integration/test_online_image_bmp.py
+++ b/tests/integration/test_online_image_bmp.py
@@ -1,62 +1,12 @@
 from __future__ import annotations
 
 import asyncio
-import re
 
 import pytest
 
+from .online_image_utils import LEN_BMP_IMAGE, handle_http, make_download_watcher
 from .types import APIClientConnectedFactory, RunCompiledFunction
 
-# black 8x8 RGB BMP, generated with
-#   from PIL import Image
-#   from io import BytesIO
-#   b = BytesIO()
-#   img = Image.new("RGB", (8, 8))
-#   img.save(b, format="BMP")
-#   b.getvalue()
-BMP_IMAGE = b"BM\xf6\x00\x00\x00\x00\x00\x00\x006\x00\x00\x00(\x00\x00\x00\x08\x00\x00\x00\x08\x00\x00\x00\x01\x00\x18\x00\x00\x00\x00\x00\xc0\x00\x00\x00\xc4\x0e\x00\x00\xc4\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-LEN_BMP_IMAGE = len(BMP_IMAGE)
-
-
-def handle_http(http_request_future):
-    async def handler(reader, writer):
-        try:
-            async with asyncio.timeout(1.0):
-                data = await reader.readuntil(b"\r\n")
-
-            # ensure our request matches the expectation
-            expected_request = b"GET /foo.bmp HTTP/1.1\r\n"
-            assert data[: len(expected_request)] == expected_request
-
-            # consume rest of request
-            async with asyncio.timeout(1.0):
-                data = await reader.readuntil(b"\r\n\r\n")
-
-            http_request_future.set_result(True)
-
-            http_response = [
-                b"HTTP/1.1 200 OK",
-                b"Content-Length: %d" % LEN_BMP_IMAGE,
-                b"Content-Type: text/plain",
-                b"Connection: close",
-                b"",
-                b"",
-            ]
-            writer.write(b"\r\n".join(http_response))
-            await writer.drain()
-
-            writer.write(BMP_IMAGE)
-
-            await writer.drain()
-        except Exception as exc:
-            if not http_request_future.done():
-                http_request_future.set_exception(exc)
-            raise
-        finally:
-            writer.close()
-
-    return handler
-
 
 @pytest.mark.asyncio
 async def test_online_image_bmp(
@@ -72,14 +22,9 @@ async def test_online_image_bmp(
     download_finished_future = loop.create_future()
     downloaded_bytes_future = loop.create_future()
 
-    def check_output(line: str) -> None:
-        """Check log output for expected messages."""
-
-        if match := re.search(r"Image fully downloaded, (\d+) bytes", line):
-            downloaded_bytes_future.set_result(int(match.group(1)))
-
-        if "download finished" in line:
-            download_finished_future.set_result(True)
+    check_output = make_download_watcher(
+        downloaded_bytes_future, download_finished_future
+    )
 
     server = await asyncio.start_server(
         handle_http(http_request_future), "127.0.0.1", 0

From e6c49e2bd9f16a4cf32cd68958978bed48ff30fc Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 15:25:39 -0500
Subject: [PATCH 098/155] [core] Retry transient network errors when
 downloading external files (#18538)

---
 esphome/external_files.py                  |  21 ++-
 esphome/framework_helpers.py               |  32 +----
 esphome/net_retry.py                       | 114 ++++++++++++++++
 tests/unit_tests/test_external_files.py    | 138 +++++++++++++++++++-
 tests/unit_tests/test_framework_helpers.py |  38 ------
 tests/unit_tests/test_net_retry.py         | 143 +++++++++++++++++++++
 6 files changed, 416 insertions(+), 70 deletions(-)
 create mode 100644 esphome/net_retry.py
 create mode 100644 tests/unit_tests/test_net_retry.py

diff --git a/esphome/external_files.py b/esphome/external_files.py
index f30d429425..58be4a7c26 100644
--- a/esphome/external_files.py
+++ b/esphome/external_files.py
@@ -16,6 +16,7 @@ from esphome.const import CONF_FILE, CONF_TYPE, CONF_URL, __version__
 from esphome.core import CORE, EsphomeError, TimePeriodSeconds
 from esphome.happy_eyeballs import ensure_happy_eyeballs
 from esphome.helpers import write_file
+from esphome.net_retry import fetch_with_retry
 from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
@@ -157,8 +158,17 @@ def has_remote_file_changed(
             }
             if etag := _read_etag(local_file_path):
                 headers[IF_NONE_MATCH] = etag
-            response = requests.head(
-                url, headers=headers, timeout=timeout, allow_redirects=True
+            # Retried so allow_stale=False consumers don't hard-fail on a
+            # healed flake. Only connection-level failures retry: HEAD
+            # never raises on HTTP status (servers rejecting HEAD with
+            # 405/501 must fall through to the GET), so 5xx is handled by
+            # the GET's own retry.
+            response = fetch_with_retry(
+                url,
+                lambda: requests.head(
+                    url, headers=headers, timeout=timeout, allow_redirects=True
+                ),
+                what="Revalidation",
             )
 
             _LOGGER.debug(
@@ -293,7 +303,7 @@ def download_content(
     _LOGGER.info("Downloading %s", url)
     _LOGGER.debug("Saving to %s", path)
 
-    try:
+    def _fetch() -> tuple[requests.Response, bytes]:
         req = requests.get(
             url,
             timeout=timeout,
@@ -304,7 +314,10 @@ def download_content(
         # and mid-stream connection errors all surface here as
         # RequestException subclasses, so this needs the same fall-back
         # treatment as the request itself.
-        data = req.content
+        return req, req.content
+
+    try:
+        req, data = fetch_with_retry(url, _fetch)
     except requests.exceptions.RequestException as e:
         if path.exists():
             # Memoized so a flaky host warns once per run, not per consumer.
diff --git a/esphome/framework_helpers.py b/esphome/framework_helpers.py
index b8a43220ff..105791c518 100644
--- a/esphome/framework_helpers.py
+++ b/esphome/framework_helpers.py
@@ -15,6 +15,7 @@ from typing import IO, TYPE_CHECKING
 
 from esphome.happy_eyeballs import ensure_happy_eyeballs
 from esphome.helpers import ProgressBar, rmtree
+from esphome.net_retry import NETWORK_MAX_ATTEMPTS, is_transient_download_error
 
 if TYPE_CHECKING:
     import requests
@@ -29,8 +30,9 @@ _LOGGER = logging.getLogger(__name__)
 _MIRROR_ATTEMPTS = 3
 
 # Passes over the whole mirror list when a transient network error is in
-# the mix; matches git.py's _NETWORK_MAX_ATTEMPTS (3 tries, 2s/4s backoff).
-_MIRROR_SWEEP_ATTEMPTS = 3
+# the mix; shares net_retry's policy (3 tries, 2s/4s backoff), which in
+# turn matches git.py's _NETWORK_MAX_ATTEMPTS.
+_MIRROR_SWEEP_ATTEMPTS = NETWORK_MAX_ATTEMPTS
 
 
 def get_project_link_flags() -> list[str]:
@@ -903,30 +905,6 @@ def _spent_attempts_error(e: Exception, attempts: int) -> Exception:
     return err
 
 
-def _is_transient_download_error(e: Exception) -> bool:
-    """Return True when a download failure is worth retrying.
-
-    Connection-level failures and HTTP 429/5xx are transient. Other HTTP
-    errors, local errors, and exhausted-attempts EsphomeError wrappers
-    (their per-mirror retries are already spent) are permanent.
-    """
-    # Imported lazily: requests is a heavy import (~85ms) and is only
-    # needed when actually downloading, never during config validation.
-    import requests
-
-    if isinstance(e, requests.exceptions.HTTPError):
-        resp = e.response
-        return resp is not None and (resp.status_code == 429 or resp.status_code >= 500)
-    return isinstance(
-        e,
-        (
-            requests.exceptions.ConnectionError,
-            requests.exceptions.Timeout,
-            requests.exceptions.ChunkedEncodingError,
-        ),
-    )
-
-
 def _try_mirrors_once(
     urls: list[str],
     path_target: Path | None,
@@ -1131,7 +1109,7 @@ def download_from_mirrors(
         # Permanent failures (404, verification mismatch) won't heal;
         # only retry when a transient error is in the mix (as git.py does).
         transient = next(
-            ((u, e) for u, e in sweep_failures if _is_transient_download_error(e)),
+            ((u, e) for u, e in sweep_failures if is_transient_download_error(e)),
             None,
         )
         if transient is None:
diff --git a/esphome/net_retry.py b/esphome/net_retry.py
new file mode 100644
index 0000000000..f7e6e601ea
--- /dev/null
+++ b/esphome/net_retry.py
@@ -0,0 +1,114 @@
+"""Retry policy for HTTP downloads.
+
+Kept import-light on purpose: this module is imported at config time, so it
+must not pull in requests (a heavy import, ~85ms) at module scope.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+import logging
+import time
+
+_LOGGER = logging.getLogger(__name__)
+
+# 3 tries with 2s/4s backoff, matching git.py's _NETWORK_MAX_ATTEMPTS.
+# Callers memoize failures so a flaky host pays this once per file per run.
+NETWORK_MAX_ATTEMPTS = 3
+
+
+def _is_permanent_dns_failure(e: BaseException) -> bool:
+    """Whether a hard socket.gaierror hides in ``e``'s exception chain.
+
+    EAI_AGAIN (flaky resolver) stays retryable; anything else is permanent
+    so offline builds fall back to their cache without sleeping first.
+    Narrower than git.py, which retries NXDOMAIN too.
+
+    Walks ``__cause__``, ``args`` (requests wraps MaxRetryError without
+    ``from``) and MaxRetryError's ``reason``, but not implicit
+    ``__context__``: an unrelated earlier attempt's resolution failure
+    must not reclassify an error it did not cause.
+    """
+    import socket
+
+    seen: set[int] = set()
+    stack: list[BaseException] = [e]
+    while stack:
+        exc = stack.pop()
+        if id(exc) in seen:
+            continue
+        if (
+            isinstance(exc, socket.gaierror)
+            and exc.errno is not None
+            and exc.errno != socket.EAI_AGAIN
+        ):
+            return True
+        seen.add(id(exc))
+        stack.extend(
+            nxt
+            for nxt in (
+                exc.__cause__,
+                getattr(exc, "reason", None),  # urllib3 MaxRetryError
+                *exc.args,
+            )
+            if isinstance(nxt, BaseException)
+        )
+    return False
+
+
+def is_transient_download_error(e: Exception) -> bool:
+    """Return True when a download failure is worth retrying.
+
+    Connection-level failures and HTTP 429/5xx are transient; hard DNS
+    failures, other HTTP errors, and local errors are permanent.
+    """
+    # Imported lazily: requests is a heavy import (~85ms) and is only
+    # needed when actually downloading, never during config validation.
+    import requests
+
+    if isinstance(e, requests.exceptions.HTTPError):
+        resp = e.response
+        return resp is not None and (resp.status_code == 429 or resp.status_code >= 500)
+    if isinstance(e, requests.exceptions.ConnectionError) and _is_permanent_dns_failure(
+        e
+    ):
+        return False
+    # SSLError (a ConnectionError subclass) stays transient on purpose: it
+    # also covers mid-handshake connection drops, not just bad certificates.
+    return isinstance(
+        e,
+        (
+            requests.exceptions.ConnectionError,
+            requests.exceptions.Timeout,
+            requests.exceptions.ChunkedEncodingError,
+            requests.exceptions.ContentDecodingError,
+        ),
+    )
+
+
+def fetch_with_retry[T](url: str, fetch: Callable[[], T], what: str = "Download") -> T:
+    """Run ``fetch``, retrying transient failures with 2s/4s backoff.
+
+    Permanent failures and the final attempt propagate to the caller;
+    ``what`` names the operation in the retry warning.
+    """
+    import requests
+
+    for attempt in range(1, NETWORK_MAX_ATTEMPTS):
+        try:
+            return fetch()
+        except requests.exceptions.RequestException as e:
+            if not is_transient_download_error(e):
+                raise
+            delay = 2**attempt
+            _LOGGER.warning(
+                "%s of %s failed: %s. Retrying in %d seconds... (attempt %d/%d)",
+                what,
+                url,
+                e,
+                delay,
+                attempt + 1,
+                NETWORK_MAX_ATTEMPTS,
+            )
+            time.sleep(delay)
+    return fetch()
diff --git a/tests/unit_tests/test_external_files.py b/tests/unit_tests/test_external_files.py
index 4e993ff4f3..caefb7ed5c 100644
--- a/tests/unit_tests/test_external_files.py
+++ b/tests/unit_tests/test_external_files.py
@@ -4,7 +4,7 @@ import os
 from pathlib import Path
 import time
 from typing import Any
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, call, patch
 
 import pytest
 import requests
@@ -81,6 +81,15 @@ def mock_download_content_many() -> MagicMock:
         yield m
 
 
+@pytest.fixture
+def mock_retry_sleep() -> MagicMock:
+    """Patch the retry backoff sleep (process-wide; net_retry.time is the
+    global module) so transient-error tests don't really wait 2s/4s.
+    """
+    with patch("esphome.net_retry.time.sleep") as m:
+        yield m
+
+
 def test_compute_local_file_dir(setup_core: Path) -> None:
     """Test compute_local_file_dir creates and returns correct path."""
     domain = "font"
@@ -495,6 +504,7 @@ class _BodyReadErrorResponse:
 def test_download_content_with_body_read_error_uses_cache(
     mock_has_remote_file_changed: MagicMock,
     mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
     setup_core: Path,
 ) -> None:
     """Body-read errors (chunked-decode/gzip-decode/mid-stream connection
@@ -519,6 +529,7 @@ def test_download_content_with_body_read_error_uses_cache(
 def test_download_content_with_body_read_error_no_cache_fails(
     mock_has_remote_file_changed: MagicMock,
     mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
     setup_core: Path,
 ) -> None:
     """A body-read failure with no cache available must surface as a
@@ -535,6 +546,131 @@ def test_download_content_with_body_read_error_no_cache_fails(
         external_files.download_content("https://example.com/file.txt", test_file)
 
 
+def test_download_content_retries_transient_error_then_succeeds(
+    mock_has_remote_file_changed: MagicMock,
+    mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
+    setup_core: Path,
+) -> None:
+    """Transient failures (connection reset, timeout) are retried with 2s/4s
+    backoff before giving up; a late success downloads normally."""
+    test_file = setup_core / "downloads" / "file.txt"
+    mock_has_remote_file_changed.return_value = True
+
+    ok = MagicMock()
+    ok.content = b"downloaded"
+    ok.headers = {}
+    mock_requests_get.side_effect = [
+        requests.exceptions.ConnectionError("reset by peer"),
+        requests.exceptions.Timeout("timed out"),
+        ok,
+    ]
+
+    result = external_files.download_content("https://example.com/file.txt", test_file)
+
+    assert result == b"downloaded"
+    assert test_file.read_bytes() == b"downloaded"
+    assert mock_retry_sleep.call_args_list == [call(2), call(4)]
+
+
+def test_download_content_transient_error_exhausts_attempts(
+    mock_has_remote_file_changed: MagicMock,
+    mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
+    setup_core: Path,
+) -> None:
+    """A persistent transient failure gives up after three attempts and then
+    follows the normal no-cache error path."""
+    test_file = setup_core / "nonexistent.txt"
+    mock_has_remote_file_changed.return_value = True
+    mock_requests_get.side_effect = requests.exceptions.ConnectionError("reset by peer")
+
+    with pytest.raises(Invalid, match="Could not download from.*reset by peer"):
+        external_files.download_content("https://example.com/file.txt", test_file)
+
+    assert mock_retry_sleep.call_args_list == [call(2), call(4)]
+
+
+def test_download_content_non_transient_error_not_retried(
+    mock_has_remote_file_changed: MagicMock,
+    mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
+    setup_core: Path,
+) -> None:
+    """Permanent failures like a 404 fail on the first attempt."""
+    test_file = setup_core / "nonexistent.txt"
+    mock_has_remote_file_changed.return_value = True
+
+    response = MagicMock()
+    response.status_code = 404
+    mock_requests_get.side_effect = requests.exceptions.HTTPError(
+        "404 Client Error", response=response
+    )
+
+    with pytest.raises(Invalid, match="Could not download from.*404"):
+        external_files.download_content("https://example.com/file.txt", test_file)
+
+    assert mock_requests_get.call_count == 1
+    mock_retry_sleep.assert_not_called()
+
+
+def test_download_content_retries_body_read_error(
+    mock_has_remote_file_changed: MagicMock,
+    mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
+    setup_core: Path,
+) -> None:
+    """Mid-stream failures surfacing from `.content` are retried too."""
+    test_file = setup_core / "downloads" / "file.txt"
+    mock_has_remote_file_changed.return_value = True
+
+    ok = MagicMock()
+    ok.content = b"downloaded"
+    ok.headers = {}
+    mock_requests_get.side_effect = [
+        _BodyReadErrorResponse(
+            requests.exceptions.ChunkedEncodingError("body truncated")
+        ),
+        ok,
+    ]
+
+    result = external_files.download_content("https://example.com/file.txt", test_file)
+
+    assert result == b"downloaded"
+    assert mock_requests_get.call_count == 2
+    assert mock_retry_sleep.call_args_list == [call(2)]
+
+
+def test_has_remote_file_changed_retries_transient_error(
+    mock_requests_head: MagicMock,
+    mock_retry_sleep: MagicMock,
+    setup_core: Path,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """A HEAD revalidation that fails transiently then returns 304 does not
+    mark the cached copy stale, and the retry warning names the operation."""
+    test_file = setup_core / "cached.txt"
+    test_file.write_bytes(b"cached content")
+
+    ok = MagicMock()
+    ok.status_code = 304
+    ok.headers = {}
+    mock_requests_head.side_effect = [
+        requests.exceptions.ConnectionError("reset by peer"),
+        ok,
+    ]
+
+    changed = external_files.has_remote_file_changed(
+        "https://example.com/file.txt", test_file
+    )
+
+    assert changed is False
+    assert test_file not in external_files._run_data().stale_paths
+    assert mock_requests_head.call_count == 2
+    assert mock_retry_sleep.call_args_list == [call(2)]
+    assert "Revalidation of" in caplog.text
+
+
 def test_download_content_skip_external_update_uses_cache(
     mock_has_remote_file_changed: MagicMock,
     mock_requests_get: MagicMock,
diff --git a/tests/unit_tests/test_framework_helpers.py b/tests/unit_tests/test_framework_helpers.py
index 2022c15bfe..500705ef67 100644
--- a/tests/unit_tests/test_framework_helpers.py
+++ b/tests/unit_tests/test_framework_helpers.py
@@ -23,7 +23,6 @@ from esphome.core import EsphomeError
 from esphome.framework_helpers import (
     _7z_extract_all,
     _detect_archive_root,
-    _is_transient_download_error,
     _rename_with_retry,
     _tar_extract_all,
     _zip_extract_all,
@@ -1594,43 +1593,6 @@ class TestDownloadFromMirrors:
         mock_sleep.assert_not_called()
 
 
-def _http_error(status: int) -> req.HTTPError:
-    """An HTTPError carrying a response with the given status, as raised by
-    ``raise_for_status`` on a real response."""
-    resp = MagicMock()
-    resp.status_code = status
-    return req.HTTPError(str(status), response=resp)
-
-
-class TestIsTransientDownloadError:
-    def test_connection_errors_are_transient(self) -> None:
-        assert _is_transient_download_error(req.ConnectionError("reset"))
-        assert _is_transient_download_error(req.Timeout("timed out"))
-        assert _is_transient_download_error(
-            req.exceptions.ChunkedEncodingError("dropped")
-        )
-
-    def test_http_statuses(self) -> None:
-        assert not _is_transient_download_error(_http_error(404))
-        assert not _is_transient_download_error(_http_error(403))
-        assert _is_transient_download_error(_http_error(429))
-        assert _is_transient_download_error(_http_error(503))
-
-    def test_http_error_without_response_is_permanent(self) -> None:
-        assert not _is_transient_download_error(req.HTTPError("boom"))
-
-    def test_exhausted_resume_attempts_are_permanent(self) -> None:
-        """download_with_resume already spent its own resume attempts; its
-        EsphomeError wrapper is not retried again at the sweep level."""
-        wrapped = EsphomeError("Failed to download after 3 attempts")
-        wrapped.__cause__ = req.ConnectionError("down")
-        assert not _is_transient_download_error(wrapped)
-
-    def test_unrelated_errors_are_permanent(self) -> None:
-        assert not _is_transient_download_error(OSError("disk full"))
-        assert not _is_transient_download_error(EsphomeError("size mismatch"))
-
-
 def test_importing_framework_helpers_does_not_import_requests() -> None:
     """Importing framework_helpers must not drag in requests.
 
diff --git a/tests/unit_tests/test_net_retry.py b/tests/unit_tests/test_net_retry.py
new file mode 100644
index 0000000000..c22bda5ee5
--- /dev/null
+++ b/tests/unit_tests/test_net_retry.py
@@ -0,0 +1,143 @@
+"""Tests for esphome.net_retry."""
+
+import socket
+from unittest.mock import MagicMock, call, patch
+
+import pytest
+import requests as req
+
+from esphome.core import EsphomeError
+from esphome.net_retry import fetch_with_retry, is_transient_download_error
+
+
+def _http_error(status: int) -> req.HTTPError:
+    """An HTTPError carrying a response with the given status, as raised by
+    ``raise_for_status`` on a real response."""
+    resp = MagicMock()
+    resp.status_code = status
+    return req.HTTPError(str(status), response=resp)
+
+
+class TestIsTransientDownloadError:
+    def test_connection_errors_are_transient(self) -> None:
+        assert is_transient_download_error(req.ConnectionError("reset"))
+        assert is_transient_download_error(req.Timeout("timed out"))
+        assert is_transient_download_error(
+            req.exceptions.ChunkedEncodingError("dropped")
+        )
+        assert is_transient_download_error(
+            req.exceptions.ContentDecodingError("gzip stream truncated")
+        )
+
+    def test_http_statuses(self) -> None:
+        assert not is_transient_download_error(_http_error(404))
+        assert not is_transient_download_error(_http_error(403))
+        assert is_transient_download_error(_http_error(429))
+        assert is_transient_download_error(_http_error(503))
+
+    def test_http_error_without_response_is_permanent(self) -> None:
+        assert not is_transient_download_error(req.HTTPError("boom"))
+
+    def test_hard_dns_failures_are_permanent(self) -> None:
+        """Hard resolution failures are permanent via both the cause chain
+        and MaxRetryError.reason."""
+        from urllib3.exceptions import MaxRetryError, NameResolutionError
+
+        gai = socket.gaierror(socket.EAI_NONAME, "nodename nor servname provided")
+
+        chained = req.ConnectionError("resolution failed")
+        chained.__cause__ = gai
+        assert not is_transient_download_error(chained)
+
+        # The real urllib3 shape: gaierror on NameResolutionError.__cause__,
+        # carried by MaxRetryError.reason.
+        try:
+            raise NameResolutionError("example.invalid", None, gai) from gai
+        except NameResolutionError as nre:
+            wrapped = req.ConnectionError(
+                MaxRetryError(None, "http://example.invalid/", reason=nre)
+            )
+        assert not is_transient_download_error(wrapped)
+
+        # A garden-variety connection reset stays transient.
+        assert is_transient_download_error(req.ConnectionError("reset by peer"))
+
+    def test_temporary_dns_failure_stays_transient(self) -> None:
+        """EAI_AGAIN (flaky resolver) stays retryable."""
+        gai = socket.gaierror(socket.EAI_AGAIN, "temporary failure in name resolution")
+        chained = req.ConnectionError("resolution failed")
+        chained.__cause__ = gai
+
+        assert is_transient_download_error(chained)
+
+    def test_implicit_context_does_not_reclassify(self) -> None:
+        """A gaierror riding along as implicit __context__ must not turn a
+        genuine connection reset permanent."""
+        try:
+            try:
+                raise socket.gaierror(socket.EAI_NONAME, "first attempt")
+            except socket.gaierror:
+                raise req.ConnectionError("reset by peer") from None
+        except req.ConnectionError as reset:
+            assert reset.__context__ is not None
+            assert is_transient_download_error(reset)
+
+    def test_gaierror_without_errno_stays_transient(self) -> None:
+        """A gaierror carrying no EAI code cannot prove a hard failure."""
+        chained = req.ConnectionError("resolution failed")
+        chained.__cause__ = socket.gaierror("no errno")
+
+        assert is_transient_download_error(chained)
+
+    def test_mixed_chain_hard_failure_wins(self) -> None:
+        """EAI_AGAIN in the chain does not mask a hard failure elsewhere."""
+        again = socket.gaierror(socket.EAI_AGAIN, "temporary failure")
+        hard = socket.gaierror(socket.EAI_NONAME, "unknown host")
+
+        outer = req.ConnectionError(hard)
+        outer.__cause__ = again
+        assert not is_transient_download_error(outer)
+
+        outer = req.ConnectionError(again)
+        outer.__cause__ = hard
+        assert not is_transient_download_error(outer)
+
+    def test_dns_walk_survives_exception_cycles(self) -> None:
+        """A cyclic cause chain must terminate (and stay transient when no
+        resolution failure is present)."""
+        outer = req.ConnectionError("a")
+        inner = ValueError("b")
+        outer.__cause__ = inner
+        inner.__cause__ = outer
+
+        assert is_transient_download_error(outer)
+
+    def test_exhausted_resume_attempts_are_permanent(self) -> None:
+        """download_with_resume already spent its own resume attempts; its
+        EsphomeError wrapper is not retried again at the sweep level."""
+        wrapped = EsphomeError("Failed to download after 3 attempts")
+        wrapped.__cause__ = req.ConnectionError("down")
+        assert not is_transient_download_error(wrapped)
+
+    def test_unrelated_errors_are_permanent(self) -> None:
+        assert not is_transient_download_error(OSError("disk full"))
+        assert not is_transient_download_error(EsphomeError("size mismatch"))
+
+
+class TestFetchWithRetry:
+    def test_logs_the_upcoming_attempt_number(
+        self, caplog: pytest.LogCaptureFixture
+    ) -> None:
+        """The warning names the attempt about to run, not the failed one."""
+        with (
+            patch("esphome.net_retry.time.sleep") as mock_sleep,
+            pytest.raises(req.ConnectionError),
+        ):
+            fetch_with_retry(
+                "https://example.com/f",
+                lambda: (_ for _ in ()).throw(req.ConnectionError("reset")),
+            )
+
+        assert mock_sleep.call_args_list == [call(2), call(4)]
+        assert "(attempt 2/3)" in caplog.text
+        assert "(attempt 3/3)" in caplog.text

From 9179fe26ce7472687dedecb46139286d776eba87 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 15:38:19 -0500
Subject: [PATCH 099/155] [api] Fix loop stall that triggers the task watchdog
 when entity list sends block (#18577)

---
 esphome/components/api/api_connection.cpp     |  16 +-
 esphome/components/api/api_connection.h       |   8 +-
 esphome/components/api/api_frame_helper.h     |   2 +-
 esphome/components/api/list_entities.cpp      |  10 +-
 esphome/components/web_server/list_entities.h |   1 -
 esphome/components/web_server/web_server.cpp  |  10 +-
 .../web_server_idf/web_server_idf.cpp         |   4 +-
 esphome/core/component_iterator.cpp           |  25 ++-
 esphome/core/component_iterator.h             |  43 +++-
 tests/components/camera/__init__.py           |  11 +
 .../camera/test_component_iterator_camera.cpp |  79 +++++++
 tests/components/core/benchmark.yaml          |  11 +
 .../core/test_component_iterator.cpp          | 195 ++++++++++++++++++
 tests/integration/README.md                   |   2 +
 .../api_list_entities_backpressure.yaml       |  23 +++
 .../sndbuf_pin_component/__init__.py          |  20 ++
 .../sndbuf_pin_component.cpp                  |  55 +++++
 .../sndbuf_pin_component.h                    |  21 ++
 tests/integration/raw_api_client.py           | 148 +++++++++++++
 .../test_api_list_entities_backpressure.py    | 110 ++++++++++
 20 files changed, 750 insertions(+), 44 deletions(-)
 create mode 100644 tests/components/camera/__init__.py
 create mode 100644 tests/components/camera/test_component_iterator_camera.cpp
 create mode 100644 tests/components/core/benchmark.yaml
 create mode 100644 tests/components/core/test_component_iterator.cpp
 create mode 100644 tests/integration/fixtures/api_list_entities_backpressure.yaml
 create mode 100644 tests/integration/fixtures/external_components/sndbuf_pin_component/__init__.py
 create mode 100644 tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.cpp
 create mode 100644 tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.h
 create mode 100644 tests/integration/raw_api_client.py
 create mode 100644 tests/integration/test_api_list_entities_backpressure.py

diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 2eb8c21c73..c1dded1271 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -412,15 +412,15 @@ void APIConnection::finalize_iterator_sync_() {
 }
 
 void APIConnection::process_iterator_batch_(ComponentIterator &iterator) {
-  size_t initial_size = this->deferred_batch_.size();
-  size_t max_batch = MAX_INITIAL_PER_BATCH;
-  while (!iterator.completed() && (this->deferred_batch_.size() - initial_size) < max_batch) {
-    iterator.advance();
-  }
+  // Budget by remaining batch capacity so a pass cannot overfill the batch;
+  // stops early on a refused send and resumes next loop pass
+  size_t batch_size = this->deferred_batch_.size();
+  if (batch_size < MAX_INITIAL_BATCH_SIZE)
+    iterator.try_advance(MAX_INITIAL_BATCH_SIZE - batch_size);
 
-  // If the batch is full, process it immediately
-  // Note: iterator.advance() already calls schedule_batch_() via schedule_message_()
-  if (this->deferred_batch_.size() >= max_batch) {
+  // Flush immediately once enough is queued (not guaranteed every pass);
+  // partial batches go out via the batch timer or finalize_iterator_sync_()
+  if (this->deferred_batch_.size() >= MAX_INITIAL_BATCH_SIZE) {
     this->process_batch_();
   }
 }
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index bb51a13000..1b47c23cfe 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -53,11 +53,11 @@ void log_dropped_message(const char *tag, int line, const LogString *what);
 
 // Keepalive timeout in milliseconds
 static constexpr uint32_t KEEPALIVE_TIMEOUT_MS = 60000;
-// Maximum number of entities to process in a single batch during initial state/info sending
-static constexpr size_t MAX_INITIAL_PER_BATCH = 34;
+// Deferred batch size cap during initial state/info sync
+static constexpr size_t MAX_INITIAL_BATCH_SIZE = 34;
 // Verify MAX_MESSAGES_PER_BATCH (defined in api_frame_helper.h) can hold the initial batch
-static_assert(MAX_MESSAGES_PER_BATCH >= MAX_INITIAL_PER_BATCH,
-              "MAX_MESSAGES_PER_BATCH must be >= MAX_INITIAL_PER_BATCH");
+static_assert(MAX_MESSAGES_PER_BATCH >= MAX_INITIAL_BATCH_SIZE,
+              "MAX_MESSAGES_PER_BATCH must be >= MAX_INITIAL_BATCH_SIZE");
 
 #ifdef USE_BENCHMARK
 class APIConnection;
diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h
index 9c49956bbd..1c60bb87a5 100644
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -36,7 +36,7 @@ static constexpr uint16_t MAX_MESSAGE_SIZE = 32768;  // 32 KiB for ESP32 and oth
 static constexpr uint16_t RX_BUF_NULL_TERMINATOR = 1;
 
 // Maximum number of messages to batch in a single write operation
-// Must be >= MAX_INITIAL_PER_BATCH in api_connection.h (enforced by static_assert there)
+// Must be >= MAX_INITIAL_BATCH_SIZE in api_connection.h (enforced by static_assert there)
 static constexpr size_t MAX_MESSAGES_PER_BATCH = 34;
 
 // Max client name length (e.g., "Home Assistant 2026.1.0.dev0" = 28 chars)
diff --git a/esphome/components/api/list_entities.cpp b/esphome/components/api/list_entities.cpp
index f9e645b506..57ff616ca7 100644
--- a/esphome/components/api/list_entities.cpp
+++ b/esphome/components/api/list_entities.cpp
@@ -95,9 +95,17 @@ bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(
 ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(client) {}
 
 #ifdef USE_API_USER_DEFINED_ACTIONS
+// Yield after every Nth service; bounds direct (non-batched) writes per loop pass
+static constexpr uint8_t SERVICE_YIELD_INTERVAL = 3;
+
 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
   auto resp = service->encode_list_service_response();
-  return this->client_->send_message(resp);
+  if (!this->client_->send_message(resp))
+    return false;
+  // at_ is this service's index
+  if ((this->at_ + 1) % SERVICE_YIELD_INTERVAL == 0)
+    this->yield_after_step_();
+  return true;
 }
 #endif
 
diff --git a/esphome/components/web_server/list_entities.h b/esphome/components/web_server/list_entities.h
index 3edb84f555..dc32cbd1ad 100644
--- a/esphome/components/web_server/list_entities.h
+++ b/esphome/components/web_server/list_entities.h
@@ -35,7 +35,6 @@ class ListEntitiesIterator final : public ComponentIterator {
 #undef ENTITY_TYPE_
 #undef ENTITY_CONTROLLER_TYPE_
   // NOLINTEND(bugprone-macro-parentheses)
-  bool completed() { return this->state_ == IteratorState::NONE; }
 
  protected:
   const WebServer *web_server_;
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 9e50b7a394..ec536910e5 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -214,8 +214,8 @@ void DeferredUpdateEventSource::process_deferred_queue_() {
 
 void DeferredUpdateEventSource::loop() {
   process_deferred_queue_();
-  if (!this->entities_iterator_.completed())
-    this->entities_iterator_.advance();
+  // One step per loop; refusals retry next pass
+  this->entities_iterator_.try_advance(1);
 }
 
 void DeferredUpdateEventSource::deferrable_send_state(void *source, const char *event_type,
@@ -321,12 +321,6 @@ void DeferredUpdateEventSourceList::on_client_connect_(DeferredUpdateEventSource
 #endif
 
     source->entities_iterator_.begin(ws->include_internal_);
-
-    // just dump them all up-front and take advantage of the deferred queue
-    //     on second thought that takes too long, but leaving the commented code here for debug purposes
-    // while(!source->entities_iterator_.completed()) {
-    //  source->entities_iterator_.advance();
-    //}
   });
 }
 
diff --git a/esphome/components/web_server_idf/web_server_idf.cpp b/esphome/components/web_server_idf/web_server_idf.cpp
index 993fb6c035..9550570cdc 100644
--- a/esphome/components/web_server_idf/web_server_idf.cpp
+++ b/esphome/components/web_server_idf/web_server_idf.cpp
@@ -935,8 +935,8 @@ void AsyncEventSourceResponse::process_buffer_() {
 void AsyncEventSourceResponse::loop() {
   process_buffer_();
   process_deferred_queue_();
-  if (!this->entities_iterator_.completed())
-    this->entities_iterator_.advance();
+  // One step per loop; refusals retry next pass
+  this->entities_iterator_.try_advance(1);
 }
 
 bool AsyncEventSourceResponse::try_send_nodefer(const char *message, size_t message_len, const char *event, uint32_t id,
diff --git a/esphome/core/component_iterator.cpp b/esphome/core/component_iterator.cpp
index f4d3c05e19..3a497db741 100644
--- a/esphome/core/component_iterator.cpp
+++ b/esphome/core/component_iterator.cpp
@@ -22,23 +22,23 @@ void ComponentIterator::advance_platform_() {
   this->at_ = 0;
 }
 
-void ComponentIterator::advance() {
+bool ComponentIterator::advance_step_() {
   switch (this->state_) {
     case IteratorState::NONE:
       // not started
-      return;
+      return false;
     case IteratorState::BEGIN:
       if (this->on_begin()) {
         advance_platform_();
+        return true;
       }
-      break;
+      return false;
 
 // Entity iterator cases (generated from entity_types.h)
 // NOLINTBEGIN(bugprone-macro-parentheses)
 #define ENTITY_TYPE_(type, singular, plural, count, upper) \
   case IteratorState::upper: \
-    this->process_platform_item_(App.get_##plural(), &ComponentIterator::on_##singular); \
-    break;
+    return this->process_platform_item_(App.get_##plural(), &ComponentIterator::on_##singular);
 #define ENTITY_CONTROLLER_TYPE_(type, singular, plural, count, upper, callback) \
   ENTITY_TYPE_(type, singular, plural, count, upper)
 #include "esphome/core/entity_types.h"
@@ -48,26 +48,29 @@ void ComponentIterator::advance() {
 
 #ifdef USE_API_USER_DEFINED_ACTIONS
     case IteratorState::SERVICE:
-      this->process_platform_item_(api::global_api_server->get_user_services(), &ComponentIterator::on_service);
-      break;
+      return this->process_platform_item_(api::global_api_server->get_user_services(), &ComponentIterator::on_service);
 #endif
 
 #ifdef USE_CAMERA
     case IteratorState::CAMERA: {
       camera::Camera *camera_instance = camera::Camera::instance();
-      if (camera_instance != nullptr && (!camera_instance->is_internal() || this->include_internal_)) {
-        this->on_camera(camera_instance);
+      if (camera_instance != nullptr && (!camera_instance->is_internal() || this->include_internal_) &&
+          !this->on_camera(camera_instance)) {
+        return false;
       }
       advance_platform_();
-    } break;
+      return true;
+    }
 #endif
 
     case IteratorState::MAX:
       if (this->on_end()) {
         this->state_ = IteratorState::NONE;
+        return true;
       }
-      return;
+      return false;
   }
+  return false;
 }
 
 bool ComponentIterator::on_end() { return true; }
diff --git a/esphome/core/component_iterator.h b/esphome/core/component_iterator.h
index d271fcfed0..fac09e9e14 100644
--- a/esphome/core/component_iterator.h
+++ b/esphome/core/component_iterator.h
@@ -30,7 +30,23 @@ class RadioFrequency;
 class ComponentIterator {
  public:
   void begin(bool include_internal = false);
-  void advance();
+  /// Run up to max_steps iteration steps; stops early when iteration
+  /// completes or a callback refuses (that step is retried on the next
+  /// call). Inline so an idle (completed) iterator costs one compare, no call.
+  ESPHOME_ALWAYS_INLINE void try_advance(size_t max_steps) {
+    size_t steps = 0;
+    while (steps < max_steps && !this->completed()) {
+      this->yield_requested_ = false;
+      if (!this->advance_step_())
+        break;
+      steps++;
+      if (this->yield_requested_)
+        break;
+    }
+  }
+  // Remove before 2027.3.0
+  ESPDEPRECATED("Use try_advance() instead. Removed in 2027.3.0", "2026.8.1")
+  void advance() { this->try_advance(1); }
   bool completed() const { return this->state_ == IteratorState::NONE; }
   virtual bool on_begin();
 // Pure virtual entity callbacks (generated from entity_types.h)
@@ -73,23 +89,34 @@ class ComponentIterator {
 #endif
     MAX,
   };
+  /// End the current try_advance() pass after this step; lets callbacks
+  /// that write directly to the socket cap direct writes per pass.
+  void yield_after_step_() { this->yield_requested_ = true; }
+
   uint16_t at_{0};  // Supports up to 65,535 entities per type
   IteratorState state_{IteratorState::NONE};
-  bool include_internal_{false};
+  bool yield_requested_ : 1 {false};
+  bool include_internal_ : 1 {false};
 
   template<typename Container>
-  void process_platform_item_(const Container &items,
+  bool process_platform_item_(const Container &items,
                               bool (ComponentIterator::*on_item)(typename Container::value_type)) {
     if (this->at_ >= items.size()) {
       this->advance_platform_();
-    } else {
-      typename Container::value_type item = items[this->at_];
-      if ((item->is_internal() && !this->include_internal_) || (this->*on_item)(item)) {
-        this->at_++;
-      }
+      return true;
     }
+    typename Container::value_type item = items[this->at_];
+    if ((item->is_internal() && !this->include_internal_) || (this->*on_item)(item)) {
+      this->at_++;
+      return true;
+    }
+    return false;
   }
 
+  /// One iteration step; false if no progress was made (callback refused
+  /// or iterator not running).
+  bool advance_step_();
+
   void advance_platform_();
 };
 
diff --git a/tests/components/camera/__init__.py b/tests/components/camera/__init__.py
new file mode 100644
index 0000000000..61104b0bb1
--- /dev/null
+++ b/tests/components/camera/__init__.py
@@ -0,0 +1,11 @@
+import esphome.codegen as cg
+from tests.testing_helpers import ComponentManifestOverride
+
+
+def override_manifest(manifest: ComponentManifestOverride) -> None:
+    # No host camera platform exists to emit USE_CAMERA; define it here so
+    # the iterator CAMERA state compiles into the test binary.
+    async def to_code_testing(config):
+        cg.add_define("USE_CAMERA")
+
+    manifest.to_code = to_code_testing
diff --git a/tests/components/camera/test_component_iterator_camera.cpp b/tests/components/camera/test_component_iterator_camera.cpp
new file mode 100644
index 0000000000..efd8261554
--- /dev/null
+++ b/tests/components/camera/test_component_iterator_camera.cpp
@@ -0,0 +1,79 @@
+#include <gtest/gtest.h>
+
+#include "esphome/core/component_iterator.h"
+
+#ifdef USE_CAMERA
+#include "esphome/components/camera/camera.h"
+
+namespace esphome::testing {
+
+class StubCamera : public camera::Camera {
+ public:
+  void add_listener(camera::CameraListener *listener) override {}
+  camera::CameraImageReader *create_image_reader() override { return nullptr; }
+  void request_image(camera::CameraRequester requester) override {}
+  void start_stream(camera::CameraRequester requester) override {}
+  void stop_stream(camera::CameraRequester requester) override {}
+};
+
+// Iterator that accepts everything except the camera, which can refuse a
+// configurable number of times. The CAMERA state is a singleton path
+// distinct from process_platform_item_; this pins the same contract:
+// a refused camera is re-offered, never skipped.
+class CameraRefusingIterator : public ComponentIterator {
+ public:
+// NOLINTBEGIN(bugprone-macro-parentheses)
+#define ENTITY_TYPE_(type, singular, plural, count, upper) \
+  bool on_##singular(type *obj) override { return true; }
+#define ENTITY_CONTROLLER_TYPE_(type, singular, plural, count, upper, callback) \
+  ENTITY_TYPE_(type, singular, plural, count, upper)
+#include "esphome/core/entity_types.h"
+#undef ENTITY_TYPE_
+#undef ENTITY_CONTROLLER_TYPE_
+  // NOLINTEND(bugprone-macro-parentheses)
+
+  bool on_camera(camera::Camera *obj) override {
+    this->camera_calls++;
+    if (this->camera_refusals > 0) {
+      this->camera_refusals--;
+      return false;
+    }
+    return true;
+  }
+
+  int camera_calls{0};
+  int camera_refusals{0};
+};
+
+// Far above the fixed number of iterator states
+static constexpr size_t BIG_BUDGET = 1000;
+
+class ComponentIteratorCameraTest : public ::testing::Test {
+ protected:
+  void SetUp() override {
+    // Constructing a Camera installs the process-wide singleton
+    static StubCamera stub_camera;
+    ASSERT_EQ(camera::Camera::instance(), &stub_camera);
+  }
+};
+
+TEST_F(ComponentIteratorCameraTest, RefusedCameraIsReofferedNotSkipped) {
+  CameraRefusingIterator it;
+  it.camera_refusals = 2;
+  it.begin();
+  // Runs until the camera refuses, which stops the pass
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.camera_calls, 1);
+  EXPECT_FALSE(it.completed());
+  // The camera is re-offered once per call, not skipped
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.camera_calls, 2);
+  EXPECT_FALSE(it.completed());
+  // Once accepted, the iteration completes
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_EQ(it.camera_calls, 3);
+}
+
+}  // namespace esphome::testing
+#endif  // USE_CAMERA
diff --git a/tests/components/core/benchmark.yaml b/tests/components/core/benchmark.yaml
new file mode 100644
index 0000000000..063ac41eff
--- /dev/null
+++ b/tests/components/core/benchmark.yaml
@@ -0,0 +1,11 @@
+# Pulls in sensor so entity iteration paths compile (USE_SENSOR);
+# tests register their own instances. Plain yaml.safe_load, no ESPHome tags.
+# An alphabetically-earlier component's sensor: block shadows this one in
+# combined builds; the tests' sensor-count ASSERT catches a capacity drop.
+sensor:
+  - platform: template
+    id: bench_sensor_a
+    name: "Bench A"
+  - platform: template
+    id: bench_sensor_b
+    name: "Bench B"
diff --git a/tests/components/core/test_component_iterator.cpp b/tests/components/core/test_component_iterator.cpp
new file mode 100644
index 0000000000..03d467c920
--- /dev/null
+++ b/tests/components/core/test_component_iterator.cpp
@@ -0,0 +1,195 @@
+#include <gtest/gtest.h>
+
+#include "esphome/core/component_iterator.h"
+
+#ifdef USE_SENSOR
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/core/application.h"
+#endif
+
+namespace esphome::testing {
+
+// Iterator whose begin/end callbacks can refuse a configurable number of
+// times; all entity callbacks accept (any registered entities are accepted).
+class RefusingIterator : public ComponentIterator {
+ public:
+// NOLINTBEGIN(bugprone-macro-parentheses)
+#define ENTITY_TYPE_(type, singular, plural, count, upper) \
+  bool on_##singular(type *obj) override { return true; }
+#define ENTITY_CONTROLLER_TYPE_(type, singular, plural, count, upper, callback) \
+  ENTITY_TYPE_(type, singular, plural, count, upper)
+#include "esphome/core/entity_types.h"
+#undef ENTITY_TYPE_
+#undef ENTITY_CONTROLLER_TYPE_
+  // NOLINTEND(bugprone-macro-parentheses)
+
+  bool on_begin() override { return step(this->begin_calls, this->begin_refusals); }
+  bool on_end() override { return step(this->end_calls, this->end_refusals); }
+
+  int begin_calls{0};
+  int end_calls{0};
+  int begin_refusals{0};
+  int end_refusals{0};
+
+ protected:
+  static bool step(int &calls, int &refusals) {
+    calls++;
+    if (refusals > 0) {
+      refusals--;
+      return false;
+    }
+    return true;
+  }
+};
+
+// Far above the fixed number of iterator states
+static constexpr size_t BIG_BUDGET = 1000;
+
+TEST(ComponentIterator, NotRunningMakesNoProgress) {
+  RefusingIterator it;
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_EQ(it.begin_calls, 0);
+  EXPECT_EQ(it.end_calls, 0);
+}
+
+TEST(ComponentIterator, CompletesInOneCallWithoutRefusals) {
+  RefusingIterator it;
+  it.begin();
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_EQ(it.begin_calls, 1);
+  EXPECT_EQ(it.end_calls, 1);
+}
+
+TEST(ComponentIterator, StepBudgetIsHonored) {
+  RefusingIterator it;
+  it.begin();
+  it.try_advance(1);
+  EXPECT_EQ(it.begin_calls, 1);
+  EXPECT_EQ(it.end_calls, 0);
+  EXPECT_FALSE(it.completed());
+}
+
+TEST(ComponentIterator, RefusedStepStopsBatchAndRetriesSameStep) {
+  RefusingIterator it;
+  it.end_refusals = 3;
+  it.begin();
+  // First call runs until the refused end step, which stops the pass
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.end_calls, 1);
+  EXPECT_FALSE(it.completed());
+  // The refused step is retried once per call, not skipped
+  it.try_advance(BIG_BUDGET);
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.end_calls, 3);
+  EXPECT_FALSE(it.completed());
+  // Once accepted, the iteration completes
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_EQ(it.end_calls, 4);
+}
+
+TEST(ComponentIterator, RefusedBeginStopsBatchAndRetries) {
+  RefusingIterator it;
+  it.begin_refusals = 2;
+  it.begin();
+  it.try_advance(BIG_BUDGET);
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.begin_calls, 2);
+  EXPECT_FALSE(it.completed());
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_EQ(it.begin_calls, 3);
+}
+
+// The deprecated advance() wrapper must keep the legacy once-per-loop
+// pattern working during the deprecation window.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+TEST(ComponentIterator, DeprecatedAdvanceKeepsLegacyPatternWorking) {
+  RefusingIterator it;
+  it.end_refusals = 2;
+  it.begin();
+  size_t guard = 0;
+  while (!it.completed() && guard++ < BIG_BUDGET) {
+    it.advance();
+  }
+  EXPECT_TRUE(it.completed());
+  // Two refused end steps were retried, then accepted
+  EXPECT_EQ(it.end_calls, 3);
+}
+#pragma GCC diagnostic pop
+
+#ifdef USE_SENSOR
+// Iterator whose sensor callback can refuse or yield; pins the per-item
+// contract: a refused item is re-offered with at_ unchanged, never skipped.
+class ItemRefusingIterator : public RefusingIterator {
+ public:
+  bool on_sensor(sensor::Sensor *obj) override {
+    this->last_sensor = obj;
+    if (!step(this->sensor_calls, this->sensor_refusals))
+      return false;
+    if (this->yield_on_sensor)
+      this->yield_after_step_();
+    return true;
+  }
+  sensor::Sensor *last_sensor{nullptr};
+  int sensor_calls{0};
+  int sensor_refusals{0};
+  bool yield_on_sensor{false};
+};
+
+class ComponentIteratorSensorTest : public ::testing::Test {
+ protected:
+  void SetUp() override {
+    static sensor::Sensor sensor_a;
+    static sensor::Sensor sensor_b;
+    static bool registered = false;
+    if (!registered) {
+      App.register_sensor(&sensor_a);
+      App.register_sensor(&sensor_b);
+      registered = true;
+    }
+    // StaticVector drops silently when full; fail the fixture, not the contract
+    ASSERT_EQ(App.get_sensors().size(), 2u) << "benchmark.yaml sensor count too small";
+  }
+};
+
+TEST_F(ComponentIteratorSensorTest, RefusedItemIsReofferedNotSkipped) {
+  ItemRefusingIterator it;
+  it.sensor_refusals = 2;
+  it.begin();
+  // Runs until the first sensor refuses
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.sensor_calls, 1);
+  EXPECT_FALSE(it.completed());
+  // The refused item is re-offered, not skipped
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.sensor_calls, 2);
+  sensor::Sensor *refused = it.last_sensor;
+  // Once accepted, iteration continues through the second sensor to the end
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_NE(it.last_sensor, refused);
+  EXPECT_EQ(it.sensor_calls, 4);
+}
+
+TEST_F(ComponentIteratorSensorTest, YieldAfterStepEndsPassAndResumes) {
+  ItemRefusingIterator it;
+  it.yield_on_sensor = true;
+  it.begin();
+  // The pass ends right after the first sensor despite a big budget
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.sensor_calls, 1);
+  EXPECT_FALSE(it.completed());
+  // The next pass ends after the second sensor
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.sensor_calls, 2);
+  // Remaining states then run to completion in one pass
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+}
+#endif  // USE_SENSOR
+
+}  // namespace esphome::testing
diff --git a/tests/integration/README.md b/tests/integration/README.md
index 44d9e0d644..790d9a3a11 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -7,6 +7,7 @@ This directory contains end-to-end integration tests for ESPHome, focusing on te
 - `conftest.py` - Common fixtures and utilities
 - `const.py` - Constants used throughout the integration tests
 - `types.py` - Type definitions for fixtures and functions
+- `raw_api_client.py` - Minimal plaintext api client whose reads happen only on request (for backpressure tests)
 - `state_utils.py` - State handling utilities (e.g., `InitialStateHelper`, `find_entity`, `require_entity`)
 - `fixtures/` - YAML configuration files for tests
 - `test_*.py` - Individual test files
@@ -347,6 +348,7 @@ Create C++ components in `fixtures/external_components/` for:
 - Custom entity behaviors
 - Scheduler testing
 - Memory management tests
+- Deterministic network backpressure (`sndbuf_pin_component` pins socket send buffers; assert on its log line to prove the pin took effect)
 
 ##### Log Line Monitoring
 ```python
diff --git a/tests/integration/fixtures/api_list_entities_backpressure.yaml b/tests/integration/fixtures/api_list_entities_backpressure.yaml
new file mode 100644
index 0000000000..1e53af7b75
--- /dev/null
+++ b/tests/integration/fixtures/api_list_entities_backpressure.yaml
@@ -0,0 +1,23 @@
+esphome:
+  name: api-backpressure-test
+
+host:
+
+api:
+  # Smallest queue so a non-draining client blocks the send path quickly
+  max_send_queue: 1
+  actions:
+# GENERATED_ACTIONS
+
+external_components:
+  - source:
+      type: local
+      path: EXTERNAL_COMPONENT_PATH
+    components: [sndbuf_pin_component]
+
+# Pins the device's socket send buffers for deterministic TCP backpressure
+sndbuf_pin_component:
+  buffer_size: SERVER_SNDBUF
+
+logger:
+  level: DEBUG
diff --git a/tests/integration/fixtures/external_components/sndbuf_pin_component/__init__.py b/tests/integration/fixtures/external_components/sndbuf_pin_component/__init__.py
new file mode 100644
index 0000000000..06dda5d1ac
--- /dev/null
+++ b/tests/integration/fixtures/external_components/sndbuf_pin_component/__init__.py
@@ -0,0 +1,20 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.const import CONF_BUFFER_SIZE, CONF_ID
+
+DEPENDENCIES = ["api"]
+
+sndbuf_pin_ns = cg.esphome_ns.namespace("sndbuf_pin")
+SndbufPinComponent = sndbuf_pin_ns.class_("SndbufPinComponent", cg.Component)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(SndbufPinComponent),
+        cv.Required(CONF_BUFFER_SIZE): cv.int_range(min=1),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID], config[CONF_BUFFER_SIZE])
+    await cg.register_component(var, config)
diff --git a/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.cpp b/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.cpp
new file mode 100644
index 0000000000..430c5075c7
--- /dev/null
+++ b/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.cpp
@@ -0,0 +1,55 @@
+#include "sndbuf_pin_component.h"
+
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <cerrno>
+
+#include "esphome/components/api/api_server.h"
+#include "esphome/core/log.h"
+
+namespace esphome::sndbuf_pin {
+
+static const char *const TAG = "sndbuf_pin";
+
+// Skip stdio; scan the low fd range where the listeners land
+static constexpr int FIRST_USER_FD = 3;
+static constexpr int MAX_FD_SCAN = 128;
+
+void SndbufPinComponent::setup() {
+  int pinned = 0;
+  for (int fd = FIRST_USER_FD; fd < MAX_FD_SCAN; fd++) {
+    int type = 0;
+    socklen_t len = sizeof(type);
+    if (::getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &len) != 0 || type != SOCK_STREAM)
+      continue;
+    struct sockaddr_in addr {};
+    socklen_t addr_len = sizeof(addr);
+    if (::getsockname(fd, reinterpret_cast<struct sockaddr *>(&addr), &addr_len) != 0) {
+      ESP_LOGW(TAG, "fd %d: getsockname failed, errno %d", fd, errno);
+      continue;
+    }
+    if (ntohs(addr.sin_port) != api::global_api_server->get_port())
+      continue;
+    if (::setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &this->buffer_size_, sizeof(this->buffer_size_)) != 0) {
+      ESP_LOGW(TAG, "fd %d: SO_SNDBUF pin failed, errno %d", fd, errno);
+      continue;
+    }
+    int applied = 0;
+    len = sizeof(applied);
+    if (::getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &applied, &len) != 0 || applied < this->buffer_size_) {
+      // Linux doubles the requested value; anything below it means clamped
+      ESP_LOGW(TAG, "fd %d: SO_SNDBUF readback %d below requested %d", fd, applied, this->buffer_size_);
+      continue;
+    }
+    // Tests assert on this line; accepted sockets inherit the pinned size
+    ESP_LOGD(TAG, "fd %d port %d: SO_SNDBUF pinned to %d (effective %d)", fd, ntohs(addr.sin_port), this->buffer_size_,
+             applied);
+    pinned++;
+  }
+  if (pinned == 0) {
+    ESP_LOGE(TAG, "api listener socket was not pinned");
+    this->mark_failed();
+  }
+}
+
+}  // namespace esphome::sndbuf_pin
diff --git a/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.h b/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.h
new file mode 100644
index 0000000000..b0af226d14
--- /dev/null
+++ b/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "esphome/core/component.h"
+
+namespace esphome::sndbuf_pin {
+
+// Test-only (host): pins SO_SNDBUF on every open TCP socket so integration
+// tests get deterministic backpressure; an explicit SO_SNDBUF also disables
+// kernel autotuning, and accepted sockets inherit it from the listener.
+class SndbufPinComponent : public Component {
+ public:
+  explicit SndbufPinComponent(int buffer_size) : buffer_size_(buffer_size) {}
+  void setup() override;
+  // After the api server so its listening socket exists
+  float get_setup_priority() const override { return setup_priority::LATE; }
+
+ protected:
+  int buffer_size_;
+};
+
+}  // namespace esphome::sndbuf_pin
diff --git a/tests/integration/raw_api_client.py b/tests/integration/raw_api_client.py
new file mode 100644
index 0000000000..1dbe40933c
--- /dev/null
+++ b/tests/integration/raw_api_client.py
@@ -0,0 +1,148 @@
+"""Minimal plaintext native-api client over a raw socket.
+
+Reads only when told to, so tests control when the TCP pipe backs up toward
+the device; payloads are skipped and only message types are counted.
+"""
+
+from __future__ import annotations
+
+import asyncio
+from collections import Counter
+import socket
+from typing import Self
+
+from aioesphomeapi import api_pb2
+import aioesphomeapi.core as api_core
+from google.protobuf import message
+
+from .const import LOCALHOST
+
+# Message type ids are protocol constants; derive them from aioesphomeapi so
+# they cannot drift from the client library in use.
+MESSAGE_TYPE_OF = {cls: num for num, cls in api_core.MESSAGE_TYPE_TO_PROTO.items()}
+
+_READ_CHUNK = 4096
+
+
+def encode_varint(value: int) -> bytes:
+    out = bytearray()
+    while True:
+        byte = value & 0x7F
+        value >>= 7
+        if value:
+            out.append(byte | 0x80)
+        else:
+            out.append(byte)
+            return bytes(out)
+
+
+def decode_varint(buf: bytearray, pos: int) -> tuple[int, int] | None:
+    """Decode one varint at pos; return (value, new_pos) or None if short."""
+    value = shift = 0
+    while pos < len(buf):
+        byte = buf[pos]
+        pos += 1
+        value |= (byte & 0x7F) << shift
+        if not byte & 0x80:
+            return value, pos
+        shift += 7
+    return None
+
+
+def encode_frame(msg_type: int, payload: bytes) -> bytes:
+    """Encode one plaintext api frame: 0x00, payload length, message type."""
+    return b"\x00" + encode_varint(len(payload)) + encode_varint(msg_type) + payload
+
+
+class FrameParser:
+    """Incremental parser for the plaintext api frame stream."""
+
+    def __init__(self) -> None:
+        self._buf = bytearray()
+
+    def feed(self, data: bytes) -> list[int]:
+        self._buf.extend(data)
+        types: list[int] = []
+        while (msg_type := self._try_parse()) is not None:
+            types.append(msg_type)
+        return types
+
+    def _try_parse(self) -> int | None:
+        buf = self._buf
+        if not buf:
+            return None
+        assert buf[0] == 0, f"expected plaintext frame, got indicator {buf[0]}"
+        if (size_decoded := decode_varint(buf, 1)) is None:
+            return None
+        size, pos = size_decoded
+        if (type_decoded := decode_varint(buf, pos)) is None:
+            return None
+        msg_type, pos = type_decoded
+        if len(buf) - pos < size:
+            return None
+        del buf[: pos + size]
+        return msg_type
+
+
+class RawApiClient:
+    """Plaintext api client whose reads happen only on request."""
+
+    def __init__(self, port: int, recv_buffer_size: int | None = None) -> None:
+        self._port = port
+        self._parser = FrameParser()
+        self.bytes_received = 0
+        self.frame_counts: Counter[int] = Counter()
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        try:
+            if recv_buffer_size is not None:
+                sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, recv_buffer_size)
+                # Kernels may round up (Linux doubles) but must not clamp below
+                applied = sock.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF)
+                assert applied >= recv_buffer_size, (
+                    f"SO_RCVBUF clamped to {applied}, requested {recv_buffer_size}"
+                )
+            sock.setblocking(False)
+        except Exception:
+            sock.close()
+            raise
+        self._sock = sock
+
+    async def __aenter__(self) -> Self:
+        return self
+
+    async def __aexit__(self, *exc_info: object) -> None:
+        self.close()
+
+    async def connect(self, client_info: str = "raw-api-client") -> None:
+        """Connect and complete the Hello handshake (no auth step since 2026.1.0)."""
+        loop = asyncio.get_running_loop()
+        await loop.sock_connect(self._sock, (LOCALHOST, self._port))
+        hello = api_pb2.HelloRequest()
+        hello.client_info = client_info
+        hello.api_version_major = 1
+        hello.api_version_minor = 10
+        await self.send_message(hello)
+        await self.read_until_frame(MESSAGE_TYPE_OF[api_pb2.HelloResponse])
+
+    async def send_message(self, msg: message.Message) -> None:
+        loop = asyncio.get_running_loop()
+        await loop.sock_sendall(
+            self._sock,
+            encode_frame(MESSAGE_TYPE_OF[type(msg)], msg.SerializeToString()),
+        )
+
+    async def read_until_frame(self, msg_type: int, timeout: float = 10.0) -> None:
+        """Read until at least one frame of msg_type has been received."""
+        loop = asyncio.get_running_loop()
+
+        async def _read_loop() -> None:
+            while not self.frame_counts[msg_type]:
+                data = await loop.sock_recv(self._sock, _READ_CHUNK)
+                assert data, "server closed the connection unexpectedly"
+                self.bytes_received += len(data)
+                self.frame_counts.update(self._parser.feed(data))
+
+        await asyncio.wait_for(_read_loop(), timeout)
+
+    def close(self) -> None:
+        self._sock.close()
diff --git a/tests/integration/test_api_list_entities_backpressure.py b/tests/integration/test_api_list_entities_backpressure.py
new file mode 100644
index 0000000000..9df6c7a298
--- /dev/null
+++ b/tests/integration/test_api_list_entities_backpressure.py
@@ -0,0 +1,110 @@
+"""A client that stops reading the entity listing must not starve other clients.
+
+Service responses are sent directly (not via the deferred batch), so a full
+TCP pipe makes the send path refuse; the drive loop now lives in
+try_advance(), which stops on refusal instead of retrying forever. Not a
+before/after regression test: pre-fix builds survive here because the
+refusal path yields and pumps the socket each retry.
+
+The sndbuf_pin_component fixture pins the device's send buffers so the pipe
+fills deterministically regardless of kernel autotuning; the test waits for
+its log line before proceeding.
+"""
+
+from __future__ import annotations
+
+import asyncio
+
+from aioesphomeapi import api_pb2
+import pytest
+
+from .raw_api_client import MESSAGE_TYPE_OF, RawApiClient
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+SERVICES_RESPONSE = MESSAGE_TYPE_OF[api_pb2.ListEntitiesServicesResponse]
+LIST_DONE_RESPONSE = MESSAGE_TYPE_OF[api_pb2.ListEntitiesDoneResponse]
+
+# Both ends of the pipe are pinned small; only tens of KB fit in the kernel
+RECV_BUFFER_SIZE = 4096
+SERVER_SNDBUF = 8192  # substituted into the fixture yaml
+# Logged by the sndbuf_pin_component fixture when it pins a socket
+SNDBUF_PIN_LOG = "SO_SNDBUF pinned to"
+# One response (~6.4 KB) must stay smaller than the pinned send buffer; an
+# oversized message parks in the overflow buffer and reports as sent.
+ARGS_PER_SERVICE = 8
+ARG_NAME_LEN = 800
+# ~160 KB listing versus a tens-of-KB pipe guarantees a mid-services block
+NUM_SERVICES = 25
+assert ARGS_PER_SERVICE * ARG_NAME_LEN < SERVER_SNDBUF
+# The pipe fills in well under a second
+STALL_SECONDS = 0.5
+# Well above pipe capacity, well below the listing size
+MIN_DRAINED_BYTES = 60_000
+
+
+def _generated_actions() -> str:
+    """Build the api actions block: services with long argument names."""
+    lines: list[str] = []
+    for i in range(NUM_SERVICES):
+        lines.append(f"    - action: backpressure_service_{i:04d}")
+        lines.append("      variables:")
+        for j in range(ARGS_PER_SERVICE):
+            prefix = f"arg_{i:04d}_{j:02d}_"
+            lines.append(
+                f"        {prefix}{'x' * (ARG_NAME_LEN - len(prefix))}: string"
+            )
+        lines.append("      then:")
+        lines.append("        - logger.log: service called")
+    return "\n".join(lines)
+
+
+@pytest.mark.asyncio
+async def test_api_list_entities_backpressure(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+    unused_tcp_port: int,
+) -> None:
+    """A stalled reader mid-services must not block other api clients."""
+    assert "# GENERATED_ACTIONS" in yaml_config
+    config = yaml_config.replace("# GENERATED_ACTIONS", _generated_actions())
+    config = config.replace("SERVER_SNDBUF", str(SERVER_SNDBUF))
+
+    pin_applied = asyncio.Event()
+
+    def _on_log_line(line: str) -> None:
+        if SNDBUF_PIN_LOG in line:
+            pin_applied.set()
+
+    async with run_compiled(config, line_callback=_on_log_line):
+        # Fails loudly if the pin never applied
+        await asyncio.wait_for(pin_applied.wait(), 10)
+
+        async with RawApiClient(
+            unused_tcp_port, recv_buffer_size=RECV_BUFFER_SIZE
+        ) as stalled:
+            await stalled.connect(client_info="backpressure-stall-client")
+            await stalled.send_message(api_pb2.ListEntitiesRequest())
+            # The client now stops reading entirely.
+
+            # Let the server run against the full pipe
+            await asyncio.sleep(STALL_SECONDS)
+
+            # Other clients must still be served while the first is blocked
+            async with api_client_connected(timeout=20) as client:
+                device_info = await asyncio.wait_for(client.device_info(), 20)
+                assert device_info.name == "api-backpressure-test"
+                _, services = await asyncio.wait_for(
+                    client.list_entities_services(), 30
+                )
+                assert len(services) == NUM_SERVICES
+
+            # Fixture-size guard: the listing must dwarf the pinned pipe
+            before = stalled.bytes_received
+            await stalled.read_until_frame(LIST_DONE_RESPONSE, timeout=60)
+            drained = stalled.bytes_received - before
+            assert drained > MIN_DRAINED_BYTES, (
+                f"only {drained} bytes drained; the listing never backed up"
+            )
+            assert stalled.frame_counts[SERVICES_RESPONSE] == NUM_SERVICES
+            assert stalled.frame_counts[LIST_DONE_RESPONSE] == 1

From 98f138f6b2b7b1cacd35e40e9a83f13cfdf6d739 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 16:16:01 -0500
Subject: [PATCH 100/155] [esp32_ble_tracker] Scan at the default window while
 a GATT connection is active (#18609)

---
 .../components/ble_device_base/__init__.py    |  43 +++++---
 .../components/esp32_ble_tracker/__init__.py  |  47 +++++++-
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   |  73 ++++++++++---
 .../esp32_ble_tracker/esp32_ble_tracker.h     |  36 ++++--
 .../config/scan_window_explicit.yaml          |  19 ++++
 .../config/scan_window_raised.yaml            |  17 +++
 .../config/scan_window_scan_only.yaml         |  12 ++
 .../scan_window_user_set_scan_only.yaml       |  14 +++
 .../test_scan_window_default.py               | 103 +++++++++++++++++-
 9 files changed, 320 insertions(+), 44 deletions(-)
 create mode 100644 tests/component_tests/esp32_ble_tracker/config/scan_window_explicit.yaml
 create mode 100644 tests/component_tests/esp32_ble_tracker/config/scan_window_raised.yaml
 create mode 100644 tests/component_tests/esp32_ble_tracker/config/scan_window_scan_only.yaml
 create mode 100644 tests/component_tests/esp32_ble_tracker/config/scan_window_user_set_scan_only.yaml

diff --git a/esphome/components/ble_device_base/__init__.py b/esphome/components/ble_device_base/__init__.py
index 15a8b08139..43ec736727 100644
--- a/esphome/components/ble_device_base/__init__.py
+++ b/esphome/components/ble_device_base/__init__.py
@@ -206,32 +206,36 @@ def validate_scan_parameters(config: ConfigType) -> ConfigType:
     interval = config[CONF_INTERVAL]
     window = config[CONF_WINDOW]
 
-    if window > interval:
-        raise cv.Invalid(
-            f"Scan window ({window}) needs to be smaller than scan interval ({interval})"
-        )
+    # Labels are reused in every error below; the optional one names its key.
+    windows = [("Scan window", window)]
+    if (connection_window := config.get(CONF_CONNECTION_SCAN_WINDOW)) is not None:
+        windows.append((CONF_CONNECTION_SCAN_WINDOW, connection_window))
+
+    for name, value in windows:
+        if value > interval:
+            raise cv.Invalid(
+                f"{name} ({value}) needs to be smaller than scan interval ({interval})"
+            )
 
     # BLE scan interval/window are programmed in 0.625 ms units as a 16-bit value; the
     # controller only accepts 2.5 ms .. 10240 ms (0x0004 .. 0x4000). Reject out-of-range
     # values here instead of letting the unit conversion silently overflow.
-    for name, value in (("interval", interval), ("window", window)):
+    for name, value in (("Scan interval", interval), *windows):
         if value.total_microseconds < 2500 or value.total_microseconds > 10_240_000:
-            raise cv.Invalid(
-                f"Scan {name} ({value}) must be between 2.5 ms and 10240 ms"
-            )
+            raise cv.Invalid(f"{name} ({value}) must be between 2.5 ms and 10240 ms")
 
     # Validate what actually reaches the controller: both values are truncated to
     # whole 0.625 ms units, so a window/interval pair that differs by less than one
     # unit collapses to the same value — silently programming a 100 % duty cycle
     # (radio permanently on) from a config that asked for less.
     interval_units = to_ble_units(interval)
-    window_units = to_ble_units(window)
-    if window_units == interval_units and window < interval:
-        raise cv.Invalid(
-            f"Scan window ({window}) and interval ({interval}) both truncate to "
-            f"{interval_units} x 0.625 ms, which the controller scans at a 100 % duty "
-            f"cycle. Separate them by at least 0.625 ms."
-        )
+    for name, value in windows:
+        if to_ble_units(value) == interval_units and value < interval:
+            raise cv.Invalid(
+                f"{name} ({value}) and interval ({interval}) both truncate to "
+                f"{interval_units} x 0.625 ms, which the controller scans at a 100 % duty "
+                f"cycle. Separate them by at least 0.625 ms."
+            )
 
     if interval.total_microseconds * 3 > duration.total_microseconds:
         raise cv.Invalid(
@@ -247,11 +251,14 @@ def validate_scan_parameters(config: ConfigType) -> ConfigType:
 # their own; also the fallback for esp32's conditional default.
 DEFAULT_SCAN_WINDOW = "30ms"
 
+CONF_CONNECTION_SCAN_WINDOW = "connection_scan_window"
+
 
 def scan_parameters_schema(
     interval_default: str,
     *,
     window_default: str | Callable[[], TimePeriod] = DEFAULT_SCAN_WINDOW,
+    connection_window: bool = False,
 ) -> cv.All:
     """Build the scan_parameters value schema shared by all BLE trackers.
 
@@ -263,7 +270,9 @@ def scan_parameters_schema(
     can adjust it once sibling keys are resolved). The `active` option
     (default on) is unconditional: active scanning is part of the tracker
     contract — every current proxy client assumes it, so a passive-only
-    tracker must not share this schema.
+    tracker must not share this schema. connection_window opts in to the
+    `connection_scan_window` option for trackers that can fall back to a
+    smaller window while a GATT connection is active.
     """
     schema = {
         cv.Optional(CONF_DURATION, default="5min"): cv.positive_time_period_seconds,
@@ -272,6 +281,8 @@ def scan_parameters_schema(
         cv.Optional(CONF_CONTINUOUS, default=True): cv.boolean,
         cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
     }
+    if connection_window:
+        schema[cv.Optional(CONF_CONNECTION_SCAN_WINDOW)] = cv.positive_time_period
     return cv.All(cv.Schema(schema), validate_scan_parameters)
 
 
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 4f6355df70..c6e34f37ca 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -7,6 +7,7 @@ import logging
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import ble_device_base, esp32_ble, ota
+from esphome.components.ble_device_base import CONF_CONNECTION_SCAN_WINDOW
 from esphome.components.const import CONF_ON_SCAN_END, CONF_SCAN_PARAMETERS, CONF_WINDOW
 from esphome.components.esp32 import (
     add_idf_sdkconfig_option,
@@ -73,8 +74,9 @@ def _get_required_features() -> set[BLEFeatures]:
 
 # Slot counters sizing the tracker's StaticVector storage; one request per
 # registered listener or client.
+CLIENT_COUNT_DEFINE = "ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT"
 _request_listener_slot = cg.slot_counter("ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT")
-_request_client_slot = cg.slot_counter("ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT")
+_request_client_slot = cg.slot_counter(CLIENT_COUNT_DEFINE)
 
 
 def register_ble_features(features: set[BLEFeatures]) -> None:
@@ -147,6 +149,7 @@ class TrackerData:
     """Per-run validation state, namespaced under DOMAIN in CORE.data."""
 
     scan_window_defaulted: bool = False
+    connection_window_injected: bool = False
 
 
 def _get_data() -> TrackerData:
@@ -175,17 +178,34 @@ def _raise_defaulted_scan_window(config: ConfigType) -> ConfigType:
     honors the window strictly (>= 5.5.5); without the arbiter a full-duty
     scan would starve wifi outright, and a user-set window is never touched.
     Raising to the interval cannot invalidate the already-validated
-    parameters, so no re-validation is needed.
+    parameters, so no re-validation is needed. The connection window is
+    checked against the window here, after the raise.
     """
+    params = config[CONF_SCAN_PARAMETERS]
     if (
         _get_data().scan_window_defaulted
         and config.get(CONF_SOFTWARE_COEXISTENCE)
         and idf_version() >= IDF_SCAN_WINDOW_FIX_VERSION
     ):
-        params = config[CONF_SCAN_PARAMETERS]
         # Copy so the config dump shows a plain value instead of a YAML
         # anchor/alias pair pointing at the interval.
         params[CONF_WINDOW] = copy.copy(params[CONF_INTERVAL])
+        # Arm the connection-time fallback unless the user set one. Injected
+        # after validation; safe because it equals the validated window default.
+        if CONF_CONNECTION_SCAN_WINDOW not in params:
+            params[CONF_CONNECTION_SCAN_WINDOW] = cv.positive_time_period(
+                ble_device_base.DEFAULT_SCAN_WINDOW
+            )
+            _get_data().connection_window_injected = True
+    if (
+        connection_window := params.get(CONF_CONNECTION_SCAN_WINDOW)
+    ) is not None and connection_window > params[CONF_WINDOW]:
+        # A larger value would widen the scan during connections.
+        raise cv.Invalid(
+            f"{CONF_CONNECTION_SCAN_WINDOW} ({connection_window}) needs to be "
+            f"smaller than the scan window ({params[CONF_WINDOW]})",
+            path=[CONF_SCAN_PARAMETERS, CONF_CONNECTION_SCAN_WINDOW],
+        )
     return config
 
 
@@ -194,7 +214,7 @@ def _raise_defaulted_scan_window(config: ConfigType) -> ConfigType:
 # window/interval pairs that collapse to the same 0.625 ms unit count.
 # The window default is conditional (see _scan_window_default above).
 SCAN_PARAMETERS_SCHEMA = ble_device_base.scan_parameters_schema(
-    "320ms", window_default=_scan_window_default
+    "320ms", window_default=_scan_window_default, connection_window=True
 )
 
 # Codegen helpers are owned by ble_device_base; kept under the historical names
@@ -288,6 +308,25 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_scan_duration(params[CONF_DURATION]))
     cg.add(var.set_scan_interval(ble_device_base.to_ble_units(params[CONF_INTERVAL])))
     cg.add(var.set_scan_window(ble_device_base.to_ble_units(params[CONF_WINDOW])))
+    if (connection_window := params.get(CONF_CONNECTION_SCAN_WINDOW)) is not None:
+        # Emitted at FINAL so a scan-only build, where the guarded C++ path
+        # compiles out, skips the call entirely.
+        window_units = ble_device_base.to_ble_units(connection_window)
+
+        @coroutine_with_priority(CoroPriority.FINAL)
+        async def _emit_connection_scan_window() -> None:
+            if cg.get_slot_count(CLIENT_COUNT_DEFINE):
+                cg.add(var.set_connection_scan_window(window_units))
+            elif not _get_data().connection_window_injected:
+                # Warn only for a user-set value; the injected default drops silently.
+                _LOGGER.warning(
+                    "'%s' has no effect because this build has no BLE client "
+                    "components (for example bluetooth_proxy with active "
+                    "connections, or ble_client)",
+                    CONF_CONNECTION_SCAN_WINDOW,
+                )
+
+        CORE.add_job(_emit_connection_scan_window)
     cg.add(var.set_scan_active(params[CONF_ACTIVE]))
     cg.add(var.set_scan_continuous(params[CONF_CONTINUOUS]))
 
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 798fd6e0ca..5339565a32 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -122,6 +122,9 @@ void ESP32BLETracker::loop() {
   // - start_scan_(): scanner_state_ becomes IDLE via set_scanner_state_() in cleanup_scan_state_()
   // - try_promote_discovered_clients_(): client enters DISCOVERED via set_state(), or
   //   connecting client finishes (state change), or scanner reaches RUNNING/IDLE
+  // - connection-window restart: scan_params_ is only written in start_scan_()
+  //   (which changes scanner state via set_scanner_state_()), and
+  //   counts.active/disconnecting only change on client state changes
   //
   // All conditions that affect the logic below are tied to state changes that increment
   // state_version_, so the fast path is safe.
@@ -144,6 +147,19 @@ void ESP32BLETracker::loop() {
       (this->scan_set_param_failed_ && this->scanner_state_ == ScannerState::RUNNING)) {
     this->handle_scanner_failure_();
   }
+
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  // The programmed window no longer matches the connection state (typically
+  // the last connection dropped): restart so the right window applies now
+  // instead of at the end of the scan period. Continuous only (a user-started
+  // scan would not restart); !disconnecting matches the restart gate below.
+  if (this->scanner_state_ == ScannerState::RUNNING && this->scan_continuous_ && !counts.disconnecting &&
+      this->scan_params_.scan_window != this->desired_scan_window_(counts.active)) {
+    // Same logical scan period continues: no on_scan_end sweeps for this
+    // restart. Only armed when the stop was issued.
+    this->skip_next_scan_end_ = this->stop_scan_();
+  }
+#endif
   /*
 
     Avoid starting the scanner if:
@@ -195,19 +211,23 @@ void ESP32BLETracker::stop_scan() {
   // reason at D themselves, and the user-facing stop action is deliberate.
   ESP_LOGV(TAG, "Stopping scan.");
   this->scan_continuous_ = false;
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  // The window-change restart is abandoned with continuous scanning.
+  this->skip_next_scan_end_ = false;
+#endif
   this->stop_scan_();
 }
 
 void ESP32BLETracker::ble_before_disabled_event_handler() { this->stop_scan_(); }
 
-void ESP32BLETracker::stop_scan_() {
+bool ESP32BLETracker::stop_scan_() {
   if (this->scanner_state_ != ScannerState::RUNNING && this->scanner_state_ != ScannerState::FAILED) {
     // IDLE means there is nothing to stop; STOPPING means a stop is already in
     // flight and will finish on its own. Neither is an error.
     if (this->scanner_state_ != ScannerState::IDLE && this->scanner_state_ != ScannerState::STOPPING) {
       ESP_LOGE(TAG, "Cannot stop scan: %s", this->scanner_state_to_string_(this->scanner_state_));
     }
-    return;
+    return false;
   }
   // Reset timeout state machine when stopping scan
   this->scan_timeout_state_ = ScanTimeoutState::INACTIVE;
@@ -215,8 +235,9 @@ void ESP32BLETracker::stop_scan_() {
   esp_err_t err = esp_ble_gap_stop_scanning();
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "esp_ble_gap_stop_scanning failed: %d", err);
-    return;
+    return false;
   }
+  return true;
 }
 
 void ESP32BLETracker::start_scan_(bool first) {
@@ -230,16 +251,11 @@ void ESP32BLETracker::start_scan_(bool first) {
   }
   this->set_scanner_state_(ScannerState::STARTING);
   ESP_LOGV(TAG, "Starting scan, set scanner state to STARTING.");
-  if (!first) {
-#ifdef ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT
-    for (auto *listener : this->listeners_)
-      listener->on_scan_end();
+  if (!first)
+    this->notify_scan_end_();
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  this->skip_next_scan_end_ = false;
 #endif
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-    for (auto *listener : this->neutral_listeners_)
-      listener->on_scan_end();
-#endif
-  }
 #ifdef USE_ESP32_BLE_DEVICE
   this->discovered_log_.clear();
 #endif
@@ -247,7 +263,17 @@ void ESP32BLETracker::start_scan_(bool first) {
   this->scan_params_.own_addr_type = BLE_ADDR_TYPE_PUBLIC;
   this->scan_params_.scan_filter_policy = BLE_SCAN_FILTER_ALLOW_ALL;
   this->scan_params_.scan_interval = this->scan_interval_;
-  this->scan_params_.scan_window = this->scan_window_;
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  // Count fresh: an automation can start a scan before loop() refreshes the counts.
+  const uint32_t window = this->desired_scan_window_(this->count_client_states_().active);
+  if (window != this->scan_window_) {
+    // Guarantee the connection airtime instead of scanning wall to wall.
+    ESP_LOGV(TAG, "Connection active, using %" PRIu32 " unit scan window", window);
+  }
+#else
+  const uint32_t window = this->scan_window_;
+#endif
+  this->scan_params_.scan_window = window;
 
   // Start timeout monitoring in loop() instead of using scheduler
   // This prevents false reboots when the loop is blocked
@@ -408,6 +434,11 @@ void ESP32BLETracker::dump_config() {
                 "  Continuous Scanning: %s",
                 this->scan_duration_, this->scan_interval_ * 0.625f, this->scan_window_ * 0.625f,
                 this->scan_active_ ? "ACTIVE" : "PASSIVE", YESNO(this->scan_continuous_));
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  if (this->connection_scan_window_ != 0) {
+    ESP_LOGCONFIG(TAG, "  Connection Scan Window: %.1f ms", this->connection_scan_window_ * 0.625f);
+  }
+#endif
   ESP_LOGCONFIG(TAG,
                 "  Scanner State: %s\n"
                 "  Connecting: %d, discovered: %d, disconnecting: %d, active: %d",
@@ -487,6 +518,18 @@ void ESP32BLETracker::cleanup_scan_state_(bool is_stop_complete) {
   // Reset timeout state machine instead of cancelling scheduler timeout
   this->scan_timeout_state_ = ScanTimeoutState::INACTIVE;
 
+  this->notify_scan_end_();
+
+  this->set_scanner_state_(ScannerState::IDLE);
+}
+
+void ESP32BLETracker::notify_scan_end_() {
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  // Window-change restart continues the same scan period; the flag stays set
+  // across the stop and is cleared by the restart in start_scan_.
+  if (this->skip_next_scan_end_)
+    return;
+#endif
 #ifdef ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT
   for (auto *listener : this->listeners_)
     listener->on_scan_end();
@@ -495,8 +538,6 @@ void ESP32BLETracker::cleanup_scan_state_(bool is_stop_complete) {
   for (auto *listener : this->neutral_listeners_)
     listener->on_scan_end();
 #endif
-
-  this->set_scanner_state_(ScannerState::IDLE);
 }
 
 void ESP32BLETracker::handle_scanner_failure_() {
@@ -534,6 +575,8 @@ void ESP32BLETracker::try_promote_discovered_clients_() {
     }
 
     ESP_LOGD(TAG, "Promoting client to connect");
+    // A connect ends the scan period a window-change restart was continuing.
+    this->skip_next_scan_end_ = false;
 #ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
     this->update_coex_preference_(true);
 #endif
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 7c3e5538fd..618444e626 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -169,6 +169,9 @@ class ESP32BLETracker final : public Component,
   void set_scan_duration(uint32_t scan_duration) { scan_duration_ = scan_duration; }
   void set_scan_interval(uint32_t scan_interval) { scan_interval_ = scan_interval; }
   void set_scan_window(uint32_t scan_window) { scan_window_ = scan_window; }
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  void set_connection_scan_window(uint32_t scan_window) { connection_scan_window_ = scan_window; }
+#endif
   void set_scan_active(bool scan_active) { scan_active_ = scan_active; }
   bool get_scan_active() const { return scan_active_; }
   void set_scan_continuous(bool scan_continuous) { scan_continuous_ = scan_continuous; }
@@ -226,7 +229,10 @@ class ESP32BLETracker final : public Component,
   ScannerState get_scanner_state() const { return this->scanner_state_; }
 
  protected:
-  void stop_scan_();
+  /// Returns true when a stop was issued to the controller.
+  bool stop_scan_();
+  /// Fire on_scan_end on every listener unless a window-change restart suppressed it.
+  void notify_scan_end_();
   /// Start a single scan by setting up the parameters and doing some esp-idf calls.
   void start_scan_(bool first);
   /// Called when a `ESP_GAP_BLE_SCAN_RESULT_EVT` event is received.
@@ -313,6 +319,15 @@ class ESP32BLETracker final : public Component,
   uint32_t scan_duration_;
   uint32_t scan_interval_;
   uint32_t scan_window_;
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  /// Window used while a GATT connection is active; set by the user, or
+  /// defaulted when the window was raised to full duty (0 = no fallback).
+  uint32_t connection_scan_window_{0};
+  /// The window to scan at for the given number of active GATT connections.
+  uint32_t desired_scan_window_(uint8_t active) const {
+    return (this->connection_scan_window_ != 0 && active > 0) ? this->connection_scan_window_ : this->scan_window_;
+  }
+#endif
   esp_bt_status_t scan_start_failed_{ESP_BT_STATUS_SUCCESS};
   esp_bt_status_t scan_set_param_failed_{ESP_BT_STATUS_SUCCESS};
 
@@ -330,15 +345,20 @@ class ESP32BLETracker final : public Component,
   /// state_version_ to detect if any state changed since last iteration.
   uint8_t last_processed_version_{0};
   ScannerState scanner_state_{ScannerState::IDLE};
-  bool scan_continuous_;
-  bool scan_active_;
+  // Packed 1-bit flags.
+  bool scan_continuous_ : 1;
+  bool scan_active_ : 1;
 #ifdef USE_OTA_STATE_LISTENER
-  bool scan_continuous_before_ota_{false};
+  bool scan_continuous_before_ota_ : 1 {false};
+#endif
+  bool ble_was_disabled_ : 1 {true};
+  bool parse_advertisements_ : 1 {false};
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  /// Suppress the window-change restart's on_scan_end sweeps (stop and start).
+  bool skip_next_scan_end_ : 1 {false};
 #endif
-  bool ble_was_disabled_{true};
-  bool parse_advertisements_{false};
 #ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
-  bool coex_prefer_ble_{false};
+  bool coex_prefer_ble_ : 1 {false};
 #endif
   // Scan timeout state machine
   enum class ScanTimeoutState : uint8_t {
@@ -346,10 +366,10 @@ class ESP32BLETracker final : public Component,
     MONITORING,     // Actively monitoring for timeout
     EXCEEDED_WAIT,  // Timeout exceeded, waiting one loop before reboot
   };
+  ScanTimeoutState scan_timeout_state_{ScanTimeoutState::INACTIVE};
   uint32_t scan_start_time_{0};
   /// Precomputed timeout value: scan_duration_ * 2000
   uint32_t scan_timeout_ms_{0};
-  ScanTimeoutState scan_timeout_state_{ScanTimeoutState::INACTIVE};
 };
 
 // NOLINTNEXTLINE
diff --git a/tests/component_tests/esp32_ble_tracker/config/scan_window_explicit.yaml b/tests/component_tests/esp32_ble_tracker/config/scan_window_explicit.yaml
new file mode 100644
index 0000000000..70760fdea6
--- /dev/null
+++ b/tests/component_tests/esp32_ble_tracker/config/scan_window_explicit.yaml
@@ -0,0 +1,19 @@
+esphome:
+  name: scan-window-explicit
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: MySSID
+
+esp32_ble_tracker:
+  scan_parameters:
+    window: 30ms
+
+bluetooth_proxy:
+  active: true
+
+api:
diff --git a/tests/component_tests/esp32_ble_tracker/config/scan_window_raised.yaml b/tests/component_tests/esp32_ble_tracker/config/scan_window_raised.yaml
new file mode 100644
index 0000000000..4febbfcf3b
--- /dev/null
+++ b/tests/component_tests/esp32_ble_tracker/config/scan_window_raised.yaml
@@ -0,0 +1,17 @@
+esphome:
+  name: scan-window-raised
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: MySSID
+
+esp32_ble_tracker:
+
+bluetooth_proxy:
+  active: true
+
+api:
diff --git a/tests/component_tests/esp32_ble_tracker/config/scan_window_scan_only.yaml b/tests/component_tests/esp32_ble_tracker/config/scan_window_scan_only.yaml
new file mode 100644
index 0000000000..5da5601388
--- /dev/null
+++ b/tests/component_tests/esp32_ble_tracker/config/scan_window_scan_only.yaml
@@ -0,0 +1,12 @@
+esphome:
+  name: scan-window-scan-only
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: MySSID
+
+esp32_ble_tracker:
diff --git a/tests/component_tests/esp32_ble_tracker/config/scan_window_user_set_scan_only.yaml b/tests/component_tests/esp32_ble_tracker/config/scan_window_user_set_scan_only.yaml
new file mode 100644
index 0000000000..2b9093164f
--- /dev/null
+++ b/tests/component_tests/esp32_ble_tracker/config/scan_window_user_set_scan_only.yaml
@@ -0,0 +1,14 @@
+esphome:
+  name: scan-window-user-scan-only
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: MySSID
+
+esp32_ble_tracker:
+  scan_parameters:
+    connection_scan_window: 20ms
diff --git a/tests/component_tests/esp32_ble_tracker/test_scan_window_default.py b/tests/component_tests/esp32_ble_tracker/test_scan_window_default.py
index 8a25f488fa..8612ac6732 100644
--- a/tests/component_tests/esp32_ble_tracker/test_scan_window_default.py
+++ b/tests/component_tests/esp32_ble_tracker/test_scan_window_default.py
@@ -12,11 +12,12 @@ arbiter a full-duty scan would starve wifi, so the 30 ms default is kept.
 from __future__ import annotations
 
 from collections.abc import Callable
+from pathlib import Path
 
 import pytest
 
 from esphome import config_validation as cv
-from esphome.components.ble_device_base import to_ble_units
+from esphome.components.ble_device_base import CONF_CONNECTION_SCAN_WINDOW, to_ble_units
 from esphome.components.const import CONF_SCAN_PARAMETERS, CONF_WINDOW
 from esphome.components.esp32 import KEY_IDF_VERSION
 from esphome.components.esp32_ble_tracker import (
@@ -120,3 +121,103 @@ def test_short_interval_without_window_still_rejected(
     stage_esp32("5.5.5", wifi=True)
     with pytest.raises(cv.Invalid, match="needs to be smaller than scan interval"):
         _scan_params({"scan_parameters": {"interval": "20ms"}})
+
+
+# The connection-time fallback window: while a GATT connection is active the
+# scanner drops from a raised full-duty window back to this value so the
+# connection gets guaranteed airtime.
+
+
+def test_raise_arms_connection_scan_window_default(
+    stage_esp32: Callable[..., None],
+) -> None:
+    stage_esp32("5.5.5", wifi=True)
+    params = _scan_params({})
+    assert params[CONF_WINDOW] == params[CONF_INTERVAL]
+    assert to_ble_units(params[CONF_CONNECTION_SCAN_WINDOW]) == 48
+
+
+def test_user_connection_scan_window_survives_raise(
+    stage_esp32: Callable[..., None],
+) -> None:
+    stage_esp32("5.5.5", wifi=True)
+    params = _scan_params({"scan_parameters": {"connection_scan_window": "60ms"}})
+    assert params[CONF_WINDOW] == params[CONF_INTERVAL]
+    assert to_ble_units(params[CONF_CONNECTION_SCAN_WINDOW]) == 96
+
+
+def test_unraised_window_gets_no_connection_scan_window_default(
+    stage_esp32: Callable[..., None],
+) -> None:
+    stage_esp32("5.5.4", wifi=True)
+    assert CONF_CONNECTION_SCAN_WINDOW not in _scan_params({})
+
+
+def test_connection_scan_window_above_interval_rejected(
+    stage_esp32: Callable[..., None],
+) -> None:
+    stage_esp32("5.5.5", wifi=True)
+    with pytest.raises(
+        cv.Invalid, match="connection_scan_window .* needs to be smaller"
+    ):
+        _scan_params({"scan_parameters": {"connection_scan_window": "400ms"}})
+
+
+def test_connection_scan_window_above_window_rejected(
+    stage_esp32: Callable[..., None],
+) -> None:
+    """A connection window above the (post-raise) window would widen the scan
+    during connections; the reject runs after the raise so a fallback below a
+    raised window still validates (covered by the survives-raise test)."""
+    stage_esp32("5.5.5", wifi=True)
+    with pytest.raises(
+        cv.Invalid, match="connection_scan_window .* needs to be smaller"
+    ):
+        _scan_params(
+            {"scan_parameters": {"window": "30ms", "connection_scan_window": "300ms"}}
+        )
+
+
+def test_connection_scan_window_truncation_collapse_rejected(
+    stage_esp32: Callable[..., None],
+) -> None:
+    """A connection window that truncates into the interval's 0.625 ms unit
+    would silently program a full-duty scan during connections."""
+    stage_esp32("5.5.5", wifi=True)
+    with pytest.raises(cv.Invalid, match="connection_scan_window .* both truncate"):
+        _scan_params(
+            {
+                "scan_parameters": {
+                    "interval": "320.5ms",
+                    "connection_scan_window": "320.2ms",
+                }
+            }
+        )
+
+
+@pytest.mark.parametrize(
+    ("config_file", "window_call", "connection_call", "warns"),
+    [
+        # Raised window with GATT clients: the injected fallback is emitted.
+        ("scan_window_raised.yaml", "set_scan_window(512)", True, False),
+        # Explicit window: nothing injected.
+        ("scan_window_explicit.yaml", "set_scan_window(48)", False, False),
+        # Scan-only build compiles the path out: the injected default is
+        # dropped silently, a user-set value warns.
+        ("scan_window_scan_only.yaml", "set_scan_window(512)", False, False),
+        ("scan_window_user_set_scan_only.yaml", "set_scan_window(512)", False, True),
+    ],
+)
+def test_connection_scan_window_codegen(
+    generate_main: Callable[[str | Path], str],
+    component_config_path: Callable[[str], Path],
+    caplog: pytest.LogCaptureFixture,
+    config_file: str,
+    window_call: str,
+    connection_call: bool,
+    warns: bool,
+) -> None:
+    main_cpp = generate_main(component_config_path(config_file))
+    assert window_call in main_cpp
+    assert ("set_connection_scan_window(48)" in main_cpp) == connection_call
+    assert ("'connection_scan_window' has no effect" in caplog.text) == warns

From 964fc1ef3fa780f5f7830df25f57a9b441e81469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20H=C3=A4ll?= <soundgoof@gmail.com>
Date: Thu, 20 Aug 2026 06:31:27 +0200
Subject: [PATCH 101/155] [wifi] Take the lwIP core lock around
 sntp_servermode_dhcp() (#18511)

---
 esphome/components/wifi/wifi_component_esp_idf.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/esphome/components/wifi/wifi_component_esp_idf.cpp b/esphome/components/wifi/wifi_component_esp_idf.cpp
index 245390b097..24cb060edb 100644
--- a/esphome/components/wifi/wifi_component_esp_idf.cpp
+++ b/esphome/components/wifi/wifi_component_esp_idf.cpp
@@ -580,7 +580,14 @@ bool WiFiComponent::wifi_sta_ip_config_(const optional<ManualIP> &manual_ip) {
     // lwIP starts the SNTP client if it gets an SNTP server from DHCP. We don't need the time, and more importantly,
     // the built-in SNTP client has a memory leak in certain situations. Disable this feature.
     // https://github.com/esphome/issues/issues/2299
-    sntp_servermode_dhcp(false);
+    {
+#if SNTP_GET_SERVERS_FROM_DHCP || SNTP_GET_SERVERS_FROM_DHCPV6
+      // sntp_servermode_dhcp() is an empty macro unless lwIP is built with
+      // DHCP-supplied NTP servers, so only that build needs the core lock.
+      LwIPLock lock;
+#endif
+      sntp_servermode_dhcp(false);
+    }
 
     // No manual IP is set; use DHCP client
     if (dhcp_status != ESP_NETIF_DHCP_STARTED) {

From c90a5f4cffcdc5f1c6af137ab23802163470919c Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2026 00:00:44 -0500
Subject: [PATCH 102/155] Bump bundled esphome-device-builder to 1.12.1
 (#18541)

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 18f705b501..55aa0ac982 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN \
     -r /requirements.txt
 
 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.12.0
+RUN uv pip install --no-cache-dir esphome-device-builder==1.12.1
 
 RUN \
     platformio settings set enable_telemetry No \

From 4c856949c283f0de0acbb0145e282c8e3df723f6 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 20 Aug 2026 06:59:57 -0500
Subject: [PATCH 103/155] [nrf52] Rebuild the Python env when its interpreter
 symlink dangles (#18540)

---
 esphome/components/nrf52/framework.py    | 26 ++++---
 tests/unit_tests/test_nrf52_framework.py | 90 +++++++++++++++++++++++-
 2 files changed, 107 insertions(+), 9 deletions(-)

diff --git a/esphome/components/nrf52/framework.py b/esphome/components/nrf52/framework.py
index 6b32fe1fea..d487820440 100644
--- a/esphome/components/nrf52/framework.py
+++ b/esphome/components/nrf52/framework.py
@@ -62,6 +62,22 @@ def get_sdk_nrf_tools_path() -> Path:
     return path.resolve()
 
 
+def _needs_venv_rebuild(
+    env_python_path: Path, sentinel: Path, requirements_hash: str
+) -> bool:
+    """True when a penv must be (re)built.
+
+    Rebuild when the interpreter is not a regular file, which covers a
+    dangling symlink (a cached venv outliving a host interpreter upgrade)
+    and a corrupt restore, or when the sentinel is missing or stale.
+    """
+    return (
+        not env_python_path.is_file()
+        or not sentinel.exists()
+        or sentinel.read_text(encoding="utf-8") != requirements_hash
+    )
+
+
 def _get_python_env_path(version: str) -> Path:
     return get_sdk_nrf_tools_path() / "penvs" / version
 
@@ -198,10 +214,7 @@ def setup_platformio_python_env() -> None:
         + "\n".join(_PLATFORMIO_PENV_REQUIREMENTS).encode()
         + f"python{sys.version_info.major}.{sys.version_info.minor}".encode()
     ).hexdigest()
-    if (
-        not sentinel.exists()
-        or sentinel.read_text(encoding="utf-8") != requirements_hash
-    ):
+    if _needs_venv_rebuild(env_python_path, sentinel, requirements_hash):
         rmdir(penv_path, msg="Clean up PlatformIO toolchain Python environment")
 
         create_venv(penv_path, msg="PlatformIO toolchain")
@@ -250,10 +263,7 @@ def check_and_install() -> None:
     env_python_path = get_python_env_executable_path(python_env_path, "python")
     sentinel = python_env_path / ".ready"
     requirements_hash = hashlib.sha256(_REQUIREMENTS.read_bytes()).hexdigest()
-    install_venv = (
-        not sentinel.exists()
-        or sentinel.read_text(encoding="utf-8") != requirements_hash
-    )
+    install_venv = _needs_venv_rebuild(env_python_path, sentinel, requirements_hash)
     if install_venv:
         rmdir(python_env_path, msg=f"Clean up {version} Python environment")
 
diff --git a/tests/unit_tests/test_nrf52_framework.py b/tests/unit_tests/test_nrf52_framework.py
index 0a6bddc280..c2ee0c2a75 100644
--- a/tests/unit_tests/test_nrf52_framework.py
+++ b/tests/unit_tests/test_nrf52_framework.py
@@ -16,6 +16,7 @@ from esphome.components.nrf52.framework import (
     _get_penv_site_packages,
     _get_platformio_penv_path,
     _get_toolchain_platform_info,
+    _needs_venv_rebuild,
     check_and_install,
     get_build_env,
     get_sdk_nrf_tools_path,
@@ -123,10 +124,19 @@ def mock_nrf52_ops():
 # ---------------------------------------------------------------------------
 
 
+def _touch_penv_python(penv: Path) -> None:
+    """Create the interpreter file so the rebuild gate sees a live venv."""
+    python = get_python_env_executable_path(penv, "python")
+    python.parent.mkdir(parents=True, exist_ok=True)
+    python.touch()
+
+
 def _mark_venv_ready(python_env: Path) -> None:
-    """Write the venv sentinel with the current requirements hash."""
+    """Write the venv sentinel with the current requirements hash and a
+    present interpreter so the rebuild gate passes."""
     requirements_hash = hashlib.sha256(_REQUIREMENTS.read_bytes()).hexdigest()
     (python_env / ".ready").write_text(requirements_hash, encoding="utf-8")
+    _touch_penv_python(python_env)
 
 
 class TestCheckAndInstall:
@@ -148,6 +158,23 @@ class TestCheckAndInstall:
         mock_nrf52_ops.download_from_mirrors.assert_not_called()
         mock_nrf52_ops.archive_extract_all.assert_not_called()
 
+    def test_missing_interpreter_rebuilds_venv(
+        self,
+        nrf52_dirs: SimpleNamespace,
+        mock_nrf52_ops: SimpleNamespace,
+    ) -> None:
+        """A valid sentinel must not mask a missing interpreter (a cached venv
+        restored after a host interpreter upgrade)."""
+        requirements_hash = hashlib.sha256(_REQUIREMENTS.read_bytes()).hexdigest()
+        (nrf52_dirs.python_env / ".ready").write_text(
+            requirements_hash, encoding="utf-8"
+        )
+        # no interpreter on disk
+
+        check_and_install()
+
+        mock_nrf52_ops.create_venv.assert_called_once()
+
     def test_fresh_install_runs_all_steps(
         self,
         nrf52_dirs: SimpleNamespace,
@@ -348,6 +375,7 @@ class TestSetupPlatformioPythonEnv:
         (platformio_penv_dir / ".ready").write_text(
             _platformio_requirements_hash(), encoding="utf-8"
         )
+        _touch_penv_python(platformio_penv_dir)
 
         with patch.dict(os.environ):
             setup_platformio_python_env()
@@ -392,6 +420,22 @@ class TestSetupPlatformioPythonEnv:
 
         assert not (platformio_penv_dir / ".ready").exists()
 
+    def test_missing_interpreter_reinstalls(
+        self,
+        platformio_penv_dir: Path,
+        mock_nrf52_ops: SimpleNamespace,
+    ) -> None:
+        """A valid sentinel must not mask a missing interpreter."""
+        (platformio_penv_dir / ".ready").write_text(
+            _platformio_requirements_hash(), encoding="utf-8"
+        )
+        # no interpreter on disk
+
+        with patch.dict(os.environ):
+            setup_platformio_python_env()
+
+        mock_nrf52_ops.create_venv.assert_called_once()
+
     def test_repeated_calls_do_not_duplicate_env_entries(
         self,
         platformio_penv_dir: Path,
@@ -401,6 +445,7 @@ class TestSetupPlatformioPythonEnv:
         (platformio_penv_dir / ".ready").write_text(
             _platformio_requirements_hash(), encoding="utf-8"
         )
+        _touch_penv_python(platformio_penv_dir)
         site_packages = str(_get_penv_site_packages(platformio_penv_dir))
         bin_dir = str(
             get_python_env_executable_path(platformio_penv_dir, "python").parent
@@ -422,6 +467,7 @@ class TestSetupPlatformioPythonEnv:
         (platformio_penv_dir / ".ready").write_text(
             _platformio_requirements_hash(), encoding="utf-8"
         )
+        _touch_penv_python(platformio_penv_dir)
         site_packages = str(_get_penv_site_packages(platformio_penv_dir))
 
         with patch.dict(os.environ, {"PYTHONPATH": "/existing/path"}):
@@ -531,3 +577,45 @@ def testget_tools_path_default_is_global_cache(
         Path(platformdirs.user_cache_dir("esphome", appauthor=False)) / "sdk-nrf"
     ).resolve()
     assert get_sdk_nrf_tools_path() == expected
+
+
+def test_needs_venv_rebuild_gates(tmp_path: Path) -> None:
+    """The shared penv gate rebuilds on any missing or stale piece."""
+    penv = tmp_path / "penv"
+    penv.mkdir()
+    python = penv / "python"
+    sentinel = penv / ".ready"
+    good_hash = "abc123"
+
+    # Nothing in place yet
+    assert _needs_venv_rebuild(python, sentinel, good_hash)
+
+    python.write_text("")
+    # Interpreter present but no sentinel
+    assert _needs_venv_rebuild(python, sentinel, good_hash)
+
+    sentinel.write_text(good_hash, encoding="utf-8")
+    # Everything in place
+    assert not _needs_venv_rebuild(python, sentinel, good_hash)
+
+    # Stale requirements hash
+    assert _needs_venv_rebuild(python, sentinel, "otherhash")
+
+
+@pytest.mark.skipif(
+    sys.platform == "win32", reason="symlink creation needs privileges on Windows"
+)
+def test_needs_venv_rebuild_on_dangling_interpreter_symlink(tmp_path: Path) -> None:
+    """A cached venv restored after a host interpreter upgrade has a
+    bin/python symlink whose target is gone; the valid sentinel must not
+    mask it."""
+    penv = tmp_path / "penv"
+    penv.mkdir()
+    python = penv / "python"
+    sentinel = penv / ".ready"
+    sentinel.write_text("abc123", encoding="utf-8")
+    python.symlink_to(tmp_path / "hostedtoolcache" / "3.12.14" / "python3")
+    assert python.is_symlink()
+    assert not python.exists()
+
+    assert _needs_venv_rebuild(python, sentinel, "abc123")

From f509516d6063ce1fc8549bd221c3223f3e668fba Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 20 Aug 2026 11:32:15 -0500
Subject: [PATCH 104/155] [core] Keep templated !include filenames as strings
 so Windows path normalization cannot corrupt them (#18549)

---
 esphome/components/substitutions/__init__.py |  5 +-
 esphome/yaml_util.py                         | 28 ++++++----
 tests/unit_tests/test_bundle.py              | 56 +++++++++++++++++++-
 tests/unit_tests/test_substitutions.py       | 19 +++++++
 tests/unit_tests/test_yaml_util.py           | 27 +++++++++-
 5 files changed, 120 insertions(+), 15 deletions(-)

diff --git a/esphome/components/substitutions/__init__.py b/esphome/components/substitutions/__init__.py
index b4fcf36c9e..5ef7a699eb 100644
--- a/esphome/components/substitutions/__init__.py
+++ b/esphome/components/substitutions/__init__.py
@@ -363,13 +363,12 @@ def resolve_include(
     an explicit non-goal here.
     """
     original = include.file
-    original_str = str(original)
     filename = str(
         _expand_substitutions(
-            original_str, path + ["file"], context_vars, strict_undefined, errors
+            original, path + ["file"], context_vars, strict_undefined, errors
         )
     )
-    substituted = filename != original_str
+    substituted = filename != original
     if substituted:
         include = include.with_file(filename)
     try:
diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index d3c6caf60b..c280e550c9 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -231,18 +231,22 @@ class IncludeFile:
     def __init__(
         self,
         parent_file: Path,
-        file: Path | str,
+        file: str,
         vars: dict[str, Any] | None,
         yaml_loader: Callable[[Path], Any],
     ) -> None:
         self.parent_file = parent_file
-        self.file = Path(file)
+        # The raw include text may be a substitution/Jinja expression, so it
+        # must never round-trip through Path(): on Windows, WindowsPath str()
+        # rewrites "/" to "\", which Jinja then decodes as escapes like
+        # "\b" -> backspace (issue #18545).
+        self.file = file
         self.vars = vars
         self.yaml_loader = yaml_loader
         self._content: Any = _UNSET
 
     def __repr__(self) -> str:
-        return f"IncludeFile({self.file.as_posix()})"
+        return f"IncludeFile({self.file})"
 
     def load(self) -> Any:
         """Load and cache the included file content.
@@ -258,15 +262,15 @@ class IncludeFile:
             raise Invalid(
                 f"Cannot load include with unresolved substitutions: {self.file}"
             )
-        self._content = self.yaml_loader(Path(self.parent_file.parent / self.file))
+        self._content = self.yaml_loader(self.parent_file.parent / self.file)
         self._content = add_context(self._content, self.vars)
         return self._content
 
     def has_unresolved_expressions(self) -> bool:
         """Check if the filename contains substitution variables or Jinja expressions."""
-        return has_substitution_or_expression(str(self.file))
+        return has_substitution_or_expression(self.file)
 
-    def with_file(self, file: Path | str) -> IncludeFile:
+    def with_file(self, file: str) -> IncludeFile:
         """Clone this include with *file* as the filename."""
         return IncludeFile(self.parent_file, file, self.vars, self.yaml_loader)
 
@@ -313,7 +317,7 @@ def _candidate_include_paths(include: IncludeFile) -> list[Path]:
     parent_dir = include.parent_file.parent
     parent_resolved = include.parent_file.resolve()
     candidates: list[Path] = []
-    for pattern in include_candidate_patterns(str(include.file)):
+    for pattern in include_candidate_patterns(include.file):
         if "*" in pattern:
             matches = sorted(_glob_include_candidates(parent_dir, pattern))
         else:
@@ -362,7 +366,7 @@ def _load_include_candidates(
             continue
         expanded_paths.add(candidate)
         try:
-            loaded = include.with_file(candidate).load()
+            loaded = include.with_file(candidate.as_posix()).load()
         except (EsphomeError, Invalid) as err:
             # Unlike an unresolved pattern (expected during the discovery
             # re-parse), a matched on-disk candidate that fails to load is a
@@ -794,6 +798,10 @@ class ESPHomeLoaderMixin:
             file = fields.get("file")
             if file is None:
                 raise yaml.MarkedYAMLError("Must include 'file'", node.start_mark)
+            if not isinstance(file, str):
+                raise yaml.MarkedYAMLError(
+                    "Include 'file' must be a string", node.start_mark
+                )
             vars = fields.get(CONF_VARS)
             return file, vars
 
@@ -1333,11 +1341,11 @@ class ESPHomeDumper(yaml.SafeDumper):
 
     def represent_include_file(self, value):
         if value.vars:
-            mapping = {"file": value.file.as_posix(), "vars": value.vars}
+            mapping = {"file": value.file, "vars": value.vars}
             return self.represent_mapping(
                 tag="!include", mapping=mapping, flow_style=False
             )
-        return self.represent_scalar(tag="!include", value=value.file.as_posix())
+        return self.represent_scalar(tag="!include", value=value.file)
 
     def represent_id(self, value):
         if is_secret(value.id):
diff --git a/tests/unit_tests/test_bundle.py b/tests/unit_tests/test_bundle.py
index 29e917fe44..1abc7a3ab8 100644
--- a/tests/unit_tests/test_bundle.py
+++ b/tests/unit_tests/test_bundle.py
@@ -29,8 +29,9 @@ from esphome.bundle import (
     read_bundle_manifest,
     remap_bundle_path,
 )
+from esphome.components.substitutions import do_substitution_pass
 from esphome.core import CORE, EsphomeError
-from esphome.yaml_util import force_load_include_files
+from esphome.yaml_util import force_load_include_files, load_yaml
 
 # ---------------------------------------------------------------------------
 # Helpers
@@ -1277,6 +1278,59 @@ def test_discover_files_bundles_all_include_candidates(tmp_path: Path) -> None:
     assert "includes/empty.yaml" in paths
 
 
+@pytest.mark.parametrize("enable_proxy", [True, False])
+def test_bundle_roundtrip_templated_include_with_path_separator(
+    tmp_path: Path, enable_proxy: bool
+) -> None:
+    r"""The issue-18545 flow: a Jinja !include whose branches contain "/" still
+    resolves after the bundle is extracted on the build server.
+
+    Windows is the leg that regresses: the raw expression text must survive
+    verbatim, or its separators get rewritten to "\" and Jinja decodes
+    sequences like "\b" as string escapes.
+    """
+    config_dir = _setup_config_dir(
+        tmp_path,
+        files={
+            "includes/boards/board.yaml": (
+                "packages:\n"
+                '  - !include ${ "bluetooth/bluetooth_proxy_single_core.yaml"'
+                ' if enable_bluetooth_proxy else "../empty.yaml" }\n'
+            ),
+            "includes/boards/bluetooth/bluetooth_proxy_single_core.yaml": (
+                "bluetooth_proxy:\n  active: true\n"
+            ),
+            "includes/empty.yaml": "{}\n",
+        },
+    )
+    (config_dir / "test.yaml").write_text(
+        "substitutions:\n"
+        f"  enable_bluetooth_proxy: {str(enable_proxy).lower()}\n"
+        "esphome:\n  name: test\n"
+        "packages:\n  - !include includes/boards/board.yaml\n"
+    )
+
+    result = ConfigBundleCreator({}).create_bundle()
+    bundle_path = tmp_path / "device.esphomebundle.tar.gz"
+    bundle_path.write_bytes(result.data)
+
+    # Both conditional branches must ship in the bundle.
+    paths = [f.path for f in result.files]
+    assert "includes/boards/bluetooth/bluetooth_proxy_single_core.yaml" in paths
+    assert "includes/empty.yaml" in paths
+
+    # Extract to a fresh directory and resolve the config from there, as a
+    # remote build server would.
+    extracted_config = extract_bundle(bundle_path, tmp_path / "remote")
+    config = do_substitution_pass(load_yaml(extracted_config))
+
+    board_pkg = config["packages"][0]["packages"][0]
+    if enable_proxy:
+        assert board_pkg == {"bluetooth_proxy": {"active": True}}
+    else:
+        assert board_pkg == {}
+
+
 def test_discover_files_candidate_outside_config_dir_skipped(
     tmp_path: Path, caplog: pytest.LogCaptureFixture
 ) -> None:
diff --git a/tests/unit_tests/test_substitutions.py b/tests/unit_tests/test_substitutions.py
index f4063237b1..73c6e496a9 100644
--- a/tests/unit_tests/test_substitutions.py
+++ b/tests/unit_tests/test_substitutions.py
@@ -744,6 +744,25 @@ def test_include_filename_substitution_undefined_var(tmp_path: Path) -> None:
         substitutions.do_substitution_pass(config)
 
 
+def test_include_filename_jinja_expression_with_path_separator(
+    tmp_path: Path,
+) -> None:
+    """A jinja !include whose string literals contain "/" resolves correctly (issue #18545)."""
+    main_file = tmp_path / "main.yaml"
+    main_file.write_text(
+        "substitutions:\n"
+        "  enable_bluetooth_proxy: true\n"
+        "result: !include "
+        '${ "bluetooth/proxy.yaml" if enable_bluetooth_proxy else "../empty.yaml" }\n'
+    )
+    (tmp_path / "bluetooth").mkdir()
+    (tmp_path / "bluetooth" / "proxy.yaml").write_text("value: 42\n")
+
+    config = yaml_util.load_yaml(main_file)
+    config = substitutions.do_substitution_pass(config)
+    assert config["result"] == {"value": 42}
+
+
 def test_raise_first_undefined_logs_extras_at_debug(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
diff --git a/tests/unit_tests/test_yaml_util.py b/tests/unit_tests/test_yaml_util.py
index e0a81652e3..3bdbd04396 100644
--- a/tests/unit_tests/test_yaml_util.py
+++ b/tests/unit_tests/test_yaml_util.py
@@ -701,6 +701,31 @@ def test_include_file_has_unresolved_expressions(
     assert include.has_unresolved_expressions() == expected
 
 
+def test_mapping_include_non_string_file_rejected(tmp_path: Path) -> None:
+    """The mapping !include form rejects a non-string 'file' with a clear error."""
+    entry = tmp_path / "entry.yaml"
+    entry.write_text("wifi: !include\n  file: [not, a, string]\n")
+    with pytest.raises(EsphomeError, match="Include 'file' must be a string"):
+        yaml_util.load_yaml(entry)
+
+
+def test_include_file_templated_filename_stays_raw_string(tmp_path: Path) -> None:
+    """A templated filename keeps its verbatim text (issue #18545)."""
+    parent = tmp_path / "main.yaml"
+    expr = '${ "bluetooth/proxy.yaml" if enable_bluetooth_proxy else "../empty.yaml" }'
+    include = yaml_util.IncludeFile(parent, expr, None, lambda _: {})
+    assert include.file == expr
+    assert include.has_unresolved_expressions()
+    assert repr(include) == f"IncludeFile({expr})"
+
+
+def test_represent_include_file_templated() -> None:
+    """Dumping a templated IncludeFile emits the raw expression unchanged."""
+    expr = '${ "a/b.yaml" if flag else "../c.yaml" }'
+    include = yaml_util.IncludeFile(Path("/fake/main.yaml"), expr, None, lambda _: {})
+    assert yaml_util.dump({"key": include}) == f"key: !include '{expr}'\n"
+
+
 def test_include_in_list_context() -> None:
     """!include of a file returning a list is handled correctly,
     including when that list itself contains a nested IncludeFile."""
@@ -1051,7 +1076,7 @@ class _StubInclude:
     ) -> None:
         # Default parent lives in a nonexistent directory so unresolved
         # stubs never glob real files during candidate expansion.
-        self.file = Path(file)
+        self.file = file
         self.parent_file = parent_file or Path("/nonexistent/parent.yaml")
         self._unresolved = unresolved
         self._load_result = load_result if load_result is not None else {}

From bdb203d74200ab0d23db746f8dcf8359af8822c6 Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2026 16:59:30 -0500
Subject: [PATCH 105/155] Bump bundled esphome-device-builder to 1.12.2
 (#18573)

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 55aa0ac982..2bbe5331e5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN \
     -r /requirements.txt
 
 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.12.1
+RUN uv pip install --no-cache-dir esphome-device-builder==1.12.2
 
 RUN \
     platformio settings set enable_telemetry No \

From c6d329db643dfd47de00cabb640fee02536e8f1b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 20 Aug 2026 18:06:23 -0500
Subject: [PATCH 106/155] [espnow] Fix dump_config crash when enable_on_boot is
 false (#18572)

---
 esphome/components/espnow/espnow_component.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/esphome/components/espnow/espnow_component.cpp b/esphome/components/espnow/espnow_component.cpp
index df9a1b8668..ecf0f79e4a 100644
--- a/esphome/components/espnow/espnow_component.cpp
+++ b/esphome/components/espnow/espnow_component.cpp
@@ -129,14 +129,17 @@ void on_data_received(const esp_now_recv_info_t *info, const uint8_t *data, int
 ESPNowComponent::ESPNowComponent() { global_esp_now = this; }
 
 void ESPNowComponent::dump_config() {
-  uint32_t version = 0;
-  esp_now_get_version(&version);
-
   ESP_LOGCONFIG(TAG, "espnow:");
-  if (this->is_disabled()) {
-    ESP_LOGCONFIG(TAG, "  Disabled");
+  // Only report driver details once enabled; with enable_on_boot: false the
+  // Wi-Fi driver is not initialized yet and esp_now_get_version() would crash,
+  // and after a failed enable_() the values would be meaningless.
+  if (this->state_ != ESPNOW_STATE_ENABLED) {
+    // OFF here means enable_() failed; the core logs the FAILED marker separately
+    ESP_LOGCONFIG(TAG, "  %s", this->is_disabled() ? LOG_STR_LITERAL("Disabled") : LOG_STR_LITERAL("Not enabled"));
     return;
   }
+  uint32_t version = 0;
+  esp_now_get_version(&version);
   char own_addr_buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
   format_mac_addr_upper(this->own_address_, own_addr_buf);
   ESP_LOGCONFIG(TAG,

From 5a3d7e3292b396c7c833394398e8da0b11153a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Metrich?=
 <45318189+FredM67@users.noreply.github.com>
Date: Fri, 21 Aug 2026 16:57:58 +0200
Subject: [PATCH 107/155] [emontx] Fix sensor state_class defaults not being
 applied correctly (#17610)

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 esphome/components/emontx/sensor/__init__.py  |  63 ++++++-----
 tests/component_tests/emontx/__init__.py      |   0
 .../emontx/test_sensor_defaults.py            | 100 ++++++++++++++++++
 tests/components/emontx/test.esp32-idf.yaml   |   3 +-
 tests/components/emontx/test.esp8266-ard.yaml |   3 +-
 tests/components/emontx/test.rp2040-ard.yaml  |   3 +-
 .../components/emontx/validate.esp32-idf.yaml |  73 +++++++++++++
 7 files changed, 213 insertions(+), 32 deletions(-)
 create mode 100644 tests/component_tests/emontx/__init__.py
 create mode 100644 tests/component_tests/emontx/test_sensor_defaults.py
 create mode 100644 tests/components/emontx/validate.esp32-idf.yaml

diff --git a/esphome/components/emontx/sensor/__init__.py b/esphome/components/emontx/sensor/__init__.py
index 83a972c5e0..967bc4e699 100644
--- a/esphome/components/emontx/sensor/__init__.py
+++ b/esphome/components/emontx/sensor/__init__.py
@@ -68,6 +68,7 @@ PATTERN_CONFIGS = {
     "PULSE": {
         CONF_UNIT_OF_MEASUREMENT: UNIT_PULSES,
         CONF_DEVICE_CLASS: DEVICE_CLASS_ENERGY,
+        CONF_STATE_CLASS: STATE_CLASS_TOTAL_INCREASING,
         CONF_ACCURACY_DECIMALS: 0,
     },
     "PF": {
@@ -78,12 +79,13 @@ PATTERN_CONFIGS = {
     },
 }
 
-# Create a base schema that's flexible for any tag
-BASE_SCHEMA = sensor.sensor_schema(
-    EmonTxSensor,
-    state_class=STATE_CLASS_MEASUREMENT,
-    accuracy_decimals=0,
-).extend(
+# BASE_SCHEMA intentionally omits state_class and accuracy_decimals defaults.
+# Passing them to sensor_schema() would register them via cv.Optional(key, default=...),
+# making them always present in the validated config dict and preventing
+# apply_tag_defaults from overriding them with the correct per-prefix values.
+# They are injected by apply_tag_defaults below, after running through
+# sensor.validate_state_class() so the value is code-generation-ready.
+BASE_SCHEMA = sensor.sensor_schema(EmonTxSensor).extend(
     {
         cv.GenerateID(CONF_EMONTX_ID): cv.use_id(EmonTx),
         cv.Required(CONF_TAG_NAME): cv.string,
@@ -91,34 +93,43 @@ BASE_SCHEMA = sensor.sensor_schema(
 )
 
 
+def _apply_defaults(config: ConfigType, defaults: dict) -> None:
+    """Inject defaults into config, skipping keys already set by the user.
+    state_class values are run through validate_state_class so they are
+    code-generation-ready, matching what sensor_schema() would normally do."""
+    for key, value in defaults.items():
+        if key not in config:
+            if key == CONF_STATE_CLASS:
+                value = sensor.validate_state_class(value)
+            config[key] = value
+
+
 def apply_tag_defaults(config: ConfigType) -> ConfigType:
     """Apply defaults based on tag prefix if applicable, but don't restrict any tags."""
     tag = config[CONF_TAG_NAME]
 
-    # Skip if tag is too short
-    if len(tag) < 2:
-        return config
+    if len(tag) >= 2:
+        tag_upper = tag.upper()
 
-    # Check if this tag starts with a known prefix
-    tag_upper = tag.upper()
+        for pattern, pattern_config in PATTERN_CONFIGS.items():
+            if tag_upper.startswith(pattern):
+                _apply_defaults(config, pattern_config)
+                return config
 
-    for pattern, pattern_config in PATTERN_CONFIGS.items():
-        if tag_upper.startswith(pattern):
-            # Apply pattern defaults if not overridden by user
-            for key, value in pattern_config.items():
-                if key not in config:
-                    config[key] = value
+        # Only apply defaults for known prefixes with numeric indices (e.g. E1, V2, T3)
+        prefix = tag_upper[0]
+        if prefix in SENSOR_CONFIGS and tag[1:].isdigit():
+            _apply_defaults(config, SENSOR_CONFIGS[prefix])
             return config
 
-    # Only apply defaults for known prefixes with numeric indices
-    prefix = tag_upper[0]
-    if prefix in SENSOR_CONFIGS and len(tag) > 1 and tag[1:].isdigit():
-        # Apply defaults for known tag types, but only if not overridden by user
-        defaults = SENSOR_CONFIGS[prefix]
-        for key, value in defaults.items():
-            if key not in config:
-                config[key] = value
-
+    # Fall back to generic defaults for tags with no known prefix
+    _apply_defaults(
+        config,
+        {
+            CONF_STATE_CLASS: STATE_CLASS_MEASUREMENT,
+            CONF_ACCURACY_DECIMALS: 0,
+        },
+    )
     return config
 
 
diff --git a/tests/component_tests/emontx/__init__.py b/tests/component_tests/emontx/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/component_tests/emontx/test_sensor_defaults.py b/tests/component_tests/emontx/test_sensor_defaults.py
new file mode 100644
index 0000000000..00d24d282e
--- /dev/null
+++ b/tests/component_tests/emontx/test_sensor_defaults.py
@@ -0,0 +1,100 @@
+"""Tests for emontx sensor tag defaults."""
+
+import pytest
+
+from esphome.components import sensor
+from esphome.components.emontx.sensor import CONFIG_SCHEMA, apply_tag_defaults
+from esphome.const import (
+    CONF_ACCURACY_DECIMALS,
+    CONF_STATE_CLASS,
+    STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_TOTAL_INCREASING,
+)
+
+
+def _resolve_via_config_schema(tag: str) -> dict:
+    """Run a minimal config through the real CONFIG_SCHEMA pipeline, the
+    same path a user's YAML goes through."""
+    return CONFIG_SCHEMA(
+        {"tag_name": tag, "emontx_id": "my_emontx", "name": f"{tag} sensor"}
+    )
+
+
+def test_config_schema_applies_tag_default_state_class():
+    """If sensor_schema(state_class=...) is reintroduced, the schema-level
+    default wins over apply_tag_defaults' per-prefix value, and E1 would
+    resolve to measurement instead of total_increasing. Driving the real
+    CONFIG_SCHEMA (not just apply_tag_defaults) catches that, since
+    sensor_schema() runs before apply_tag_defaults in the cv.All() chain.
+    """
+    result = _resolve_via_config_schema("E1")
+    assert result[CONF_STATE_CLASS] == sensor.validate_state_class(
+        STATE_CLASS_TOTAL_INCREASING
+    )
+
+
+def test_config_schema_applies_tag_default_accuracy_decimals():
+    """Same root cause as the state_class regression: reintroducing
+    sensor_schema(accuracy_decimals=...) would make V1 resolve to the
+    schema-level default instead of the prefix-specific value of 2.
+    """
+    result = _resolve_via_config_schema("V1")
+    assert result[CONF_ACCURACY_DECIMALS] == 2
+
+
+def _make_config(tag: str) -> dict:
+    """Minimal config dict with only tag_name set — no overrides."""
+    return {"tag_name": tag}
+
+
+@pytest.mark.parametrize(
+    ("tag", "expected_state_class", "expected_decimals"),
+    [
+        # Known numeric-index prefixes
+        ("E1", STATE_CLASS_TOTAL_INCREASING, 0),
+        ("E12", STATE_CLASS_TOTAL_INCREASING, 0),
+        ("P1", STATE_CLASS_MEASUREMENT, 0),
+        ("V1", STATE_CLASS_MEASUREMENT, 2),
+        ("I1", STATE_CLASS_MEASUREMENT, 2),
+        ("T1", STATE_CLASS_MEASUREMENT, 2),
+        # Known patterns
+        ("PULSE1", STATE_CLASS_TOTAL_INCREASING, 0),
+        ("PULSE12", STATE_CLASS_TOTAL_INCREASING, 0),
+        ("PF1", STATE_CLASS_MEASUREMENT, 2),
+        # Unknown / free-form tags fall back to generic defaults
+        ("CUSTOM1", STATE_CLASS_MEASUREMENT, 0),
+        ("X", STATE_CLASS_MEASUREMENT, 0),
+    ],
+)
+def test_apply_tag_defaults(tag, expected_state_class, expected_decimals):
+    """apply_tag_defaults must inject the correct state_class and accuracy_decimals
+    for each tag type when no user overrides are present."""
+    config = _make_config(tag)
+    result = apply_tag_defaults(config)
+
+    assert result[CONF_STATE_CLASS] == sensor.validate_state_class(expected_state_class)
+    assert result[CONF_ACCURACY_DECIMALS] == expected_decimals
+
+
+@pytest.mark.parametrize(
+    ("tag", "user_state_class", "user_decimals"),
+    [
+        # User overrides must not be clobbered by defaults
+        ("E1", STATE_CLASS_MEASUREMENT, 3),
+        ("PULSE1", STATE_CLASS_MEASUREMENT, 1),
+        ("V1", STATE_CLASS_TOTAL_INCREASING, 0),
+        ("CUSTOM1", STATE_CLASS_TOTAL_INCREASING, 4),
+    ],
+)
+def test_apply_tag_defaults_respects_user_overrides(
+    tag, user_state_class, user_decimals
+):
+    """apply_tag_defaults must not overwrite values already set by the user."""
+    config = _make_config(tag)
+    config[CONF_STATE_CLASS] = sensor.validate_state_class(user_state_class)
+    config[CONF_ACCURACY_DECIMALS] = user_decimals
+
+    result = apply_tag_defaults(config)
+
+    assert result[CONF_STATE_CLASS] == sensor.validate_state_class(user_state_class)
+    assert result[CONF_ACCURACY_DECIMALS] == user_decimals
diff --git a/tests/components/emontx/test.esp32-idf.yaml b/tests/components/emontx/test.esp32-idf.yaml
index a0784fcd53..e56b1bda5d 100644
--- a/tests/components/emontx/test.esp32-idf.yaml
+++ b/tests/components/emontx/test.esp32-idf.yaml
@@ -1,4 +1,3 @@
 packages:
   uart_115200: !include ../../test_build_components/common/uart_115200/esp32-idf.yaml
-
-<<: !include common.yaml
+  emontx: !include common.yaml
diff --git a/tests/components/emontx/test.esp8266-ard.yaml b/tests/components/emontx/test.esp8266-ard.yaml
index 80a2cb2fc0..9ec9377437 100644
--- a/tests/components/emontx/test.esp8266-ard.yaml
+++ b/tests/components/emontx/test.esp8266-ard.yaml
@@ -1,4 +1,3 @@
 packages:
   uart_115200: !include ../../test_build_components/common/uart_115200/esp8266-ard.yaml
-
-<<: !include common.yaml
+  emontx: !include common.yaml
diff --git a/tests/components/emontx/test.rp2040-ard.yaml b/tests/components/emontx/test.rp2040-ard.yaml
index 410c579d4b..6f4952d8e5 100644
--- a/tests/components/emontx/test.rp2040-ard.yaml
+++ b/tests/components/emontx/test.rp2040-ard.yaml
@@ -1,4 +1,3 @@
 packages:
   uart_115200: !include ../../test_build_components/common/uart_115200/rp2040-ard.yaml
-
-<<: !include common.yaml
+  emontx: !include common.yaml
diff --git a/tests/components/emontx/validate.esp32-idf.yaml b/tests/components/emontx/validate.esp32-idf.yaml
new file mode 100644
index 0000000000..7caee78a07
--- /dev/null
+++ b/tests/components/emontx/validate.esp32-idf.yaml
@@ -0,0 +1,73 @@
+packages:
+  uart_115200: !include ../../test_build_components/common/uart_115200/esp32-idf.yaml
+  emontx: !include common.yaml
+
+# Validate that each sensor type gets the correct default state_class,
+# unit_of_measurement, device_class, and accuracy_decimals when NO overrides
+# are provided. The values are intentionally omitted so apply_tag_defaults is
+# exercised, not the user-override path.
+
+sensor:
+  # Energy sensor (E prefix): expects state_class=total_increasing, unit=Wh,
+  # device_class=energy, accuracy_decimals=0
+  - platform: emontx
+    tag_name: E1
+    name: Energy 1
+    emontx_id: test_emontx
+
+  # Power sensor (P prefix): expects state_class=measurement, unit=W,
+  # device_class=power, accuracy_decimals=0
+  - platform: emontx
+    tag_name: P1
+    name: Power 1
+    emontx_id: test_emontx
+
+  # Voltage sensor (V prefix): expects state_class=measurement, unit=V,
+  # device_class=voltage, accuracy_decimals=2
+  - platform: emontx
+    tag_name: V1
+    name: Voltage 1
+    emontx_id: test_emontx
+
+  # Current sensor (I prefix): expects state_class=measurement, unit=A,
+  # device_class=current, accuracy_decimals=2
+  - platform: emontx
+    tag_name: I1
+    name: Current 1
+    emontx_id: test_emontx
+
+  # Temperature sensor (T prefix): expects state_class=measurement, unit=°C,
+  # device_class=temperature, accuracy_decimals=2
+  - platform: emontx
+    tag_name: T1
+    name: Temperature 1
+    emontx_id: test_emontx
+
+  # Pulse sensor (PULSE pattern): expects state_class=total_increasing,
+  # unit=pulses, device_class=energy, accuracy_decimals=0
+  - platform: emontx
+    tag_name: PULSE1
+    name: Pulse 1
+    emontx_id: test_emontx
+
+  # Power factor sensor (PF pattern): expects state_class=measurement,
+  # device_class=power_factor, accuracy_decimals=2
+  - platform: emontx
+    tag_name: PF1
+    name: Power Factor 1
+    emontx_id: test_emontx
+
+  # Unknown tag: no prefix match, falls back to state_class=measurement,
+  # accuracy_decimals=0
+  - platform: emontx
+    tag_name: CUSTOM1
+    name: Custom sensor
+    emontx_id: test_emontx
+
+  # User override: verify that explicit values are respected and not clobbered
+  - platform: emontx
+    tag_name: E2
+    name: Energy 2 (user override)
+    emontx_id: test_emontx
+    state_class: measurement
+    accuracy_decimals: 3

From f248a85b518b9f112e5e536a8a20ebadd384e0bc Mon Sep 17 00:00:00 2001
From: Jonathan Swoboda <154711427+swoboda1337@users.noreply.github.com>
Date: Fri, 21 Aug 2026 11:53:44 -0400
Subject: [PATCH 108/155] [esp32_hosted] Fire on_update_available trigger when
 update is detected (#18591)

---
 .../esp32_hosted/update/esp32_hosted_update.cpp          | 9 +++++++++
 .../esp32_hosted/test-embedded.esp32-p4-idf.yaml         | 3 +++
 .../components/esp32_hosted/test-http.esp32-p4-idf.yaml  | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/esphome/components/esp32_hosted/update/esp32_hosted_update.cpp b/esphome/components/esp32_hosted/update/esp32_hosted_update.cpp
index 351b0869b0..4eb5d1745b 100644
--- a/esphome/components/esp32_hosted/update/esp32_hosted_update.cpp
+++ b/esphome/components/esp32_hosted/update/esp32_hosted_update.cpp
@@ -135,6 +135,10 @@ void Esp32HostedUpdate::setup() {
   // Publish state
   this->status_clear_error();
   this->publish_state();
+  // Defer so the automation runs on the main loop after setup, not during App.setup()
+  if (this->state_ == update::UPDATE_STATE_AVAILABLE && this->update_available_trigger_) {
+    this->defer([this]() { this->update_available_trigger_->trigger(this->update_info_); });
+  }
 #else
   // HTTP mode: check every 10s until network is ready (max 6 attempts)
   // Only if update interval is > 1 minute to avoid redundant checks
@@ -185,6 +189,8 @@ void Esp32HostedUpdate::check() {
     return;
   }
 
+  const bool was_available = this->state_ == update::UPDATE_STATE_AVAILABLE;
+
   // Compare versions
   if (this->update_info_.latest_version.empty() ||
       this->update_info_.latest_version == this->update_info_.current_version) {
@@ -197,6 +203,9 @@ void Esp32HostedUpdate::check() {
   this->update_info_.progress = 0.0f;
   this->status_clear_error();
   this->publish_state();
+  if (this->state_ == update::UPDATE_STATE_AVAILABLE && !was_available && this->update_available_trigger_) {
+    this->update_available_trigger_->trigger(this->update_info_);
+  }
 #endif
 }
 
diff --git a/tests/components/esp32_hosted/test-embedded.esp32-p4-idf.yaml b/tests/components/esp32_hosted/test-embedded.esp32-p4-idf.yaml
index 9640032b34..5cf33179ba 100644
--- a/tests/components/esp32_hosted/test-embedded.esp32-p4-idf.yaml
+++ b/tests/components/esp32_hosted/test-embedded.esp32-p4-idf.yaml
@@ -6,3 +6,6 @@ update:
     type: embedded
     path: $component_dir/test_firmware.bin
     sha256: de2f256064a0af797747c2b97505dc0b9f3df0de4f489eac731c23ae9ca9cc31
+    on_update_available:
+      then:
+        - logger.log: "Coprocessor update available"
diff --git a/tests/components/esp32_hosted/test-http.esp32-p4-idf.yaml b/tests/components/esp32_hosted/test-http.esp32-p4-idf.yaml
index 17cde0f35d..88b620cfe8 100644
--- a/tests/components/esp32_hosted/test-http.esp32-p4-idf.yaml
+++ b/tests/components/esp32_hosted/test-http.esp32-p4-idf.yaml
@@ -8,3 +8,6 @@ update:
     type: http
     source: https://esphome.github.io/esp-hosted-firmware/manifest/esp32c6.json
     update_interval: 6h
+    on_update_available:
+      then:
+        - logger.log: "Coprocessor update available"

From 603c3539a36cf513e602103f20932d7e31d5d23b Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 14:05:00 -0500
Subject: [PATCH 109/155] Bump bundled esphome-device-builder to 1.12.3
 (#18601)

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2bbe5331e5..4cde6505b3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN \
     -r /requirements.txt
 
 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.12.2
+RUN uv pip install --no-cache-dir esphome-device-builder==1.12.3
 
 RUN \
     platformio settings set enable_telemetry No \

From 6b6d27f905ad9c813b806e2fde8f63173876177d Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Sat, 22 Aug 2026 15:42:53 +0000
Subject: [PATCH 110/155] Bump bundled esphome-device-builder to 1.12.4
 (#18651)

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4cde6505b3..9f27d51059 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,7 +22,7 @@ RUN \
     -r /requirements.txt
 
 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.12.3
+RUN uv pip install --no-cache-dir esphome-device-builder==1.12.4
 
 RUN \
     platformio settings set enable_telemetry No \

From b28efcd545290dca53166f416b77117771fb69dc Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 18:59:24 -0500
Subject: [PATCH 111/155] [bk72xx_ble] Block BK7238 until the LibreTiny bonding
 partition fix lands (#18649)

---
 esphome/components/bk72xx_ble/__init__.py     | 30 +++++++++----------
 .../bk72xx_ble/config/test_bk7238.yaml        |  7 +++++
 .../bk72xx_ble/test_family_gate.py            |  1 +
 3 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 tests/component_tests/bk72xx_ble/config/test_bk7238.yaml

diff --git a/esphome/components/bk72xx_ble/__init__.py b/esphome/components/bk72xx_ble/__init__.py
index b58464a1f6..fc89a7bfc4 100644
--- a/esphome/components/bk72xx_ble/__init__.py
+++ b/esphome/components/bk72xx_ble/__init__.py
@@ -4,9 +4,12 @@ The platform analog of esp32_ble / rp2040_ble: owns the Beken BDK BLE stack
 bring-up and the controller BLE address. Consumers (bk72xx_ble_tracker) build
 on this component and contain no SDK calls of their own.
 
-Supported SoCs (BLE 5.x): BK7231N/BK7236 (BLE 5.1), BK7238/BK7252N/BK7253
-(BLE 5.2), and any future BLE-5.x SoC. Known non-5.x families are rejected in
-to_code; unknown families are capability-checked at compile time via
+Supported SoCs (BLE 5.x): BK7231N/BK7236 (BLE 5.1), BK7252N/BK7253 (BLE 5.2),
+and any future BLE-5.x SoC. BK7238 (BLE 5.2) is blocked for now: with BLE
+compiled in, the Beken SDK erases the bootloader flash sector at boot because
+LibreTiny's partition table has no BLE bonding entry (esphome#18646,
+libretiny-eu/libretiny#408). Known non-5.x families and BK7238 are rejected in
+to_code. Unknown families are capability-checked at compile time via
 `__has_include("app_ble.h")`, a header only on the BLE 5.x include path
 (ble_api.h ships for every SoC, so it cannot be the probe). A non-5.x build
 fails with a clear #error.
@@ -65,6 +68,14 @@ def _unsupported_family_message(family: str) -> str | None:
         )
     if family == FAMILY_BK7231Q:
         return "bk72xx_ble does not support BK7231Q: this SoC has no BLE"
+    if family == FAMILY_BK7238:
+        return (
+            "bk72xx_ble is disabled on BK7238: with BLE compiled in, the Beken SDK "
+            "erases the bootloader flash sector at boot and the device can no longer "
+            "start (see https://github.com/esphome/esphome/issues/18646); support "
+            "returns once the LibreTiny partition table fix "
+            "(libretiny-eu/libretiny#408) is released"
+        )
     return None
 
 
@@ -114,18 +125,7 @@ async def to_code(config: ConfigType) -> None:
     # BK7231N, but NOT on BK7238 (its BLE stack has no such symbol; the address is
     # derived from the WiFi MAC instead — the BDK's own fallback). Tell the C++
     # which path is available so it doesn't reference a missing symbol.
-    family = libretiny.get_libretiny_family()
-    if family == FAMILY_BK7231N:
+    if libretiny.get_libretiny_family() == FAMILY_BK7231N:
         cg.add_define("BK72XX_BLE_HAS_COMMON_BDADDR")
-    elif family == FAMILY_BK7238:
-        # ESPHome's LibreTiny disables BLE on BK7238 because the SDK can hang at
-        # WiFi STA startup when BLE init runs. This component re-enables BLE, so
-        # warn loudly: BK7238 is accepted but not hardware-verified and may be
-        # WiFi-unstable with BLE on.
-        _LOGGER.warning(
-            "bk72xx_ble on BK7238: enabling BLE is known to risk a WiFi STA startup "
-            "hang on this family and is not yet hardware-verified. Expect possible "
-            "instability."
-        )
 
     cg.add_define("USE_BK72XX_BLE")
diff --git a/tests/component_tests/bk72xx_ble/config/test_bk7238.yaml b/tests/component_tests/bk72xx_ble/config/test_bk7238.yaml
new file mode 100644
index 0000000000..0880cf69f5
--- /dev/null
+++ b/tests/component_tests/bk72xx_ble/config/test_bk7238.yaml
@@ -0,0 +1,7 @@
+esphome:
+  name: bk-family-gate-7238
+
+bk72xx:
+  board: generic-bk7238
+
+bk72xx_ble:
diff --git a/tests/component_tests/bk72xx_ble/test_family_gate.py b/tests/component_tests/bk72xx_ble/test_family_gate.py
index da67749bb3..86f3ef0039 100644
--- a/tests/component_tests/bk72xx_ble/test_family_gate.py
+++ b/tests/component_tests/bk72xx_ble/test_family_gate.py
@@ -16,6 +16,7 @@ from esphome.core import EsphomeError
         ("test_bk7231t.yaml", "BK7231T.*BLE 4.2"),
         ("test_bk7252.yaml", "BK7251.*BLE 4.2"),
         ("test_bk7231q.yaml", "BK7231Q.*no BLE"),
+        ("test_bk7238.yaml", "BK7238.*bootloader"),
     ],
 )
 def test_unsupported_family_rejected(

From d770004e0eec62e1e9610c6dc8408562d2d309f9 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 20:57:58 -0500
Subject: [PATCH 112/155] [esp32_ble] Log connection parameter update results
 (#18607)

---
 esphome/components/esp32_ble/ble.cpp | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/esphome/components/esp32_ble/ble.cpp b/esphome/components/esp32_ble/ble.cpp
index e2d79173ff..6e6fb0e30d 100644
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -643,8 +643,28 @@ void ESP32BLE::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_pa
       App.wake_loop_threadsafe();
       return;
 
+    // Log the result of connection parameter updates: a peer can reject or
+    // never answer an update, and without this the link silently stays on the
+    // old parameters (visible only as unexplained supervision timeouts).
+    case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: {
+      if (param->update_conn_params.status != ESP_BT_STATUS_SUCCESS) {
+        char mac_s[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
+        format_mac_addr_upper(param->update_conn_params.bda, mac_s);
+        ESP_LOGW(TAG, "[%s] Conn param update failed, status=%d", mac_s, param->update_conn_params.status);
+      }
+#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
+      else {
+        char mac_s[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
+        format_mac_addr_upper(param->update_conn_params.bda, mac_s);
+        ESP_LOGV(TAG, "[%s] Conn params updated: interval=%u (x1.25ms) latency=%u timeout=%u (x10ms)", mac_s,
+                 param->update_conn_params.conn_int, param->update_conn_params.latency,
+                 param->update_conn_params.timeout);
+      }
+#endif
+      return;
+    }
+
     // Ignore these GAP events as they are not relevant for our use case
-    case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT:
     case ESP_GAP_BLE_SET_PKT_LENGTH_COMPLETE_EVT:
     case ESP_GAP_BLE_PHY_UPDATE_COMPLETE_EVT:       // BLE 5.0 PHY update complete
     case ESP_GAP_BLE_CHANNEL_SELECT_ALGORITHM_EVT:  // BLE 5.0 channel selection algorithm

From ca3f31643fcc9b8341a8fb6b0295fb7125b48654 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 20:58:13 -0500
Subject: [PATCH 113/155] [esp8266] Don't report stale crash state after
 hardware WDT resets (#18597)

---
 esphome/components/esp8266/crash_handler.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/esphome/components/esp8266/crash_handler.cpp b/esphome/components/esp8266/crash_handler.cpp
index 91b0cf9082..dc79043f21 100644
--- a/esphome/components/esp8266/crash_handler.cpp
+++ b/esphome/components/esp8266/crash_handler.cpp
@@ -118,8 +118,6 @@ static const LogString *get_exception_cause(uint32_t cause) {
 }
 
 static const LogString *get_reset_reason(uint32_t reason) {
-  if (reason == REASON_WDT_RST)
-    return LOG_STR("Hardware WDT");
   if (reason == REASON_EXCEPTION_RST)
     return LOG_STR("Exception");
   if (reason == REASON_SOFT_WDT_RST)
@@ -162,13 +160,20 @@ void crash_handler_log() {
   if (!is_crash_reason(resetInfo.reason))
     return;
 
+  ESP_LOGE(TAG, "*** CRASH DETECTED ON PREVIOUS BOOT ***");
+  if (resetInfo.reason == REASON_WDT_RST) {
+    // A hardware WDT reset happens entirely in hardware: the postmortem hook
+    // never runs, so rst_info epc1/exccause and the RTC backtrace are
+    // leftovers from an earlier crash. Don't misattribute them (#18596).
+    ESP_LOGE(TAG, "  Reason: Hardware WDT (no crash state is recorded for hardware WDT resets)");
+    return;
+  }
+
   // Read and filter backtrace from RTC into stack-local buffer (no persistent RAM cost).
   // Both resetInfo and RTC data survive until the next reset, so this can be
   // called multiple times (logger init + API subscribe) with the same result.
   uint32_t backtrace[MAX_BACKTRACE];
   uint8_t bt_count = read_rtc_backtrace(backtrace, MAX_BACKTRACE);
-
-  ESP_LOGE(TAG, "*** CRASH DETECTED ON PREVIOUS BOOT ***");
   // GCC's ROM divide routine triggers IllegalInstruction (exccause=0) at specific
   // ROM addresses instead of IntegerDivideByZero (exccause=6). Patch to match
   // the Arduino core's postmortem handler behavior.

From 4c62420f1bce9b52bb8650a96fce663329863cde Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 20:58:28 -0500
Subject: [PATCH 114/155] [core] Dump the main.cpp config comment with sorted
 keys (#18653)

---
 esphome/__main__.py           |  6 ++++--
 tests/unit_tests/test_main.py | 30 +++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 1262a4525e..695581a435 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -762,9 +762,11 @@ def _wrap_to_code(name, comp, yaml_util):
     async def wrapped(conf):
         cg.add(cg.LineComment(f"{name}:"))
         if comp.config_schema is not None:
-            conf_str = yaml_util.dump(conf)
+            # sort_keys: voluptuous fills defaults in set order, so an
+            # unsorted dump would churn main.cpp and relink every run
+            conf_str = yaml_util.dump(conf, sort_keys=True)
             conf_str = conf_str.replace("//", "")
-            # remove tailing \ to avoid multi-line comment warning
+            # remove trailing \ to avoid multi-line comment warning
             conf_str = conf_str.replace("\\\n", "\n")
             cg.add(cg.LineComment(indent(conf_str)))
         await coro(conf)
diff --git a/tests/unit_tests/test_main.py b/tests/unit_tests/test_main.py
index a40341e194..1cb710ca58 100644
--- a/tests/unit_tests/test_main.py
+++ b/tests/unit_tests/test_main.py
@@ -11,6 +11,7 @@ from pathlib import Path
 import re
 import sys
 import time
+from types import SimpleNamespace
 from typing import Any, Self
 from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
@@ -18,7 +19,7 @@ import pytest
 from pytest import CaptureFixture
 from zeroconf import ServiceStateChange
 
-from esphome import __main__ as main
+from esphome import __main__ as main, yaml_util
 from esphome.__main__ import (
     Purpose,
     _get_configured_xtal_freq,
@@ -29,6 +30,7 @@ from esphome.__main__ import (
     _unresolved_default_error,
     _validate_bootloader_binary,
     _validate_partition_table_binary,
+    _wrap_to_code,
     check_permissions,
     choose_upload_log_host,
     command_analyze_memory,
@@ -116,6 +118,7 @@ from esphome.espota2 import (
     OTA_TYPE_UPDATE_PARTITION_TABLE,
 )
 from esphome.platformio import toolchain
+from esphome.types import ConfigType
 from esphome.util import BootselResult, FlashImage
 from esphome.zeroconf import _await_discovery, discover_mdns_devices
 
@@ -7130,3 +7133,28 @@ def test_warn_source_tree_mismatch_falls_back_when_stat_fails(
 
     # Same tree, so the path comparison still finds them equal and stays silent
     assert not caplog.text
+
+
+@pytest.mark.asyncio
+async def test_wrap_to_code_comment_is_insertion_order_independent() -> None:
+    """The config comment dumps with sorted keys: voluptuous fills schema
+    defaults in set-iteration order, so an unsorted dump would churn
+    main.cpp and relink the firmware on every run."""
+    comments: list[str] = []
+
+    async def to_code(conf: ConfigType) -> None:
+        """Accept any config; only the wrapper's comment output matters."""
+
+    comp = SimpleNamespace(to_code=to_code, config_schema=object())
+    wrapped = _wrap_to_code("demo", comp, yaml_util)
+    with patch("esphome.codegen.add", side_effect=lambda st: comments.append(str(st))):
+        # Nested on purpose: the real churn lives in nested action configs,
+        # so sorting must apply at every mapping level
+        await wrapped({"beta": 1, "alpha": {"z": 1, "a": 2}})
+        first = "\n".join(comments)
+        comments.clear()
+        await wrapped({"alpha": {"a": 2, "z": 1}, "beta": 1})
+    second = "\n".join(comments)
+    assert first == second
+    assert second.index("alpha") < second.index("beta")
+    assert second.index("a: 2") < second.index("z: 1")

From fb1332792262c7a15a48b1eb9028889f75f7cbda Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 22 Aug 2026 22:00:17 -0500
Subject: [PATCH 115/155] [esp32] Report abort and task watchdog panics
 correctly in crash handler (#18575)

---
 esphome/components/esp32/crash_handler.cpp | 61 +++++++++++++++++++---
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/esphome/components/esp32/crash_handler.cpp b/esphome/components/esp32/crash_handler.cpp
index b61dad7386..6f65243aaa 100644
--- a/esphome/components/esp32/crash_handler.cpp
+++ b/esphome/components/esp32/crash_handler.cpp
@@ -124,6 +124,15 @@ static uint8_t IRAM_ATTR capture_riscv_backtrace(RvExcFrame *frame, uint32_t *ou
 // Version is uint32_t because it would be padded to 4 bytes anyway before the next
 // uint32_t field, so we use the full width rather than wasting 3 bytes of padding.
 static constexpr uint32_t CRASH_DATA_VERSION = 4;
+#if CONFIG_IDF_TARGET_ARCH_XTENSA
+// EXCCAUSE is a 6-bit register; larger recorded values mean the frame's
+// cause/vaddr slots were never written (not a real exception frame).
+static constexpr uint32_t XTENSA_EXCCAUSE_COUNT = XCHAL_EXCCAUSE_NUM;
+#elif CONFIG_IDF_TARGET_ARCH_RISCV
+// Synchronous mcause exception codes are small and have no interrupt bit;
+// anything else in a non-pseudo record is a stale slot.
+static constexpr uint32_t RISCV_EXCEPTION_CAUSE_COUNT = 32;
+#endif
 struct RawCrashData {
   uint32_t version;
   uint32_t magic;
@@ -198,10 +207,28 @@ void crash_handler_clear() {
   s_raw_crash_data.magic = 0;
 }
 
+// Whether the cause slot was written by a real exception frame.
+static bool cause_slot_was_written() {
+#if CONFIG_IDF_TARGET_ARCH_XTENSA
+  return s_raw_crash_data.cause < XTENSA_EXCCAUSE_COUNT;
+#else
+  return s_raw_crash_data.cause < RISCV_EXCEPTION_CAUSE_COUNT;
+#endif
+}
+
 // Look up the exception cause as a human-readable string.
 // Tables mirror ESP-IDF's panic_arch_fill_info() which uses local static arrays
 // not exposed via any public API.
 static const char *get_exception_reason() {
+  uint8_t exception = s_raw_crash_data.exception;
+  if (exception == PANIC_EXCEPTION_ABORT || exception == PANIC_EXCEPTION_TWDT) {
+    // Abort-class panics carry no cause register
+    return nullptr;
+  }
+  if (!cause_slot_was_written()) {
+    // Garbage from old-build or corrupt records; report just the type
+    return nullptr;
+  }
 #if CONFIG_IDF_TARGET_ARCH_XTENSA
   if (s_raw_crash_data.pseudo_excause) {
     // SoC-level panic: watchdog, cache error, etc.
@@ -354,10 +381,11 @@ static const char *const FAULT_ADDR_REG = "MTVAL";
 static const char *const FAULT_ADDR_REG_LOWER = "mtval";
 #endif
 
-// Whether the fault address is meaningful — real CPU faults only, not
-// aborts/watchdogs or SoC-level pseudo exceptions.
+// Whether the fault address is meaningful: real CPU faults with a validly
+// written frame only.
 static bool has_fault_addr() {
-  return s_raw_crash_data.exception == PANIC_EXCEPTION_FAULT && !s_raw_crash_data.pseudo_excause;
+  return s_raw_crash_data.exception == PANIC_EXCEPTION_FAULT && !s_raw_crash_data.pseudo_excause &&
+         cause_slot_was_written();
 }
 
 // The record was captured by a different firmware build (it survives soft
@@ -458,6 +486,10 @@ void crash_handler_log() {
 // into NOINIT memory before the normal panic handler runs.
 //
 extern "C" {
+// Set by IDF's task watchdog (task_wdt.c, no header) before it simulates an
+// abort; weak so builds without the task watchdog still link.
+extern bool g_twdt_isr __attribute__((weak));
+
 // NOLINTBEGIN(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp,readability-identifier-naming)
 // Names are mandated by the --wrap linker mechanism
 extern void __real_esp_panic_handler(panic_info_t *info);
@@ -470,6 +502,14 @@ void IRAM_ATTR __wrap_esp_panic_handler(panic_info_t *info) {
   s_raw_crash_data.exception = (uint8_t) info->exception;
   s_raw_crash_data.pseudo_excause = info->pseudo_excause ? 1 : 0;
   s_raw_crash_data.crashed_core = (uint8_t) info->core;
+  if (g_panic_abort) {
+    // IDF reclassifies to ABORT only inside esp_panic_handler(), after this
+    // wrapper captured info->exception; correct it here. TWDT is our own
+    // distinction (IDF never assigns PANIC_EXCEPTION_TWDT). The abort text is
+    // not stored; the symbolized backtrace already identifies the site.
+    bool is_twdt = &g_twdt_isr != nullptr && g_twdt_isr;
+    s_raw_crash_data.exception = (uint8_t) (is_twdt ? PANIC_EXCEPTION_TWDT : PANIC_EXCEPTION_ABORT);
+  }
   // Zero unconditionally so a null frame doesn't leave stale .noinit data from a previous boot
   s_raw_crash_data.cause = 0;
   s_raw_crash_data.fault_addr = 0;
@@ -487,8 +527,12 @@ void IRAM_ATTR __wrap_esp_panic_handler(panic_info_t *info) {
   // Xtensa: walk the backtrace using the public API
   if (info->frame != nullptr) {
     auto *xt_frame = (XtExcFrame *) info->frame;
-    s_raw_crash_data.cause = xt_frame->exccause;
-    s_raw_crash_data.fault_addr = xt_frame->excvaddr;
+    if (!g_panic_abort) {
+      // Abort-class frames carry no useful cause/vaddr: TWDT task snapshots
+      // never wrote them and abort() traps describe only the synthetic trap.
+      s_raw_crash_data.cause = xt_frame->exccause;
+      s_raw_crash_data.fault_addr = xt_frame->excvaddr;
+    }
     s_raw_crash_data.backtrace_count = walk_xtensa_backtrace(xt_frame, s_raw_crash_data.backtrace, MAX_BACKTRACE);
   }
 
@@ -510,8 +554,11 @@ void IRAM_ATTR __wrap_esp_panic_handler(panic_info_t *info) {
   // RISC-V: capture MEPC + RA, then scan stack for code addresses
   if (info->frame != nullptr) {
     auto *rv_frame = (RvExcFrame *) info->frame;
-    s_raw_crash_data.cause = rv_frame->mcause;
-    s_raw_crash_data.fault_addr = rv_frame->mtval;
+    if (!g_panic_abort) {
+      // See the Xtensa branch: abort-class frames carry no valid cause/vaddr.
+      s_raw_crash_data.cause = rv_frame->mcause;
+      s_raw_crash_data.fault_addr = rv_frame->mtval;
+    }
     s_raw_crash_data.backtrace_count =
         capture_riscv_backtrace(rv_frame, s_raw_crash_data.backtrace, MAX_BACKTRACE, &s_raw_crash_data.reg_frame_count);
   }

From 4ce4768ebd2af64ddba7741b187e51d26eaf1476 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 15:25:39 -0500
Subject: [PATCH 116/155] [core] Retry transient network errors when
 downloading external files (#18538)

---
 esphome/external_files.py                  |  21 ++-
 esphome/framework_helpers.py               |  32 +----
 esphome/net_retry.py                       | 114 ++++++++++++++++
 tests/unit_tests/test_external_files.py    | 138 +++++++++++++++++++-
 tests/unit_tests/test_framework_helpers.py |  38 ------
 tests/unit_tests/test_net_retry.py         | 143 +++++++++++++++++++++
 6 files changed, 416 insertions(+), 70 deletions(-)
 create mode 100644 esphome/net_retry.py
 create mode 100644 tests/unit_tests/test_net_retry.py

diff --git a/esphome/external_files.py b/esphome/external_files.py
index f30d429425..58be4a7c26 100644
--- a/esphome/external_files.py
+++ b/esphome/external_files.py
@@ -16,6 +16,7 @@ from esphome.const import CONF_FILE, CONF_TYPE, CONF_URL, __version__
 from esphome.core import CORE, EsphomeError, TimePeriodSeconds
 from esphome.happy_eyeballs import ensure_happy_eyeballs
 from esphome.helpers import write_file
+from esphome.net_retry import fetch_with_retry
 from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
@@ -157,8 +158,17 @@ def has_remote_file_changed(
             }
             if etag := _read_etag(local_file_path):
                 headers[IF_NONE_MATCH] = etag
-            response = requests.head(
-                url, headers=headers, timeout=timeout, allow_redirects=True
+            # Retried so allow_stale=False consumers don't hard-fail on a
+            # healed flake. Only connection-level failures retry: HEAD
+            # never raises on HTTP status (servers rejecting HEAD with
+            # 405/501 must fall through to the GET), so 5xx is handled by
+            # the GET's own retry.
+            response = fetch_with_retry(
+                url,
+                lambda: requests.head(
+                    url, headers=headers, timeout=timeout, allow_redirects=True
+                ),
+                what="Revalidation",
             )
 
             _LOGGER.debug(
@@ -293,7 +303,7 @@ def download_content(
     _LOGGER.info("Downloading %s", url)
     _LOGGER.debug("Saving to %s", path)
 
-    try:
+    def _fetch() -> tuple[requests.Response, bytes]:
         req = requests.get(
             url,
             timeout=timeout,
@@ -304,7 +314,10 @@ def download_content(
         # and mid-stream connection errors all surface here as
         # RequestException subclasses, so this needs the same fall-back
         # treatment as the request itself.
-        data = req.content
+        return req, req.content
+
+    try:
+        req, data = fetch_with_retry(url, _fetch)
     except requests.exceptions.RequestException as e:
         if path.exists():
             # Memoized so a flaky host warns once per run, not per consumer.
diff --git a/esphome/framework_helpers.py b/esphome/framework_helpers.py
index b8a43220ff..105791c518 100644
--- a/esphome/framework_helpers.py
+++ b/esphome/framework_helpers.py
@@ -15,6 +15,7 @@ from typing import IO, TYPE_CHECKING
 
 from esphome.happy_eyeballs import ensure_happy_eyeballs
 from esphome.helpers import ProgressBar, rmtree
+from esphome.net_retry import NETWORK_MAX_ATTEMPTS, is_transient_download_error
 
 if TYPE_CHECKING:
     import requests
@@ -29,8 +30,9 @@ _LOGGER = logging.getLogger(__name__)
 _MIRROR_ATTEMPTS = 3
 
 # Passes over the whole mirror list when a transient network error is in
-# the mix; matches git.py's _NETWORK_MAX_ATTEMPTS (3 tries, 2s/4s backoff).
-_MIRROR_SWEEP_ATTEMPTS = 3
+# the mix; shares net_retry's policy (3 tries, 2s/4s backoff), which in
+# turn matches git.py's _NETWORK_MAX_ATTEMPTS.
+_MIRROR_SWEEP_ATTEMPTS = NETWORK_MAX_ATTEMPTS
 
 
 def get_project_link_flags() -> list[str]:
@@ -903,30 +905,6 @@ def _spent_attempts_error(e: Exception, attempts: int) -> Exception:
     return err
 
 
-def _is_transient_download_error(e: Exception) -> bool:
-    """Return True when a download failure is worth retrying.
-
-    Connection-level failures and HTTP 429/5xx are transient. Other HTTP
-    errors, local errors, and exhausted-attempts EsphomeError wrappers
-    (their per-mirror retries are already spent) are permanent.
-    """
-    # Imported lazily: requests is a heavy import (~85ms) and is only
-    # needed when actually downloading, never during config validation.
-    import requests
-
-    if isinstance(e, requests.exceptions.HTTPError):
-        resp = e.response
-        return resp is not None and (resp.status_code == 429 or resp.status_code >= 500)
-    return isinstance(
-        e,
-        (
-            requests.exceptions.ConnectionError,
-            requests.exceptions.Timeout,
-            requests.exceptions.ChunkedEncodingError,
-        ),
-    )
-
-
 def _try_mirrors_once(
     urls: list[str],
     path_target: Path | None,
@@ -1131,7 +1109,7 @@ def download_from_mirrors(
         # Permanent failures (404, verification mismatch) won't heal;
         # only retry when a transient error is in the mix (as git.py does).
         transient = next(
-            ((u, e) for u, e in sweep_failures if _is_transient_download_error(e)),
+            ((u, e) for u, e in sweep_failures if is_transient_download_error(e)),
             None,
         )
         if transient is None:
diff --git a/esphome/net_retry.py b/esphome/net_retry.py
new file mode 100644
index 0000000000..f7e6e601ea
--- /dev/null
+++ b/esphome/net_retry.py
@@ -0,0 +1,114 @@
+"""Retry policy for HTTP downloads.
+
+Kept import-light on purpose: this module is imported at config time, so it
+must not pull in requests (a heavy import, ~85ms) at module scope.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+import logging
+import time
+
+_LOGGER = logging.getLogger(__name__)
+
+# 3 tries with 2s/4s backoff, matching git.py's _NETWORK_MAX_ATTEMPTS.
+# Callers memoize failures so a flaky host pays this once per file per run.
+NETWORK_MAX_ATTEMPTS = 3
+
+
+def _is_permanent_dns_failure(e: BaseException) -> bool:
+    """Whether a hard socket.gaierror hides in ``e``'s exception chain.
+
+    EAI_AGAIN (flaky resolver) stays retryable; anything else is permanent
+    so offline builds fall back to their cache without sleeping first.
+    Narrower than git.py, which retries NXDOMAIN too.
+
+    Walks ``__cause__``, ``args`` (requests wraps MaxRetryError without
+    ``from``) and MaxRetryError's ``reason``, but not implicit
+    ``__context__``: an unrelated earlier attempt's resolution failure
+    must not reclassify an error it did not cause.
+    """
+    import socket
+
+    seen: set[int] = set()
+    stack: list[BaseException] = [e]
+    while stack:
+        exc = stack.pop()
+        if id(exc) in seen:
+            continue
+        if (
+            isinstance(exc, socket.gaierror)
+            and exc.errno is not None
+            and exc.errno != socket.EAI_AGAIN
+        ):
+            return True
+        seen.add(id(exc))
+        stack.extend(
+            nxt
+            for nxt in (
+                exc.__cause__,
+                getattr(exc, "reason", None),  # urllib3 MaxRetryError
+                *exc.args,
+            )
+            if isinstance(nxt, BaseException)
+        )
+    return False
+
+
+def is_transient_download_error(e: Exception) -> bool:
+    """Return True when a download failure is worth retrying.
+
+    Connection-level failures and HTTP 429/5xx are transient; hard DNS
+    failures, other HTTP errors, and local errors are permanent.
+    """
+    # Imported lazily: requests is a heavy import (~85ms) and is only
+    # needed when actually downloading, never during config validation.
+    import requests
+
+    if isinstance(e, requests.exceptions.HTTPError):
+        resp = e.response
+        return resp is not None and (resp.status_code == 429 or resp.status_code >= 500)
+    if isinstance(e, requests.exceptions.ConnectionError) and _is_permanent_dns_failure(
+        e
+    ):
+        return False
+    # SSLError (a ConnectionError subclass) stays transient on purpose: it
+    # also covers mid-handshake connection drops, not just bad certificates.
+    return isinstance(
+        e,
+        (
+            requests.exceptions.ConnectionError,
+            requests.exceptions.Timeout,
+            requests.exceptions.ChunkedEncodingError,
+            requests.exceptions.ContentDecodingError,
+        ),
+    )
+
+
+def fetch_with_retry[T](url: str, fetch: Callable[[], T], what: str = "Download") -> T:
+    """Run ``fetch``, retrying transient failures with 2s/4s backoff.
+
+    Permanent failures and the final attempt propagate to the caller;
+    ``what`` names the operation in the retry warning.
+    """
+    import requests
+
+    for attempt in range(1, NETWORK_MAX_ATTEMPTS):
+        try:
+            return fetch()
+        except requests.exceptions.RequestException as e:
+            if not is_transient_download_error(e):
+                raise
+            delay = 2**attempt
+            _LOGGER.warning(
+                "%s of %s failed: %s. Retrying in %d seconds... (attempt %d/%d)",
+                what,
+                url,
+                e,
+                delay,
+                attempt + 1,
+                NETWORK_MAX_ATTEMPTS,
+            )
+            time.sleep(delay)
+    return fetch()
diff --git a/tests/unit_tests/test_external_files.py b/tests/unit_tests/test_external_files.py
index 4e993ff4f3..caefb7ed5c 100644
--- a/tests/unit_tests/test_external_files.py
+++ b/tests/unit_tests/test_external_files.py
@@ -4,7 +4,7 @@ import os
 from pathlib import Path
 import time
 from typing import Any
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, call, patch
 
 import pytest
 import requests
@@ -81,6 +81,15 @@ def mock_download_content_many() -> MagicMock:
         yield m
 
 
+@pytest.fixture
+def mock_retry_sleep() -> MagicMock:
+    """Patch the retry backoff sleep (process-wide; net_retry.time is the
+    global module) so transient-error tests don't really wait 2s/4s.
+    """
+    with patch("esphome.net_retry.time.sleep") as m:
+        yield m
+
+
 def test_compute_local_file_dir(setup_core: Path) -> None:
     """Test compute_local_file_dir creates and returns correct path."""
     domain = "font"
@@ -495,6 +504,7 @@ class _BodyReadErrorResponse:
 def test_download_content_with_body_read_error_uses_cache(
     mock_has_remote_file_changed: MagicMock,
     mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
     setup_core: Path,
 ) -> None:
     """Body-read errors (chunked-decode/gzip-decode/mid-stream connection
@@ -519,6 +529,7 @@ def test_download_content_with_body_read_error_uses_cache(
 def test_download_content_with_body_read_error_no_cache_fails(
     mock_has_remote_file_changed: MagicMock,
     mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
     setup_core: Path,
 ) -> None:
     """A body-read failure with no cache available must surface as a
@@ -535,6 +546,131 @@ def test_download_content_with_body_read_error_no_cache_fails(
         external_files.download_content("https://example.com/file.txt", test_file)
 
 
+def test_download_content_retries_transient_error_then_succeeds(
+    mock_has_remote_file_changed: MagicMock,
+    mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
+    setup_core: Path,
+) -> None:
+    """Transient failures (connection reset, timeout) are retried with 2s/4s
+    backoff before giving up; a late success downloads normally."""
+    test_file = setup_core / "downloads" / "file.txt"
+    mock_has_remote_file_changed.return_value = True
+
+    ok = MagicMock()
+    ok.content = b"downloaded"
+    ok.headers = {}
+    mock_requests_get.side_effect = [
+        requests.exceptions.ConnectionError("reset by peer"),
+        requests.exceptions.Timeout("timed out"),
+        ok,
+    ]
+
+    result = external_files.download_content("https://example.com/file.txt", test_file)
+
+    assert result == b"downloaded"
+    assert test_file.read_bytes() == b"downloaded"
+    assert mock_retry_sleep.call_args_list == [call(2), call(4)]
+
+
+def test_download_content_transient_error_exhausts_attempts(
+    mock_has_remote_file_changed: MagicMock,
+    mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
+    setup_core: Path,
+) -> None:
+    """A persistent transient failure gives up after three attempts and then
+    follows the normal no-cache error path."""
+    test_file = setup_core / "nonexistent.txt"
+    mock_has_remote_file_changed.return_value = True
+    mock_requests_get.side_effect = requests.exceptions.ConnectionError("reset by peer")
+
+    with pytest.raises(Invalid, match="Could not download from.*reset by peer"):
+        external_files.download_content("https://example.com/file.txt", test_file)
+
+    assert mock_retry_sleep.call_args_list == [call(2), call(4)]
+
+
+def test_download_content_non_transient_error_not_retried(
+    mock_has_remote_file_changed: MagicMock,
+    mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
+    setup_core: Path,
+) -> None:
+    """Permanent failures like a 404 fail on the first attempt."""
+    test_file = setup_core / "nonexistent.txt"
+    mock_has_remote_file_changed.return_value = True
+
+    response = MagicMock()
+    response.status_code = 404
+    mock_requests_get.side_effect = requests.exceptions.HTTPError(
+        "404 Client Error", response=response
+    )
+
+    with pytest.raises(Invalid, match="Could not download from.*404"):
+        external_files.download_content("https://example.com/file.txt", test_file)
+
+    assert mock_requests_get.call_count == 1
+    mock_retry_sleep.assert_not_called()
+
+
+def test_download_content_retries_body_read_error(
+    mock_has_remote_file_changed: MagicMock,
+    mock_requests_get: MagicMock,
+    mock_retry_sleep: MagicMock,
+    setup_core: Path,
+) -> None:
+    """Mid-stream failures surfacing from `.content` are retried too."""
+    test_file = setup_core / "downloads" / "file.txt"
+    mock_has_remote_file_changed.return_value = True
+
+    ok = MagicMock()
+    ok.content = b"downloaded"
+    ok.headers = {}
+    mock_requests_get.side_effect = [
+        _BodyReadErrorResponse(
+            requests.exceptions.ChunkedEncodingError("body truncated")
+        ),
+        ok,
+    ]
+
+    result = external_files.download_content("https://example.com/file.txt", test_file)
+
+    assert result == b"downloaded"
+    assert mock_requests_get.call_count == 2
+    assert mock_retry_sleep.call_args_list == [call(2)]
+
+
+def test_has_remote_file_changed_retries_transient_error(
+    mock_requests_head: MagicMock,
+    mock_retry_sleep: MagicMock,
+    setup_core: Path,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """A HEAD revalidation that fails transiently then returns 304 does not
+    mark the cached copy stale, and the retry warning names the operation."""
+    test_file = setup_core / "cached.txt"
+    test_file.write_bytes(b"cached content")
+
+    ok = MagicMock()
+    ok.status_code = 304
+    ok.headers = {}
+    mock_requests_head.side_effect = [
+        requests.exceptions.ConnectionError("reset by peer"),
+        ok,
+    ]
+
+    changed = external_files.has_remote_file_changed(
+        "https://example.com/file.txt", test_file
+    )
+
+    assert changed is False
+    assert test_file not in external_files._run_data().stale_paths
+    assert mock_requests_head.call_count == 2
+    assert mock_retry_sleep.call_args_list == [call(2)]
+    assert "Revalidation of" in caplog.text
+
+
 def test_download_content_skip_external_update_uses_cache(
     mock_has_remote_file_changed: MagicMock,
     mock_requests_get: MagicMock,
diff --git a/tests/unit_tests/test_framework_helpers.py b/tests/unit_tests/test_framework_helpers.py
index 2022c15bfe..500705ef67 100644
--- a/tests/unit_tests/test_framework_helpers.py
+++ b/tests/unit_tests/test_framework_helpers.py
@@ -23,7 +23,6 @@ from esphome.core import EsphomeError
 from esphome.framework_helpers import (
     _7z_extract_all,
     _detect_archive_root,
-    _is_transient_download_error,
     _rename_with_retry,
     _tar_extract_all,
     _zip_extract_all,
@@ -1594,43 +1593,6 @@ class TestDownloadFromMirrors:
         mock_sleep.assert_not_called()
 
 
-def _http_error(status: int) -> req.HTTPError:
-    """An HTTPError carrying a response with the given status, as raised by
-    ``raise_for_status`` on a real response."""
-    resp = MagicMock()
-    resp.status_code = status
-    return req.HTTPError(str(status), response=resp)
-
-
-class TestIsTransientDownloadError:
-    def test_connection_errors_are_transient(self) -> None:
-        assert _is_transient_download_error(req.ConnectionError("reset"))
-        assert _is_transient_download_error(req.Timeout("timed out"))
-        assert _is_transient_download_error(
-            req.exceptions.ChunkedEncodingError("dropped")
-        )
-
-    def test_http_statuses(self) -> None:
-        assert not _is_transient_download_error(_http_error(404))
-        assert not _is_transient_download_error(_http_error(403))
-        assert _is_transient_download_error(_http_error(429))
-        assert _is_transient_download_error(_http_error(503))
-
-    def test_http_error_without_response_is_permanent(self) -> None:
-        assert not _is_transient_download_error(req.HTTPError("boom"))
-
-    def test_exhausted_resume_attempts_are_permanent(self) -> None:
-        """download_with_resume already spent its own resume attempts; its
-        EsphomeError wrapper is not retried again at the sweep level."""
-        wrapped = EsphomeError("Failed to download after 3 attempts")
-        wrapped.__cause__ = req.ConnectionError("down")
-        assert not _is_transient_download_error(wrapped)
-
-    def test_unrelated_errors_are_permanent(self) -> None:
-        assert not _is_transient_download_error(OSError("disk full"))
-        assert not _is_transient_download_error(EsphomeError("size mismatch"))
-
-
 def test_importing_framework_helpers_does_not_import_requests() -> None:
     """Importing framework_helpers must not drag in requests.
 
diff --git a/tests/unit_tests/test_net_retry.py b/tests/unit_tests/test_net_retry.py
new file mode 100644
index 0000000000..c22bda5ee5
--- /dev/null
+++ b/tests/unit_tests/test_net_retry.py
@@ -0,0 +1,143 @@
+"""Tests for esphome.net_retry."""
+
+import socket
+from unittest.mock import MagicMock, call, patch
+
+import pytest
+import requests as req
+
+from esphome.core import EsphomeError
+from esphome.net_retry import fetch_with_retry, is_transient_download_error
+
+
+def _http_error(status: int) -> req.HTTPError:
+    """An HTTPError carrying a response with the given status, as raised by
+    ``raise_for_status`` on a real response."""
+    resp = MagicMock()
+    resp.status_code = status
+    return req.HTTPError(str(status), response=resp)
+
+
+class TestIsTransientDownloadError:
+    def test_connection_errors_are_transient(self) -> None:
+        assert is_transient_download_error(req.ConnectionError("reset"))
+        assert is_transient_download_error(req.Timeout("timed out"))
+        assert is_transient_download_error(
+            req.exceptions.ChunkedEncodingError("dropped")
+        )
+        assert is_transient_download_error(
+            req.exceptions.ContentDecodingError("gzip stream truncated")
+        )
+
+    def test_http_statuses(self) -> None:
+        assert not is_transient_download_error(_http_error(404))
+        assert not is_transient_download_error(_http_error(403))
+        assert is_transient_download_error(_http_error(429))
+        assert is_transient_download_error(_http_error(503))
+
+    def test_http_error_without_response_is_permanent(self) -> None:
+        assert not is_transient_download_error(req.HTTPError("boom"))
+
+    def test_hard_dns_failures_are_permanent(self) -> None:
+        """Hard resolution failures are permanent via both the cause chain
+        and MaxRetryError.reason."""
+        from urllib3.exceptions import MaxRetryError, NameResolutionError
+
+        gai = socket.gaierror(socket.EAI_NONAME, "nodename nor servname provided")
+
+        chained = req.ConnectionError("resolution failed")
+        chained.__cause__ = gai
+        assert not is_transient_download_error(chained)
+
+        # The real urllib3 shape: gaierror on NameResolutionError.__cause__,
+        # carried by MaxRetryError.reason.
+        try:
+            raise NameResolutionError("example.invalid", None, gai) from gai
+        except NameResolutionError as nre:
+            wrapped = req.ConnectionError(
+                MaxRetryError(None, "http://example.invalid/", reason=nre)
+            )
+        assert not is_transient_download_error(wrapped)
+
+        # A garden-variety connection reset stays transient.
+        assert is_transient_download_error(req.ConnectionError("reset by peer"))
+
+    def test_temporary_dns_failure_stays_transient(self) -> None:
+        """EAI_AGAIN (flaky resolver) stays retryable."""
+        gai = socket.gaierror(socket.EAI_AGAIN, "temporary failure in name resolution")
+        chained = req.ConnectionError("resolution failed")
+        chained.__cause__ = gai
+
+        assert is_transient_download_error(chained)
+
+    def test_implicit_context_does_not_reclassify(self) -> None:
+        """A gaierror riding along as implicit __context__ must not turn a
+        genuine connection reset permanent."""
+        try:
+            try:
+                raise socket.gaierror(socket.EAI_NONAME, "first attempt")
+            except socket.gaierror:
+                raise req.ConnectionError("reset by peer") from None
+        except req.ConnectionError as reset:
+            assert reset.__context__ is not None
+            assert is_transient_download_error(reset)
+
+    def test_gaierror_without_errno_stays_transient(self) -> None:
+        """A gaierror carrying no EAI code cannot prove a hard failure."""
+        chained = req.ConnectionError("resolution failed")
+        chained.__cause__ = socket.gaierror("no errno")
+
+        assert is_transient_download_error(chained)
+
+    def test_mixed_chain_hard_failure_wins(self) -> None:
+        """EAI_AGAIN in the chain does not mask a hard failure elsewhere."""
+        again = socket.gaierror(socket.EAI_AGAIN, "temporary failure")
+        hard = socket.gaierror(socket.EAI_NONAME, "unknown host")
+
+        outer = req.ConnectionError(hard)
+        outer.__cause__ = again
+        assert not is_transient_download_error(outer)
+
+        outer = req.ConnectionError(again)
+        outer.__cause__ = hard
+        assert not is_transient_download_error(outer)
+
+    def test_dns_walk_survives_exception_cycles(self) -> None:
+        """A cyclic cause chain must terminate (and stay transient when no
+        resolution failure is present)."""
+        outer = req.ConnectionError("a")
+        inner = ValueError("b")
+        outer.__cause__ = inner
+        inner.__cause__ = outer
+
+        assert is_transient_download_error(outer)
+
+    def test_exhausted_resume_attempts_are_permanent(self) -> None:
+        """download_with_resume already spent its own resume attempts; its
+        EsphomeError wrapper is not retried again at the sweep level."""
+        wrapped = EsphomeError("Failed to download after 3 attempts")
+        wrapped.__cause__ = req.ConnectionError("down")
+        assert not is_transient_download_error(wrapped)
+
+    def test_unrelated_errors_are_permanent(self) -> None:
+        assert not is_transient_download_error(OSError("disk full"))
+        assert not is_transient_download_error(EsphomeError("size mismatch"))
+
+
+class TestFetchWithRetry:
+    def test_logs_the_upcoming_attempt_number(
+        self, caplog: pytest.LogCaptureFixture
+    ) -> None:
+        """The warning names the attempt about to run, not the failed one."""
+        with (
+            patch("esphome.net_retry.time.sleep") as mock_sleep,
+            pytest.raises(req.ConnectionError),
+        ):
+            fetch_with_retry(
+                "https://example.com/f",
+                lambda: (_ for _ in ()).throw(req.ConnectionError("reset")),
+            )
+
+        assert mock_sleep.call_args_list == [call(2), call(4)]
+        assert "(attempt 2/3)" in caplog.text
+        assert "(attempt 3/3)" in caplog.text

From 0d71ab8efbfcf4f7cf34d9267fab048c2692737c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 15:38:19 -0500
Subject: [PATCH 117/155] [api] Fix loop stall that triggers the task watchdog
 when entity list sends block (#18577)

---
 esphome/components/api/api_connection.cpp     |  16 +-
 esphome/components/api/api_connection.h       |   8 +-
 esphome/components/api/api_frame_helper.h     |   2 +-
 esphome/components/api/list_entities.cpp      |  10 +-
 esphome/components/web_server/list_entities.h |   1 -
 esphome/components/web_server/web_server.cpp  |  10 +-
 .../web_server_idf/web_server_idf.cpp         |   4 +-
 esphome/core/component_iterator.cpp           |  25 ++-
 esphome/core/component_iterator.h             |  43 +++-
 tests/components/camera/__init__.py           |  11 +
 .../camera/test_component_iterator_camera.cpp |  79 +++++++
 tests/components/core/benchmark.yaml          |  11 +
 .../core/test_component_iterator.cpp          | 195 ++++++++++++++++++
 tests/integration/README.md                   |   2 +
 .../api_list_entities_backpressure.yaml       |  23 +++
 .../sndbuf_pin_component/__init__.py          |  20 ++
 .../sndbuf_pin_component.cpp                  |  55 +++++
 .../sndbuf_pin_component.h                    |  21 ++
 tests/integration/raw_api_client.py           | 148 +++++++++++++
 .../test_api_list_entities_backpressure.py    | 110 ++++++++++
 20 files changed, 750 insertions(+), 44 deletions(-)
 create mode 100644 tests/components/camera/__init__.py
 create mode 100644 tests/components/camera/test_component_iterator_camera.cpp
 create mode 100644 tests/components/core/benchmark.yaml
 create mode 100644 tests/components/core/test_component_iterator.cpp
 create mode 100644 tests/integration/fixtures/api_list_entities_backpressure.yaml
 create mode 100644 tests/integration/fixtures/external_components/sndbuf_pin_component/__init__.py
 create mode 100644 tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.cpp
 create mode 100644 tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.h
 create mode 100644 tests/integration/raw_api_client.py
 create mode 100644 tests/integration/test_api_list_entities_backpressure.py

diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 73b4f3e5bd..6607e211da 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -417,15 +417,15 @@ void APIConnection::finalize_iterator_sync_() {
 }
 
 void APIConnection::process_iterator_batch_(ComponentIterator &iterator) {
-  size_t initial_size = this->deferred_batch_.size();
-  size_t max_batch = MAX_INITIAL_PER_BATCH;
-  while (!iterator.completed() && (this->deferred_batch_.size() - initial_size) < max_batch) {
-    iterator.advance();
-  }
+  // Budget by remaining batch capacity so a pass cannot overfill the batch;
+  // stops early on a refused send and resumes next loop pass
+  size_t batch_size = this->deferred_batch_.size();
+  if (batch_size < MAX_INITIAL_BATCH_SIZE)
+    iterator.try_advance(MAX_INITIAL_BATCH_SIZE - batch_size);
 
-  // If the batch is full, process it immediately
-  // Note: iterator.advance() already calls schedule_batch_() via schedule_message_()
-  if (this->deferred_batch_.size() >= max_batch) {
+  // Flush immediately once enough is queued (not guaranteed every pass);
+  // partial batches go out via the batch timer or finalize_iterator_sync_()
+  if (this->deferred_batch_.size() >= MAX_INITIAL_BATCH_SIZE) {
     this->process_batch_();
   }
 }
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index bb51a13000..1b47c23cfe 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -53,11 +53,11 @@ void log_dropped_message(const char *tag, int line, const LogString *what);
 
 // Keepalive timeout in milliseconds
 static constexpr uint32_t KEEPALIVE_TIMEOUT_MS = 60000;
-// Maximum number of entities to process in a single batch during initial state/info sending
-static constexpr size_t MAX_INITIAL_PER_BATCH = 34;
+// Deferred batch size cap during initial state/info sync
+static constexpr size_t MAX_INITIAL_BATCH_SIZE = 34;
 // Verify MAX_MESSAGES_PER_BATCH (defined in api_frame_helper.h) can hold the initial batch
-static_assert(MAX_MESSAGES_PER_BATCH >= MAX_INITIAL_PER_BATCH,
-              "MAX_MESSAGES_PER_BATCH must be >= MAX_INITIAL_PER_BATCH");
+static_assert(MAX_MESSAGES_PER_BATCH >= MAX_INITIAL_BATCH_SIZE,
+              "MAX_MESSAGES_PER_BATCH must be >= MAX_INITIAL_BATCH_SIZE");
 
 #ifdef USE_BENCHMARK
 class APIConnection;
diff --git a/esphome/components/api/api_frame_helper.h b/esphome/components/api/api_frame_helper.h
index 9c49956bbd..1c60bb87a5 100644
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -36,7 +36,7 @@ static constexpr uint16_t MAX_MESSAGE_SIZE = 32768;  // 32 KiB for ESP32 and oth
 static constexpr uint16_t RX_BUF_NULL_TERMINATOR = 1;
 
 // Maximum number of messages to batch in a single write operation
-// Must be >= MAX_INITIAL_PER_BATCH in api_connection.h (enforced by static_assert there)
+// Must be >= MAX_INITIAL_BATCH_SIZE in api_connection.h (enforced by static_assert there)
 static constexpr size_t MAX_MESSAGES_PER_BATCH = 34;
 
 // Max client name length (e.g., "Home Assistant 2026.1.0.dev0" = 28 chars)
diff --git a/esphome/components/api/list_entities.cpp b/esphome/components/api/list_entities.cpp
index f9e645b506..57ff616ca7 100644
--- a/esphome/components/api/list_entities.cpp
+++ b/esphome/components/api/list_entities.cpp
@@ -95,9 +95,17 @@ bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(
 ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(client) {}
 
 #ifdef USE_API_USER_DEFINED_ACTIONS
+// Yield after every Nth service; bounds direct (non-batched) writes per loop pass
+static constexpr uint8_t SERVICE_YIELD_INTERVAL = 3;
+
 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
   auto resp = service->encode_list_service_response();
-  return this->client_->send_message(resp);
+  if (!this->client_->send_message(resp))
+    return false;
+  // at_ is this service's index
+  if ((this->at_ + 1) % SERVICE_YIELD_INTERVAL == 0)
+    this->yield_after_step_();
+  return true;
 }
 #endif
 
diff --git a/esphome/components/web_server/list_entities.h b/esphome/components/web_server/list_entities.h
index 3edb84f555..dc32cbd1ad 100644
--- a/esphome/components/web_server/list_entities.h
+++ b/esphome/components/web_server/list_entities.h
@@ -35,7 +35,6 @@ class ListEntitiesIterator final : public ComponentIterator {
 #undef ENTITY_TYPE_
 #undef ENTITY_CONTROLLER_TYPE_
   // NOLINTEND(bugprone-macro-parentheses)
-  bool completed() { return this->state_ == IteratorState::NONE; }
 
  protected:
   const WebServer *web_server_;
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 9e50b7a394..ec536910e5 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -214,8 +214,8 @@ void DeferredUpdateEventSource::process_deferred_queue_() {
 
 void DeferredUpdateEventSource::loop() {
   process_deferred_queue_();
-  if (!this->entities_iterator_.completed())
-    this->entities_iterator_.advance();
+  // One step per loop; refusals retry next pass
+  this->entities_iterator_.try_advance(1);
 }
 
 void DeferredUpdateEventSource::deferrable_send_state(void *source, const char *event_type,
@@ -321,12 +321,6 @@ void DeferredUpdateEventSourceList::on_client_connect_(DeferredUpdateEventSource
 #endif
 
     source->entities_iterator_.begin(ws->include_internal_);
-
-    // just dump them all up-front and take advantage of the deferred queue
-    //     on second thought that takes too long, but leaving the commented code here for debug purposes
-    // while(!source->entities_iterator_.completed()) {
-    //  source->entities_iterator_.advance();
-    //}
   });
 }
 
diff --git a/esphome/components/web_server_idf/web_server_idf.cpp b/esphome/components/web_server_idf/web_server_idf.cpp
index 993fb6c035..9550570cdc 100644
--- a/esphome/components/web_server_idf/web_server_idf.cpp
+++ b/esphome/components/web_server_idf/web_server_idf.cpp
@@ -935,8 +935,8 @@ void AsyncEventSourceResponse::process_buffer_() {
 void AsyncEventSourceResponse::loop() {
   process_buffer_();
   process_deferred_queue_();
-  if (!this->entities_iterator_.completed())
-    this->entities_iterator_.advance();
+  // One step per loop; refusals retry next pass
+  this->entities_iterator_.try_advance(1);
 }
 
 bool AsyncEventSourceResponse::try_send_nodefer(const char *message, size_t message_len, const char *event, uint32_t id,
diff --git a/esphome/core/component_iterator.cpp b/esphome/core/component_iterator.cpp
index f4d3c05e19..3a497db741 100644
--- a/esphome/core/component_iterator.cpp
+++ b/esphome/core/component_iterator.cpp
@@ -22,23 +22,23 @@ void ComponentIterator::advance_platform_() {
   this->at_ = 0;
 }
 
-void ComponentIterator::advance() {
+bool ComponentIterator::advance_step_() {
   switch (this->state_) {
     case IteratorState::NONE:
       // not started
-      return;
+      return false;
     case IteratorState::BEGIN:
       if (this->on_begin()) {
         advance_platform_();
+        return true;
       }
-      break;
+      return false;
 
 // Entity iterator cases (generated from entity_types.h)
 // NOLINTBEGIN(bugprone-macro-parentheses)
 #define ENTITY_TYPE_(type, singular, plural, count, upper) \
   case IteratorState::upper: \
-    this->process_platform_item_(App.get_##plural(), &ComponentIterator::on_##singular); \
-    break;
+    return this->process_platform_item_(App.get_##plural(), &ComponentIterator::on_##singular);
 #define ENTITY_CONTROLLER_TYPE_(type, singular, plural, count, upper, callback) \
   ENTITY_TYPE_(type, singular, plural, count, upper)
 #include "esphome/core/entity_types.h"
@@ -48,26 +48,29 @@ void ComponentIterator::advance() {
 
 #ifdef USE_API_USER_DEFINED_ACTIONS
     case IteratorState::SERVICE:
-      this->process_platform_item_(api::global_api_server->get_user_services(), &ComponentIterator::on_service);
-      break;
+      return this->process_platform_item_(api::global_api_server->get_user_services(), &ComponentIterator::on_service);
 #endif
 
 #ifdef USE_CAMERA
     case IteratorState::CAMERA: {
       camera::Camera *camera_instance = camera::Camera::instance();
-      if (camera_instance != nullptr && (!camera_instance->is_internal() || this->include_internal_)) {
-        this->on_camera(camera_instance);
+      if (camera_instance != nullptr && (!camera_instance->is_internal() || this->include_internal_) &&
+          !this->on_camera(camera_instance)) {
+        return false;
       }
       advance_platform_();
-    } break;
+      return true;
+    }
 #endif
 
     case IteratorState::MAX:
       if (this->on_end()) {
         this->state_ = IteratorState::NONE;
+        return true;
       }
-      return;
+      return false;
   }
+  return false;
 }
 
 bool ComponentIterator::on_end() { return true; }
diff --git a/esphome/core/component_iterator.h b/esphome/core/component_iterator.h
index d271fcfed0..fac09e9e14 100644
--- a/esphome/core/component_iterator.h
+++ b/esphome/core/component_iterator.h
@@ -30,7 +30,23 @@ class RadioFrequency;
 class ComponentIterator {
  public:
   void begin(bool include_internal = false);
-  void advance();
+  /// Run up to max_steps iteration steps; stops early when iteration
+  /// completes or a callback refuses (that step is retried on the next
+  /// call). Inline so an idle (completed) iterator costs one compare, no call.
+  ESPHOME_ALWAYS_INLINE void try_advance(size_t max_steps) {
+    size_t steps = 0;
+    while (steps < max_steps && !this->completed()) {
+      this->yield_requested_ = false;
+      if (!this->advance_step_())
+        break;
+      steps++;
+      if (this->yield_requested_)
+        break;
+    }
+  }
+  // Remove before 2027.3.0
+  ESPDEPRECATED("Use try_advance() instead. Removed in 2027.3.0", "2026.8.1")
+  void advance() { this->try_advance(1); }
   bool completed() const { return this->state_ == IteratorState::NONE; }
   virtual bool on_begin();
 // Pure virtual entity callbacks (generated from entity_types.h)
@@ -73,23 +89,34 @@ class ComponentIterator {
 #endif
     MAX,
   };
+  /// End the current try_advance() pass after this step; lets callbacks
+  /// that write directly to the socket cap direct writes per pass.
+  void yield_after_step_() { this->yield_requested_ = true; }
+
   uint16_t at_{0};  // Supports up to 65,535 entities per type
   IteratorState state_{IteratorState::NONE};
-  bool include_internal_{false};
+  bool yield_requested_ : 1 {false};
+  bool include_internal_ : 1 {false};
 
   template<typename Container>
-  void process_platform_item_(const Container &items,
+  bool process_platform_item_(const Container &items,
                               bool (ComponentIterator::*on_item)(typename Container::value_type)) {
     if (this->at_ >= items.size()) {
       this->advance_platform_();
-    } else {
-      typename Container::value_type item = items[this->at_];
-      if ((item->is_internal() && !this->include_internal_) || (this->*on_item)(item)) {
-        this->at_++;
-      }
+      return true;
     }
+    typename Container::value_type item = items[this->at_];
+    if ((item->is_internal() && !this->include_internal_) || (this->*on_item)(item)) {
+      this->at_++;
+      return true;
+    }
+    return false;
   }
 
+  /// One iteration step; false if no progress was made (callback refused
+  /// or iterator not running).
+  bool advance_step_();
+
   void advance_platform_();
 };
 
diff --git a/tests/components/camera/__init__.py b/tests/components/camera/__init__.py
new file mode 100644
index 0000000000..61104b0bb1
--- /dev/null
+++ b/tests/components/camera/__init__.py
@@ -0,0 +1,11 @@
+import esphome.codegen as cg
+from tests.testing_helpers import ComponentManifestOverride
+
+
+def override_manifest(manifest: ComponentManifestOverride) -> None:
+    # No host camera platform exists to emit USE_CAMERA; define it here so
+    # the iterator CAMERA state compiles into the test binary.
+    async def to_code_testing(config):
+        cg.add_define("USE_CAMERA")
+
+    manifest.to_code = to_code_testing
diff --git a/tests/components/camera/test_component_iterator_camera.cpp b/tests/components/camera/test_component_iterator_camera.cpp
new file mode 100644
index 0000000000..efd8261554
--- /dev/null
+++ b/tests/components/camera/test_component_iterator_camera.cpp
@@ -0,0 +1,79 @@
+#include <gtest/gtest.h>
+
+#include "esphome/core/component_iterator.h"
+
+#ifdef USE_CAMERA
+#include "esphome/components/camera/camera.h"
+
+namespace esphome::testing {
+
+class StubCamera : public camera::Camera {
+ public:
+  void add_listener(camera::CameraListener *listener) override {}
+  camera::CameraImageReader *create_image_reader() override { return nullptr; }
+  void request_image(camera::CameraRequester requester) override {}
+  void start_stream(camera::CameraRequester requester) override {}
+  void stop_stream(camera::CameraRequester requester) override {}
+};
+
+// Iterator that accepts everything except the camera, which can refuse a
+// configurable number of times. The CAMERA state is a singleton path
+// distinct from process_platform_item_; this pins the same contract:
+// a refused camera is re-offered, never skipped.
+class CameraRefusingIterator : public ComponentIterator {
+ public:
+// NOLINTBEGIN(bugprone-macro-parentheses)
+#define ENTITY_TYPE_(type, singular, plural, count, upper) \
+  bool on_##singular(type *obj) override { return true; }
+#define ENTITY_CONTROLLER_TYPE_(type, singular, plural, count, upper, callback) \
+  ENTITY_TYPE_(type, singular, plural, count, upper)
+#include "esphome/core/entity_types.h"
+#undef ENTITY_TYPE_
+#undef ENTITY_CONTROLLER_TYPE_
+  // NOLINTEND(bugprone-macro-parentheses)
+
+  bool on_camera(camera::Camera *obj) override {
+    this->camera_calls++;
+    if (this->camera_refusals > 0) {
+      this->camera_refusals--;
+      return false;
+    }
+    return true;
+  }
+
+  int camera_calls{0};
+  int camera_refusals{0};
+};
+
+// Far above the fixed number of iterator states
+static constexpr size_t BIG_BUDGET = 1000;
+
+class ComponentIteratorCameraTest : public ::testing::Test {
+ protected:
+  void SetUp() override {
+    // Constructing a Camera installs the process-wide singleton
+    static StubCamera stub_camera;
+    ASSERT_EQ(camera::Camera::instance(), &stub_camera);
+  }
+};
+
+TEST_F(ComponentIteratorCameraTest, RefusedCameraIsReofferedNotSkipped) {
+  CameraRefusingIterator it;
+  it.camera_refusals = 2;
+  it.begin();
+  // Runs until the camera refuses, which stops the pass
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.camera_calls, 1);
+  EXPECT_FALSE(it.completed());
+  // The camera is re-offered once per call, not skipped
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.camera_calls, 2);
+  EXPECT_FALSE(it.completed());
+  // Once accepted, the iteration completes
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_EQ(it.camera_calls, 3);
+}
+
+}  // namespace esphome::testing
+#endif  // USE_CAMERA
diff --git a/tests/components/core/benchmark.yaml b/tests/components/core/benchmark.yaml
new file mode 100644
index 0000000000..063ac41eff
--- /dev/null
+++ b/tests/components/core/benchmark.yaml
@@ -0,0 +1,11 @@
+# Pulls in sensor so entity iteration paths compile (USE_SENSOR);
+# tests register their own instances. Plain yaml.safe_load, no ESPHome tags.
+# An alphabetically-earlier component's sensor: block shadows this one in
+# combined builds; the tests' sensor-count ASSERT catches a capacity drop.
+sensor:
+  - platform: template
+    id: bench_sensor_a
+    name: "Bench A"
+  - platform: template
+    id: bench_sensor_b
+    name: "Bench B"
diff --git a/tests/components/core/test_component_iterator.cpp b/tests/components/core/test_component_iterator.cpp
new file mode 100644
index 0000000000..03d467c920
--- /dev/null
+++ b/tests/components/core/test_component_iterator.cpp
@@ -0,0 +1,195 @@
+#include <gtest/gtest.h>
+
+#include "esphome/core/component_iterator.h"
+
+#ifdef USE_SENSOR
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/core/application.h"
+#endif
+
+namespace esphome::testing {
+
+// Iterator whose begin/end callbacks can refuse a configurable number of
+// times; all entity callbacks accept (any registered entities are accepted).
+class RefusingIterator : public ComponentIterator {
+ public:
+// NOLINTBEGIN(bugprone-macro-parentheses)
+#define ENTITY_TYPE_(type, singular, plural, count, upper) \
+  bool on_##singular(type *obj) override { return true; }
+#define ENTITY_CONTROLLER_TYPE_(type, singular, plural, count, upper, callback) \
+  ENTITY_TYPE_(type, singular, plural, count, upper)
+#include "esphome/core/entity_types.h"
+#undef ENTITY_TYPE_
+#undef ENTITY_CONTROLLER_TYPE_
+  // NOLINTEND(bugprone-macro-parentheses)
+
+  bool on_begin() override { return step(this->begin_calls, this->begin_refusals); }
+  bool on_end() override { return step(this->end_calls, this->end_refusals); }
+
+  int begin_calls{0};
+  int end_calls{0};
+  int begin_refusals{0};
+  int end_refusals{0};
+
+ protected:
+  static bool step(int &calls, int &refusals) {
+    calls++;
+    if (refusals > 0) {
+      refusals--;
+      return false;
+    }
+    return true;
+  }
+};
+
+// Far above the fixed number of iterator states
+static constexpr size_t BIG_BUDGET = 1000;
+
+TEST(ComponentIterator, NotRunningMakesNoProgress) {
+  RefusingIterator it;
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_EQ(it.begin_calls, 0);
+  EXPECT_EQ(it.end_calls, 0);
+}
+
+TEST(ComponentIterator, CompletesInOneCallWithoutRefusals) {
+  RefusingIterator it;
+  it.begin();
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_EQ(it.begin_calls, 1);
+  EXPECT_EQ(it.end_calls, 1);
+}
+
+TEST(ComponentIterator, StepBudgetIsHonored) {
+  RefusingIterator it;
+  it.begin();
+  it.try_advance(1);
+  EXPECT_EQ(it.begin_calls, 1);
+  EXPECT_EQ(it.end_calls, 0);
+  EXPECT_FALSE(it.completed());
+}
+
+TEST(ComponentIterator, RefusedStepStopsBatchAndRetriesSameStep) {
+  RefusingIterator it;
+  it.end_refusals = 3;
+  it.begin();
+  // First call runs until the refused end step, which stops the pass
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.end_calls, 1);
+  EXPECT_FALSE(it.completed());
+  // The refused step is retried once per call, not skipped
+  it.try_advance(BIG_BUDGET);
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.end_calls, 3);
+  EXPECT_FALSE(it.completed());
+  // Once accepted, the iteration completes
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_EQ(it.end_calls, 4);
+}
+
+TEST(ComponentIterator, RefusedBeginStopsBatchAndRetries) {
+  RefusingIterator it;
+  it.begin_refusals = 2;
+  it.begin();
+  it.try_advance(BIG_BUDGET);
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.begin_calls, 2);
+  EXPECT_FALSE(it.completed());
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_EQ(it.begin_calls, 3);
+}
+
+// The deprecated advance() wrapper must keep the legacy once-per-loop
+// pattern working during the deprecation window.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+TEST(ComponentIterator, DeprecatedAdvanceKeepsLegacyPatternWorking) {
+  RefusingIterator it;
+  it.end_refusals = 2;
+  it.begin();
+  size_t guard = 0;
+  while (!it.completed() && guard++ < BIG_BUDGET) {
+    it.advance();
+  }
+  EXPECT_TRUE(it.completed());
+  // Two refused end steps were retried, then accepted
+  EXPECT_EQ(it.end_calls, 3);
+}
+#pragma GCC diagnostic pop
+
+#ifdef USE_SENSOR
+// Iterator whose sensor callback can refuse or yield; pins the per-item
+// contract: a refused item is re-offered with at_ unchanged, never skipped.
+class ItemRefusingIterator : public RefusingIterator {
+ public:
+  bool on_sensor(sensor::Sensor *obj) override {
+    this->last_sensor = obj;
+    if (!step(this->sensor_calls, this->sensor_refusals))
+      return false;
+    if (this->yield_on_sensor)
+      this->yield_after_step_();
+    return true;
+  }
+  sensor::Sensor *last_sensor{nullptr};
+  int sensor_calls{0};
+  int sensor_refusals{0};
+  bool yield_on_sensor{false};
+};
+
+class ComponentIteratorSensorTest : public ::testing::Test {
+ protected:
+  void SetUp() override {
+    static sensor::Sensor sensor_a;
+    static sensor::Sensor sensor_b;
+    static bool registered = false;
+    if (!registered) {
+      App.register_sensor(&sensor_a);
+      App.register_sensor(&sensor_b);
+      registered = true;
+    }
+    // StaticVector drops silently when full; fail the fixture, not the contract
+    ASSERT_EQ(App.get_sensors().size(), 2u) << "benchmark.yaml sensor count too small";
+  }
+};
+
+TEST_F(ComponentIteratorSensorTest, RefusedItemIsReofferedNotSkipped) {
+  ItemRefusingIterator it;
+  it.sensor_refusals = 2;
+  it.begin();
+  // Runs until the first sensor refuses
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.sensor_calls, 1);
+  EXPECT_FALSE(it.completed());
+  // The refused item is re-offered, not skipped
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.sensor_calls, 2);
+  sensor::Sensor *refused = it.last_sensor;
+  // Once accepted, iteration continues through the second sensor to the end
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+  EXPECT_NE(it.last_sensor, refused);
+  EXPECT_EQ(it.sensor_calls, 4);
+}
+
+TEST_F(ComponentIteratorSensorTest, YieldAfterStepEndsPassAndResumes) {
+  ItemRefusingIterator it;
+  it.yield_on_sensor = true;
+  it.begin();
+  // The pass ends right after the first sensor despite a big budget
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.sensor_calls, 1);
+  EXPECT_FALSE(it.completed());
+  // The next pass ends after the second sensor
+  it.try_advance(BIG_BUDGET);
+  EXPECT_EQ(it.sensor_calls, 2);
+  // Remaining states then run to completion in one pass
+  it.try_advance(BIG_BUDGET);
+  EXPECT_TRUE(it.completed());
+}
+#endif  // USE_SENSOR
+
+}  // namespace esphome::testing
diff --git a/tests/integration/README.md b/tests/integration/README.md
index 44d9e0d644..790d9a3a11 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -7,6 +7,7 @@ This directory contains end-to-end integration tests for ESPHome, focusing on te
 - `conftest.py` - Common fixtures and utilities
 - `const.py` - Constants used throughout the integration tests
 - `types.py` - Type definitions for fixtures and functions
+- `raw_api_client.py` - Minimal plaintext api client whose reads happen only on request (for backpressure tests)
 - `state_utils.py` - State handling utilities (e.g., `InitialStateHelper`, `find_entity`, `require_entity`)
 - `fixtures/` - YAML configuration files for tests
 - `test_*.py` - Individual test files
@@ -347,6 +348,7 @@ Create C++ components in `fixtures/external_components/` for:
 - Custom entity behaviors
 - Scheduler testing
 - Memory management tests
+- Deterministic network backpressure (`sndbuf_pin_component` pins socket send buffers; assert on its log line to prove the pin took effect)
 
 ##### Log Line Monitoring
 ```python
diff --git a/tests/integration/fixtures/api_list_entities_backpressure.yaml b/tests/integration/fixtures/api_list_entities_backpressure.yaml
new file mode 100644
index 0000000000..1e53af7b75
--- /dev/null
+++ b/tests/integration/fixtures/api_list_entities_backpressure.yaml
@@ -0,0 +1,23 @@
+esphome:
+  name: api-backpressure-test
+
+host:
+
+api:
+  # Smallest queue so a non-draining client blocks the send path quickly
+  max_send_queue: 1
+  actions:
+# GENERATED_ACTIONS
+
+external_components:
+  - source:
+      type: local
+      path: EXTERNAL_COMPONENT_PATH
+    components: [sndbuf_pin_component]
+
+# Pins the device's socket send buffers for deterministic TCP backpressure
+sndbuf_pin_component:
+  buffer_size: SERVER_SNDBUF
+
+logger:
+  level: DEBUG
diff --git a/tests/integration/fixtures/external_components/sndbuf_pin_component/__init__.py b/tests/integration/fixtures/external_components/sndbuf_pin_component/__init__.py
new file mode 100644
index 0000000000..06dda5d1ac
--- /dev/null
+++ b/tests/integration/fixtures/external_components/sndbuf_pin_component/__init__.py
@@ -0,0 +1,20 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.const import CONF_BUFFER_SIZE, CONF_ID
+
+DEPENDENCIES = ["api"]
+
+sndbuf_pin_ns = cg.esphome_ns.namespace("sndbuf_pin")
+SndbufPinComponent = sndbuf_pin_ns.class_("SndbufPinComponent", cg.Component)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(SndbufPinComponent),
+        cv.Required(CONF_BUFFER_SIZE): cv.int_range(min=1),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID], config[CONF_BUFFER_SIZE])
+    await cg.register_component(var, config)
diff --git a/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.cpp b/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.cpp
new file mode 100644
index 0000000000..430c5075c7
--- /dev/null
+++ b/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.cpp
@@ -0,0 +1,55 @@
+#include "sndbuf_pin_component.h"
+
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <cerrno>
+
+#include "esphome/components/api/api_server.h"
+#include "esphome/core/log.h"
+
+namespace esphome::sndbuf_pin {
+
+static const char *const TAG = "sndbuf_pin";
+
+// Skip stdio; scan the low fd range where the listeners land
+static constexpr int FIRST_USER_FD = 3;
+static constexpr int MAX_FD_SCAN = 128;
+
+void SndbufPinComponent::setup() {
+  int pinned = 0;
+  for (int fd = FIRST_USER_FD; fd < MAX_FD_SCAN; fd++) {
+    int type = 0;
+    socklen_t len = sizeof(type);
+    if (::getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &len) != 0 || type != SOCK_STREAM)
+      continue;
+    struct sockaddr_in addr {};
+    socklen_t addr_len = sizeof(addr);
+    if (::getsockname(fd, reinterpret_cast<struct sockaddr *>(&addr), &addr_len) != 0) {
+      ESP_LOGW(TAG, "fd %d: getsockname failed, errno %d", fd, errno);
+      continue;
+    }
+    if (ntohs(addr.sin_port) != api::global_api_server->get_port())
+      continue;
+    if (::setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &this->buffer_size_, sizeof(this->buffer_size_)) != 0) {
+      ESP_LOGW(TAG, "fd %d: SO_SNDBUF pin failed, errno %d", fd, errno);
+      continue;
+    }
+    int applied = 0;
+    len = sizeof(applied);
+    if (::getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &applied, &len) != 0 || applied < this->buffer_size_) {
+      // Linux doubles the requested value; anything below it means clamped
+      ESP_LOGW(TAG, "fd %d: SO_SNDBUF readback %d below requested %d", fd, applied, this->buffer_size_);
+      continue;
+    }
+    // Tests assert on this line; accepted sockets inherit the pinned size
+    ESP_LOGD(TAG, "fd %d port %d: SO_SNDBUF pinned to %d (effective %d)", fd, ntohs(addr.sin_port), this->buffer_size_,
+             applied);
+    pinned++;
+  }
+  if (pinned == 0) {
+    ESP_LOGE(TAG, "api listener socket was not pinned");
+    this->mark_failed();
+  }
+}
+
+}  // namespace esphome::sndbuf_pin
diff --git a/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.h b/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.h
new file mode 100644
index 0000000000..b0af226d14
--- /dev/null
+++ b/tests/integration/fixtures/external_components/sndbuf_pin_component/sndbuf_pin_component.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "esphome/core/component.h"
+
+namespace esphome::sndbuf_pin {
+
+// Test-only (host): pins SO_SNDBUF on every open TCP socket so integration
+// tests get deterministic backpressure; an explicit SO_SNDBUF also disables
+// kernel autotuning, and accepted sockets inherit it from the listener.
+class SndbufPinComponent : public Component {
+ public:
+  explicit SndbufPinComponent(int buffer_size) : buffer_size_(buffer_size) {}
+  void setup() override;
+  // After the api server so its listening socket exists
+  float get_setup_priority() const override { return setup_priority::LATE; }
+
+ protected:
+  int buffer_size_;
+};
+
+}  // namespace esphome::sndbuf_pin
diff --git a/tests/integration/raw_api_client.py b/tests/integration/raw_api_client.py
new file mode 100644
index 0000000000..1dbe40933c
--- /dev/null
+++ b/tests/integration/raw_api_client.py
@@ -0,0 +1,148 @@
+"""Minimal plaintext native-api client over a raw socket.
+
+Reads only when told to, so tests control when the TCP pipe backs up toward
+the device; payloads are skipped and only message types are counted.
+"""
+
+from __future__ import annotations
+
+import asyncio
+from collections import Counter
+import socket
+from typing import Self
+
+from aioesphomeapi import api_pb2
+import aioesphomeapi.core as api_core
+from google.protobuf import message
+
+from .const import LOCALHOST
+
+# Message type ids are protocol constants; derive them from aioesphomeapi so
+# they cannot drift from the client library in use.
+MESSAGE_TYPE_OF = {cls: num for num, cls in api_core.MESSAGE_TYPE_TO_PROTO.items()}
+
+_READ_CHUNK = 4096
+
+
+def encode_varint(value: int) -> bytes:
+    out = bytearray()
+    while True:
+        byte = value & 0x7F
+        value >>= 7
+        if value:
+            out.append(byte | 0x80)
+        else:
+            out.append(byte)
+            return bytes(out)
+
+
+def decode_varint(buf: bytearray, pos: int) -> tuple[int, int] | None:
+    """Decode one varint at pos; return (value, new_pos) or None if short."""
+    value = shift = 0
+    while pos < len(buf):
+        byte = buf[pos]
+        pos += 1
+        value |= (byte & 0x7F) << shift
+        if not byte & 0x80:
+            return value, pos
+        shift += 7
+    return None
+
+
+def encode_frame(msg_type: int, payload: bytes) -> bytes:
+    """Encode one plaintext api frame: 0x00, payload length, message type."""
+    return b"\x00" + encode_varint(len(payload)) + encode_varint(msg_type) + payload
+
+
+class FrameParser:
+    """Incremental parser for the plaintext api frame stream."""
+
+    def __init__(self) -> None:
+        self._buf = bytearray()
+
+    def feed(self, data: bytes) -> list[int]:
+        self._buf.extend(data)
+        types: list[int] = []
+        while (msg_type := self._try_parse()) is not None:
+            types.append(msg_type)
+        return types
+
+    def _try_parse(self) -> int | None:
+        buf = self._buf
+        if not buf:
+            return None
+        assert buf[0] == 0, f"expected plaintext frame, got indicator {buf[0]}"
+        if (size_decoded := decode_varint(buf, 1)) is None:
+            return None
+        size, pos = size_decoded
+        if (type_decoded := decode_varint(buf, pos)) is None:
+            return None
+        msg_type, pos = type_decoded
+        if len(buf) - pos < size:
+            return None
+        del buf[: pos + size]
+        return msg_type
+
+
+class RawApiClient:
+    """Plaintext api client whose reads happen only on request."""
+
+    def __init__(self, port: int, recv_buffer_size: int | None = None) -> None:
+        self._port = port
+        self._parser = FrameParser()
+        self.bytes_received = 0
+        self.frame_counts: Counter[int] = Counter()
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        try:
+            if recv_buffer_size is not None:
+                sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, recv_buffer_size)
+                # Kernels may round up (Linux doubles) but must not clamp below
+                applied = sock.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF)
+                assert applied >= recv_buffer_size, (
+                    f"SO_RCVBUF clamped to {applied}, requested {recv_buffer_size}"
+                )
+            sock.setblocking(False)
+        except Exception:
+            sock.close()
+            raise
+        self._sock = sock
+
+    async def __aenter__(self) -> Self:
+        return self
+
+    async def __aexit__(self, *exc_info: object) -> None:
+        self.close()
+
+    async def connect(self, client_info: str = "raw-api-client") -> None:
+        """Connect and complete the Hello handshake (no auth step since 2026.1.0)."""
+        loop = asyncio.get_running_loop()
+        await loop.sock_connect(self._sock, (LOCALHOST, self._port))
+        hello = api_pb2.HelloRequest()
+        hello.client_info = client_info
+        hello.api_version_major = 1
+        hello.api_version_minor = 10
+        await self.send_message(hello)
+        await self.read_until_frame(MESSAGE_TYPE_OF[api_pb2.HelloResponse])
+
+    async def send_message(self, msg: message.Message) -> None:
+        loop = asyncio.get_running_loop()
+        await loop.sock_sendall(
+            self._sock,
+            encode_frame(MESSAGE_TYPE_OF[type(msg)], msg.SerializeToString()),
+        )
+
+    async def read_until_frame(self, msg_type: int, timeout: float = 10.0) -> None:
+        """Read until at least one frame of msg_type has been received."""
+        loop = asyncio.get_running_loop()
+
+        async def _read_loop() -> None:
+            while not self.frame_counts[msg_type]:
+                data = await loop.sock_recv(self._sock, _READ_CHUNK)
+                assert data, "server closed the connection unexpectedly"
+                self.bytes_received += len(data)
+                self.frame_counts.update(self._parser.feed(data))
+
+        await asyncio.wait_for(_read_loop(), timeout)
+
+    def close(self) -> None:
+        self._sock.close()
diff --git a/tests/integration/test_api_list_entities_backpressure.py b/tests/integration/test_api_list_entities_backpressure.py
new file mode 100644
index 0000000000..9df6c7a298
--- /dev/null
+++ b/tests/integration/test_api_list_entities_backpressure.py
@@ -0,0 +1,110 @@
+"""A client that stops reading the entity listing must not starve other clients.
+
+Service responses are sent directly (not via the deferred batch), so a full
+TCP pipe makes the send path refuse; the drive loop now lives in
+try_advance(), which stops on refusal instead of retrying forever. Not a
+before/after regression test: pre-fix builds survive here because the
+refusal path yields and pumps the socket each retry.
+
+The sndbuf_pin_component fixture pins the device's send buffers so the pipe
+fills deterministically regardless of kernel autotuning; the test waits for
+its log line before proceeding.
+"""
+
+from __future__ import annotations
+
+import asyncio
+
+from aioesphomeapi import api_pb2
+import pytest
+
+from .raw_api_client import MESSAGE_TYPE_OF, RawApiClient
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+SERVICES_RESPONSE = MESSAGE_TYPE_OF[api_pb2.ListEntitiesServicesResponse]
+LIST_DONE_RESPONSE = MESSAGE_TYPE_OF[api_pb2.ListEntitiesDoneResponse]
+
+# Both ends of the pipe are pinned small; only tens of KB fit in the kernel
+RECV_BUFFER_SIZE = 4096
+SERVER_SNDBUF = 8192  # substituted into the fixture yaml
+# Logged by the sndbuf_pin_component fixture when it pins a socket
+SNDBUF_PIN_LOG = "SO_SNDBUF pinned to"
+# One response (~6.4 KB) must stay smaller than the pinned send buffer; an
+# oversized message parks in the overflow buffer and reports as sent.
+ARGS_PER_SERVICE = 8
+ARG_NAME_LEN = 800
+# ~160 KB listing versus a tens-of-KB pipe guarantees a mid-services block
+NUM_SERVICES = 25
+assert ARGS_PER_SERVICE * ARG_NAME_LEN < SERVER_SNDBUF
+# The pipe fills in well under a second
+STALL_SECONDS = 0.5
+# Well above pipe capacity, well below the listing size
+MIN_DRAINED_BYTES = 60_000
+
+
+def _generated_actions() -> str:
+    """Build the api actions block: services with long argument names."""
+    lines: list[str] = []
+    for i in range(NUM_SERVICES):
+        lines.append(f"    - action: backpressure_service_{i:04d}")
+        lines.append("      variables:")
+        for j in range(ARGS_PER_SERVICE):
+            prefix = f"arg_{i:04d}_{j:02d}_"
+            lines.append(
+                f"        {prefix}{'x' * (ARG_NAME_LEN - len(prefix))}: string"
+            )
+        lines.append("      then:")
+        lines.append("        - logger.log: service called")
+    return "\n".join(lines)
+
+
+@pytest.mark.asyncio
+async def test_api_list_entities_backpressure(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+    unused_tcp_port: int,
+) -> None:
+    """A stalled reader mid-services must not block other api clients."""
+    assert "# GENERATED_ACTIONS" in yaml_config
+    config = yaml_config.replace("# GENERATED_ACTIONS", _generated_actions())
+    config = config.replace("SERVER_SNDBUF", str(SERVER_SNDBUF))
+
+    pin_applied = asyncio.Event()
+
+    def _on_log_line(line: str) -> None:
+        if SNDBUF_PIN_LOG in line:
+            pin_applied.set()
+
+    async with run_compiled(config, line_callback=_on_log_line):
+        # Fails loudly if the pin never applied
+        await asyncio.wait_for(pin_applied.wait(), 10)
+
+        async with RawApiClient(
+            unused_tcp_port, recv_buffer_size=RECV_BUFFER_SIZE
+        ) as stalled:
+            await stalled.connect(client_info="backpressure-stall-client")
+            await stalled.send_message(api_pb2.ListEntitiesRequest())
+            # The client now stops reading entirely.
+
+            # Let the server run against the full pipe
+            await asyncio.sleep(STALL_SECONDS)
+
+            # Other clients must still be served while the first is blocked
+            async with api_client_connected(timeout=20) as client:
+                device_info = await asyncio.wait_for(client.device_info(), 20)
+                assert device_info.name == "api-backpressure-test"
+                _, services = await asyncio.wait_for(
+                    client.list_entities_services(), 30
+                )
+                assert len(services) == NUM_SERVICES
+
+            # Fixture-size guard: the listing must dwarf the pinned pipe
+            before = stalled.bytes_received
+            await stalled.read_until_frame(LIST_DONE_RESPONSE, timeout=60)
+            drained = stalled.bytes_received - before
+            assert drained > MIN_DRAINED_BYTES, (
+                f"only {drained} bytes drained; the listing never backed up"
+            )
+            assert stalled.frame_counts[SERVICES_RESPONSE] == NUM_SERVICES
+            assert stalled.frame_counts[LIST_DONE_RESPONSE] == 1

From 662bf7d7f05d7bbd585b9258af034f179c8a60ae Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 16:16:01 -0500
Subject: [PATCH 118/155] [esp32_ble_tracker] Scan at the default window while
 a GATT connection is active (#18609)

---
 .../components/ble_device_base/__init__.py    |  43 +++++---
 .../components/esp32_ble_tracker/__init__.py  |  47 +++++++-
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   |  73 ++++++++++---
 .../esp32_ble_tracker/esp32_ble_tracker.h     |  36 ++++--
 .../config/scan_window_explicit.yaml          |  19 ++++
 .../config/scan_window_raised.yaml            |  17 +++
 .../config/scan_window_scan_only.yaml         |  12 ++
 .../scan_window_user_set_scan_only.yaml       |  14 +++
 .../test_scan_window_default.py               | 103 +++++++++++++++++-
 9 files changed, 320 insertions(+), 44 deletions(-)
 create mode 100644 tests/component_tests/esp32_ble_tracker/config/scan_window_explicit.yaml
 create mode 100644 tests/component_tests/esp32_ble_tracker/config/scan_window_raised.yaml
 create mode 100644 tests/component_tests/esp32_ble_tracker/config/scan_window_scan_only.yaml
 create mode 100644 tests/component_tests/esp32_ble_tracker/config/scan_window_user_set_scan_only.yaml

diff --git a/esphome/components/ble_device_base/__init__.py b/esphome/components/ble_device_base/__init__.py
index 15a8b08139..43ec736727 100644
--- a/esphome/components/ble_device_base/__init__.py
+++ b/esphome/components/ble_device_base/__init__.py
@@ -206,32 +206,36 @@ def validate_scan_parameters(config: ConfigType) -> ConfigType:
     interval = config[CONF_INTERVAL]
     window = config[CONF_WINDOW]
 
-    if window > interval:
-        raise cv.Invalid(
-            f"Scan window ({window}) needs to be smaller than scan interval ({interval})"
-        )
+    # Labels are reused in every error below; the optional one names its key.
+    windows = [("Scan window", window)]
+    if (connection_window := config.get(CONF_CONNECTION_SCAN_WINDOW)) is not None:
+        windows.append((CONF_CONNECTION_SCAN_WINDOW, connection_window))
+
+    for name, value in windows:
+        if value > interval:
+            raise cv.Invalid(
+                f"{name} ({value}) needs to be smaller than scan interval ({interval})"
+            )
 
     # BLE scan interval/window are programmed in 0.625 ms units as a 16-bit value; the
     # controller only accepts 2.5 ms .. 10240 ms (0x0004 .. 0x4000). Reject out-of-range
     # values here instead of letting the unit conversion silently overflow.
-    for name, value in (("interval", interval), ("window", window)):
+    for name, value in (("Scan interval", interval), *windows):
         if value.total_microseconds < 2500 or value.total_microseconds > 10_240_000:
-            raise cv.Invalid(
-                f"Scan {name} ({value}) must be between 2.5 ms and 10240 ms"
-            )
+            raise cv.Invalid(f"{name} ({value}) must be between 2.5 ms and 10240 ms")
 
     # Validate what actually reaches the controller: both values are truncated to
     # whole 0.625 ms units, so a window/interval pair that differs by less than one
     # unit collapses to the same value — silently programming a 100 % duty cycle
     # (radio permanently on) from a config that asked for less.
     interval_units = to_ble_units(interval)
-    window_units = to_ble_units(window)
-    if window_units == interval_units and window < interval:
-        raise cv.Invalid(
-            f"Scan window ({window}) and interval ({interval}) both truncate to "
-            f"{interval_units} x 0.625 ms, which the controller scans at a 100 % duty "
-            f"cycle. Separate them by at least 0.625 ms."
-        )
+    for name, value in windows:
+        if to_ble_units(value) == interval_units and value < interval:
+            raise cv.Invalid(
+                f"{name} ({value}) and interval ({interval}) both truncate to "
+                f"{interval_units} x 0.625 ms, which the controller scans at a 100 % duty "
+                f"cycle. Separate them by at least 0.625 ms."
+            )
 
     if interval.total_microseconds * 3 > duration.total_microseconds:
         raise cv.Invalid(
@@ -247,11 +251,14 @@ def validate_scan_parameters(config: ConfigType) -> ConfigType:
 # their own; also the fallback for esp32's conditional default.
 DEFAULT_SCAN_WINDOW = "30ms"
 
+CONF_CONNECTION_SCAN_WINDOW = "connection_scan_window"
+
 
 def scan_parameters_schema(
     interval_default: str,
     *,
     window_default: str | Callable[[], TimePeriod] = DEFAULT_SCAN_WINDOW,
+    connection_window: bool = False,
 ) -> cv.All:
     """Build the scan_parameters value schema shared by all BLE trackers.
 
@@ -263,7 +270,9 @@ def scan_parameters_schema(
     can adjust it once sibling keys are resolved). The `active` option
     (default on) is unconditional: active scanning is part of the tracker
     contract — every current proxy client assumes it, so a passive-only
-    tracker must not share this schema.
+    tracker must not share this schema. connection_window opts in to the
+    `connection_scan_window` option for trackers that can fall back to a
+    smaller window while a GATT connection is active.
     """
     schema = {
         cv.Optional(CONF_DURATION, default="5min"): cv.positive_time_period_seconds,
@@ -272,6 +281,8 @@ def scan_parameters_schema(
         cv.Optional(CONF_CONTINUOUS, default=True): cv.boolean,
         cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
     }
+    if connection_window:
+        schema[cv.Optional(CONF_CONNECTION_SCAN_WINDOW)] = cv.positive_time_period
     return cv.All(cv.Schema(schema), validate_scan_parameters)
 
 
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 28c8c7fcf1..55aa67c96d 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -7,6 +7,7 @@ import logging
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import ble_device_base, esp32_ble, ota
+from esphome.components.ble_device_base import CONF_CONNECTION_SCAN_WINDOW
 from esphome.components.const import CONF_ON_SCAN_END, CONF_SCAN_PARAMETERS, CONF_WINDOW
 from esphome.components.esp32 import (
     add_idf_sdkconfig_option,
@@ -72,8 +73,9 @@ def _get_required_features() -> set[BLEFeatures]:
 
 # Slot counters sizing the tracker's StaticVector storage; one request per
 # registered listener or client.
+CLIENT_COUNT_DEFINE = "ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT"
 _request_listener_slot = cg.slot_counter("ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT")
-_request_client_slot = cg.slot_counter("ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT")
+_request_client_slot = cg.slot_counter(CLIENT_COUNT_DEFINE)
 
 
 def register_ble_features(features: set[BLEFeatures]) -> None:
@@ -146,6 +148,7 @@ class TrackerData:
     """Per-run validation state, namespaced under DOMAIN in CORE.data."""
 
     scan_window_defaulted: bool = False
+    connection_window_injected: bool = False
 
 
 def _get_data() -> TrackerData:
@@ -174,17 +177,34 @@ def _raise_defaulted_scan_window(config: ConfigType) -> ConfigType:
     honors the window strictly (>= 5.5.5); without the arbiter a full-duty
     scan would starve wifi outright, and a user-set window is never touched.
     Raising to the interval cannot invalidate the already-validated
-    parameters, so no re-validation is needed.
+    parameters, so no re-validation is needed. The connection window is
+    checked against the window here, after the raise.
     """
+    params = config[CONF_SCAN_PARAMETERS]
     if (
         _get_data().scan_window_defaulted
         and config.get(CONF_SOFTWARE_COEXISTENCE)
         and idf_version() >= IDF_SCAN_WINDOW_FIX_VERSION
     ):
-        params = config[CONF_SCAN_PARAMETERS]
         # Copy so the config dump shows a plain value instead of a YAML
         # anchor/alias pair pointing at the interval.
         params[CONF_WINDOW] = copy.copy(params[CONF_INTERVAL])
+        # Arm the connection-time fallback unless the user set one. Injected
+        # after validation; safe because it equals the validated window default.
+        if CONF_CONNECTION_SCAN_WINDOW not in params:
+            params[CONF_CONNECTION_SCAN_WINDOW] = cv.positive_time_period(
+                ble_device_base.DEFAULT_SCAN_WINDOW
+            )
+            _get_data().connection_window_injected = True
+    if (
+        connection_window := params.get(CONF_CONNECTION_SCAN_WINDOW)
+    ) is not None and connection_window > params[CONF_WINDOW]:
+        # A larger value would widen the scan during connections.
+        raise cv.Invalid(
+            f"{CONF_CONNECTION_SCAN_WINDOW} ({connection_window}) needs to be "
+            f"smaller than the scan window ({params[CONF_WINDOW]})",
+            path=[CONF_SCAN_PARAMETERS, CONF_CONNECTION_SCAN_WINDOW],
+        )
     return config
 
 
@@ -193,7 +213,7 @@ def _raise_defaulted_scan_window(config: ConfigType) -> ConfigType:
 # window/interval pairs that collapse to the same 0.625 ms unit count.
 # The window default is conditional (see _scan_window_default above).
 SCAN_PARAMETERS_SCHEMA = ble_device_base.scan_parameters_schema(
-    "320ms", window_default=_scan_window_default
+    "320ms", window_default=_scan_window_default, connection_window=True
 )
 
 # Codegen helpers are owned by ble_device_base; kept under the historical names
@@ -287,6 +307,25 @@ async def to_code(config):
     cg.add(var.set_scan_duration(params[CONF_DURATION]))
     cg.add(var.set_scan_interval(ble_device_base.to_ble_units(params[CONF_INTERVAL])))
     cg.add(var.set_scan_window(ble_device_base.to_ble_units(params[CONF_WINDOW])))
+    if (connection_window := params.get(CONF_CONNECTION_SCAN_WINDOW)) is not None:
+        # Emitted at FINAL so a scan-only build, where the guarded C++ path
+        # compiles out, skips the call entirely.
+        window_units = ble_device_base.to_ble_units(connection_window)
+
+        @coroutine_with_priority(CoroPriority.FINAL)
+        async def _emit_connection_scan_window() -> None:
+            if cg.get_slot_count(CLIENT_COUNT_DEFINE):
+                cg.add(var.set_connection_scan_window(window_units))
+            elif not _get_data().connection_window_injected:
+                # Warn only for a user-set value; the injected default drops silently.
+                _LOGGER.warning(
+                    "'%s' has no effect because this build has no BLE client "
+                    "components (for example bluetooth_proxy with active "
+                    "connections, or ble_client)",
+                    CONF_CONNECTION_SCAN_WINDOW,
+                )
+
+        CORE.add_job(_emit_connection_scan_window)
     cg.add(var.set_scan_active(params[CONF_ACTIVE]))
     cg.add(var.set_scan_continuous(params[CONF_CONTINUOUS]))
 
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 798fd6e0ca..5339565a32 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -122,6 +122,9 @@ void ESP32BLETracker::loop() {
   // - start_scan_(): scanner_state_ becomes IDLE via set_scanner_state_() in cleanup_scan_state_()
   // - try_promote_discovered_clients_(): client enters DISCOVERED via set_state(), or
   //   connecting client finishes (state change), or scanner reaches RUNNING/IDLE
+  // - connection-window restart: scan_params_ is only written in start_scan_()
+  //   (which changes scanner state via set_scanner_state_()), and
+  //   counts.active/disconnecting only change on client state changes
   //
   // All conditions that affect the logic below are tied to state changes that increment
   // state_version_, so the fast path is safe.
@@ -144,6 +147,19 @@ void ESP32BLETracker::loop() {
       (this->scan_set_param_failed_ && this->scanner_state_ == ScannerState::RUNNING)) {
     this->handle_scanner_failure_();
   }
+
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  // The programmed window no longer matches the connection state (typically
+  // the last connection dropped): restart so the right window applies now
+  // instead of at the end of the scan period. Continuous only (a user-started
+  // scan would not restart); !disconnecting matches the restart gate below.
+  if (this->scanner_state_ == ScannerState::RUNNING && this->scan_continuous_ && !counts.disconnecting &&
+      this->scan_params_.scan_window != this->desired_scan_window_(counts.active)) {
+    // Same logical scan period continues: no on_scan_end sweeps for this
+    // restart. Only armed when the stop was issued.
+    this->skip_next_scan_end_ = this->stop_scan_();
+  }
+#endif
   /*
 
     Avoid starting the scanner if:
@@ -195,19 +211,23 @@ void ESP32BLETracker::stop_scan() {
   // reason at D themselves, and the user-facing stop action is deliberate.
   ESP_LOGV(TAG, "Stopping scan.");
   this->scan_continuous_ = false;
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  // The window-change restart is abandoned with continuous scanning.
+  this->skip_next_scan_end_ = false;
+#endif
   this->stop_scan_();
 }
 
 void ESP32BLETracker::ble_before_disabled_event_handler() { this->stop_scan_(); }
 
-void ESP32BLETracker::stop_scan_() {
+bool ESP32BLETracker::stop_scan_() {
   if (this->scanner_state_ != ScannerState::RUNNING && this->scanner_state_ != ScannerState::FAILED) {
     // IDLE means there is nothing to stop; STOPPING means a stop is already in
     // flight and will finish on its own. Neither is an error.
     if (this->scanner_state_ != ScannerState::IDLE && this->scanner_state_ != ScannerState::STOPPING) {
       ESP_LOGE(TAG, "Cannot stop scan: %s", this->scanner_state_to_string_(this->scanner_state_));
     }
-    return;
+    return false;
   }
   // Reset timeout state machine when stopping scan
   this->scan_timeout_state_ = ScanTimeoutState::INACTIVE;
@@ -215,8 +235,9 @@ void ESP32BLETracker::stop_scan_() {
   esp_err_t err = esp_ble_gap_stop_scanning();
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "esp_ble_gap_stop_scanning failed: %d", err);
-    return;
+    return false;
   }
+  return true;
 }
 
 void ESP32BLETracker::start_scan_(bool first) {
@@ -230,16 +251,11 @@ void ESP32BLETracker::start_scan_(bool first) {
   }
   this->set_scanner_state_(ScannerState::STARTING);
   ESP_LOGV(TAG, "Starting scan, set scanner state to STARTING.");
-  if (!first) {
-#ifdef ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT
-    for (auto *listener : this->listeners_)
-      listener->on_scan_end();
+  if (!first)
+    this->notify_scan_end_();
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  this->skip_next_scan_end_ = false;
 #endif
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-    for (auto *listener : this->neutral_listeners_)
-      listener->on_scan_end();
-#endif
-  }
 #ifdef USE_ESP32_BLE_DEVICE
   this->discovered_log_.clear();
 #endif
@@ -247,7 +263,17 @@ void ESP32BLETracker::start_scan_(bool first) {
   this->scan_params_.own_addr_type = BLE_ADDR_TYPE_PUBLIC;
   this->scan_params_.scan_filter_policy = BLE_SCAN_FILTER_ALLOW_ALL;
   this->scan_params_.scan_interval = this->scan_interval_;
-  this->scan_params_.scan_window = this->scan_window_;
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  // Count fresh: an automation can start a scan before loop() refreshes the counts.
+  const uint32_t window = this->desired_scan_window_(this->count_client_states_().active);
+  if (window != this->scan_window_) {
+    // Guarantee the connection airtime instead of scanning wall to wall.
+    ESP_LOGV(TAG, "Connection active, using %" PRIu32 " unit scan window", window);
+  }
+#else
+  const uint32_t window = this->scan_window_;
+#endif
+  this->scan_params_.scan_window = window;
 
   // Start timeout monitoring in loop() instead of using scheduler
   // This prevents false reboots when the loop is blocked
@@ -408,6 +434,11 @@ void ESP32BLETracker::dump_config() {
                 "  Continuous Scanning: %s",
                 this->scan_duration_, this->scan_interval_ * 0.625f, this->scan_window_ * 0.625f,
                 this->scan_active_ ? "ACTIVE" : "PASSIVE", YESNO(this->scan_continuous_));
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  if (this->connection_scan_window_ != 0) {
+    ESP_LOGCONFIG(TAG, "  Connection Scan Window: %.1f ms", this->connection_scan_window_ * 0.625f);
+  }
+#endif
   ESP_LOGCONFIG(TAG,
                 "  Scanner State: %s\n"
                 "  Connecting: %d, discovered: %d, disconnecting: %d, active: %d",
@@ -487,6 +518,18 @@ void ESP32BLETracker::cleanup_scan_state_(bool is_stop_complete) {
   // Reset timeout state machine instead of cancelling scheduler timeout
   this->scan_timeout_state_ = ScanTimeoutState::INACTIVE;
 
+  this->notify_scan_end_();
+
+  this->set_scanner_state_(ScannerState::IDLE);
+}
+
+void ESP32BLETracker::notify_scan_end_() {
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  // Window-change restart continues the same scan period; the flag stays set
+  // across the stop and is cleared by the restart in start_scan_.
+  if (this->skip_next_scan_end_)
+    return;
+#endif
 #ifdef ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT
   for (auto *listener : this->listeners_)
     listener->on_scan_end();
@@ -495,8 +538,6 @@ void ESP32BLETracker::cleanup_scan_state_(bool is_stop_complete) {
   for (auto *listener : this->neutral_listeners_)
     listener->on_scan_end();
 #endif
-
-  this->set_scanner_state_(ScannerState::IDLE);
 }
 
 void ESP32BLETracker::handle_scanner_failure_() {
@@ -534,6 +575,8 @@ void ESP32BLETracker::try_promote_discovered_clients_() {
     }
 
     ESP_LOGD(TAG, "Promoting client to connect");
+    // A connect ends the scan period a window-change restart was continuing.
+    this->skip_next_scan_end_ = false;
 #ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
     this->update_coex_preference_(true);
 #endif
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 7c3e5538fd..618444e626 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -169,6 +169,9 @@ class ESP32BLETracker final : public Component,
   void set_scan_duration(uint32_t scan_duration) { scan_duration_ = scan_duration; }
   void set_scan_interval(uint32_t scan_interval) { scan_interval_ = scan_interval; }
   void set_scan_window(uint32_t scan_window) { scan_window_ = scan_window; }
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  void set_connection_scan_window(uint32_t scan_window) { connection_scan_window_ = scan_window; }
+#endif
   void set_scan_active(bool scan_active) { scan_active_ = scan_active; }
   bool get_scan_active() const { return scan_active_; }
   void set_scan_continuous(bool scan_continuous) { scan_continuous_ = scan_continuous; }
@@ -226,7 +229,10 @@ class ESP32BLETracker final : public Component,
   ScannerState get_scanner_state() const { return this->scanner_state_; }
 
  protected:
-  void stop_scan_();
+  /// Returns true when a stop was issued to the controller.
+  bool stop_scan_();
+  /// Fire on_scan_end on every listener unless a window-change restart suppressed it.
+  void notify_scan_end_();
   /// Start a single scan by setting up the parameters and doing some esp-idf calls.
   void start_scan_(bool first);
   /// Called when a `ESP_GAP_BLE_SCAN_RESULT_EVT` event is received.
@@ -313,6 +319,15 @@ class ESP32BLETracker final : public Component,
   uint32_t scan_duration_;
   uint32_t scan_interval_;
   uint32_t scan_window_;
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  /// Window used while a GATT connection is active; set by the user, or
+  /// defaulted when the window was raised to full duty (0 = no fallback).
+  uint32_t connection_scan_window_{0};
+  /// The window to scan at for the given number of active GATT connections.
+  uint32_t desired_scan_window_(uint8_t active) const {
+    return (this->connection_scan_window_ != 0 && active > 0) ? this->connection_scan_window_ : this->scan_window_;
+  }
+#endif
   esp_bt_status_t scan_start_failed_{ESP_BT_STATUS_SUCCESS};
   esp_bt_status_t scan_set_param_failed_{ESP_BT_STATUS_SUCCESS};
 
@@ -330,15 +345,20 @@ class ESP32BLETracker final : public Component,
   /// state_version_ to detect if any state changed since last iteration.
   uint8_t last_processed_version_{0};
   ScannerState scanner_state_{ScannerState::IDLE};
-  bool scan_continuous_;
-  bool scan_active_;
+  // Packed 1-bit flags.
+  bool scan_continuous_ : 1;
+  bool scan_active_ : 1;
 #ifdef USE_OTA_STATE_LISTENER
-  bool scan_continuous_before_ota_{false};
+  bool scan_continuous_before_ota_ : 1 {false};
+#endif
+  bool ble_was_disabled_ : 1 {true};
+  bool parse_advertisements_ : 1 {false};
+#ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
+  /// Suppress the window-change restart's on_scan_end sweeps (stop and start).
+  bool skip_next_scan_end_ : 1 {false};
 #endif
-  bool ble_was_disabled_{true};
-  bool parse_advertisements_{false};
 #ifdef USE_ESP32_BLE_SOFTWARE_COEXISTENCE
-  bool coex_prefer_ble_{false};
+  bool coex_prefer_ble_ : 1 {false};
 #endif
   // Scan timeout state machine
   enum class ScanTimeoutState : uint8_t {
@@ -346,10 +366,10 @@ class ESP32BLETracker final : public Component,
     MONITORING,     // Actively monitoring for timeout
     EXCEEDED_WAIT,  // Timeout exceeded, waiting one loop before reboot
   };
+  ScanTimeoutState scan_timeout_state_{ScanTimeoutState::INACTIVE};
   uint32_t scan_start_time_{0};
   /// Precomputed timeout value: scan_duration_ * 2000
   uint32_t scan_timeout_ms_{0};
-  ScanTimeoutState scan_timeout_state_{ScanTimeoutState::INACTIVE};
 };
 
 // NOLINTNEXTLINE
diff --git a/tests/component_tests/esp32_ble_tracker/config/scan_window_explicit.yaml b/tests/component_tests/esp32_ble_tracker/config/scan_window_explicit.yaml
new file mode 100644
index 0000000000..70760fdea6
--- /dev/null
+++ b/tests/component_tests/esp32_ble_tracker/config/scan_window_explicit.yaml
@@ -0,0 +1,19 @@
+esphome:
+  name: scan-window-explicit
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: MySSID
+
+esp32_ble_tracker:
+  scan_parameters:
+    window: 30ms
+
+bluetooth_proxy:
+  active: true
+
+api:
diff --git a/tests/component_tests/esp32_ble_tracker/config/scan_window_raised.yaml b/tests/component_tests/esp32_ble_tracker/config/scan_window_raised.yaml
new file mode 100644
index 0000000000..4febbfcf3b
--- /dev/null
+++ b/tests/component_tests/esp32_ble_tracker/config/scan_window_raised.yaml
@@ -0,0 +1,17 @@
+esphome:
+  name: scan-window-raised
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: MySSID
+
+esp32_ble_tracker:
+
+bluetooth_proxy:
+  active: true
+
+api:
diff --git a/tests/component_tests/esp32_ble_tracker/config/scan_window_scan_only.yaml b/tests/component_tests/esp32_ble_tracker/config/scan_window_scan_only.yaml
new file mode 100644
index 0000000000..5da5601388
--- /dev/null
+++ b/tests/component_tests/esp32_ble_tracker/config/scan_window_scan_only.yaml
@@ -0,0 +1,12 @@
+esphome:
+  name: scan-window-scan-only
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: MySSID
+
+esp32_ble_tracker:
diff --git a/tests/component_tests/esp32_ble_tracker/config/scan_window_user_set_scan_only.yaml b/tests/component_tests/esp32_ble_tracker/config/scan_window_user_set_scan_only.yaml
new file mode 100644
index 0000000000..2b9093164f
--- /dev/null
+++ b/tests/component_tests/esp32_ble_tracker/config/scan_window_user_set_scan_only.yaml
@@ -0,0 +1,14 @@
+esphome:
+  name: scan-window-user-scan-only
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: MySSID
+
+esp32_ble_tracker:
+  scan_parameters:
+    connection_scan_window: 20ms
diff --git a/tests/component_tests/esp32_ble_tracker/test_scan_window_default.py b/tests/component_tests/esp32_ble_tracker/test_scan_window_default.py
index 8a25f488fa..8612ac6732 100644
--- a/tests/component_tests/esp32_ble_tracker/test_scan_window_default.py
+++ b/tests/component_tests/esp32_ble_tracker/test_scan_window_default.py
@@ -12,11 +12,12 @@ arbiter a full-duty scan would starve wifi, so the 30 ms default is kept.
 from __future__ import annotations
 
 from collections.abc import Callable
+from pathlib import Path
 
 import pytest
 
 from esphome import config_validation as cv
-from esphome.components.ble_device_base import to_ble_units
+from esphome.components.ble_device_base import CONF_CONNECTION_SCAN_WINDOW, to_ble_units
 from esphome.components.const import CONF_SCAN_PARAMETERS, CONF_WINDOW
 from esphome.components.esp32 import KEY_IDF_VERSION
 from esphome.components.esp32_ble_tracker import (
@@ -120,3 +121,103 @@ def test_short_interval_without_window_still_rejected(
     stage_esp32("5.5.5", wifi=True)
     with pytest.raises(cv.Invalid, match="needs to be smaller than scan interval"):
         _scan_params({"scan_parameters": {"interval": "20ms"}})
+
+
+# The connection-time fallback window: while a GATT connection is active the
+# scanner drops from a raised full-duty window back to this value so the
+# connection gets guaranteed airtime.
+
+
+def test_raise_arms_connection_scan_window_default(
+    stage_esp32: Callable[..., None],
+) -> None:
+    stage_esp32("5.5.5", wifi=True)
+    params = _scan_params({})
+    assert params[CONF_WINDOW] == params[CONF_INTERVAL]
+    assert to_ble_units(params[CONF_CONNECTION_SCAN_WINDOW]) == 48
+
+
+def test_user_connection_scan_window_survives_raise(
+    stage_esp32: Callable[..., None],
+) -> None:
+    stage_esp32("5.5.5", wifi=True)
+    params = _scan_params({"scan_parameters": {"connection_scan_window": "60ms"}})
+    assert params[CONF_WINDOW] == params[CONF_INTERVAL]
+    assert to_ble_units(params[CONF_CONNECTION_SCAN_WINDOW]) == 96
+
+
+def test_unraised_window_gets_no_connection_scan_window_default(
+    stage_esp32: Callable[..., None],
+) -> None:
+    stage_esp32("5.5.4", wifi=True)
+    assert CONF_CONNECTION_SCAN_WINDOW not in _scan_params({})
+
+
+def test_connection_scan_window_above_interval_rejected(
+    stage_esp32: Callable[..., None],
+) -> None:
+    stage_esp32("5.5.5", wifi=True)
+    with pytest.raises(
+        cv.Invalid, match="connection_scan_window .* needs to be smaller"
+    ):
+        _scan_params({"scan_parameters": {"connection_scan_window": "400ms"}})
+
+
+def test_connection_scan_window_above_window_rejected(
+    stage_esp32: Callable[..., None],
+) -> None:
+    """A connection window above the (post-raise) window would widen the scan
+    during connections; the reject runs after the raise so a fallback below a
+    raised window still validates (covered by the survives-raise test)."""
+    stage_esp32("5.5.5", wifi=True)
+    with pytest.raises(
+        cv.Invalid, match="connection_scan_window .* needs to be smaller"
+    ):
+        _scan_params(
+            {"scan_parameters": {"window": "30ms", "connection_scan_window": "300ms"}}
+        )
+
+
+def test_connection_scan_window_truncation_collapse_rejected(
+    stage_esp32: Callable[..., None],
+) -> None:
+    """A connection window that truncates into the interval's 0.625 ms unit
+    would silently program a full-duty scan during connections."""
+    stage_esp32("5.5.5", wifi=True)
+    with pytest.raises(cv.Invalid, match="connection_scan_window .* both truncate"):
+        _scan_params(
+            {
+                "scan_parameters": {
+                    "interval": "320.5ms",
+                    "connection_scan_window": "320.2ms",
+                }
+            }
+        )
+
+
+@pytest.mark.parametrize(
+    ("config_file", "window_call", "connection_call", "warns"),
+    [
+        # Raised window with GATT clients: the injected fallback is emitted.
+        ("scan_window_raised.yaml", "set_scan_window(512)", True, False),
+        # Explicit window: nothing injected.
+        ("scan_window_explicit.yaml", "set_scan_window(48)", False, False),
+        # Scan-only build compiles the path out: the injected default is
+        # dropped silently, a user-set value warns.
+        ("scan_window_scan_only.yaml", "set_scan_window(512)", False, False),
+        ("scan_window_user_set_scan_only.yaml", "set_scan_window(512)", False, True),
+    ],
+)
+def test_connection_scan_window_codegen(
+    generate_main: Callable[[str | Path], str],
+    component_config_path: Callable[[str], Path],
+    caplog: pytest.LogCaptureFixture,
+    config_file: str,
+    window_call: str,
+    connection_call: bool,
+    warns: bool,
+) -> None:
+    main_cpp = generate_main(component_config_path(config_file))
+    assert window_call in main_cpp
+    assert ("set_connection_scan_window(48)" in main_cpp) == connection_call
+    assert ("'connection_scan_window' has no effect" in caplog.text) == warns

From 68f3a6b9a56e73ca05e10d7a950e50208b900702 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 24 Aug 2026 09:19:29 +1200
Subject: [PATCH 119/155] Bump version to 2026.8.1

---
 Doxyfile         | 2 +-
 esphome/const.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doxyfile b/Doxyfile
index ed0670621d..3d9a6f7221 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -48,7 +48,7 @@ PROJECT_NAME           = ESPHome
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2026.8.0
+PROJECT_NUMBER         = 2026.8.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/esphome/const.py b/esphome/const.py
index 17ff1e17d9..53da67a4f4 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -4,7 +4,7 @@ from enum import Enum
 
 from esphome.enum import StrEnum
 
-__version__ = "2026.8.0"
+__version__ = "2026.8.1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (

From 76caadc594a7b1988406971ca3b3143f4e789ad5 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <3060199+jesserockz@users.noreply.github.com>
Date: Sun, 23 Aug 2026 18:03:44 -0500
Subject: [PATCH 120/155] [noise] Add shared noise component and move api noise
 primitives (#18490)

---
 CODEOWNERS                                    |   1 +
 esphome/components/api/__init__.py            |  56 ++---
 esphome/components/api/api_connection.cpp     |   4 +-
 .../components/api/api_frame_helper_noise.cpp | 210 +++++-------------
 .../components/api/api_frame_helper_noise.h   |  14 +-
 esphome/components/api/api_noise_context.h    |  37 ---
 esphome/components/api/api_server.cpp         |   2 +-
 esphome/components/api/api_server.h           |  15 +-
 esphome/components/noise/__init__.py          |  69 ++++++
 esphome/components/noise/noise.cpp            |  88 ++++++++
 esphome/components/noise/noise.h              |  74 ++++++
 esphome/components/noise/noise_handshake.cpp  | 139 ++++++++++++
 esphome/components/noise/noise_handshake.h    |  63 ++++++
 esphome/core/defines.h                        |   1 +
 platformio.ini                                |   6 +-
 tests/benchmarks/components/api/__init__.py   |   5 +-
 tests/benchmarks/components/noise/__init__.py |   7 +
 tests/component_tests/noise/__init__.py       |   0
 .../noise/test_encryption_key.py              |  37 +++
 tests/components/noise/__init__.py            |   7 +
 tests/components/noise/common.yaml            |   1 +
 tests/components/noise/test.esp32-idf.yaml    |   2 +
 tests/components/noise/test.esp8266-ard.yaml  |   2 +
 tests/components/noise/test.host.yaml         |   2 +
 tests/components/noise/test.rp2040-ard.yaml   |   2 +
 .../components/noise/test_noise_handshake.cpp | 199 +++++++++++++++++
 .../noise/test_noise_primitives.cpp           |  74 ++++++
 27 files changed, 870 insertions(+), 247 deletions(-)
 delete mode 100644 esphome/components/api/api_noise_context.h
 create mode 100644 esphome/components/noise/__init__.py
 create mode 100644 esphome/components/noise/noise.cpp
 create mode 100644 esphome/components/noise/noise.h
 create mode 100644 esphome/components/noise/noise_handshake.cpp
 create mode 100644 esphome/components/noise/noise_handshake.h
 create mode 100644 tests/benchmarks/components/noise/__init__.py
 create mode 100644 tests/component_tests/noise/__init__.py
 create mode 100644 tests/component_tests/noise/test_encryption_key.py
 create mode 100644 tests/components/noise/__init__.py
 create mode 100644 tests/components/noise/common.yaml
 create mode 100644 tests/components/noise/test.esp32-idf.yaml
 create mode 100644 tests/components/noise/test.esp8266-ard.yaml
 create mode 100644 tests/components/noise/test.host.yaml
 create mode 100644 tests/components/noise/test.rp2040-ard.yaml
 create mode 100644 tests/components/noise/test_noise_handshake.cpp
 create mode 100644 tests/components/noise/test_noise_primitives.cpp

diff --git a/CODEOWNERS b/CODEOWNERS
index 9ddbca5c71..3047072ea2 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -381,6 +381,7 @@ esphome/components/nextion/switch/* @senexcrenshaw
 esphome/components/nextion/text_sensor/* @senexcrenshaw
 esphome/components/nfc/* @jesserockz @kbx81
 esphome/components/noblex/* @AGalfra
+esphome/components/noise/* @esphome/core
 esphome/components/npi19/* @bakerkj
 esphome/components/nrf52/* @tomaszduda23
 esphome/components/number/* @esphome/core
diff --git a/esphome/components/api/__init__.py b/esphome/components/api/__init__.py
index 0dc4b905bf..53ad0fe5d7 100644
--- a/esphome/components/api/__init__.py
+++ b/esphome/components/api/__init__.py
@@ -1,4 +1,3 @@
-import base64
 import logging
 from typing import Any
 
@@ -6,6 +5,15 @@ from esphome import automation
 from esphome.automation import Condition
 import esphome.codegen as cg
 from esphome.components.logger import request_log_listener
+
+# ENCRYPTION_SCHEMA and validate_encryption_key are re-exported for external
+# components and downstream consumers that import them from api
+from esphome.components.noise import (  # noqa: F401
+    ENCRYPTION_SCHEMA,
+    decode_encryption_key,
+    encryption_schema,
+    validate_encryption_key,
+)
 from esphome.config_helpers import get_logger_level
 import esphome.config_validation as cv
 from esphome.const import (
@@ -38,6 +46,10 @@ from esphome.core import CORE, ID, CoroPriority, EsphomeError, coroutine_with_pr
 from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigFragmentType, ConfigType
 
+# Compat alias: downstream consumers (e.g. device-builder) referenced the
+# schema by its old private name before it moved to the noise component
+_encryption_schema = encryption_schema
+
 _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = "api"
@@ -46,9 +58,15 @@ CODEOWNERS = ["@esphome/core"]
 
 
 def AUTO_LOAD(config: ConfigType) -> list[str]:
-    """Conditionally auto-load json only when capture_response is used."""
+    """Conditionally auto-load noise (encryption) and json (capture_response)."""
     base = ["socket"]
 
+    # A falsy config is a tooling probe for the maximal set (None from
+    # dependency resolution, {} from the components-graph platform probe);
+    # a validated config always carries defaults, never empty
+    if not config or CONF_ENCRYPTION in config:
+        base = base + ["noise"]
+
     # Check if any homeassistant.action/homeassistant.service has capture_response: true
     # This flag is set during config validation in _validate_response_config
     if not config or CORE.data.get(DOMAIN, {}).get(CONF_CAPTURE_RESPONSE, False):
@@ -130,20 +148,6 @@ def _register_provisioning_source(config: ConfigType) -> ConfigType:
     return config
 
 
-def validate_encryption_key(value: Any) -> str:
-    value = cv.string_strict(value)
-    try:
-        decoded = base64.b64decode(value, validate=True)
-    except ValueError as err:
-        raise cv.Invalid("Invalid key format, please check it's using base64") from err
-
-    if len(decoded) != 32:
-        raise cv.Invalid("Encryption key must be base64 and 32 bytes long")
-
-    # Return original data for roundtrip conversion
-    return value
-
-
 CONF_SUPPORTS_RESPONSE = "supports_response"
 
 # Enum values in api::enums namespace
@@ -250,18 +254,6 @@ ACTIONS_SCHEMA = automation.validate_automation(
     ),
 )
 
-ENCRYPTION_SCHEMA = cv.Schema(
-    {
-        cv.Optional(CONF_KEY): cv.sensitive(validate_encryption_key),
-    }
-)
-
-
-def _encryption_schema(config: ConfigType | None) -> ConfigType:
-    if config is None:
-        config = {}
-    return ENCRYPTION_SCHEMA(config)
-
 
 def _consume_api_sockets(config: ConfigType) -> ConfigType:
     """Register socket needs for API component."""
@@ -297,7 +289,7 @@ CONFIG_SCHEMA = cv.All(
                 CONF_SERVICES, group_of_exclusion=CONF_ACTIONS
             ): ACTIONS_SCHEMA,
             cv.Exclusive(CONF_ACTIONS, group_of_exclusion=CONF_ACTIONS): ACTIONS_SCHEMA,
-            cv.Optional(CONF_ENCRYPTION): _encryption_schema,
+            cv.Optional(CONF_ENCRYPTION): encryption_schema,
             cv.Optional(CONF_BATCH_DELAY, default="100ms"): cv.All(
                 cv.positive_time_period_milliseconds,
                 cv.Range(max=cv.TimePeriod(milliseconds=65535)),
@@ -484,7 +476,7 @@ async def to_code(config: ConfigType) -> None:
 
     if (encryption_config := config.get(CONF_ENCRYPTION, None)) is not None:
         if key := encryption_config.get(CONF_KEY):
-            decoded = base64.b64decode(key)
+            decoded = decode_encryption_key(key)
             cg.add(var.set_noise_psk(list(decoded)))
             cg.add_define("USE_API_NOISE_PSK_FROM_YAML")
         else:
@@ -498,10 +490,6 @@ async def to_code(config: ConfigType) -> None:
             # and plaintext disabled. Only a factory reset can remove it.
             cg.add_define("USE_API_PLAINTEXT")
         cg.add_define("USE_API_NOISE")
-        cg.add_library("esphome/noise-c", "0.1.21")
-        # Enable optimized memzero/memcmp in libsodium instead of volatile byte loops
-        cg.add_build_flag("-DHAVE_WEAK_SYMBOLS=1")
-        cg.add_build_flag("-DHAVE_INLINE_ASM=1")
     else:
         cg.add_define("USE_API_PLAINTEXT")
 
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index c1dded1271..91d13eed65 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -2130,7 +2130,7 @@ bool APIConnection::send_noise_encryption_set_key_response_(const NoiseEncryptio
   }
 #endif
 
-  psk_t psk{};
+  noise::psk_t psk{};
   if (msg.key_len == 0) {
     if (this->parent_->clear_noise_psk(true)) {
       resp.success = true;
@@ -2139,7 +2139,7 @@ bool APIConnection::send_noise_encryption_set_key_response_(const NoiseEncryptio
     }
   } else if (base64_decode(msg.key, msg.key_len, psk.data(), psk.size()) != psk.size()) {
     ESP_LOGW(TAG, "Invalid encryption key length");
-  } else if (APINoiseContext::is_all_zeros(psk)) {
+  } else if (noise::NoiseContext::is_all_zeros(psk)) {
     // Accepting the reserved provisioning PSK would report success without
     // enabling encryption (or silently clear an existing key)
     ESP_LOGW(TAG, "Rejecting all-zero encryption key");
diff --git a/esphome/components/api/api_frame_helper_noise.cpp b/esphome/components/api/api_frame_helper_noise.cpp
index 09e3ca2b9e..d7554e62c5 100644
--- a/esphome/components/api/api_frame_helper_noise.cpp
+++ b/esphome/components/api/api_frame_helper_noise.cpp
@@ -2,9 +2,9 @@
 #ifdef USE_API
 #ifdef USE_API_NOISE
 #include "api_connection.h"  // For ClientInfo struct
+#include "esphome/components/noise/noise.h"
 #include "esphome/core/application.h"
 #include "esphome/core/entity_base.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "proto.h"
@@ -17,6 +17,14 @@
 
 namespace esphome::api {
 
+using noise::noise_err_to_logstr;
+
+// api_frame_helper.h keeps its own MAX_HANDSHAKE_SIZE because that header is
+// also compiled in plaintext-only builds without the noise component; keep
+// the two definitions from drifting apart.
+static_assert(MAX_HANDSHAKE_SIZE == noise::MAX_HANDSHAKE_SIZE,
+              "api and noise component handshake size limits must match");
+
 static const char *const TAG = "api.noise";
 #ifdef USE_ESP8266
 static constexpr char PROLOGUE_INIT[] PROGMEM = "NoiseAPIInit";
@@ -51,45 +59,6 @@ static constexpr size_t API_MAX_LOG_BYTES = 168;
 #define LOG_PACKET_RECEIVED(buffer) ((void) 0)
 #endif
 
-/// Convert a noise error code to a readable error
-const LogString *noise_err_to_logstr(int err) {
-  if (err == NOISE_ERROR_NO_MEMORY)
-    return LOG_STR("NO_MEMORY");
-  if (err == NOISE_ERROR_UNKNOWN_ID)
-    return LOG_STR("UNKNOWN_ID");
-  if (err == NOISE_ERROR_UNKNOWN_NAME)
-    return LOG_STR("UNKNOWN_NAME");
-  if (err == NOISE_ERROR_MAC_FAILURE)
-    return LOG_STR("MAC_FAILURE");
-  if (err == NOISE_ERROR_NOT_APPLICABLE)
-    return LOG_STR("NOT_APPLICABLE");
-  if (err == NOISE_ERROR_SYSTEM)
-    return LOG_STR("SYSTEM");
-  if (err == NOISE_ERROR_REMOTE_KEY_REQUIRED)
-    return LOG_STR("REMOTE_KEY_REQUIRED");
-  if (err == NOISE_ERROR_LOCAL_KEY_REQUIRED)
-    return LOG_STR("LOCAL_KEY_REQUIRED");
-  if (err == NOISE_ERROR_PSK_REQUIRED)
-    return LOG_STR("PSK_REQUIRED");
-  if (err == NOISE_ERROR_INVALID_LENGTH)
-    return LOG_STR("INVALID_LENGTH");
-  if (err == NOISE_ERROR_INVALID_PARAM)
-    return LOG_STR("INVALID_PARAM");
-  if (err == NOISE_ERROR_INVALID_STATE)
-    return LOG_STR("INVALID_STATE");
-  if (err == NOISE_ERROR_INVALID_NONCE)
-    return LOG_STR("INVALID_NONCE");
-  if (err == NOISE_ERROR_INVALID_PRIVATE_KEY)
-    return LOG_STR("INVALID_PRIVATE_KEY");
-  if (err == NOISE_ERROR_INVALID_PUBLIC_KEY)
-    return LOG_STR("INVALID_PUBLIC_KEY");
-  if (err == NOISE_ERROR_INVALID_FORMAT)
-    return LOG_STR("INVALID_FORMAT");
-  if (err == NOISE_ERROR_INVALID_SIGNATURE)
-    return LOG_STR("INVALID_SIGNATURE");
-  return LOG_STR("UNKNOWN");
-}
-
 /// Initialize the frame helper, returns OK if successful.
 APIError APINoiseFrameHelper::init() {
   APIError err = init_common_();
@@ -194,9 +163,9 @@ APIError APINoiseFrameHelper::loop() {
  */
 APIError APINoiseFrameHelper::try_read_frame_() {
   // read header
-  if (rx_header_buf_len_ < 3) {
+  if (rx_header_buf_len_ < noise::FRAME_HEADER_SIZE) {
     // no header information yet
-    uint8_t to_read = 3 - rx_header_buf_len_;
+    uint8_t to_read = static_cast<uint8_t>(noise::FRAME_HEADER_SIZE) - rx_header_buf_len_;
     ssize_t received = this->socket_->read(&rx_header_buf_[rx_header_buf_len_], to_read);
     APIError err = handle_socket_read_result_(received);
     if (err != APIError::OK) {
@@ -208,7 +177,7 @@ APIError APINoiseFrameHelper::try_read_frame_() {
       return APIError::WOULD_BLOCK;
     }
 
-    if (rx_header_buf_[0] != 0x01) {
+    if (rx_header_buf_[0] != noise::FRAME_INDICATOR) {
       state_ = State::FAILED;
       HELPER_LOG("Bad indicator byte %u", rx_header_buf_[0]);
       return APIError::BAD_INDICATOR;
@@ -348,15 +317,15 @@ APIError APINoiseFrameHelper::state_action_server_hello_() {
   return APIError::OK;
 }
 APIError APINoiseFrameHelper::state_action_handshake_() {
-  int action = noise_handshakestate_get_action(this->handshake_);
-  if (action == NOISE_ACTION_READ_MESSAGE) {
+  noise::NoiseResponderHandshake::Action action = this->handshake_.action();
+  if (action == noise::NoiseResponderHandshake::Action::ACTION_READ) {
     return this->state_action_handshake_read_();
-  } else if (action == NOISE_ACTION_WRITE_MESSAGE) {
+  } else if (action == noise::NoiseResponderHandshake::Action::ACTION_WRITE) {
     return this->state_action_handshake_write_();
   }
   // bad state for action
   this->state_ = State::FAILED;
-  HELPER_LOG("Bad action for handshake: %d", action);
+  HELPER_LOG("Bad action for handshake: %d", (int) action);
   return APIError::HANDSHAKESTATE_BAD_STATE;
 }
 APIError APINoiseFrameHelper::state_action_handshake_read_() {
@@ -368,20 +337,16 @@ APIError APINoiseFrameHelper::state_action_handshake_read_() {
   if (this->rx_buf_.empty()) {
     this->send_explicit_handshake_reject_(LOG_STR("Empty handshake message"));
     return APIError::BAD_HANDSHAKE_ERROR_BYTE;
-  } else if (this->rx_buf_[0] != 0x00) {
+  } else if (this->rx_buf_[0] != noise::HANDSHAKE_STATUS_OK) {
     HELPER_LOG("Bad handshake error byte: %u", this->rx_buf_[0]);
     this->send_explicit_handshake_reject_(LOG_STR("Bad handshake error byte"));
     return APIError::BAD_HANDSHAKE_ERROR_BYTE;
   }
 
-  NoiseBuffer mbuf;
-  noise_buffer_init(mbuf);
-  noise_buffer_set_input(mbuf, this->rx_buf_.data() + 1, this->rx_buf_.size() - 1);
-  int err = noise_handshakestate_read_message(this->handshake_, &mbuf, nullptr);
+  int err = this->handshake_.read_message(this->rx_buf_.data() + 1, this->rx_buf_.size() - 1);
   if (err != 0) {
     // Special handling for MAC failure
-    this->send_explicit_handshake_reject_(err == NOISE_ERROR_MAC_FAILURE ? LOG_STR("Handshake MAC failure")
-                                                                         : LOG_STR("Handshake error"));
+    this->send_explicit_handshake_reject_(noise::reject_reason_for(err));
     return this->handle_noise_error_(err, LOG_STR("noise_handshakestate_read_message"),
                                      APIError::HANDSHAKESTATE_READ_FAILED);
   }
@@ -390,18 +355,16 @@ APIError APINoiseFrameHelper::state_action_handshake_read_() {
 }
 APIError APINoiseFrameHelper::state_action_handshake_write_() {
   uint8_t buffer[65];
-  NoiseBuffer mbuf;
-  noise_buffer_init(mbuf);
-  noise_buffer_set_output(mbuf, buffer + 1, sizeof(buffer) - 1);
+  size_t msg_len = 0;
 
-  int err = noise_handshakestate_write_message(this->handshake_, &mbuf, nullptr);
+  int err = this->handshake_.write_message(buffer + 1, sizeof(buffer) - 1, msg_len);
   APIError aerr = this->handle_noise_error_(err, LOG_STR("noise_handshakestate_write_message"),
                                             APIError::HANDSHAKESTATE_WRITE_FAILED);
   if (aerr != APIError::OK)
     return aerr;
-  buffer[0] = 0x00;  // success
+  buffer[0] = noise::HANDSHAKE_STATUS_OK;
 
-  aerr = this->write_frame_(buffer, mbuf.size + 1);
+  aerr = this->write_frame_(buffer, msg_len + 1);
   if (aerr != APIError::OK)
     return aerr;
   return this->check_handshake_finished_();
@@ -409,33 +372,22 @@ APIError APINoiseFrameHelper::state_action_handshake_write_() {
 void APINoiseFrameHelper::send_explicit_handshake_reject_(const LogString *reason) {
   // Max reject message: "Bad handshake packet len" (24) + 1 (failure byte) = 25 bytes
   uint8_t data[32];
-  data[0] = 0x01;  // failure
-
-#ifdef USE_STORE_LOG_STR_IN_FLASH
-  // On ESP8266 with flash strings, we need to use PROGMEM-aware functions
-  size_t reason_len = strlen_P(reinterpret_cast<PGM_P>(reason));
-  reason_len = std::min(reason_len, sizeof(data) - 1);
-  if (reason_len > 0) {
-    memcpy_P(data + 1, reinterpret_cast<PGM_P>(reason), reason_len);
-  }
-#else
-  // Normal memory access
-  const char *reason_str = LOG_STR_ARG(reason);
-  size_t reason_len = strlen(reason_str);
-  reason_len = std::min(reason_len, sizeof(data) - 1);
-  if (reason_len > 0) {
-    // NOLINTNEXTLINE(bugprone-not-null-terminated-result) - binary protocol, not a C string
-    std::memcpy(data + 1, reason_str, reason_len);
-  }
-#endif
-
-  size_t data_size = reason_len + 1;
+  static_assert(sizeof(data) >= noise::MAC_FAILURE_PAYLOAD_SIZE,
+                "reject buffer must fit the MAC failure wire contract");
+  size_t data_size = noise::format_reject_payload(data, sizeof(data), reason);
 
   // temporarily remove failed state
   auto orig_state = state_;
   state_ = State::EXPLICIT_REJECT;
-  write_frame_(data, data_size);
-  state_ = orig_state;
+  APIError aerr = write_frame_(data, data_size);
+  if (aerr != APIError::OK) {
+    // Best effort; the reject reason is a diagnosis aid, not a protocol step
+    ESP_LOGW(TAG, "Sending handshake reject failed: %d", (int) aerr);
+  }
+  if (state_ == State::EXPLICIT_REJECT) {
+    // write_frame_ may have moved the state to FAILED; keep that decision
+    state_ = orig_state;
+  }
 }
 APIError APINoiseFrameHelper::read_packet(ReadPacketBuffer *buffer) {
   APIError aerr = this->check_data_state_();
@@ -492,12 +444,10 @@ APIError APINoiseFrameHelper::read_packet(ReadPacketBuffer *buffer) {
 // Returns APIError::OK on success.
 APIError APINoiseFrameHelper::encrypt_noise_message_(uint8_t *buf_start, uint16_t payload_size, uint8_t message_type,
                                                      uint16_t &encrypted_len_out) {
-  // Write noise header
-  buf_start[0] = 0x01;  // indicator
-  // buf_start[1], buf_start[2] to be set after encryption
+  // The noise frame header is written after encryption, when the size is known
 
   // Write message header (to be encrypted)
-  constexpr uint8_t msg_offset = 3;
+  constexpr uint8_t msg_offset = noise::FRAME_HEADER_SIZE;
   buf_start[msg_offset] = static_cast<uint8_t>(message_type >> 8);      // type high byte
   buf_start[msg_offset + 1] = static_cast<uint8_t>(message_type);       // type low byte
   buf_start[msg_offset + 2] = static_cast<uint8_t>(payload_size >> 8);  // data_len high byte
@@ -515,11 +465,10 @@ APIError APINoiseFrameHelper::encrypt_noise_message_(uint8_t *buf_start, uint16_
   if (aerr != APIError::OK)
     return aerr;
 
-  // Fill in the encrypted size
-  buf_start[1] = static_cast<uint8_t>(mbuf.size >> 8);
-  buf_start[2] = static_cast<uint8_t>(mbuf.size);
+  // Fill in the frame header now that the encrypted size is known
+  noise::write_frame_header(buf_start, static_cast<uint16_t>(mbuf.size));
 
-  encrypted_len_out = static_cast<uint16_t>(3 + mbuf.size);  // indicator + size + encrypted data
+  encrypted_len_out = static_cast<uint16_t>(noise::FRAME_HEADER_SIZE + mbuf.size);
   return APIError::OK;
 }
 
@@ -568,21 +517,19 @@ APIError APINoiseFrameHelper::write_protobuf_messages(ProtoWriteBuffer buffer, s
 }
 
 APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, uint16_t len) {
-  uint8_t header[3];
-  header[0] = 0x01;  // indicator
-  header[1] = (uint8_t) (len >> 8);
-  header[2] = (uint8_t) len;
+  uint8_t header[noise::FRAME_HEADER_SIZE];
+  noise::write_frame_header(header, len);
 
   if (len == 0) {
-    return this->write_raw_buf_(header, 3);
+    return this->write_raw_buf_(header, noise::FRAME_HEADER_SIZE);
   }
   struct iovec iov[2];
   iov[0].iov_base = header;
-  iov[0].iov_len = 3;
+  iov[0].iov_len = noise::FRAME_HEADER_SIZE;
   iov[1].iov_base = const_cast<uint8_t *>(data);
   iov[1].iov_len = len;
 
-  return this->write_raw_iov_(iov, 2, 3 + len);
+  return this->write_raw_iov_(iov, 2, noise::FRAME_HEADER_SIZE + len);
 }
 
 /** Initiate the data structures for the handshake.
@@ -590,45 +537,12 @@ APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, uint16_t len) {
  * @return 0 on success, -1 on error (check errno)
  */
 APIError APINoiseFrameHelper::init_handshake_() {
-  int err;
-  // Noise_NNpsk0_25519_ChaChaPoly_SHA256, built on the stack:
-  // noise_handshakestate_new_by_id copies it, so a member would waste
-  // 104 bytes per connection, and a static const would sit in RAM on
-  // ESP8266 (.rodata is DRAM there).
-  const NoiseProtocolId nid = {
-      .prefix_id = NOISE_PREFIX_STANDARD,
-      .pattern_id = NOISE_PATTERN_NN,
-      .modifier_ids = {NOISE_MODIFIER_PSK0},
-      .dh_id = NOISE_DH_CURVE25519,
-      .cipher_id = NOISE_CIPHER_CHACHAPOLY,
-      .hash_id = NOISE_HASH_SHA256,
-      .hybrid_id = NOISE_DH_NONE,
-  };
-
-  err = noise_handshakestate_new_by_id(&handshake_, &nid, NOISE_ROLE_RESPONDER);
-  APIError aerr =
-      handle_noise_error_(err, LOG_STR("noise_handshakestate_new_by_id"), APIError::HANDSHAKESTATE_SETUP_FAILED);
+  int err = this->handshake_.init(this->ctx_.get_psk(), prologue_.data(), prologue_.size());
+  APIError aerr = handle_noise_error_(err, LOG_STR("noise_handshake_init"), APIError::HANDSHAKESTATE_SETUP_FAILED);
   if (aerr != APIError::OK)
     return aerr;
-
-  const auto &psk = this->ctx_.get_psk();
-  err = noise_handshakestate_set_pre_shared_key(handshake_, psk.data(), psk.size());
-  aerr = handle_noise_error_(err, LOG_STR("noise_handshakestate_set_pre_shared_key"),
-                             APIError::HANDSHAKESTATE_SETUP_FAILED);
-  if (aerr != APIError::OK)
-    return aerr;
-
-  err = noise_handshakestate_set_prologue(handshake_, prologue_.data(), prologue_.size());
-  aerr = handle_noise_error_(err, LOG_STR("noise_handshakestate_set_prologue"), APIError::HANDSHAKESTATE_SETUP_FAILED);
-  if (aerr != APIError::OK)
-    return aerr;
-  // set_prologue copies it into handshakestate, so we can get rid of it now
+  // init copies the prologue into the handshakestate, so we can get rid of it now
   prologue_.release();
-
-  err = noise_handshakestate_start(handshake_);
-  aerr = handle_noise_error_(err, LOG_STR("noise_handshakestate_start"), APIError::HANDSHAKESTATE_SETUP_FAILED);
-  if (aerr != APIError::OK)
-    return aerr;
   return APIError::OK;
 }
 
@@ -637,15 +551,17 @@ APIError APINoiseFrameHelper::check_handshake_finished_() {
   assert(state_ == State::HANDSHAKE);
 #endif
 
-  int action = noise_handshakestate_get_action(handshake_);
-  if (action == NOISE_ACTION_READ_MESSAGE || action == NOISE_ACTION_WRITE_MESSAGE)
+  noise::NoiseResponderHandshake::Action action = this->handshake_.action();
+  if (action == noise::NoiseResponderHandshake::Action::ACTION_READ ||
+      action == noise::NoiseResponderHandshake::Action::ACTION_WRITE)
     return APIError::OK;
-  if (action != NOISE_ACTION_SPLIT) {
+  if (action != noise::NoiseResponderHandshake::Action::ACTION_SPLIT) {
     state_ = State::FAILED;
-    HELPER_LOG("Bad action for handshake: %d", action);
+    HELPER_LOG("Bad action for handshake: %d", (int) action);
     return APIError::HANDSHAKESTATE_BAD_STATE;
   }
-  int err = noise_handshakestate_split(handshake_, &send_cipher_, &recv_cipher_);
+  // split() also frees the handshake state
+  int err = this->handshake_.split(send_cipher_, recv_cipher_);
   APIError aerr =
       handle_noise_error_(err, LOG_STR("noise_handshakestate_split"), APIError::HANDSHAKESTATE_SPLIT_FAILED);
   if (aerr != APIError::OK)
@@ -654,17 +570,11 @@ APIError APINoiseFrameHelper::check_handshake_finished_() {
   this->frame_footer_size_ = noise_cipherstate_get_mac_length(send_cipher_);
 
   HELPER_LOG("Handshake complete!");
-  noise_handshakestate_free(handshake_);
-  handshake_ = nullptr;
   state_ = State::DATA;
   return APIError::OK;
 }
 
 APINoiseFrameHelper::~APINoiseFrameHelper() {
-  if (handshake_ != nullptr) {
-    noise_handshakestate_free(handshake_);
-    handshake_ = nullptr;
-  }
   if (send_cipher_ != nullptr) {
     noise_cipherstate_free(send_cipher_);
     send_cipher_ = nullptr;
@@ -675,16 +585,6 @@ APINoiseFrameHelper::~APINoiseFrameHelper() {
   }
 }
 
-extern "C" {
-// declare how noise generates random bytes (here with a good HWRNG based on the RF system)
-void noise_rand_bytes(void *output, size_t len) {
-  if (!esphome::random_bytes(reinterpret_cast<uint8_t *>(output), len)) {
-    ESP_LOGE(TAG, "Acquiring random bytes failed; rebooting");
-    arch_restart();
-  }
-}
-}
-
 }  // namespace esphome::api
 #endif  // USE_API_NOISE
 #endif  // USE_API
diff --git a/esphome/components/api/api_frame_helper_noise.h b/esphome/components/api/api_frame_helper_noise.h
index 46bd366672..05060c77de 100644
--- a/esphome/components/api/api_frame_helper_noise.h
+++ b/esphome/components/api/api_frame_helper_noise.h
@@ -3,7 +3,7 @@
 #ifdef USE_API
 #ifdef USE_API_NOISE
 #include "noise/protocol.h"
-#include "api_noise_context.h"
+#include "esphome/components/noise/noise_handshake.h"
 
 namespace esphome::api {
 
@@ -14,9 +14,9 @@ class APINoiseFrameHelper final : public APIFrameHelper {
   // Pos 1-2: encrypted payload size (16-bit big-endian)
   // Pos 3-6: encrypted type (16-bit) + data_len (16-bit)
   // Pos 7+: actual payload data
-  static constexpr uint8_t HEADER_PADDING = 1 + 2 + 2 + 2;  // indicator + size + type + data_len
+  static constexpr uint8_t HEADER_PADDING = noise::FRAME_HEADER_SIZE + 2 + 2;  // frame header + type + data_len
 
-  APINoiseFrameHelper(std::unique_ptr<socket::Socket> socket, APINoiseContext &ctx)
+  APINoiseFrameHelper(std::unique_ptr<socket::Socket> socket, noise::NoiseContext &ctx)
       : APIFrameHelper(std::move(socket)), ctx_(ctx) {
     frame_header_padding_ = HEADER_PADDING;
   }
@@ -52,13 +52,13 @@ class APINoiseFrameHelper final : public APIFrameHelper {
   APIError handle_handshake_frame_error_(APIError aerr);
   APIError handle_noise_error_(int err, const LogString *func_name, APIError api_err);
 
-  // Pointers first (4 bytes each)
-  NoiseHandshakeState *handshake_{nullptr};
+  // Pointers first (4 bytes each; the handshake wrapper holds one pointer)
+  noise::NoiseResponderHandshake handshake_;
   NoiseCipherState *send_cipher_{nullptr};
   NoiseCipherState *recv_cipher_{nullptr};
 
   // Reference to noise context (4 bytes on 32-bit)
-  APINoiseContext &ctx_;
+  noise::NoiseContext &ctx_;
 
   // Buffer for noise handshake prologue (released after handshake)
   APIBuffer prologue_;
@@ -67,7 +67,7 @@ class APINoiseFrameHelper final : public APIFrameHelper {
   // Fixed-size header buffer for noise protocol:
   // 1 byte for indicator + 2 bytes for message size (16-bit value, not varint)
   // Note: Maximum message size is UINT16_MAX (65535), with a limit of 128 bytes during handshake phase
-  uint8_t rx_header_buf_[3];
+  uint8_t rx_header_buf_[noise::FRAME_HEADER_SIZE];
   uint8_t rx_header_buf_len_ = 0;
   // 4 bytes total, no padding
 };
diff --git a/esphome/components/api/api_noise_context.h b/esphome/components/api/api_noise_context.h
deleted file mode 100644
index 44484ffa2c..0000000000
--- a/esphome/components/api/api_noise_context.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-#include <array>
-#include <cstdint>
-#include "esphome/core/defines.h"
-
-namespace esphome::api {
-
-#ifdef USE_API_NOISE
-using psk_t = std::array<uint8_t, 32>;
-
-class APINoiseContext {
- public:
-  // The all-zeros PSK is reserved: it marks the device as unprovisioned and
-  // doubles as the well-known provisioning PSK that unprovisioned devices
-  // accept for Noise handshakes (passive-sniffing protection only, no
-  // authentication). It is never a valid real key.
-  static bool is_all_zeros(const psk_t &psk) {
-    uint8_t acc = 0;
-    for (uint8_t b : psk) {
-      acc |= b;
-    }
-    return acc == 0;
-  }
-  void set_psk(psk_t psk) {
-    this->psk_ = psk;
-    this->has_psk_ = !is_all_zeros(psk);
-  }
-  const psk_t &get_psk() const { return this->psk_; }
-  bool has_psk() const { return this->has_psk_; }
-
- protected:
-  psk_t psk_{};
-  bool has_psk_{false};
-};
-#endif  // USE_API_NOISE
-
-}  // namespace esphome::api
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 2d5f9e4155..751f2e4c3b 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -588,7 +588,7 @@ bool APIServer::load_and_apply_noise_psk_() {
   return true;
 }
 
-bool APIServer::save_noise_psk(psk_t psk, bool make_active) {
+bool APIServer::save_noise_psk(noise::psk_t psk, bool make_active) {
 #ifdef USE_API_NOISE_PSK_FROM_YAML
   // When PSK is set from YAML, this function should never be called
   // but if it is, reject the change
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index a58e42534b..072a583901 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -5,7 +5,10 @@
 #include "api_buffer.h"
 // Must precede clients_ so APIConnection is complete for default_delete (libc++).
 #include "api_connection.h"
-#include "api_noise_context.h"
+#ifdef USE_API_NOISE
+// Only present in the build when the noise component is loaded
+#include "esphome/components/noise/noise.h"
+#endif
 #include "api_pb2.h"
 #include "api_pb2_service.h"
 #include "esphome/components/socket/socket.h"
@@ -37,7 +40,7 @@ class UserServiceDescriptor;
 
 #ifdef USE_API_NOISE
 struct SavedNoisePsk {
-  psk_t psk;
+  noise::psk_t psk;
 } PACKED;  // NOLINT
 #endif
 
@@ -73,10 +76,10 @@ class APIServer final : public Component,
   APIBuffer &get_shared_buffer_ref() { return shared_write_buffer_; }
 
 #ifdef USE_API_NOISE
-  bool save_noise_psk(psk_t psk, bool make_active = true);
+  bool save_noise_psk(noise::psk_t psk, bool make_active = true);
   bool clear_noise_psk(bool make_active = true);
-  void set_noise_psk(psk_t psk) { this->noise_ctx_.set_psk(psk); }
-  APINoiseContext &get_noise_ctx() { return this->noise_ctx_; }
+  void set_noise_psk(noise::psk_t psk) { this->noise_ctx_.set_psk(psk); }
+  noise::NoiseContext &get_noise_ctx() { return this->noise_ctx_; }
 #endif  // USE_API_NOISE
 
   void handle_disconnect(APIConnection *conn);
@@ -354,7 +357,7 @@ class APIServer final : public Component,
 #endif
 
 #ifdef USE_API_NOISE
-  APINoiseContext noise_ctx_;
+  noise::NoiseContext noise_ctx_;
   ESPPreferenceObject noise_pref_;
 #endif  // USE_API_NOISE
 };
diff --git a/esphome/components/noise/__init__.py b/esphome/components/noise/__init__.py
new file mode 100644
index 0000000000..e5fcc94332
--- /dev/null
+++ b/esphome/components/noise/__init__.py
@@ -0,0 +1,69 @@
+import base64
+import binascii
+from typing import Any
+
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.const import CONF_KEY
+from esphome.types import ConfigType
+
+CODEOWNERS = ["@esphome/core"]
+
+noise_ns = cg.esphome_ns.namespace("noise")
+
+CONFIG_SCHEMA = cv.Schema({})
+
+
+def validate_encryption_key(value: Any) -> str:
+    value = cv.string_strict(value)
+    try:
+        decoded = base64.b64decode(value, validate=True)
+    except ValueError as err:
+        raise cv.Invalid("Invalid key format, please check it's using base64") from err
+
+    if len(decoded) != 32:
+        raise cv.Invalid("Encryption key must be base64 and 32 bytes long")
+
+    # Return original data for roundtrip conversion
+    return value
+
+
+def decode_encryption_key(value: str) -> bytes:
+    """Decode a base64 encryption key to its 32 raw bytes.
+
+    a2b_base64 matches the decode the clients use (aioesphomeapi
+    decode_noise_psk), so both ends derive the same bytes. The length is
+    re-checked so a caller cannot turn an unvalidated short decode into a
+    zero-padded PSK.
+    """
+    try:
+        decoded = binascii.a2b_base64(value)
+    except ValueError as err:
+        raise cv.Invalid("Invalid key format, please check it's using base64") from err
+    if len(decoded) != 32:
+        raise cv.Invalid("Encryption key must be base64 and 32 bytes long")
+    return decoded
+
+
+ENCRYPTION_SCHEMA = cv.Schema(
+    {
+        cv.Optional(CONF_KEY): cv.sensitive(validate_encryption_key),
+    }
+)
+
+
+def encryption_schema(config: ConfigType | None) -> ConfigType:
+    # A bare `encryption:` block is valid; a missing key means the consumer
+    # falls back to its keyless behavior (api provisioning, ota inheriting
+    # the api key).
+    if config is None:
+        config = {}
+    return ENCRYPTION_SCHEMA(config)
+
+
+async def to_code(config: ConfigType) -> None:
+    cg.add_define("USE_NOISE")
+    cg.add_library("esphome/noise-c", "0.1.21")
+    # Enable optimized memzero/memcmp in libsodium instead of volatile byte loops
+    cg.add_build_flag("-DHAVE_WEAK_SYMBOLS=1")
+    cg.add_build_flag("-DHAVE_INLINE_ASM=1")
diff --git a/esphome/components/noise/noise.cpp b/esphome/components/noise/noise.cpp
new file mode 100644
index 0000000000..95fab322db
--- /dev/null
+++ b/esphome/components/noise/noise.cpp
@@ -0,0 +1,88 @@
+#include "noise.h"
+#ifdef USE_NOISE
+#include "esphome/core/log.h"
+
+#include <algorithm>
+#include <cstring>
+
+#include <noise/protocol.h>
+
+#ifdef USE_ESP8266
+#include <pgmspace.h>
+#endif
+
+namespace esphome::noise {
+
+static const char *const TAG = "noise";
+
+const LogString *noise_err_to_logstr(int err) {
+  if (err == NOISE_ERROR_NO_MEMORY)
+    return LOG_STR("NO_MEMORY");
+  if (err == NOISE_ERROR_UNKNOWN_ID)
+    return LOG_STR("UNKNOWN_ID");
+  if (err == NOISE_ERROR_UNKNOWN_NAME)
+    return LOG_STR("UNKNOWN_NAME");
+  if (err == NOISE_ERROR_MAC_FAILURE)
+    return LOG_STR("MAC_FAILURE");
+  if (err == NOISE_ERROR_NOT_APPLICABLE)
+    return LOG_STR("NOT_APPLICABLE");
+  if (err == NOISE_ERROR_SYSTEM)
+    return LOG_STR("SYSTEM");
+  if (err == NOISE_ERROR_REMOTE_KEY_REQUIRED)
+    return LOG_STR("REMOTE_KEY_REQUIRED");
+  if (err == NOISE_ERROR_LOCAL_KEY_REQUIRED)
+    return LOG_STR("LOCAL_KEY_REQUIRED");
+  if (err == NOISE_ERROR_PSK_REQUIRED)
+    return LOG_STR("PSK_REQUIRED");
+  if (err == NOISE_ERROR_INVALID_LENGTH)
+    return LOG_STR("INVALID_LENGTH");
+  if (err == NOISE_ERROR_INVALID_PARAM)
+    return LOG_STR("INVALID_PARAM");
+  if (err == NOISE_ERROR_INVALID_STATE)
+    return LOG_STR("INVALID_STATE");
+  if (err == NOISE_ERROR_INVALID_NONCE)
+    return LOG_STR("INVALID_NONCE");
+  if (err == NOISE_ERROR_INVALID_PRIVATE_KEY)
+    return LOG_STR("INVALID_PRIVATE_KEY");
+  if (err == NOISE_ERROR_INVALID_PUBLIC_KEY)
+    return LOG_STR("INVALID_PUBLIC_KEY");
+  if (err == NOISE_ERROR_INVALID_FORMAT)
+    return LOG_STR("INVALID_FORMAT");
+  if (err == NOISE_ERROR_INVALID_SIGNATURE)
+    return LOG_STR("INVALID_SIGNATURE");
+  return LOG_STR("UNKNOWN");
+}
+
+const LogString *reject_reason_for(int err) {
+  return err == NOISE_ERROR_MAC_FAILURE ? LOG_STR("Handshake MAC failure") : LOG_STR("Handshake error");
+}
+
+size_t format_reject_payload(uint8_t *buf, size_t capacity, const LogString *reason) {
+  if (capacity == 0) {
+    // A caller bug; the MAC_FAILURE_PAYLOAD_SIZE static_asserts at the call
+    // sites make this unreachable, kept as cheap memory safety
+    ESP_LOGVV(TAG, "Reject buffer has no capacity");
+    return 0;
+  }
+  buf[0] = HANDSHAKE_STATUS_REJECT;
+#ifdef USE_STORE_LOG_STR_IN_FLASH
+  // On ESP8266 with flash strings, we need to use PROGMEM-aware functions
+  size_t reason_len = strlen_P(reinterpret_cast<PGM_P>(reason));
+  reason_len = std::min(reason_len, capacity - 1);
+  if (reason_len > 0) {
+    memcpy_P(buf + 1, reinterpret_cast<PGM_P>(reason), reason_len);
+  }
+#else
+  const char *reason_str = LOG_STR_ARG(reason);
+  size_t reason_len = strlen(reason_str);
+  reason_len = std::min(reason_len, capacity - 1);
+  if (reason_len > 0) {
+    // NOLINTNEXTLINE(bugprone-not-null-terminated-result) - binary protocol, not a C string
+    std::memcpy(buf + 1, reason_str, reason_len);
+  }
+#endif
+  return reason_len + 1;
+}
+
+}  // namespace esphome::noise
+#endif  // USE_NOISE
diff --git a/esphome/components/noise/noise.h b/esphome/components/noise/noise.h
new file mode 100644
index 0000000000..f9da8d35b8
--- /dev/null
+++ b/esphome/components/noise/noise.h
@@ -0,0 +1,74 @@
+#pragma once
+#include "esphome/core/defines.h"
+#ifdef USE_NOISE
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include "esphome/core/log.h"
+
+namespace esphome::noise {
+
+using psk_t = std::array<uint8_t, 32>;
+
+class NoiseContext {
+ public:
+  // The all-zeros PSK is reserved: it marks the device as unprovisioned and
+  // doubles as the well-known provisioning PSK that unprovisioned devices
+  // accept for Noise handshakes (passive-sniffing protection only, no
+  // authentication). It is never a valid real key.
+  static bool is_all_zeros(const psk_t &psk) {
+    uint8_t acc = 0;
+    for (uint8_t b : psk) {
+      acc |= b;
+    }
+    return acc == 0;
+  }
+  void set_psk(psk_t psk) {
+    this->psk_ = psk;
+    this->has_psk_ = !is_all_zeros(psk);
+  }
+  const psk_t &get_psk() const { return this->psk_; }
+  bool has_psk() const { return this->has_psk_; }
+
+ protected:
+  psk_t psk_{};
+  bool has_psk_{false};
+};
+
+/// Convert a noise error code to a readable error
+const LogString *noise_err_to_logstr(int err);
+
+// Shared wire format for the noise transports (api and ota): every frame is
+// FRAME_INDICATOR, a 16-bit big-endian payload length, then the payload.
+// Handshake payloads start with a status byte; transport payloads end with
+// the ChaCha20-Poly1305 MAC.
+static constexpr uint8_t FRAME_INDICATOR = 0x01;
+static constexpr size_t FRAME_HEADER_SIZE = 3;
+static constexpr size_t MAC_SIZE = 16;
+static constexpr size_t MAX_HANDSHAKE_SIZE = 128;
+static constexpr uint8_t HANDSHAKE_STATUS_OK = 0x00;
+static constexpr uint8_t HANDSHAKE_STATUS_REJECT = 0x01;
+
+inline void write_frame_header(uint8_t *buf, uint16_t payload_len) {
+  buf[0] = FRAME_INDICATOR;
+  buf[1] = (uint8_t) (payload_len >> 8);
+  buf[2] = (uint8_t) payload_len;
+}
+
+/// Fill buf with a handshake reject payload (status byte plus the reason
+/// text, PROGMEM aware); returns the payload length. buf needs capacity for
+/// the status byte plus the truncated reason.
+size_t format_reject_payload(uint8_t *buf, size_t capacity, const LogString *reason);
+
+/// Reject reason for a failed handshake read. The MAC failure string is a
+/// wire contract: clients match it to report a wrong key.
+const LogString *reject_reason_for(int err);
+
+/// Payload size of the MAC failure reject, the one reason string that is a
+/// wire contract (sizeof's NUL stands in for the status byte). static_assert
+/// reject buffers against this so a wrong key report can never truncate;
+/// longer caller-supplied reasons are informational and sized by the caller.
+static constexpr size_t MAC_FAILURE_PAYLOAD_SIZE = sizeof("Handshake MAC failure");
+
+}  // namespace esphome::noise
+#endif  // USE_NOISE
diff --git a/esphome/components/noise/noise_handshake.cpp b/esphome/components/noise/noise_handshake.cpp
new file mode 100644
index 0000000000..6d426de012
--- /dev/null
+++ b/esphome/components/noise/noise_handshake.cpp
@@ -0,0 +1,139 @@
+#include "noise_handshake.h"
+#ifdef USE_NOISE
+#include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome::noise {
+
+static const char *const TAG = "noise";
+
+// Log the failing noise-c call at the same verbosity the api helper used
+// before this class existed; callers only see one collapsed error code.
+#define HANDSHAKE_STEP_LOG(func_name, err_code) \
+  ESP_LOGVV(TAG, "%s failed: %s", LOG_STR_ARG(LOG_STR(func_name)), LOG_STR_ARG(noise_err_to_logstr(err_code)))
+
+NoiseResponderHandshake::~NoiseResponderHandshake() {
+  if (this->handshake_ != nullptr) {
+    noise_handshakestate_free(this->handshake_);
+    this->handshake_ = nullptr;
+  }
+}
+
+int NoiseResponderHandshake::init(const psk_t &psk, const uint8_t *prologue, size_t prologue_len) {
+  if (this->handshake_ != nullptr) {
+    noise_handshakestate_free(this->handshake_);
+    this->handshake_ = nullptr;
+  }
+  // Noise_NNpsk0_25519_ChaChaPoly_SHA256, built on the stack:
+  // noise_handshakestate_new_by_id copies it, so a member would waste
+  // 104 bytes per connection, and a static const would sit in RAM on
+  // ESP8266 (.rodata is DRAM there).
+  const NoiseProtocolId nid = {
+      .prefix_id = NOISE_PREFIX_STANDARD,
+      .pattern_id = NOISE_PATTERN_NN,
+      .modifier_ids = {NOISE_MODIFIER_PSK0},
+      .dh_id = NOISE_DH_CURVE25519,
+      .cipher_id = NOISE_CIPHER_CHACHAPOLY,
+      .hash_id = NOISE_HASH_SHA256,
+      .hybrid_id = NOISE_DH_NONE,
+  };
+
+  int err = noise_handshakestate_new_by_id(&this->handshake_, &nid, NOISE_ROLE_RESPONDER);
+  if (err != 0) {
+    HANDSHAKE_STEP_LOG("noise_handshakestate_new_by_id", err);
+    return err;
+  }
+  err = noise_handshakestate_set_pre_shared_key(this->handshake_, psk.data(), psk.size());
+  if (err != 0) {
+    HANDSHAKE_STEP_LOG("noise_handshakestate_set_pre_shared_key", err);
+    return this->fail_init_(err);
+  }
+  err = noise_handshakestate_set_prologue(this->handshake_, prologue, prologue_len);
+  if (err != 0) {
+    HANDSHAKE_STEP_LOG("noise_handshakestate_set_prologue", err);
+    return this->fail_init_(err);
+  }
+  err = noise_handshakestate_start(this->handshake_);
+  if (err != 0) {
+    HANDSHAKE_STEP_LOG("noise_handshakestate_start", err);
+    return this->fail_init_(err);
+  }
+  return 0;
+}
+
+/// Release a half-initialized state so a failed init() leaves the object as
+/// if init() was never called.
+int NoiseResponderHandshake::fail_init_(int err) {
+  noise_handshakestate_free(this->handshake_);
+  this->handshake_ = nullptr;
+  return err;
+}
+
+NoiseResponderHandshake::Action NoiseResponderHandshake::action() const {
+  if (this->handshake_ == nullptr) {
+    // A caller bug: init() was never called, or split() already released the state
+    ESP_LOGVV(TAG, "action() on uninitialized or split handshake");
+    return Action::ACTION_FAILED;
+  }
+  int raw = noise_handshakestate_get_action(this->handshake_);
+  switch (raw) {
+    case NOISE_ACTION_READ_MESSAGE:
+      return Action::ACTION_READ;
+    case NOISE_ACTION_WRITE_MESSAGE:
+      return Action::ACTION_WRITE;
+    case NOISE_ACTION_SPLIT:
+      return Action::ACTION_SPLIT;
+    default:
+      // Preserve the raw code in debug logs; callers only see the collapsed enum
+      ESP_LOGVV(TAG, "Unexpected noise action %d", raw);
+      return Action::ACTION_FAILED;
+  }
+}
+
+int NoiseResponderHandshake::read_message(uint8_t *data, size_t len) {
+  NoiseBuffer mbuf;
+  noise_buffer_init(mbuf);
+  noise_buffer_set_input(mbuf, data, len);
+  return noise_handshakestate_read_message(this->handshake_, &mbuf, nullptr);
+}
+
+int NoiseResponderHandshake::write_message(uint8_t *out, size_t capacity, size_t &out_len) {
+  out_len = 0;
+  NoiseBuffer mbuf;
+  noise_buffer_init(mbuf);
+  noise_buffer_set_output(mbuf, out, capacity);
+  int err = noise_handshakestate_write_message(this->handshake_, &mbuf, nullptr);
+  if (err == 0)
+    out_len = mbuf.size;
+  return err;
+}
+
+int NoiseResponderHandshake::split(NoiseCipherState *&send_cipher, NoiseCipherState *&recv_cipher) {
+  // Defined error postcondition: noise-c leaves the out-params unwritten on
+  // its early error returns, so a caller passing uninitialized locals must
+  // never see garbage to free
+  send_cipher = nullptr;
+  recv_cipher = nullptr;
+  int err = noise_handshakestate_split(this->handshake_, &send_cipher, &recv_cipher);
+  if (err != 0)
+    return err;
+  noise_handshakestate_free(this->handshake_);
+  this->handshake_ = nullptr;
+  return 0;
+}
+
+extern "C" {
+// noise-c's only randomness source (the vendored library compiles no rand of
+// its own); HWRNG backed. Lives in this TU so every handshake consumer links
+// it and the definition can never be dropped from the archive.
+void noise_rand_bytes(void *output, size_t len) {
+  if (!esphome::random_bytes(reinterpret_cast<uint8_t *>(output), len)) {
+    ESP_LOGE(TAG, "Acquiring random bytes failed; rebooting");
+    arch_restart();
+  }
+}
+}
+
+}  // namespace esphome::noise
+#endif  // USE_NOISE
diff --git a/esphome/components/noise/noise_handshake.h b/esphome/components/noise/noise_handshake.h
new file mode 100644
index 0000000000..30596f35c2
--- /dev/null
+++ b/esphome/components/noise/noise_handshake.h
@@ -0,0 +1,63 @@
+#pragma once
+#include "esphome/core/defines.h"
+#ifdef USE_NOISE
+#include <cstddef>
+#include <cstdint>
+
+#include <noise/protocol.h>
+
+#include "noise.h"
+
+namespace esphome::noise {
+
+/** Sans-IO responder side of a Noise_NNpsk0_25519_ChaChaPoly_SHA256 handshake.
+ *
+ * Owns only the noise-c handshake state; the caller moves the raw handshake
+ * messages (no framing) over its own transport, driven by action():
+ * read_message() while READ, write_message() while WRITE, then split() to
+ * take ownership of the transport ciphers. All methods return a noise-c
+ * error code, 0 on success. Called outside their action() step (before
+ * init(), after split()) the message methods return a noise-c error rather
+ * than crashing; the library checks its state argument.
+ *
+ * Methods are deliberately small separate functions so callers on tight
+ * stacks (RP2040 core0 scratch bank) never pay for more than one branch;
+ * the curve25519 step alone needs ~2KB of stack.
+ */
+class NoiseResponderHandshake {
+ public:
+  // The ACTION_ prefix is macro-collision safety: SDK headers #define bare
+  // names like READ/WRITE, and macros expand even inside an enum class.
+  enum class Action : uint8_t { ACTION_READ, ACTION_WRITE, ACTION_SPLIT, ACTION_FAILED };
+
+  NoiseResponderHandshake() = default;
+  ~NoiseResponderHandshake();
+  // Owns a raw noise-c handshake state; copying would double free it
+  NoiseResponderHandshake(const NoiseResponderHandshake &) = delete;
+  NoiseResponderHandshake &operator=(const NoiseResponderHandshake &) = delete;
+
+  /// Create and start the handshake with the given PSK and prologue. A
+  /// repeated call frees the previous handshake state and starts over.
+  [[nodiscard]] int init(const psk_t &psk, const uint8_t *prologue, size_t prologue_len);
+  /// ACTION_FAILED is the catch-all: returned before init(), after split()
+  /// has released the state, and when noise-c reports a failed handshake.
+  [[nodiscard]] Action action() const;
+  /// Process one received handshake message. The buffer is consumed in
+  /// place: noise-c decrypts into it and zeroes it before returning.
+  [[nodiscard]] int read_message(uint8_t *data, size_t len);
+  /// Produce the next handshake message into out; out_len receives its size
+  /// and is zero on error.
+  [[nodiscard]] int write_message(uint8_t *out, size_t capacity, size_t &out_len);
+  /// Hand out the transport ciphers and free the handshake state. The caller
+  /// owns both cipher states and must free them with noise_cipherstate_free();
+  /// both are set to nullptr on error.
+  [[nodiscard]] int split(NoiseCipherState *&send_cipher, NoiseCipherState *&recv_cipher);
+
+ protected:
+  int fail_init_(int err);
+
+  NoiseHandshakeState *handshake_{nullptr};
+};
+
+}  // namespace esphome::noise
+#endif  // USE_NOISE
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 20aca3776f..5f34437145 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -222,6 +222,7 @@
 #define API_MAX_SEND_QUEUE 8
 #define MAX_API_CONNECTIONS 6
 #define USE_MD5
+#define USE_NOISE
 #define USE_SHA256
 #ifndef USE_RP2  // no MQTT backend or esp_wireguard library on RP2
 #define USE_MQTT
diff --git a/platformio.ini b/platformio.ini
index 4c372cc0bb..b2a36e687c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -45,7 +45,7 @@ lib_deps_base =
 lib_deps =
     ${common.lib_deps_base}
     https://github.com/dudanov/MideaUART.git#eeea6c3e9b4474f067054592b435be1c4e466815 ; midea
-    esphome/noise-c@0.1.21                 ; api
+    esphome/noise-c@0.1.21                 ; noise (api, ota)
     improv/Improv@1.2.6                    ; improv_serial / esp32_improv
     kikuchan98/pngle@1.1.0                 ; online_image
     ; Using the repository directly, otherwise ESP-IDF can't use the library
@@ -244,7 +244,7 @@ lib_deps =
     ${common:idf-component-libs.lib_deps}
     ESP32Async/ESPAsyncWebServer@3.9.6    ; web_server_base
     droscy/esp_wireguard@0.4.5            ; wireguard
-    esphome/noise-c@0.1.21                ; api
+    esphome/noise-c@0.1.21                ; noise (api, ota)
     ESP32Async/AsyncTCP@3.4.5             ; async_tcp
     DNSServer                             ; captive_portal
     heman/AsyncMqttClient-esphome@2.0.0   ; mqtt
@@ -641,7 +641,7 @@ build_unflags =
 extends = common
 platform = platformio/native
 lib_deps =
-    esphome/noise-c@0.1.21  ; used by api
+    esphome/noise-c@0.1.21  ; used by noise (api, ota)
     lvgl/lvgl@9.5.0         ; lvgl
 build_flags =
     ${common.build_flags}
diff --git a/tests/benchmarks/components/api/__init__.py b/tests/benchmarks/components/api/__init__.py
index 0565bc5330..12c078911c 100644
--- a/tests/benchmarks/components/api/__init__.py
+++ b/tests/benchmarks/components/api/__init__.py
@@ -3,8 +3,9 @@ from tests.testing_helpers import ComponentManifestOverride
 
 
 def override_manifest(manifest: ComponentManifestOverride) -> None:
-    # api must run its to_code to define USE_API, USE_API_PLAINTEXT,
-    # and add the noise-c library dependency.
+    # api must run its to_code to define USE_API and USE_API_NOISE. The
+    # AUTO_LOADed noise component runs its own to_code via the override in
+    # tests/benchmarks/components/noise/__init__.py.
     manifest.enable_codegen()
 
     original_to_code = manifest.to_code
diff --git a/tests/benchmarks/components/noise/__init__.py b/tests/benchmarks/components/noise/__init__.py
new file mode 100644
index 0000000000..f430e9dd36
--- /dev/null
+++ b/tests/benchmarks/components/noise/__init__.py
@@ -0,0 +1,7 @@
+from tests.testing_helpers import ComponentManifestOverride
+
+
+def override_manifest(manifest: ComponentManifestOverride) -> None:
+    # to_code must run: it defines USE_NOISE and adds the noise-c library
+    # the api benchmark sources need.
+    manifest.enable_codegen()
diff --git a/tests/component_tests/noise/__init__.py b/tests/component_tests/noise/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/component_tests/noise/test_encryption_key.py b/tests/component_tests/noise/test_encryption_key.py
new file mode 100644
index 0000000000..62abae6487
--- /dev/null
+++ b/tests/component_tests/noise/test_encryption_key.py
@@ -0,0 +1,37 @@
+"""Tests for the shared noise encryption key helpers."""
+
+from __future__ import annotations
+
+import pytest
+
+from esphome import config_validation as cv
+from esphome.components.noise import decode_encryption_key, validate_encryption_key
+
+KEY = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8="
+
+
+def test_validate_encryption_key_roundtrips() -> None:
+    assert validate_encryption_key(KEY) == KEY
+
+
+@pytest.mark.parametrize("value", ["not-base64!!!", "AAECAw=="])
+def test_validate_encryption_key_rejects_bad_input(value: str) -> None:
+    with pytest.raises(cv.Invalid):
+        validate_encryption_key(value)
+
+
+def test_decode_encryption_key_returns_32_bytes() -> None:
+    assert decode_encryption_key(KEY) == bytes(range(32))
+
+
+def test_decode_encryption_key_rejects_invalid_base64() -> None:
+    """The shared helper raises cv.Invalid, not binascii.Error."""
+    with pytest.raises(cv.Invalid, match="base64"):
+        decode_encryption_key("A")
+
+
+def test_decode_encryption_key_rejects_short_decode() -> None:
+    """a2b_base64 stops at embedded padding; a short decode must not become
+    a zero padded PSK on the device."""
+    with pytest.raises(cv.Invalid, match="32 bytes"):
+        decode_encryption_key("AAECAw==")
diff --git a/tests/components/noise/__init__.py b/tests/components/noise/__init__.py
new file mode 100644
index 0000000000..60a5740a83
--- /dev/null
+++ b/tests/components/noise/__init__.py
@@ -0,0 +1,7 @@
+from tests.testing_helpers import ComponentManifestOverride
+
+
+def override_manifest(manifest: ComponentManifestOverride) -> None:
+    # to_code must run: it defines USE_NOISE and adds the noise-c library
+    # the component sources under test need.
+    manifest.enable_codegen()
diff --git a/tests/components/noise/common.yaml b/tests/components/noise/common.yaml
new file mode 100644
index 0000000000..35253a35e6
--- /dev/null
+++ b/tests/components/noise/common.yaml
@@ -0,0 +1 @@
+noise:
diff --git a/tests/components/noise/test.esp32-idf.yaml b/tests/components/noise/test.esp32-idf.yaml
new file mode 100644
index 0000000000..550ffd1f88
--- /dev/null
+++ b/tests/components/noise/test.esp32-idf.yaml
@@ -0,0 +1,2 @@
+packages:
+  noise: !include common.yaml
diff --git a/tests/components/noise/test.esp8266-ard.yaml b/tests/components/noise/test.esp8266-ard.yaml
new file mode 100644
index 0000000000..550ffd1f88
--- /dev/null
+++ b/tests/components/noise/test.esp8266-ard.yaml
@@ -0,0 +1,2 @@
+packages:
+  noise: !include common.yaml
diff --git a/tests/components/noise/test.host.yaml b/tests/components/noise/test.host.yaml
new file mode 100644
index 0000000000..550ffd1f88
--- /dev/null
+++ b/tests/components/noise/test.host.yaml
@@ -0,0 +1,2 @@
+packages:
+  noise: !include common.yaml
diff --git a/tests/components/noise/test.rp2040-ard.yaml b/tests/components/noise/test.rp2040-ard.yaml
new file mode 100644
index 0000000000..550ffd1f88
--- /dev/null
+++ b/tests/components/noise/test.rp2040-ard.yaml
@@ -0,0 +1,2 @@
+packages:
+  noise: !include common.yaml
diff --git a/tests/components/noise/test_noise_handshake.cpp b/tests/components/noise/test_noise_handshake.cpp
new file mode 100644
index 0000000000..d879a26c43
--- /dev/null
+++ b/tests/components/noise/test_noise_handshake.cpp
@@ -0,0 +1,199 @@
+#include <gtest/gtest.h>
+
+#include <cstring>
+
+#include <noise/protocol.h>
+
+#include "esphome/components/noise/noise.h"
+#include "esphome/components/noise/noise_handshake.h"
+
+namespace esphome::noise::testing {
+
+using Action = NoiseResponderHandshake::Action;
+
+// A raw noise-c initiator driving the same Noise_NNpsk0_25519_ChaChaPoly_SHA256
+// pattern the responder class implements, so the tests exercise a real
+// two-message handshake rather than mirrored calls into the class under test.
+class Initiator {
+ public:
+  Initiator(const psk_t &psk, const uint8_t *prologue, size_t prologue_len) {
+    const NoiseProtocolId nid = {
+        .prefix_id = NOISE_PREFIX_STANDARD,
+        .pattern_id = NOISE_PATTERN_NN,
+        .modifier_ids = {NOISE_MODIFIER_PSK0},
+        .dh_id = NOISE_DH_CURVE25519,
+        .cipher_id = NOISE_CIPHER_CHACHAPOLY,
+        .hash_id = NOISE_HASH_SHA256,
+        .hybrid_id = NOISE_DH_NONE,
+    };
+    EXPECT_EQ(noise_handshakestate_new_by_id(&this->state_, &nid, NOISE_ROLE_INITIATOR), 0);
+    EXPECT_EQ(noise_handshakestate_set_pre_shared_key(this->state_, psk.data(), psk.size()), 0);
+    EXPECT_EQ(noise_handshakestate_set_prologue(this->state_, prologue, prologue_len), 0);
+    EXPECT_EQ(noise_handshakestate_start(this->state_), 0);
+  }
+  ~Initiator() {
+    if (this->state_ != nullptr)
+      noise_handshakestate_free(this->state_);
+    if (this->send_ != nullptr)
+      noise_cipherstate_free(this->send_);
+    if (this->recv_ != nullptr)
+      noise_cipherstate_free(this->recv_);
+  }
+  Initiator(const Initiator &) = delete;
+  Initiator &operator=(const Initiator &) = delete;
+
+  size_t write_message(uint8_t *out, size_t capacity) {
+    NoiseBuffer mbuf;
+    noise_buffer_init(mbuf);
+    noise_buffer_set_output(mbuf, out, capacity);
+    EXPECT_EQ(noise_handshakestate_write_message(this->state_, &mbuf, nullptr), 0);
+    return mbuf.size;
+  }
+
+  int read_message(uint8_t *data, size_t len) {
+    NoiseBuffer mbuf;
+    noise_buffer_init(mbuf);
+    noise_buffer_set_input(mbuf, data, len);
+    return noise_handshakestate_read_message(this->state_, &mbuf, nullptr);
+  }
+
+  void split() { EXPECT_EQ(noise_handshakestate_split(this->state_, &this->send_, &this->recv_), 0); }
+
+  NoiseCipherState *send_{nullptr};
+  NoiseCipherState *recv_{nullptr};
+
+ private:
+  NoiseHandshakeState *state_{nullptr};
+};
+
+static const uint8_t PROLOGUE[] = {'t', 'e', 's', 't', 'p', 'r', 'o', 'l', 'o', 'g', 'u', 'e'};
+
+static psk_t make_psk(uint8_t seed) {
+  psk_t psk;
+  for (size_t i = 0; i < psk.size(); i++) {
+    psk[i] = static_cast<uint8_t>(seed + i);
+  }
+  return psk;
+}
+
+TEST(NoiseResponderHandshakeTest, ActionFailedBeforeInit) {
+  NoiseResponderHandshake handshake;
+  EXPECT_EQ(handshake.action(), Action::ACTION_FAILED);
+}
+
+TEST(NoiseResponderHandshakeTest, MessageMethodsErrorBeforeInit) {
+  // The class doc promises a noise-c error, not a crash, when the message
+  // methods run outside their action() step; pin the library's null check
+  NoiseResponderHandshake handshake;
+  uint8_t buf[MAX_HANDSHAKE_SIZE] = {};
+  size_t out_len = 0;
+  EXPECT_NE(handshake.read_message(buf, sizeof(buf)), 0);
+  EXPECT_NE(handshake.write_message(buf, sizeof(buf), out_len), 0);
+  // Deliberately non-null: split() documents a nullptr postcondition on
+  // error, so a caller's uninitialized locals never hold garbage to free
+  auto *sentinel = reinterpret_cast<NoiseCipherState *>(0x1);
+  NoiseCipherState *send_cipher = sentinel;
+  NoiseCipherState *recv_cipher = sentinel;
+  EXPECT_NE(handshake.split(send_cipher, recv_cipher), 0);
+  EXPECT_EQ(send_cipher, nullptr);
+  EXPECT_EQ(recv_cipher, nullptr);
+}
+
+TEST(NoiseResponderHandshakeTest, FullHandshakeAndTransportRoundTrip) {
+  const psk_t psk = make_psk(7);
+  NoiseResponderHandshake responder;
+  ASSERT_EQ(responder.init(psk, PROLOGUE, sizeof(PROLOGUE)), 0);
+  EXPECT_EQ(responder.action(), Action::ACTION_READ);
+
+  Initiator initiator(psk, PROLOGUE, sizeof(PROLOGUE));
+  uint8_t msg[MAX_HANDSHAKE_SIZE];
+  size_t msg_len = initiator.write_message(msg, sizeof(msg));
+  ASSERT_GT(msg_len, 0u);
+
+  ASSERT_EQ(responder.read_message(msg, msg_len), 0);
+  ASSERT_EQ(responder.action(), Action::ACTION_WRITE);
+
+  size_t reply_len = 0;
+  ASSERT_EQ(responder.write_message(msg, sizeof(msg), reply_len), 0);
+  ASSERT_GT(reply_len, 0u);
+  ASSERT_EQ(responder.action(), Action::ACTION_SPLIT);
+
+  ASSERT_EQ(initiator.read_message(msg, reply_len), 0);
+  initiator.split();
+
+  NoiseCipherState *send_cipher = nullptr;
+  NoiseCipherState *recv_cipher = nullptr;
+  ASSERT_EQ(responder.split(send_cipher, recv_cipher), 0);
+  ASSERT_NE(send_cipher, nullptr);
+  ASSERT_NE(recv_cipher, nullptr);
+  // The handshake state is released by split(); the class reports FAILED after
+  EXPECT_EQ(responder.action(), Action::ACTION_FAILED);
+  EXPECT_EQ(static_cast<size_t>(noise_cipherstate_get_mac_length(send_cipher)), MAC_SIZE);
+
+  // Responder encrypts, initiator decrypts
+  uint8_t frame[64];
+  static constexpr char PLAINTEXT[] = "encrypted ota";
+  std::memcpy(frame, PLAINTEXT, sizeof(PLAINTEXT));
+  NoiseBuffer mbuf;
+  noise_buffer_init(mbuf);
+  noise_buffer_set_inout(mbuf, frame, sizeof(PLAINTEXT), sizeof(frame));
+  ASSERT_EQ(noise_cipherstate_encrypt(send_cipher, &mbuf), 0);
+  EXPECT_EQ(mbuf.size, sizeof(PLAINTEXT) + MAC_SIZE);
+
+  noise_buffer_set_inout(mbuf, frame, mbuf.size, sizeof(frame));
+  ASSERT_EQ(noise_cipherstate_decrypt(initiator.recv_, &mbuf), 0);
+  ASSERT_EQ(mbuf.size, sizeof(PLAINTEXT));
+  EXPECT_EQ(std::memcmp(frame, PLAINTEXT, sizeof(PLAINTEXT)), 0);
+
+  noise_cipherstate_free(send_cipher);
+  noise_cipherstate_free(recv_cipher);
+}
+
+TEST(NoiseResponderHandshakeTest, ReInitRestartsHandshake) {
+  // The documented retry shape: a repeated init() frees the previous state
+  // and starts over. The first message under the new key authenticating
+  // proves the restart took effect; the old state surviving would fail the
+  // MAC here.
+  NoiseResponderHandshake responder;
+  ASSERT_EQ(responder.init(make_psk(7), PROLOGUE, sizeof(PROLOGUE)), 0);
+  ASSERT_EQ(responder.init(make_psk(9), PROLOGUE, sizeof(PROLOGUE)), 0);
+  EXPECT_EQ(responder.action(), Action::ACTION_READ);
+
+  Initiator initiator(make_psk(9), PROLOGUE, sizeof(PROLOGUE));
+  uint8_t msg[MAX_HANDSHAKE_SIZE];
+  size_t msg_len = initiator.write_message(msg, sizeof(msg));
+  ASSERT_GT(msg_len, 0u);
+  EXPECT_EQ(responder.read_message(msg, msg_len), 0);
+}
+
+TEST(NoiseResponderHandshakeTest, WrongPskFailsWithMacFailure) {
+  NoiseResponderHandshake responder;
+  ASSERT_EQ(responder.init(make_psk(7), PROLOGUE, sizeof(PROLOGUE)), 0);
+
+  Initiator initiator(make_psk(200), PROLOGUE, sizeof(PROLOGUE));
+  uint8_t msg[MAX_HANDSHAKE_SIZE];
+  size_t msg_len = initiator.write_message(msg, sizeof(msg));
+  ASSERT_GT(msg_len, 0u);
+
+  int err = responder.read_message(msg, msg_len);
+  EXPECT_EQ(err, NOISE_ERROR_MAC_FAILURE);
+  EXPECT_EQ(responder.action(), Action::ACTION_FAILED);
+}
+
+TEST(NoiseResponderHandshakeTest, MismatchedPrologueFailsWithMacFailure) {
+  // The prologue binds the plaintext preamble for downgrade resistance; a
+  // tampered preamble must fail even with the right key.
+  const psk_t psk = make_psk(7);
+  NoiseResponderHandshake responder;
+  ASSERT_EQ(responder.init(psk, PROLOGUE, sizeof(PROLOGUE)), 0);
+
+  static const uint8_t TAMPERED[] = {'x'};
+  Initiator initiator(psk, TAMPERED, sizeof(TAMPERED));
+  uint8_t msg[MAX_HANDSHAKE_SIZE];
+  size_t msg_len = initiator.write_message(msg, sizeof(msg));
+  ASSERT_GT(msg_len, 0u);
+
+  EXPECT_EQ(responder.read_message(msg, msg_len), NOISE_ERROR_MAC_FAILURE);
+}
+
+}  // namespace esphome::noise::testing
diff --git a/tests/components/noise/test_noise_primitives.cpp b/tests/components/noise/test_noise_primitives.cpp
new file mode 100644
index 0000000000..018be9f717
--- /dev/null
+++ b/tests/components/noise/test_noise_primitives.cpp
@@ -0,0 +1,74 @@
+#include <gtest/gtest.h>
+
+#include <cstring>
+
+#include <noise/protocol.h>
+
+#include "esphome/components/noise/noise.h"
+
+namespace esphome::noise::testing {
+
+TEST(NoiseContextTest, AllZerosPskIsReserved) {
+  psk_t zeros{};
+  EXPECT_TRUE(NoiseContext::is_all_zeros(zeros));
+
+  psk_t psk{};
+  psk[31] = 1;
+  EXPECT_FALSE(NoiseContext::is_all_zeros(psk));
+
+  NoiseContext ctx;
+  EXPECT_FALSE(ctx.has_psk());
+  ctx.set_psk(zeros);
+  EXPECT_FALSE(ctx.has_psk());
+  ctx.set_psk(psk);
+  EXPECT_TRUE(ctx.has_psk());
+  EXPECT_EQ(ctx.get_psk(), psk);
+}
+
+TEST(WireFormatTest, FrameHeaderIsIndicatorPlusBigEndianLength) {
+  uint8_t header[FRAME_HEADER_SIZE];
+  write_frame_header(header, 0x1234);
+  EXPECT_EQ(header[0], FRAME_INDICATOR);
+  EXPECT_EQ(header[1], 0x12);
+  EXPECT_EQ(header[2], 0x34);
+}
+
+TEST(WireFormatTest, RejectPayloadCarriesStatusByteAndMacFailureContract) {
+  // The MAC failure string is a wire contract: clients match it to report a
+  // wrong key. Format the payload exactly the way the handshake read path does.
+  uint8_t buf[64];
+  size_t len = format_reject_payload(buf, sizeof(buf), reject_reason_for(NOISE_ERROR_MAC_FAILURE));
+  static constexpr char EXPECTED[] = "Handshake MAC failure";
+  ASSERT_EQ(len, 1 + strlen(EXPECTED));
+  EXPECT_EQ(buf[0], HANDSHAKE_STATUS_REJECT);
+  EXPECT_EQ(memcmp(buf + 1, EXPECTED, strlen(EXPECTED)), 0);
+  // The exported floor covers the full MAC failure payload exactly
+  EXPECT_EQ(MAC_FAILURE_PAYLOAD_SIZE, 1 + strlen(EXPECTED));
+
+  // Any other error maps to the generic reason
+  len = format_reject_payload(buf, sizeof(buf), reject_reason_for(NOISE_ERROR_INVALID_STATE));
+  static constexpr char GENERIC[] = "Handshake error";
+  ASSERT_EQ(len, 1 + strlen(GENERIC));
+  EXPECT_EQ(memcmp(buf + 1, GENERIC, strlen(GENERIC)), 0);
+}
+
+TEST(WireFormatTest, RejectPayloadTruncatesToCapacity) {
+  uint8_t buf[8];
+  size_t len = format_reject_payload(buf, sizeof(buf), reject_reason_for(NOISE_ERROR_MAC_FAILURE));
+  ASSERT_EQ(len, sizeof(buf));
+  EXPECT_EQ(buf[0], HANDSHAKE_STATUS_REJECT);
+  EXPECT_EQ(memcmp(buf + 1, "Handsha", 7), 0);
+
+  // A one-byte buffer still carries the status byte
+  uint8_t tiny[1];
+  len = format_reject_payload(tiny, sizeof(tiny), reject_reason_for(NOISE_ERROR_MAC_FAILURE));
+  ASSERT_EQ(len, 1u);
+  EXPECT_EQ(tiny[0], HANDSHAKE_STATUS_REJECT);
+
+  // A zero-capacity buffer yields no payload and stays untouched
+  uint8_t none[1] = {0xAA};
+  EXPECT_EQ(format_reject_payload(none, 0, reject_reason_for(NOISE_ERROR_MAC_FAILURE)), 0u);
+  EXPECT_EQ(none[0], 0xAA);
+}
+
+}  // namespace esphome::noise::testing

From 5cc1f001fa4b0d5512a2da37aefa572354099ddb Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:12:58 -0500
Subject: [PATCH 121/155] [light] Skip light_json_schema.cpp when json is not
 used (#18675)

---
 esphome/components/light/__init__.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/esphome/components/light/__init__.py b/esphome/components/light/__init__.py
index 175f5b43cf..dbcc28d64a 100644
--- a/esphome/components/light/__init__.py
+++ b/esphome/components/light/__init__.py
@@ -7,6 +7,7 @@ import esphome.automation as auto
 import esphome.codegen as cg
 from esphome.components import mqtt, power_supply, web_server
 from esphome.components.const import CONF_CHANNEL_COLORS, CONF_IS_WRGB
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_BLUE,
@@ -557,3 +558,10 @@ async def new_light(config, *args):
 @coroutine_with_priority(CoroPriority.CORE)
 async def to_code(config):
     cg.add_global(light_ns.using)
+
+
+# light_json_schema.cpp is only used by mqtt and web_server, which both
+# auto load json; USE_JSON alone is too broad since other components load it.
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {"light_json_schema.cpp": ("USE_MQTT", "USE_WEBSERVER")}
+)

From 0ecc7045fa3354e5195a749d3f42cd469ba7d3ea Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:13:34 -0500
Subject: [PATCH 122/155] [core] Parse the common on/off spellings in boolean
 env vars (#18667)

---
 esphome/helpers.py               | 13 +++++++++++--
 tests/unit_tests/test_helpers.py |  7 +++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/esphome/helpers.py b/esphome/helpers.py
index 7aa1a9a88c..b3102ca277 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -31,6 +31,13 @@ SockAddr = IPv4SockAddr | IPv6SockAddr
 
 _LOGGER = logging.getLogger(__name__)
 
+# cv.boolean's closed spelling tables, shared with the env-knob parsing below
+TRUTHY_BOOL_STRINGS = frozenset({"true", "yes", "on", "enable"})
+FALSY_BOOL_STRINGS = frozenset({"false", "no", "off", "disable"})
+# cv.boolean's spelling tables plus the 1/0 env convention
+TRUTHY_ENV_STRINGS = TRUTHY_BOOL_STRINGS | {"1"}
+FALSY_ENV_STRINGS = FALSY_BOOL_STRINGS | {"0"}
+
 IS_MACOS = platform.system() == "Darwin"
 IS_WINDOWS = platform.system() == "Windows"
 IS_LINUX = platform.system() == "Linux"
@@ -395,12 +402,14 @@ def sort_ip_addresses(address_list: list[str]) -> list[str]:
 
 
 def get_bool_env(var, default=False):
+    """Read a boolean env var: the ``cv.boolean`` spellings plus ``1``/``0``;
+    anything else falls through to ``bool(value)``."""
     value = os.getenv(var, default)
     if isinstance(value, str):
         value = value.lower()
-        if value in ["1", "true"]:
+        if value in TRUTHY_ENV_STRINGS:
             return True
-        if value in ["0", "false"]:
+        if value in FALSY_ENV_STRINGS:
             return False
     return bool(value)
 
diff --git a/tests/unit_tests/test_helpers.py b/tests/unit_tests/test_helpers.py
index eaa7d5a8dc..3160469063 100644
--- a/tests/unit_tests/test_helpers.py
+++ b/tests/unit_tests/test_helpers.py
@@ -171,6 +171,13 @@ def test_is_ip_address__valid(value):
         ("FOO", "fAlSe", True, False),
         ("FOO", "Yes", False, True),
         ("FOO", "123", False, True),
+        # cv.boolean's spellings; falsy rows use default=True on purpose
+        ("FOO", "on", False, True),
+        ("FOO", "enable", False, True),
+        ("FOO", "no", True, False),
+        ("FOO", "off", True, False),
+        ("FOO", "OFF", True, False),
+        ("FOO", "Disable", True, False),
     ),
 )
 def test_get_bool_env(monkeypatch, var, value, default, expected):

From 4510f104917fbd5f9a5ae4847a74afc3989ab44e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:13:57 -0500
Subject: [PATCH 123/155] [core] Treat a malformed build_info.json as stale
 instead of crashing (#18669)

---
 esphome/writer.py               |  21 ++-
 tests/unit_tests/test_writer.py | 243 +++++++++++++++-----------------
 2 files changed, 130 insertions(+), 134 deletions(-)

diff --git a/esphome/writer.py b/esphome/writer.py
index 866377d2f5..d614204603 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -337,12 +337,29 @@ def copy_src_tree():
     else:
         try:
             existing = json.loads(build_info_json_path.read_text(encoding="utf-8"))
-            if (
+            if not isinstance(existing, dict) or (
                 existing.get("config_hash") != config_hash
                 or existing.get("esphome_version") != __version__
             ):
+                # Non-object JSON is stale like every other damage case
                 sources_changed = True
-        except (json.JSONDecodeError, KeyError, OSError):
+        except FileNotFoundError:
+            # An absent build_info.json is stale, not damaged; rebuild quietly
+            sources_changed = True
+        except (ValueError, OSError) as err:
+            # ValueError covers both JSONDecodeError and UnicodeDecodeError;
+            # unlink so the regenerating write never re-reads the bad copy.
+            # "Unreadable" not "damaged": EACCES/EISDIR land here too
+            _LOGGER.warning("Regenerating unreadable build_info.json: %s", err)
+            try:
+                # missing_ok: a concurrent clean may have removed it already
+                build_info_json_path.unlink(missing_ok=True)
+            except OSError as unlink_err:
+                # The later write re-reads the file, so a kept unreadable copy
+                # fails again with a misattributed error; name the real cause
+                _LOGGER.warning(
+                    "Could not remove unreadable build_info.json: %s", unlink_err
+                )
             sources_changed = True
 
     # Write build_info header and JSON metadata
diff --git a/tests/unit_tests/test_writer.py b/tests/unit_tests/test_writer.py
index 46e60ebd8e..c73a5c5789 100644
--- a/tests/unit_tests/test_writer.py
+++ b/tests/unit_tests/test_writer.py
@@ -2041,6 +2041,38 @@ def test_copy_src_tree_writes_build_info_files(
     assert build_info_json["esphome_version"] == "2025.1.0-dev"
 
 
+def _setup_build_info_mocks(
+    mock_core: MagicMock,
+    mock_iter_components: MagicMock,
+    mock_walk_files: MagicMock,
+    tmp_path: Path,
+) -> Path:
+    """Point CORE at tmp_path and return the build_info.json path."""
+    src_path = tmp_path / "src"
+    (src_path / "esphome" / "core").mkdir(parents=True)
+    build_path = tmp_path / "build"
+    build_path.mkdir()
+    mock_core.relative_src_path.side_effect = src_path.joinpath
+    mock_core.relative_build_path.side_effect = build_path.joinpath
+    mock_core.defines = []
+    mock_core.config_hash = 0xDEADBEEF
+    mock_core.comment = ""
+    mock_core.target_platform = "test_platform"
+    mock_core.config = {}
+    mock_iter_components.return_value = []
+    mock_walk_files.return_value = []
+    return build_path / "build_info.json"
+
+
+def _run_copy_src_tree(version: str = "2025.1.0-dev") -> None:
+    with (
+        patch("esphome.writer.__version__", version),
+        patch("esphome.writer.importlib.import_module") as mock_import,
+    ):
+        mock_import.side_effect = AttributeError
+        copy_src_tree()
+
+
 @patch("esphome.writer.CORE")
 @patch("esphome.writer.iter_components")
 @patch("esphome.writer.walk_files")
@@ -2050,59 +2082,17 @@ def test_copy_src_tree_detects_config_hash_change(
     mock_core: MagicMock,
     tmp_path: Path,
 ) -> None:
-    """Test copy_src_tree detects when config_hash changes."""
-    # Setup directory structure
-    src_path = tmp_path / "src"
-    src_path.mkdir()
-    esphome_core_path = src_path / "esphome" / "core"
-    esphome_core_path.mkdir(parents=True)
-    build_path = tmp_path / "build"
-    build_path.mkdir()
-
-    # Create existing build_info.json with different config_hash
-    build_info_json_path = build_path / "build_info.json"
-    build_info_json_path.write_text(
-        json.dumps(
-            {
-                "config_hash": 0x12345678,  # Different from current
-                "build_time": 1700000000,
-                "build_time_str": "2023-11-14 22:13:20 +0000",
-                "esphome_version": "2025.1.0-dev",
-            }
-        )
+    """A changed config_hash regenerates build_info after a steady-state run."""
+    build_info_json_path = _setup_build_info_mocks(
+        mock_core, mock_iter_components, mock_walk_files, tmp_path
     )
+    _run_copy_src_tree()
+    assert json.loads(build_info_json_path.read_text())["config_hash"] == 0xDEADBEEF
 
-    # Create existing build_info_data.h
-    build_info_h_path = esphome_core_path / "build_info_data.h"
-    build_info_h_path.write_text("// old build_info_data.h")
-
-    # Setup mocks
-    mock_core.relative_src_path.side_effect = src_path.joinpath
-    mock_core.relative_build_path.side_effect = build_path.joinpath
-    mock_core.defines = []
-    mock_core.config_hash = 0xDEADBEEF  # Different from existing
-    mock_core.comment = ""
-    mock_core.target_platform = "test_platform"
-    mock_core.config = {}
-    mock_iter_components.return_value = []
-    mock_walk_files.return_value = []
-
-    with (
-        patch("esphome.writer.__version__", "2025.1.0-dev"),
-        patch("esphome.writer.importlib.import_module") as mock_import,
-    ):
-        mock_import.side_effect = AttributeError
-        copy_src_tree()
-
-    # Verify build_info files were updated due to config_hash change
-    assert build_info_h_path.exists()
-    build_info_cpp_path = esphome_core_path / "build_info_data.cpp"
-    assert build_info_cpp_path.exists()
-    new_content = build_info_cpp_path.read_text()
-    assert "0xdeadbeef" in new_content.lower()
-
-    new_json = json.loads(build_info_json_path.read_text())
-    assert new_json["config_hash"] == 0xDEADBEEF
+    # Second run only regenerates if the hash comparison detects the change
+    mock_core.config_hash = 0xC0FFEE
+    _run_copy_src_tree()
+    assert json.loads(build_info_json_path.read_text())["config_hash"] == 0xC0FFEE
 
 
 @patch("esphome.writer.CORE")
@@ -2114,104 +2104,93 @@ def test_copy_src_tree_detects_version_change(
     mock_core: MagicMock,
     tmp_path: Path,
 ) -> None:
-    """Test copy_src_tree detects when esphome_version changes."""
-    # Setup directory structure
-    src_path = tmp_path / "src"
-    src_path.mkdir()
-    esphome_core_path = src_path / "esphome" / "core"
-    esphome_core_path.mkdir(parents=True)
-    build_path = tmp_path / "build"
-    build_path.mkdir()
-
-    # Create existing build_info.json with different version
-    build_info_json_path = build_path / "build_info.json"
-    build_info_json_path.write_text(
-        json.dumps(
-            {
-                "config_hash": 0xDEADBEEF,
-                "build_time": 1700000000,
-                "build_time_str": "2023-11-14 22:13:20 +0000",
-                "esphome_version": "2024.12.0",  # Old version
-            }
-        )
+    """A changed esphome_version regenerates build_info after a steady-state run."""
+    build_info_json_path = _setup_build_info_mocks(
+        mock_core, mock_iter_components, mock_walk_files, tmp_path
     )
-
-    # Create existing build_info_data.h
-    build_info_h_path = esphome_core_path / "build_info_data.h"
-    build_info_h_path.write_text("// old build_info_data.h")
-
-    # Setup mocks
-    mock_core.relative_src_path.side_effect = src_path.joinpath
-    mock_core.relative_build_path.side_effect = build_path.joinpath
-    mock_core.defines = []
-    mock_core.config_hash = 0xDEADBEEF
-    mock_core.comment = ""
-    mock_core.target_platform = "test_platform"
-    mock_core.config = {}
-    mock_iter_components.return_value = []
-    mock_walk_files.return_value = []
-
-    with (
-        patch("esphome.writer.__version__", "2025.1.0-dev"),  # New version
-        patch("esphome.writer.importlib.import_module") as mock_import,
-    ):
-        mock_import.side_effect = AttributeError
-        copy_src_tree()
-
-    # Verify build_info files were updated due to version change
-    assert build_info_h_path.exists()
+    # Pin version.h so only the build_info comparison can see the bump
+    with patch("esphome.writer.generate_version_h", return_value="// version.h\n"):
+        _run_copy_src_tree(version="2024.12.0")
+        _run_copy_src_tree(version="2025.1.0-dev")
     new_json = json.loads(build_info_json_path.read_text())
     assert new_json["esphome_version"] == "2025.1.0-dev"
 
 
+@pytest.mark.parametrize(
+    "damage",
+    (b"invalid json {{{", b"[]", b'\xff{"config_hash": 1}'),
+    ids=("invalid-json", "non-object", "non-utf8"),
+)
+@patch("esphome.writer.CORE")
+@patch("esphome.writer.iter_components")
+@patch("esphome.writer.walk_files")
+def test_copy_src_tree_regenerates_damaged_build_info(
+    mock_walk_files: MagicMock,
+    mock_iter_components: MagicMock,
+    mock_core: MagicMock,
+    tmp_path: Path,
+    damage: bytes,
+) -> None:
+    """A damaged build_info.json reads as stale and is regenerated, not left in place."""
+    build_info_json_path = _setup_build_info_mocks(
+        mock_core, mock_iter_components, mock_walk_files, tmp_path
+    )
+    _run_copy_src_tree()
+    build_info_json_path.write_bytes(damage)
+    # Second run only rewrites the file if the damage branch fires
+    _run_copy_src_tree()
+    new_json = json.loads(build_info_json_path.read_text())
+    assert new_json["config_hash"] == 0xDEADBEEF
+
+
 @patch("esphome.writer.CORE")
 @patch("esphome.writer.iter_components")
 @patch("esphome.writer.walk_files")
-def test_copy_src_tree_handles_invalid_build_info_json(
+def test_copy_src_tree_missing_build_info_rebuilds_quietly(
     mock_walk_files: MagicMock,
     mock_iter_components: MagicMock,
     mock_core: MagicMock,
     tmp_path: Path,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
-    """Test copy_src_tree handles invalid build_info.json gracefully."""
-    # Setup directory structure
-    src_path = tmp_path / "src"
-    src_path.mkdir()
-    esphome_core_path = src_path / "esphome" / "core"
-    esphome_core_path.mkdir(parents=True)
-    build_path = tmp_path / "build"
-    build_path.mkdir()
+    """An absent build_info.json regenerates without claiming damage."""
+    build_info_json_path = _setup_build_info_mocks(
+        mock_core, mock_iter_components, mock_walk_files, tmp_path
+    )
+    _run_copy_src_tree()
+    build_info_json_path.unlink()
+    _run_copy_src_tree()
+    assert json.loads(build_info_json_path.read_text())["config_hash"] == 0xDEADBEEF
+    assert "unreadable" not in caplog.text
 
-    # Create invalid build_info.json
-    build_info_json_path = build_path / "build_info.json"
+
+@patch("esphome.writer.CORE")
+@patch("esphome.writer.iter_components")
+@patch("esphome.writer.walk_files")
+def test_copy_src_tree_unremovable_damaged_build_info_is_logged(
+    mock_walk_files: MagicMock,
+    mock_iter_components: MagicMock,
+    mock_core: MagicMock,
+    tmp_path: Path,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """A failed unlink of the damaged file names the real cause."""
+    build_info_json_path = _setup_build_info_mocks(
+        mock_core, mock_iter_components, mock_walk_files, tmp_path
+    )
+    _run_copy_src_tree()
     build_info_json_path.write_text("invalid json {{{")
+    real_unlink = Path.unlink
 
-    # Create existing build_info_data.h
-    build_info_h_path = esphome_core_path / "build_info_data.h"
-    build_info_h_path.write_text("// old build_info_data.h")
+    def fail_on_build_info(self: Path, missing_ok: bool = False) -> None:
+        if self.name == "build_info.json":
+            raise OSError("simulated EACCES")
+        real_unlink(self, missing_ok=missing_ok)
 
-    # Setup mocks
-    mock_core.relative_src_path.side_effect = src_path.joinpath
-    mock_core.relative_build_path.side_effect = build_path.joinpath
-    mock_core.defines = []
-    mock_core.config_hash = 0xDEADBEEF
-    mock_core.comment = ""
-    mock_core.target_platform = "test_platform"
-    mock_core.config = {}
-    mock_iter_components.return_value = []
-    mock_walk_files.return_value = []
-
-    with (
-        patch("esphome.writer.__version__", "2025.1.0-dev"),
-        patch("esphome.writer.importlib.import_module") as mock_import,
-    ):
-        mock_import.side_effect = AttributeError
-        copy_src_tree()
-
-    # Verify build_info files were created despite invalid JSON
-    assert build_info_h_path.exists()
-    new_json = json.loads(build_info_json_path.read_text())
-    assert new_json["config_hash"] == 0xDEADBEEF
+    with patch.object(Path, "unlink", fail_on_build_info):
+        _run_copy_src_tree()
+    assert "Could not remove unreadable build_info.json" in caplog.text
+    assert json.loads(build_info_json_path.read_text())["config_hash"] == 0xDEADBEEF
 
 
 @patch("esphome.writer.CORE")

From 25fb3983cb259f765c747c5d07c8e7afd187c2c0 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:14:40 -0500
Subject: [PATCH 124/155] [mqtt] Skip entity sources for entity types not in
 the config (#18677)

---
 esphome/components/mqtt/__init__.py | 38 +++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index 9178bc79e5..3050ceb1a4 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -8,7 +8,10 @@ from esphome.components.esp32 import (
     idf_version,
     include_builtin_idf_component,
 )
-from esphome.config_helpers import filter_source_files_from_platform
+from esphome.config_helpers import (
+    filter_source_files_from_defines,
+    filter_source_files_from_platform,
+)
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_AVAILABILITY,
@@ -640,7 +643,7 @@ async def mqtt_disable_to_code(config, action_id, template_arg, args):
     return cg.new_Pvariable(action_id, template_arg, paren)
 
 
-FILTER_SOURCE_FILES = filter_source_files_from_platform(
+_platform_filter = filter_source_files_from_platform(
     {
         "mqtt_backend_esp32.cpp": {
             PlatformFramework.ESP32_ARDUINO,
@@ -648,3 +651,34 @@ FILTER_SOURCE_FILES = filter_source_files_from_platform(
         },
     }
 )
+
+# Each entity file is fully #ifdef'd on the USE_<ENTITY> define the core
+# emits for entity platforms present in the config.
+_define_filter = filter_source_files_from_defines(
+    {
+        "mqtt_alarm_control_panel.cpp": "USE_ALARM_CONTROL_PANEL",
+        "mqtt_binary_sensor.cpp": "USE_BINARY_SENSOR",
+        "mqtt_button.cpp": "USE_BUTTON",
+        "mqtt_climate.cpp": "USE_CLIMATE",
+        "mqtt_cover.cpp": "USE_COVER",
+        "mqtt_date.cpp": "USE_DATETIME_DATE",
+        "mqtt_datetime.cpp": "USE_DATETIME_DATETIME",
+        "mqtt_event.cpp": "USE_EVENT",
+        "mqtt_fan.cpp": "USE_FAN",
+        "mqtt_light.cpp": "USE_LIGHT",
+        "mqtt_lock.cpp": "USE_LOCK",
+        "mqtt_number.cpp": "USE_NUMBER",
+        "mqtt_select.cpp": "USE_SELECT",
+        "mqtt_sensor.cpp": "USE_SENSOR",
+        "mqtt_switch.cpp": "USE_SWITCH",
+        "mqtt_text.cpp": "USE_TEXT",
+        "mqtt_text_sensor.cpp": "USE_TEXT_SENSOR",
+        "mqtt_time.cpp": "USE_DATETIME_TIME",
+        "mqtt_update.cpp": "USE_UPDATE",
+        "mqtt_valve.cpp": "USE_VALVE",
+    }
+)
+
+
+def FILTER_SOURCE_FILES() -> list[str]:
+    return _platform_filter() + _define_filter()

From 00bdbf8ed10d0442f0c04d81f5329ab3337f1e71 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:15:21 -0500
Subject: [PATCH 125/155] [uart] Skip uart_debugger.cpp when no debug block is
 configured (#18678)

---
 esphome/components/uart/__init__.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/esphome/components/uart/__init__.py b/esphome/components/uart/__init__.py
index 7e3701bb07..78633bcf6a 100644
--- a/esphome/components/uart/__init__.py
+++ b/esphome/components/uart/__init__.py
@@ -5,7 +5,10 @@ import re
 from esphome import automation, pins
 import esphome.codegen as cg
 from esphome.components.const import CONF_DATA_BITS, CONF_PARITY, CONF_STOP_BITS
-from esphome.config_helpers import filter_source_files_from_platform
+from esphome.config_helpers import (
+    filter_source_files_from_defines,
+    filter_source_files_from_platform,
+)
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_AFTER,
@@ -521,7 +524,7 @@ async def final_step():
         cg.add_define("USE_UART_WAKE_LOOP_ON_RX")
 
 
-FILTER_SOURCE_FILES = filter_source_files_from_platform(
+_platform_filter = filter_source_files_from_platform(
     {
         "uart_component_esp_idf.cpp": {
             PlatformFramework.ESP32_IDF,
@@ -537,3 +540,13 @@ FILTER_SOURCE_FILES = filter_source_files_from_platform(
         },
     }
 )
+
+# uart_debugger.cpp is fully #ifdef'd on USE_UART_DEBUGGER, set only when a
+# debug block is configured.
+_define_filter = filter_source_files_from_defines(
+    {"uart_debugger.cpp": "USE_UART_DEBUGGER"}
+)
+
+
+def FILTER_SOURCE_FILES() -> list[str]:
+    return _platform_filter() + _define_filter()

From a872626fba1d75859110059f63789cc3d8f0ac43 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:15:54 -0500
Subject: [PATCH 126/155] [esp32_ble] Skip ble_advertising.cpp when advertising
 is not used (#18679)

---
 esphome/components/esp32_ble/__init__.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/esphome/components/esp32_ble/__init__.py b/esphome/components/esp32_ble/__init__.py
index 79747c6f31..7e97111686 100644
--- a/esphome/components/esp32_ble/__init__.py
+++ b/esphome/components/esp32_ble/__init__.py
@@ -22,6 +22,7 @@ from esphome.components.esp32 import (
     request_bluetooth,
 )
 from esphome.components.esp32.const import VARIANT_ESP32C2
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ENABLE_ON_BOOT,
@@ -637,3 +638,10 @@ async def ble_disable_to_code(
     args: TemplateArgsType,
 ) -> MockObj:
     return cg.new_Pvariable(action_id, template_arg)
+
+
+# ble_advertising.cpp is fully #ifdef'd on USE_ESP32_BLE_ADVERTISING, set
+# when advertising is enabled here or by esp32_ble_server / esp32_ble_beacon.
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {"ble_advertising.cpp": "USE_ESP32_BLE_ADVERTISING"}
+)

From bdf8dec028fe7a92a371a50e77b688a903fd7cc3 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:16:03 -0500
Subject: [PATCH 127/155] [i2s_audio] Skip SPDIF speaker sources when
 spdif_mode is off (#18676)

---
 esphome/components/i2s_audio/speaker/__init__.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/esphome/components/i2s_audio/speaker/__init__.py b/esphome/components/i2s_audio/speaker/__init__.py
index 1849c376aa..4dc15681bf 100644
--- a/esphome/components/i2s_audio/speaker/__init__.py
+++ b/esphome/components/i2s_audio/speaker/__init__.py
@@ -1,6 +1,7 @@
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components import audio, esp32, speaker
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_BITS_PER_SAMPLE,
@@ -261,3 +262,13 @@ async def to_code(config: ConfigType) -> None:
     if config[CONF_TIMEOUT] != CONF_NEVER:
         cg.add(var.set_timeout(config[CONF_TIMEOUT]))
     cg.add(var.set_buffer_duration(config[CONF_BUFFER_DURATION]))
+
+
+# The SPDIF encoder and speaker are fully #ifdef'd on USE_I2S_AUDIO_SPDIF_MODE,
+# set only when spdif_mode is enabled.
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {
+        "spdif_encoder.cpp": "USE_I2S_AUDIO_SPDIF_MODE",
+        "i2s_audio_spdif.cpp": "USE_I2S_AUDIO_SPDIF_MODE",
+    }
+)

From 41171e61d183104a5cf733f6ebb278b82491f497 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:29:05 -0500
Subject: [PATCH 128/155] [core] Keep str_contains_ignore_case needle literals
 in flash on ESP8266 (#18574)

---
 esphome/core/helpers.cpp               | 20 ++++++++++++++++++++
 esphome/core/helpers.h                 | 12 +++++++++++-
 tests/components/core/helpers_test.cpp |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index ded8051df8..71e3c87e1e 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -233,6 +233,26 @@ bool str_contains_ignore_case_fallback(const char *haystack, const char *needle)
   return false;
 }
 
+#ifdef USE_ESP8266
+// _P mirror of str_contains_ignore_case_fallback above; host tests cover only the fallback,
+// so keep the two bodies in sync.
+bool str_contains_ignore_case_p(const char *haystack, PGM_P needle) {
+  if (haystack == nullptr || needle == nullptr) {
+    return false;
+  }
+  const size_t needle_len = strlen_P(needle);
+  if (needle_len == 0) {
+    return true;
+  }
+  for (const char *p = haystack; *p != '\0'; p++) {
+    if (strncasecmp_P(p, needle, needle_len) == 0) {
+      return true;
+    }
+  }
+  return false;
+}
+#endif  // USE_ESP8266
+
 // str_truncate, str_until, str_lower_case, str_upper_case, str_snake_case moved to alloc_helpers.cpp
 char *str_sanitize_to(char *buffer, size_t buffer_size, const char *str) {
   if (buffer_size == 0) {
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index b13d92ccce..e60316d4ee 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -984,6 +984,15 @@ inline bool str_endswith_ignore_case(const std::string &str, const char *suffix)
 /// Fallback implementation for case insensitive substring comparison.
 bool str_contains_ignore_case_fallback(const char *haystack, const char *needle);
 
+#ifdef USE_ESP8266
+/// ESP8266 internal implementation reading the needle from flash — prefer the
+/// `str_contains_ignore_case` macro which wraps needle literals with PSTR() automatically.
+bool str_contains_ignore_case_p(const char *haystack, PGM_P needle);
+/// Case-insensitive check if needle string is contained in haystack (no heap allocation).
+/// On ESP8266 the needle is wrapped with PSTR() so it stays in flash, which requires it to be
+/// a string literal; a runtime needle needs str_contains_ignore_case_p behind #ifdef USE_ESP8266.
+#define str_contains_ignore_case(haystack, needle) str_contains_ignore_case_p(haystack, PSTR(needle))
+#else
 /// Case-insensitive check if needle string is contained in haystack (no heap allocation).
 inline bool str_contains_ignore_case(const char *haystack, const char *needle) {
   if (!needle || !haystack) {
@@ -991,7 +1000,7 @@ inline bool str_contains_ignore_case(const char *haystack, const char *needle) {
   }
 
 // strcasestr is a GNU extension: newlib only declares it when _GNU_SOURCE is set.
-// ESP32/ESP8266/host builds get it from their framework or from g++ on Linux;
+// ESP32/host builds get it from their framework or from g++ on Linux;
 // LibreTiny, RP2 and Zephyr do not, so they use the hand-rolled fallback.
 #if defined(USE_LIBRETINY) || defined(USE_RP2) || defined(USE_ZEPHYR)
   return str_contains_ignore_case_fallback(haystack, needle);
@@ -999,6 +1008,7 @@ inline bool str_contains_ignore_case(const char *haystack, const char *needle) {
   return strcasestr(haystack, needle) != nullptr;
 #endif  // defined(USE_LIBRETINY) || defined(USE_RP2) || defined(USE_ZEPHYR)
 }
+#endif  // USE_ESP8266
 
 // str_truncate moved to alloc_helpers.h - remove this include before 2026.11.0
 
diff --git a/tests/components/core/helpers_test.cpp b/tests/components/core/helpers_test.cpp
index d5219f9d47..521ae10e5c 100644
--- a/tests/components/core/helpers_test.cpp
+++ b/tests/components/core/helpers_test.cpp
@@ -121,7 +121,7 @@ TEST(StringContainsIgnoreCaseTest, MiscNotMatching) {
 
 TEST(StringContainsIgnoreCaseTest, FallbackMatchesLibc) {
   const char *haystack = "Hello World";
-  for (const char *needle : {"", "Hello", "hELLO", "Hell", "world", "Heaven", "Hello!", "d"}) {
+  for (const char *needle : {"", "Hello", "hELLO", "HELLO", "Hell", "world", "World", "Heaven", "Hello!", "d"}) {
     EXPECT_EQ(str_contains_ignore_case_fallback(haystack, needle), str_contains_ignore_case(haystack, needle))
         << "needle: " << needle;
   }

From 6c23ad661da7c642215d6d2ddcc08c63d09786ac Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:30:11 -0500
Subject: [PATCH 129/155] [bluetooth_proxy] Warn once per transaction when the
 TCP buffer is congested (#18605)

---
 .../bluetooth_connection_hub.cpp              | 23 +++++++++++++++----
 .../bluetooth_connection_hub.h                |  9 +++++++-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/esphome/components/bluetooth_connection/bluetooth_connection_hub.cpp b/esphome/components/bluetooth_connection/bluetooth_connection_hub.cpp
index c8f97f207e..ddab4812cc 100644
--- a/esphome/components/bluetooth_connection/bluetooth_connection_hub.cpp
+++ b/esphome/components/bluetooth_connection/bluetooth_connection_hub.cpp
@@ -275,10 +275,15 @@ void BluetoothConnection::send_ack_(PendingAck kind, uint16_t handle, conn_err_t
   if (this->try_send_ack_(kind, handle, error))
     return;
   // Report a newly owed reply and a displaced one; displacing is the case
-  // that loses a reply. Re-refusing the same one stays quiet.
+  // that loses a reply. Re-refusing the same one stays quiet, and so does a
+  // fresh deferral for the handle already warned about: a congested bulk
+  // transfer re-asks the same handle every cycle and each ack would warn.
   if (!this->has_pending_ack_()) {
-    ESP_LOGW(TAG, "[%d] [%s] GATT reply for handle 0x%04X deferred, TCP buffer full", this->connection_index_,
-             this->address_str_, handle);
+    if (!this->ack_deferred_warned_ || this->pending_ack_handle_ != handle) {
+      ESP_LOGW(TAG, "[%d] [%s] GATT reply for handle 0x%04X deferred, TCP buffer full", this->connection_index_,
+               this->address_str_, handle);
+      this->ack_deferred_warned_ = true;
+    }
   } else if (this->pending_ack_handle_ != handle || this->pending_ack_ != kind) {
     ESP_LOGW(TAG, "[%d] [%s] GATT reply for handle 0x%04X dropped for handle 0x%04X", this->connection_index_,
              this->address_str_, this->pending_ack_handle_, handle);
@@ -365,8 +370,16 @@ void BluetoothConnection::on_notify_data(uint16_t handle, const uint8_t *data, u
   resp.set_data(data, len);
   if (!api_connection->send_message(resp)) {
     // Not latched, same reason as the read reply. Notify data is lossy: the
-    // peripheral will not resend it.
-    ESP_LOGW(TAG, "[%d] [%s] Failed to send notify data response", this->connection_index_, this->address_str_);
+    // peripheral will not resend it. Warn on the first drop only; a congested
+    // link drops a whole stream and one line per notify floods the log.
+    if (!this->notify_drop_warned_) {
+      ESP_LOGW(TAG, "[%d] [%s] Failed to send notify data response, handle 0x%04X", this->connection_index_,
+               this->address_str_, handle);
+      this->notify_drop_warned_ = true;
+    } else {
+      ESP_LOGV(TAG, "[%d] [%s] Failed to send notify data response, handle 0x%04X", this->connection_index_,
+               this->address_str_, handle);
+    }
   }
 }
 
diff --git a/esphome/components/bluetooth_connection/bluetooth_connection_hub.h b/esphome/components/bluetooth_connection/bluetooth_connection_hub.h
index f87d545f7d..47181e81a7 100644
--- a/esphome/components/bluetooth_connection/bluetooth_connection_hub.h
+++ b/esphome/components/bluetooth_connection/bluetooth_connection_hub.h
@@ -164,6 +164,8 @@ class BluetoothConnection final : public ble_device_base::GattClientListener {
     this->pending_ack_ = PendingAck::PENDING_ACK_NONE;
     this->batch_stalled_ = false;
     this->connected_reply_owed_ = false;
+    this->ack_deferred_warned_ = false;
+    this->notify_drop_warned_ = false;
   }
   /// Sole construction site for these replies, shared by send and retry.
   bool try_send_ack_(PendingAck kind, uint16_t handle, conn_err_t error);
@@ -238,7 +240,7 @@ class BluetoothConnection final : public ble_device_base::GattClientListener {
 
   // Group 5: bit-packed tail. The first two bytes were already full, so the
   // first added bit forced a third and took the 8-aligned object 48 -> 56;
-  // the handle, error and retry counter ride in that padding. Four bitfield
+  // the handle, error and retry counter ride in that padding. Two bitfield
   // bits left; another byte-sized member costs 8 per slot.
   static_assert(static_cast<uint8_t>(ClientState::ESTABLISHED) < (1 << 3), "state_ bitfield too narrow");
   static_assert(static_cast<uint8_t>(ConnectionType::V3_WITHOUT_CACHE) < (1 << 2),
@@ -258,6 +260,11 @@ class BluetoothConnection final : public ble_device_base::GattClientListener {
   bool batch_stalled_ : 1 {false};
   /// An owed connected=true reply; the proxy's paced drain re-offers it.
   bool connected_reply_owed_ : 1 {false};
+  /// Set once the deferred warn fired; with an unchanged pending_ack_handle_
+  /// it keeps re-deferrals of the same handle quiet (see send_ack_).
+  bool ack_deferred_warned_ : 1 {false};
+  /// Set on the first dropped notify; later drops log at verbose only.
+  bool notify_drop_warned_ : 1 {false};
   // Plain byte after the bitfields: takes the padding byte instead of
   // straddling pending_ack_'s storage unit and growing the object.
   static_assert(PENDING_ACK_RETRY_LIMIT <= 0xFF, "retry counter too narrow");

From 6f7b9a148227dfc2f8788e3e2a4749f578796026 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:31:48 -0500
Subject: [PATCH 130/155] [gpio] Fix linker error when binary sensor only uses
 expander pins (#18698)

---
 .../components/gpio/binary_sensor/__init__.py |  1 +
 .../gpio/binary_sensor/gpio_binary_sensor.cpp | 22 +++++--
 .../gpio/binary_sensor/gpio_binary_sensor.h   | 13 +++-
 esphome/core/defines.h                        |  1 +
 .../gpio/test_gpio_binary_sensor.py           | 64 +++++++++++++++++++
 .../test_gpio_binary_sensor_expander.yaml     | 21 ++++++
 .../gpio/test_gpio_binary_sensor_mixed.yaml   | 17 +++++
 7 files changed, 133 insertions(+), 6 deletions(-)
 create mode 100644 tests/component_tests/gpio/test_gpio_binary_sensor_expander.yaml
 create mode 100644 tests/component_tests/gpio/test_gpio_binary_sensor_mixed.yaml

diff --git a/esphome/components/gpio/binary_sensor/__init__.py b/esphome/components/gpio/binary_sensor/__init__.py
index 7cc16eb5b2..8a40e4e732 100644
--- a/esphome/components/gpio/binary_sensor/__init__.py
+++ b/esphome/components/gpio/binary_sensor/__init__.py
@@ -133,6 +133,7 @@ async def to_code(config: ConfigType) -> None:
     cg.add(var.set_pin(pin))
 
     if config[CONF_USE_INTERRUPT]:
+        cg.add_define("USE_GPIO_BINARY_SENSOR_INTERRUPT")
         cg.add(var.set_interrupt_type(config[CONF_INTERRUPT_TYPE]))
     else:
         cg.add(var.set_use_interrupt(False))
diff --git a/esphome/components/gpio/binary_sensor/gpio_binary_sensor.cpp b/esphome/components/gpio/binary_sensor/gpio_binary_sensor.cpp
index ff07d76901..9d044dca2d 100644
--- a/esphome/components/gpio/binary_sensor/gpio_binary_sensor.cpp
+++ b/esphome/components/gpio/binary_sensor/gpio_binary_sensor.cpp
@@ -7,6 +7,7 @@ namespace esphome::gpio {
 static const char *const TAG = "gpio.binary_sensor";
 
 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_DEBUG
+#ifdef USE_GPIO_BINARY_SENSOR_INTERRUPT
 // Interrupt type strings indexed by edge-triggered InterruptType values:
 // indices 1-3: RISING_EDGE, FALLING_EDGE, ANY_EDGE; other values (e.g. level-triggered) map to UNKNOWN (index 0).
 PROGMEM_STRING_TABLE(InterruptTypeStrings, "UNKNOWN", "RISING_EDGE", "FALLING_EDGE", "ANY_EDGE");
@@ -19,7 +20,9 @@ static const LogString *gpio_mode_to_string(bool use_interrupt) {
   return use_interrupt ? LOG_STR("interrupt") : LOG_STR("polling");
 }
 #endif
+#endif
 
+#ifdef USE_GPIO_BINARY_SENSOR_INTERRUPT
 void IRAM_ATTR GPIOBinarySensorStore::gpio_intr(GPIOBinarySensorStore *arg) {
   bool new_state = arg->isr_pin_.digital_read();
   if (new_state != arg->state_) {
@@ -43,28 +46,36 @@ void GPIOBinarySensorStore::setup(InternalGPIOPin *pin, Component *component) {
   // Attach interrupt - from this point on, any changes will be caught by the interrupt
   pin->attach_interrupt(&GPIOBinarySensorStore::gpio_intr, this, this->interrupt_type_);
 }
+#endif  // USE_GPIO_BINARY_SENSOR_INTERRUPT
 
 void GPIOBinarySensor::setup() {
+#ifdef USE_GPIO_BINARY_SENSOR_INTERRUPT
   if (this->store_.use_interrupt_) {
     auto *internal_pin = static_cast<InternalGPIOPin *>(this->pin_);
     this->store_.setup(internal_pin, this);
     this->publish_initial_state(this->store_.get_state());
-  } else {
-    this->pin_->setup();
-    this->publish_initial_state(this->pin_->digital_read());
+    return;
   }
+#endif
+  this->pin_->setup();
+  this->publish_initial_state(this->pin_->digital_read());
 }
 
 void GPIOBinarySensor::dump_config() {
   LOG_BINARY_SENSOR("", "GPIO Binary Sensor", this);
   LOG_PIN("  Pin: ", this->pin_);
+#ifdef USE_GPIO_BINARY_SENSOR_INTERRUPT
   ESP_LOGCONFIG(TAG, "  Mode: %s", LOG_STR_ARG(gpio_mode_to_string(this->store_.use_interrupt_)));
   if (this->store_.use_interrupt_) {
     ESP_LOGCONFIG(TAG, "  Interrupt Type: %s", LOG_STR_ARG(interrupt_type_to_string(this->store_.interrupt_type_)));
   }
+#else
+  ESP_LOGCONFIG(TAG, "  Mode: polling");
+#endif
 }
 
 void GPIOBinarySensor::loop() {
+#ifdef USE_GPIO_BINARY_SENSOR_INTERRUPT
   if (this->store_.use_interrupt_) {
     if (this->store_.is_changed()) {
       // Clear the flag immediately to minimize the window where we might miss changes
@@ -78,9 +89,10 @@ void GPIOBinarySensor::loop() {
       // No changes, disable the loop until the next interrupt
       this->disable_loop();
     }
-  } else {
-    this->publish_state(this->pin_->digital_read());
+    return;
   }
+#endif
+  this->publish_state(this->pin_->digital_read());
 }
 
 float GPIOBinarySensor::get_setup_priority() const { return setup_priority::HARDWARE; }
diff --git a/esphome/components/gpio/binary_sensor/gpio_binary_sensor.h b/esphome/components/gpio/binary_sensor/gpio_binary_sensor.h
index 100edb4cca..956443fab5 100644
--- a/esphome/components/gpio/binary_sensor/gpio_binary_sensor.h
+++ b/esphome/components/gpio/binary_sensor/gpio_binary_sensor.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
@@ -10,6 +11,7 @@ namespace esphome::gpio {
 // Store class for ISR data and configuration (no vtables, ISR-safe)
 class GPIOBinarySensorStore {
  public:
+#ifdef USE_GPIO_BINARY_SENSOR_INTERRUPT
   void setup(InternalGPIOPin *pin, Component *component);
 
   static void gpio_intr(GPIOBinarySensorStore *arg);
@@ -29,15 +31,18 @@ class GPIOBinarySensorStore {
     // Separate method to clear the flag
     this->changed_ = false;
   }
+#endif
 
  protected:
   friend class GPIOBinarySensor;
+#ifdef USE_GPIO_BINARY_SENSOR_INTERRUPT
   ISRInternalGPIOPin isr_pin_;
   Component *component_{nullptr};  // Pointer to the component for enable_loop_soon_any_context()
   volatile bool state_{false};
   volatile bool changed_{false};
-  bool use_interrupt_{true};
   gpio::InterruptType interrupt_type_{gpio::INTERRUPT_ANY_EDGE};
+  bool use_interrupt_{true};
+#endif
 };
 
 class GPIOBinarySensor final : public binary_sensor::BinarySensor, public Component {
@@ -46,8 +51,14 @@ class GPIOBinarySensor final : public binary_sensor::BinarySensor, public Compon
   // Interrupts are only detached on reboot when memory is cleared anyway.
 
   void set_pin(GPIOPin *pin) { this->pin_ = pin; }
+#ifdef USE_GPIO_BINARY_SENSOR_INTERRUPT
   void set_use_interrupt(bool use_interrupt) { this->store_.use_interrupt_ = use_interrupt; }
   void set_interrupt_type(gpio::InterruptType type) { this->store_.interrupt_type_ = type; }
+#else
+  // Polling-only build: codegen still emits set_use_interrupt(false) calls,
+  // so keep the setter as an inlined no-op instead of storing the flag.
+  void set_use_interrupt(bool /*use_interrupt*/) {}
+#endif
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
   /// Setup pin
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 5f34437145..42da0191ed 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -72,6 +72,7 @@
 #define USE_ESP32_IMPROV_STATE_CALLBACK
 #define USE_EVENT
 #define USE_FAN
+#define USE_GPIO_BINARY_SENSOR_INTERRUPT
 #define USE_GPIO_SWITCH_INTERLOCK
 #define USE_GRAPH
 #define USE_GRAPHICAL_DISPLAY_MENU
diff --git a/tests/component_tests/gpio/test_gpio_binary_sensor.py b/tests/component_tests/gpio/test_gpio_binary_sensor.py
index f336a9105e..60494d9cba 100644
--- a/tests/component_tests/gpio/test_gpio_binary_sensor.py
+++ b/tests/component_tests/gpio/test_gpio_binary_sensor.py
@@ -3,10 +3,15 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+import logging
 from pathlib import Path
 
 import pytest
 
+from esphome.core import CORE
+
+INTERRUPT_DEFINE = "USE_GPIO_BINARY_SENSOR_INTERRUPT"
+
 
 def test_gpio_binary_sensor_basic_setup(
     generate_main: Callable[[str | Path], str],
@@ -69,3 +74,62 @@ def test_gpio_binary_sensor_explicit_polling_mode(
     )
 
     assert "bs_polling->set_use_interrupt(false);" in main_cpp
+
+
+def test_gpio_binary_sensor_interrupt_emits_define(
+    generate_main: Callable[[str | Path], str],
+) -> None:
+    """
+    An interrupt-mode sensor must emit the define that compiles the ISR code,
+    since the platform ISR pin implementation is only built when needed
+    """
+    generate_main("tests/component_tests/gpio/test_gpio_binary_sensor.yaml")
+
+    assert INTERRUPT_DEFINE in {d.name for d in CORE.defines}
+
+
+def test_gpio_binary_sensor_polling_omits_define(
+    generate_main: Callable[[str | Path], str],
+) -> None:
+    """
+    A polling-only config must not emit the interrupt define, so the ISR code
+    (and its reference to ISRInternalGPIOPin) is compiled out
+    """
+    generate_main("tests/component_tests/gpio/test_gpio_binary_sensor_polling.yaml")
+
+    assert INTERRUPT_DEFINE not in {d.name for d in CORE.defines}
+
+
+def test_gpio_binary_sensor_mixed_modes_emit_define(
+    generate_main: Callable[[str | Path], str],
+) -> None:
+    """
+    With one interrupt and one polling sensor, the define is emitted and the
+    polling instance still opts out via its setter
+    """
+    main_cpp = generate_main(
+        "tests/component_tests/gpio/test_gpio_binary_sensor_mixed.yaml"
+    )
+
+    assert INTERRUPT_DEFINE in {d.name for d in CORE.defines}
+    assert "bs_polling->set_use_interrupt(false);" in main_cpp
+    assert "bs_interrupt->set_use_interrupt" not in main_cpp
+
+
+def test_gpio_binary_sensor_expander_pin_omits_define(
+    generate_main: Callable[[str | Path], str],
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """
+    An expander pin can't use interrupts: final validation falls back to
+    polling and the interrupt define must not be emitted. This is the config
+    that fails to link if the ISR code is compiled without an internal pin
+    """
+    with caplog.at_level(logging.INFO):
+        main_cpp = generate_main(
+            "tests/component_tests/gpio/test_gpio_binary_sensor_expander.yaml"
+        )
+
+    assert "bs_expander->set_use_interrupt(false);" in main_cpp
+    assert INTERRUPT_DEFINE not in {d.name for d in CORE.defines}
+    assert "falling back to polling mode" in caplog.text
diff --git a/tests/component_tests/gpio/test_gpio_binary_sensor_expander.yaml b/tests/component_tests/gpio/test_gpio_binary_sensor_expander.yaml
new file mode 100644
index 0000000000..f153ccebfd
--- /dev/null
+++ b/tests/component_tests/gpio/test_gpio_binary_sensor_expander.yaml
@@ -0,0 +1,21 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+
+i2c:
+  scl: 16
+  sda: 17
+
+ch422g:
+  - id: ch422g_hub
+
+binary_sensor:
+  - platform: gpio
+    name: "Expander Sensor"
+    id: bs_expander
+    pin:
+      ch422g: ch422g_hub
+      number: 1
+      mode: INPUT
diff --git a/tests/component_tests/gpio/test_gpio_binary_sensor_mixed.yaml b/tests/component_tests/gpio/test_gpio_binary_sensor_mixed.yaml
new file mode 100644
index 0000000000..0e8c7ec3fd
--- /dev/null
+++ b/tests/component_tests/gpio/test_gpio_binary_sensor_mixed.yaml
@@ -0,0 +1,17 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+
+binary_sensor:
+  - platform: gpio
+    pin: 5
+    name: "Interrupt Sensor"
+    id: bs_interrupt
+
+  - platform: gpio
+    pin: 4
+    name: "Polling Sensor"
+    id: bs_polling
+    use_interrupt: false

From 31afd94a30dfa134548864a6123c6c74ce1218f7 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:35:45 -0500
Subject: [PATCH 131/155] [noise] Declare libsodium as a direct dependency
 (#18692)

---
 esphome/components/noise/__init__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/esphome/components/noise/__init__.py b/esphome/components/noise/__init__.py
index e5fcc94332..3a8e2609ef 100644
--- a/esphome/components/noise/__init__.py
+++ b/esphome/components/noise/__init__.py
@@ -64,6 +64,11 @@ def encryption_schema(config: ConfigType | None) -> ConfigType:
 async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_NOISE")
     cg.add_library("esphome/noise-c", "0.1.21")
+    # noise-c depends on libsodium, but declaring it here too lets the
+    # library manager see the full set up front instead of discovering
+    # libsodium only after noise-c has downloaded, so the two can download
+    # in parallel. The version must match noise-c's library.json.
+    cg.add_library("esphome/libsodium", "1.10021.4")
     # Enable optimized memzero/memcmp in libsodium instead of volatile byte loops
     cg.add_build_flag("-DHAVE_WEAK_SYMBOLS=1")
     cg.add_build_flag("-DHAVE_INLINE_ASM=1")

From c9e91be35fe834e76f6b9735d7f21cb25ef89a3b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 18:45:26 -0500
Subject: [PATCH 132/155] [web_server_idf] Skip multipart parser sources when
 OTA upload is disabled (#18534)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
---
 esphome/components/web_server_idf/__init__.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/esphome/components/web_server_idf/__init__.py b/esphome/components/web_server_idf/__init__.py
index adf21ddc49..1f195425f5 100644
--- a/esphome/components/web_server_idf/__init__.py
+++ b/esphome/components/web_server_idf/__init__.py
@@ -2,6 +2,7 @@ from esphome.components.esp32 import (
     add_idf_sdkconfig_option,
     include_builtin_idf_component,
 )
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 
 CODEOWNERS = ["@dentra"]
@@ -18,3 +19,10 @@ async def to_code(config):
     # Re-enable esp-tls (excluded by default to save compile time);
     # web_server_idf.cpp includes <esp_tls_crypto.h> for digest auth
     include_builtin_idf_component("esp-tls")
+
+
+# multipart.cpp is fully #ifdef'd on USE_WEBSERVER_OTA (set by the
+# web_server OTA platform); skip it when OTA uploads are not configured.
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {"multipart.cpp": "USE_WEBSERVER_OTA"}
+)

From 34c1a009b638f4fc0f92e2f0c0219ee34ea651ca Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 19:20:00 -0500
Subject: [PATCH 133/155] [core] Use filter_source_files_from_defines in api,
 socket and ethernet (#18674)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/api/__init__.py      | 36 ++++++++++---------------
 esphome/components/ethernet/__init__.py | 22 +++++++++------
 esphome/components/socket/__init__.py   | 23 +++++++---------
 3 files changed, 38 insertions(+), 43 deletions(-)

diff --git a/esphome/components/api/__init__.py b/esphome/components/api/__init__.py
index 53ad0fe5d7..a10bfd3418 100644
--- a/esphome/components/api/__init__.py
+++ b/esphome/components/api/__init__.py
@@ -14,7 +14,7 @@ from esphome.components.noise import (  # noqa: F401
     encryption_schema,
     validate_encryption_key,
 )
-from esphome.config_helpers import get_logger_level
+from esphome.config_helpers import filter_source_files_from_defines, get_logger_level
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ACTION,
@@ -835,11 +835,20 @@ async def api_connected_to_code(
     return var
 
 
+# user_services.cpp is only needed when user defined actions exist; the
+# frame helpers are fully #ifdef'd on the protocol defines set in to_code
+# (both are set when encryption is configured without a key).
+_define_filter = filter_source_files_from_defines(
+    {
+        "user_services.cpp": "USE_API_USER_DEFINED_ACTIONS",
+        "api_frame_helper_noise.cpp": "USE_API_NOISE",
+        "api_frame_helper_plaintext.cpp": "USE_API_PLAINTEXT",
+    }
+)
+
+
 def FILTER_SOURCE_FILES() -> list[str]:
-    """Filter out api_pb2_dump.cpp when proto message dumping is not enabled,
-    user_services.cpp when no services are defined, and protocol-specific
-    implementations based on encryption configuration."""
-    files_to_filter: list[str] = []
+    files_to_filter = _define_filter()
 
     # api_pb2_dump.cpp is only needed when HAS_PROTO_MESSAGE_DUMP is defined
     # This is a particularly large file that still needs to be opened and read
@@ -850,21 +859,4 @@ def FILTER_SOURCE_FILES() -> list[str]:
     if get_logger_level() != "VERY_VERBOSE":
         files_to_filter.append("api_pb2_dump.cpp")
 
-    # user_services.cpp is only needed when services are defined
-    config = CORE.config.get(DOMAIN, {})
-    if config and not config.get(CONF_ACTIONS) and not config[CONF_CUSTOM_SERVICES]:
-        files_to_filter.append("user_services.cpp")
-
-    # Filter protocol-specific implementations based on encryption configuration
-    encryption_config = config.get(CONF_ENCRYPTION) if config else None
-
-    # If encryption is not configured at all, we only need plaintext
-    if encryption_config is None:
-        files_to_filter.append("api_frame_helper_noise.cpp")
-    # If encryption is configured with a key, we only need noise
-    elif encryption_config.get(CONF_KEY):
-        files_to_filter.append("api_frame_helper_plaintext.cpp")
-    # If encryption is configured but no key is provided, we need both
-    # (this allows a plaintext client to provide a noise key)
-
     return files_to_filter
diff --git a/esphome/components/ethernet/__init__.py b/esphome/components/ethernet/__init__.py
index cd5904f501..a44a609d3c 100644
--- a/esphome/components/ethernet/__init__.py
+++ b/esphome/components/ethernet/__init__.py
@@ -10,7 +10,10 @@ from esphome.components.network import (
     get_priority_interfaces_from_full_config,
     ip_address_literal,
 )
-from esphome.config_helpers import filter_source_files_from_platform
+from esphome.config_helpers import (
+    filter_source_files_from_defines,
+    filter_source_files_from_platform,
+)
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ADDRESS,
@@ -821,8 +824,15 @@ _platform_filter = filter_source_files_from_platform(
 )
 
 
+# The custom W5500 SPI driver is fully #ifdef'd on USE_ESP32 and
+# USE_ETHERNET_W5500 (the platform filter map above handles non-ESP32).
+_define_filter = filter_source_files_from_defines(
+    {"w5500_custom_spi.cpp": "USE_ETHERNET_W5500"}
+)
+
+
 def _filter_source_files() -> list[str]:
-    excluded = _platform_filter()
+    excluded = _platform_filter() + _define_filter()
     eth_data = CORE.data.get(KEY_ETHERNET, {})
     eth_type = eth_data.get(ETHERNET_TYPE_KEY)
     # Only compile the custom JL1101 driver when JL1101 is configured
@@ -836,12 +846,8 @@ def _filter_source_files() -> list[str]:
         # to avoid shadowing. Native IDF builds always need the custom driver.
         if cv.Version(5, 4, 2) <= idf_version() < cv.Version(6, 0, 0):
             excluded.append("esp_eth_phy_jl1101.c")
-    # The custom W5500 SPI driver is fully #ifdef'd on USE_ESP32 and
-    # USE_ETHERNET_W5500 (the platform filter map above handles non-ESP32);
-    # skip it entirely for the other ethernet types.
-    if eth_type != "W5500":
-        excluded.append("w5500_custom_spi.cpp")
-    return excluded
+    # The platform and define filters can both name the same file
+    return list(dict.fromkeys(excluded))
 
 
 FILTER_SOURCE_FILES = _filter_source_files
diff --git a/esphome/components/socket/__init__.py b/esphome/components/socket/__init__.py
index cd002d9eb0..895fc8d03a 100644
--- a/esphome/components/socket/__init__.py
+++ b/esphome/components/socket/__init__.py
@@ -4,6 +4,7 @@ from enum import StrEnum
 import logging
 
 import esphome.codegen as cg
+from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.core import CORE
 
@@ -181,16 +182,12 @@ async def to_code(config):
         cg.add_build_flag("-DUSE_LWIP_FAST_SELECT")
 
 
-def FILTER_SOURCE_FILES() -> list[str]:
-    """Return list of socket implementation files that aren't selected by the user."""
-    impl = CORE.config["socket"][CONF_IMPLEMENTATION]
-
-    # Build list of files to exclude based on selected implementation
-    excluded = []
-    if impl != IMPLEMENTATION_LWIP_TCP:
-        excluded.append("lwip_raw_tcp_impl.cpp")
-    if impl != IMPLEMENTATION_BSD_SOCKETS:
-        excluded.append("bsd_sockets_impl.cpp")
-    if impl != IMPLEMENTATION_LWIP_SOCKETS:
-        excluded.append("lwip_sockets_impl.cpp")
-    return excluded
+# Each implementation file is fully #ifdef'd on the define set in to_code
+# for the selected implementation.
+FILTER_SOURCE_FILES = filter_source_files_from_defines(
+    {
+        "lwip_raw_tcp_impl.cpp": "USE_SOCKET_IMPL_LWIP_TCP",
+        "bsd_sockets_impl.cpp": "USE_SOCKET_IMPL_BSD_SOCKETS",
+        "lwip_sockets_impl.cpp": "USE_SOCKET_IMPL_LWIP_SOCKETS",
+    }
+)

From d75f85b089745416246f6a43482945d35eb62af1 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 19:23:08 -0500
Subject: [PATCH 134/155] [network] Add tcp_send_buffer option (#18610)

---
 esphome/components/network/__init__.py        | 25 ++++++
 .../components/network/network_component.cpp  | 10 +++
 .../components/network/network_component.h    |  1 +
 .../network/config/tcp_send_buffer.yaml       | 14 +++
 .../config/tcp_send_buffer_high_perf.yaml     | 15 ++++
 .../network/test_tcp_send_buffer.py           | 85 +++++++++++++++++++
 tests/components/network/test.esp32-idf.yaml  |  1 +
 7 files changed, 151 insertions(+)
 create mode 100644 tests/component_tests/network/config/tcp_send_buffer.yaml
 create mode 100644 tests/component_tests/network/config/tcp_send_buffer_high_perf.yaml
 create mode 100644 tests/component_tests/network/test_tcp_send_buffer.py

diff --git a/esphome/components/network/__init__.py b/esphome/components/network/__init__.py
index 3544fb2647..96a6f11b9a 100644
--- a/esphome/components/network/__init__.py
+++ b/esphome/components/network/__init__.py
@@ -26,6 +26,16 @@ _LOGGER = logging.getLogger(__name__)
 # Components can request high performance networking and this configures lwip and WiFi settings
 KEY_HIGH_PERFORMANCE_NETWORKING = "high_performance_networking"
 CONF_ENABLE_HIGH_PERFORMANCE = "enable_high_performance"
+CONF_TCP_SEND_BUFFER = "tcp_send_buffer"
+
+# lwIP queues at most this many unsent/unacked bytes per TCP socket; the
+# stock ESP-IDF default (5744 bytes) stalls bursty senders like a Bluetooth
+# proxy streaming GATT notifications. Bounds follow the lwIP guidance for the
+# default 1440 byte MSS: at least 2 x MSS, at most 65535 without window
+# scaling. The cap is kept even when window scaling is on (high performance
+# with PSRAM) as a deliberate conservative bound.
+TCP_SEND_BUFFER_MIN = 2880
+TCP_SEND_BUFFER_MAX = 65535
 
 # Network priority tracking infrastructure
 # Components can query this to determine their relative setup priority.
@@ -306,6 +316,11 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_ENABLE_HIGH_PERFORMANCE): cv.All(
                 cv.boolean, cv.only_on_esp32
             ),
+            cv.Optional(CONF_TCP_SEND_BUFFER): cv.All(
+                cv.validate_bytes,
+                cv.int_range(min=TCP_SEND_BUFFER_MIN, max=TCP_SEND_BUFFER_MAX),
+                cv.only_on_esp32,
+            ),
             cv.Optional(CONF_PRIORITY): _validate_priority_list,
         }
     ),
@@ -446,6 +461,16 @@ async def to_code(config):
             add_idf_sdkconfig_option("CONFIG_LWIP_TCP_RECVMBOX_SIZE", 64)
             add_idf_sdkconfig_option("CONFIG_LWIP_TCPIP_RECVMBOX_SIZE", 64)
 
+    # After the high performance block so an explicit size wins over the
+    # bundle's 65534 (last write wins in the sdkconfig store).
+    if (tcp_send_buffer := config.get(CONF_TCP_SEND_BUFFER)) is not None:
+        if CORE.is_esp32 and should_enable:
+            _LOGGER.info(
+                "TCP send buffer set to %d bytes by configuration (overriding high performance value)",
+                tcp_send_buffer,
+            )
+        add_idf_sdkconfig_option("CONFIG_LWIP_TCP_SND_BUF_DEFAULT", tcp_send_buffer)
+
     if CORE.is_nrf52:
         zephyr_add_prj_conf("NETWORKING", True)
         zephyr_add_prj_conf("NET_IPV6", True)
diff --git a/esphome/components/network/network_component.cpp b/esphome/components/network/network_component.cpp
index cf457bb661..7e05983733 100644
--- a/esphome/components/network/network_component.cpp
+++ b/esphome/components/network/network_component.cpp
@@ -6,6 +6,7 @@
 #include "esp_err.h"
 #include "esp_netif.h"
 #include "esp_event.h"
+#include "lwip/opt.h"
 
 #ifdef USE_NETWORK_DEFAULT_ROUTE
 #include "esphome/core/application.h"
@@ -43,6 +44,15 @@ void NetworkComponent::setup() {
   }
 }
 
+void NetworkComponent::dump_config() {
+  // The effective compile-time lwIP value, so the log reflects tcp_send_buffer
+  // or the high performance bundle when either changed it.
+  ESP_LOGCONFIG(TAG,
+                "Network:\n"
+                "  TCP send buffer: %d bytes",
+                TCP_SND_BUF);
+}
+
 #ifdef USE_NETWORK_DEFAULT_ROUTE
 static esp_netif_t *connected_wifi_netif() {
 #ifdef USE_WIFI
diff --git a/esphome/components/network/network_component.h b/esphome/components/network/network_component.h
index 8d4866d4f0..870530974e 100644
--- a/esphome/components/network/network_component.h
+++ b/esphome/components/network/network_component.h
@@ -13,6 +13,7 @@ namespace esphome::network {
 class NetworkComponent final : public Component {
  public:
   void setup() override;
+  void dump_config() override;
   // AFTER_BLUETOOTH: BLE controller must initialize before esp_netif_init per IDF guidance.
   float get_setup_priority() const override { return setup_priority::AFTER_BLUETOOTH; }
 
diff --git a/tests/component_tests/network/config/tcp_send_buffer.yaml b/tests/component_tests/network/config/tcp_send_buffer.yaml
new file mode 100644
index 0000000000..59c3a29fd2
--- /dev/null
+++ b/tests/component_tests/network/config/tcp_send_buffer.yaml
@@ -0,0 +1,14 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: "test_ssid"
+  password: "test_password"
+
+network:
+  tcp_send_buffer: 32kB
diff --git a/tests/component_tests/network/config/tcp_send_buffer_high_perf.yaml b/tests/component_tests/network/config/tcp_send_buffer_high_perf.yaml
new file mode 100644
index 0000000000..18dd1fe5fd
--- /dev/null
+++ b/tests/component_tests/network/config/tcp_send_buffer_high_perf.yaml
@@ -0,0 +1,15 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+wifi:
+  ssid: "test_ssid"
+  password: "test_password"
+
+network:
+  enable_high_performance: true
+  tcp_send_buffer: 16384
diff --git a/tests/component_tests/network/test_tcp_send_buffer.py b/tests/component_tests/network/test_tcp_send_buffer.py
new file mode 100644
index 0000000000..6498921243
--- /dev/null
+++ b/tests/component_tests/network/test_tcp_send_buffer.py
@@ -0,0 +1,85 @@
+"""Tests for the ``network: tcp_send_buffer:`` option.
+
+The option sets lwIP's per-socket TCP send buffer
+(CONFIG_LWIP_TCP_SND_BUF_DEFAULT) on ESP-IDF. The stock default (5744 bytes)
+stalls bursty senders such as a Bluetooth proxy streaming GATT notifications;
+until now the only way to raise it was the all-or-nothing
+``enable_high_performance`` bundle.
+"""
+
+from collections.abc import Callable
+from pathlib import Path
+
+import pytest
+from voluptuous import Invalid
+
+from esphome import config_validation as cv
+from esphome.components.esp32.const import (
+    KEY_SDKCONFIG_OPTIONS,
+    KEY_VARIANT,
+    VARIANT_ESP32,
+)
+from esphome.components.network import (
+    CONF_TCP_SEND_BUFFER,
+    CONFIG_SCHEMA,
+    TCP_SEND_BUFFER_MAX,
+    TCP_SEND_BUFFER_MIN,
+)
+from esphome.const import KEY_ESP32, KEY_FRAMEWORK_VERSION, PlatformFramework
+from esphome.core import CORE
+from tests.component_tests.types import SetCoreConfigCallable
+
+
+def _sdkconfig_option(name: str) -> int | None:
+    return CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS].get(name)
+
+
+def test_tcp_send_buffer_sets_sdkconfig(
+    generate_main: Callable[[str | Path], str],
+    component_config_path: Callable[[str], Path],
+) -> None:
+    generate_main(component_config_path("tcp_send_buffer.yaml"))
+    assert _sdkconfig_option("CONFIG_LWIP_TCP_SND_BUF_DEFAULT") == 32000
+
+
+def test_tcp_send_buffer_overrides_high_performance(
+    generate_main: Callable[[str | Path], str],
+    component_config_path: Callable[[str], Path],
+) -> None:
+    """An explicit size wins over the high performance bundle's 65534."""
+    generate_main(component_config_path("tcp_send_buffer_high_perf.yaml"))
+    assert _sdkconfig_option("CONFIG_LWIP_TCP_SND_BUF_DEFAULT") == 16384
+
+
+@pytest.mark.parametrize("value", [TCP_SEND_BUFFER_MIN, TCP_SEND_BUFFER_MAX])
+def test_boundary_values_accepted(
+    set_core_config: SetCoreConfigCallable, value: int
+) -> None:
+    set_core_config(
+        PlatformFramework.ESP32_IDF,
+        core_data={KEY_FRAMEWORK_VERSION: cv.Version(5, 5, 5)},
+        platform_data={KEY_VARIANT: VARIANT_ESP32},
+    )
+    assert CONFIG_SCHEMA({"tcp_send_buffer": value})[CONF_TCP_SEND_BUFFER] == value
+
+
+@pytest.mark.parametrize("value", ["1kB", "128kB"])
+def test_out_of_range_rejected(
+    set_core_config: SetCoreConfigCallable, value: str
+) -> None:
+    set_core_config(
+        PlatformFramework.ESP32_IDF,
+        core_data={KEY_FRAMEWORK_VERSION: cv.Version(5, 5, 5)},
+        platform_data={KEY_VARIANT: VARIANT_ESP32},
+    )
+    with pytest.raises(Invalid):
+        CONFIG_SCHEMA({"tcp_send_buffer": value})
+
+
+def test_rejected_on_esp8266(set_core_config: SetCoreConfigCallable) -> None:
+    set_core_config(
+        PlatformFramework.ESP8266_ARDUINO,
+        core_data={KEY_FRAMEWORK_VERSION: cv.Version(3, 1, 2)},
+    )
+    with pytest.raises(Invalid, match="esp32"):
+        CONFIG_SCHEMA({"tcp_send_buffer": "32kB"})
diff --git a/tests/components/network/test.esp32-idf.yaml b/tests/components/network/test.esp32-idf.yaml
index 7c01bafa0d..6ad365ead2 100644
--- a/tests/components/network/test.esp32-idf.yaml
+++ b/tests/components/network/test.esp32-idf.yaml
@@ -2,3 +2,4 @@
 
 network:
   enable_high_performance: true
+  tcp_send_buffer: 32kB

From 1ceaf699c2f4aaae4f90f5113ad4168e5c4977e7 Mon Sep 17 00:00:00 2001
From: Bonne Eggleston <bonne@exciton.com.au>
Date: Sun, 23 Aug 2026 17:33:53 -0700
Subject: [PATCH 135/155] [modbus_controller] Rename custom_command to
 custom_pdu; reject address 0; retire skip_updates (#18652)

---
 esphome/components/modbus/__init__.py         |  33 ++++-
 .../components/modbus_controller/__init__.py  | 121 ++++++++++++++++--
 .../binary_sensor/__init__.py                 |   5 +-
 .../binary_sensor/modbus_binarysensor.h       |   3 +-
 esphome/components/modbus_controller/const.py |   1 +
 .../modbus_controller/modbus_controller.cpp   |  92 ++++++-------
 .../modbus_controller/modbus_controller.h     |  21 +--
 .../modbus_controller/number/__init__.py      |  12 +-
 .../modbus_controller/number/modbus_number.h  |   3 +-
 .../modbus_controller/output/__init__.py      |  11 +-
 .../modbus_controller/output/modbus_output.h  |   2 -
 .../modbus_controller/select/__init__.py      |  10 +-
 .../modbus_controller/select/modbus_select.h  |   5 +-
 .../modbus_controller/sensor/__init__.py      |   5 +-
 .../modbus_controller/sensor/modbus_sensor.h  |   3 +-
 .../modbus_controller/switch/__init__.py      |   5 +-
 .../modbus_controller/switch/modbus_switch.h  |   3 +-
 .../modbus_controller/text_sensor/__init__.py |   5 +-
 .../text_sensor/modbus_textsensor.h           |   3 +-
 .../modbus_controller/test_custom_pdu.py      |  47 +++++++
 .../components/modbus_controller/common.yaml  |  16 +++
 ....yaml => uart_mock_modbus_custom_pdu.yaml} |  11 +-
 .../fixtures/uart_mock_modbus_grouping.yaml   |   4 +-
 .../fixtures/uart_mock_modbus_offline.yaml    |   6 +-
 .../uart_mock_modbus_shared_address.yaml      |  21 +--
 tests/integration/test_uart_mock_modbus.py    |  28 ++--
 26 files changed, 315 insertions(+), 161 deletions(-)
 create mode 100644 tests/component_tests/modbus_controller/test_custom_pdu.py
 rename tests/integration/fixtures/{uart_mock_modbus_custom_command.yaml => uart_mock_modbus_custom_pdu.yaml} (83%)

diff --git a/esphome/components/modbus/__init__.py b/esphome/components/modbus/__init__.py
index 89ffc7facf..c9ba00f111 100644
--- a/esphome/components/modbus/__init__.py
+++ b/esphome/components/modbus/__init__.py
@@ -175,15 +175,34 @@ async def to_code(config: ConfigType) -> None:
         cg.add(var.set_turnaround_time(config[CONF_TURNAROUND_TIME]))
 
 
+# The broadcast address (0) is delivered to every device and is never answered (Modbus 4.1),
+# so it cannot identify an individual device or read anything back.
+BROADCAST_ADDRESS = 0
+
+
+def reject_broadcast_address(
+    address: int, usage: str, guidance: str, path: list[str] | None = None
+) -> None:
+    """Raise cv.Invalid if `address` is the Modbus broadcast address (0).
+
+    `usage` names how the address is being used (e.g. "a server device address") and `guidance`
+    is a sentence telling the user what to do instead. Sharing the leading sentence here keeps the
+    call sites (server device, modbus_controller) from drifting apart.
+    """
+    if address == BROADCAST_ADDRESS:
+        raise cv.Invalid(
+            f"Address 0 is the Modbus broadcast address and cannot be used as {usage}. {guidance}",
+            path,
+        )
+
+
 def _validate_server_address(value: Any) -> int:
     address = cv.hex_uint8_t(value)
-    # The broadcast address (0) is delivered to every device and is never answered (Modbus 4.1),
-    # so it cannot identify an individual server device.
-    if address == 0:
-        raise cv.Invalid(
-            "Address 0 is the Modbus broadcast address and cannot be used as a "
-            "server device address. Assign a unique unit address instead."
-        )
+    reject_broadcast_address(
+        address,
+        "a server device address",
+        "Assign a unique unit address instead.",
+    )
     return address
 
 
diff --git a/esphome/components/modbus_controller/__init__.py b/esphome/components/modbus_controller/__init__.py
index f3cd28d138..188b552a3c 100644
--- a/esphome/components/modbus_controller/__init__.py
+++ b/esphome/components/modbus_controller/__init__.py
@@ -1,4 +1,6 @@
 import binascii
+from dataclasses import dataclass
+from typing import Any
 
 from esphome import automation
 import esphome.codegen as cg
@@ -10,7 +12,9 @@ from esphome.components.modbus.helpers import (
 )
 import esphome.config_validation as cv
 from esphome.const import CONF_ADDRESS, CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_OFFSET
+from esphome.core import CORE
 from esphome.cpp_helpers import logging
+import esphome.final_validate as fv
 from esphome.types import ConfigType
 
 from .const import (
@@ -19,6 +23,7 @@ from .const import (
     CONF_BYTE_OFFSET,
     CONF_COMMAND_THROTTLE,
     CONF_CUSTOM_COMMAND,
+    CONF_CUSTOM_PDU,
     CONF_FORCE_NEW_RANGE,
     CONF_MAX_CMD_RETRIES,
     CONF_MODBUS_CONTROLLER_ID,
@@ -41,6 +46,8 @@ AUTO_LOAD = ["modbus"]
 
 MULTI_CONF = True
 
+DOMAIN = "modbus_controller"
+
 modbus_controller_ns = cg.esphome_ns.namespace("modbus_controller")
 ModbusController = modbus_controller_ns.class_("ModbusController", cg.PollingComponent)
 
@@ -48,6 +55,19 @@ SensorItem = modbus_controller_ns.struct("SensorItem")
 
 _LOGGER = logging.getLogger(__name__)
 
+
+@dataclass
+class ModbusControllerData:
+    # Set once the deprecated 'skip_updates' warning has been emitted so we warn only once total.
+    skip_updates_warned: bool = False
+
+
+def _get_data() -> ModbusControllerData:
+    if DOMAIN not in CORE.data:
+        CORE.data[DOMAIN] = ModbusControllerData()
+    return CORE.data[DOMAIN]
+
+
 # Remove before 2027.2.0
 _REMOVED_OPTIONS = {
     CONF_COMMAND_THROTTLE: "Command spacing is handled by the 'modbus' component - use 'turnaround_time' there instead.",
@@ -67,6 +87,32 @@ def _warn_removed_options(config: ConfigType) -> ConfigType:
     return config
 
 
+def _reject_broadcast_address(config: ConfigType) -> ConfigType:
+    """A modbus_controller polls one device, so its address cannot be the broadcast address (0):
+    a broadcast is never answered (Modbus 4.1), so no register could ever read back."""
+    modbus.reject_broadcast_address(
+        config.get(CONF_ADDRESS),
+        "a modbus_controller device address",
+        "Assign the unit address of the device you want to poll.",
+        [CONF_ADDRESS],
+    )
+    return config
+
+
+# Remove before 2027.3.0. skip_updates (a per-sensor option) no longer does anything: every range is
+# polled each update_interval. The key is still accepted so existing configs keep working, with a warning.
+def validate_skip_updates_deprecated(value: Any) -> int:
+    data = _get_data()
+    if not data.skip_updates_warned:
+        _LOGGER.warning(
+            "[modbus_controller] 'skip_updates' no longer has any effect and will be removed in 2027.3.0. "
+            "To poll some registers less often, add a second modbus_controller with the same address and a "
+            "slower update_interval, and attach the slow sensors to it."
+        )
+        data.skip_updates_warned = True
+    return cv.positive_int(value)
+
+
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
@@ -92,13 +138,32 @@ CONFIG_SCHEMA = cv.All(
     .extend(cv.polling_component_schema("60s"))
     .extend(modbus.modbus_device_schema(0x01)),
     _warn_removed_options,
+    _reject_broadcast_address,
 )
 
 ModbusItemBaseSchema = cv.Schema(
     {
         cv.GenerateID(CONF_MODBUS_CONTROLLER_ID): cv.use_id(ModbusController),
         cv.Optional(CONF_ADDRESS): cv.positive_int,
-        cv.Optional(CONF_CUSTOM_COMMAND): cv.ensure_list(cv.hex_uint8_t),
+        cv.Exclusive(
+            CONF_CUSTOM_PDU,
+            "custom_source",
+            f"{CONF_CUSTOM_PDU} and {CONF_CUSTOM_COMMAND} can't be used together",
+        ): cv.All(
+            cv.ensure_list(cv.hex_uint8_t),
+            cv.Length(min=1, max=modbus.MAX_PDU_SIZE),
+        ),
+        # Deprecated: takes a raw frame with a leading device address byte. Auto-migrated to
+        # custom_pdu in migrate_custom_command (final validate). Remove before 2027.3.0. The upper
+        # bound is MAX_PDU_SIZE + 1: the extra byte is the address the migration strips.
+        cv.Exclusive(
+            CONF_CUSTOM_COMMAND,
+            "custom_source",
+            f"{CONF_CUSTOM_PDU} and {CONF_CUSTOM_COMMAND} can't be used together",
+        ): cv.All(
+            cv.ensure_list(cv.hex_uint8_t),
+            cv.Length(min=2, max=modbus.MAX_PDU_SIZE + 1),
+        ),
         cv.Exclusive(
             CONF_OFFSET,
             "offset",
@@ -110,7 +175,7 @@ ModbusItemBaseSchema = cv.Schema(
             f"{CONF_OFFSET} and {CONF_BYTE_OFFSET} can't be used together",
         ): cv.positive_int,
         cv.Optional(CONF_BITMASK, default=0xFFFFFFFF): cv.hex_uint32_t,
-        cv.Optional(CONF_SKIP_UPDATES, default=0): cv.positive_int,
+        cv.Optional(CONF_SKIP_UPDATES): validate_skip_updates_deprecated,
         cv.Optional(CONF_FORCE_NEW_RANGE, default=False): cv.boolean,
         cv.Optional(CONF_LAMBDA): cv.returning_lambda,
         cv.Optional(CONF_RESPONSE_SIZE, default=0): cv.positive_int,
@@ -119,22 +184,56 @@ ModbusItemBaseSchema = cv.Schema(
 
 
 def validate_modbus_register(config):
-    if CONF_CUSTOM_COMMAND not in config and CONF_ADDRESS not in config:
+    # custom_command is the deprecated alias for custom_pdu (migrated later in final validate); treat
+    # either as "a custom frame is configured" so the address/register_type rules match.
+    has_custom = CONF_CUSTOM_PDU in config or CONF_CUSTOM_COMMAND in config
+    if not has_custom and CONF_ADDRESS not in config:
         raise cv.Invalid(
-            f" {CONF_ADDRESS} is a required property if '{CONF_CUSTOM_COMMAND}:' isn't used"
+            f" {CONF_ADDRESS} is a required property if '{CONF_CUSTOM_PDU}:' isn't used"
         )
-    if CONF_CUSTOM_COMMAND in config and CONF_REGISTER_TYPE in config:
+    if has_custom and CONF_REGISTER_TYPE in config:
         raise cv.Invalid(
-            f"can't use '{CONF_REGISTER_TYPE}:' together with '{CONF_CUSTOM_COMMAND}:'",
+            f"can't use '{CONF_REGISTER_TYPE}:' together with '{CONF_CUSTOM_PDU}:'",
         )
 
-    if CONF_CUSTOM_COMMAND not in config and CONF_REGISTER_TYPE not in config:
+    if not has_custom and CONF_REGISTER_TYPE not in config:
         raise cv.Invalid(
-            f" {CONF_REGISTER_TYPE} is a required property if '{CONF_CUSTOM_COMMAND}:' isn't used"
+            f" {CONF_REGISTER_TYPE} is a required property if '{CONF_CUSTOM_PDU}:' isn't used"
         )
     return config
 
 
+def migrate_custom_command(config: ConfigType) -> None:
+    """Final-validate: auto-migrate the deprecated custom_command (raw frame incl. device address)
+    to custom_pdu (PDU only). custom_pdu is always sent to the controller's own address, so a frame
+    whose address byte does not match the controller's address is a hard error (it targeted a
+    different unit). Mutates config in place; final validate discards the return value."""
+    frame = config.get(CONF_CUSTOM_COMMAND)
+    if frame is None:
+        return
+    fconf = fv.full_config.get()
+    path = fconf.get_path_for_id(config[CONF_MODBUS_CONTROLLER_ID])[:-1]
+    controller = fconf.get_config_for_path(path)
+    # the controller's DEVICE address (from modbus_device_schema)
+    address = controller[CONF_ADDRESS]
+    if frame[0] != address:
+        raise cv.Invalid(
+            f"'custom_command' begins with device address {frame[0]:#04x}, but this sensor's "
+            f"modbus_controller uses address {address:#04x}. 'custom_command' is renamed to "
+            f"'custom_pdu', which is always sent to the controller's own address. Drop the leading "
+            f"address byte and use 'custom_pdu' if {address:#04x} is correct, or move this sensor to "
+            f"the modbus_controller for device {frame[0]:#04x}.",
+            [CONF_CUSTOM_COMMAND],
+        )
+    _LOGGER.warning(
+        "[modbus_controller] 'custom_command' is deprecated and will be removed in 2027.3.0; "
+        "auto-migrated to 'custom_pdu' (dropped the leading device address byte). Rename the key "
+        "and drop that byte to silence this warning."
+    )
+    config[CONF_CUSTOM_PDU] = list(frame[1:])
+    del config[CONF_CUSTOM_COMMAND]
+
+
 def _final_validate(config: ConfigType) -> None:
     modbus.final_validate_modbus_device("modbus_controller", role="client")(config)
 
@@ -156,7 +255,7 @@ def modbus_calc_properties(config):
         value_type = config[CONF_VALUE_TYPE]
         if reg_count == 0:
             reg_count = TYPE_REGISTER_MAP[value_type]
-    if CONF_CUSTOM_COMMAND in config:
+    if CONF_CUSTOM_PDU in config:
         if CONF_ADDRESS not in config:
             # generate a unique modbus address using the hash of the name
             # CONF_NAME set even if only CONF_ID is used.
@@ -173,8 +272,8 @@ def modbus_calc_properties(config):
 async def add_modbus_base_properties(
     var, config, sensor_type, lambda_param_type=cg.float_, lambda_return_type=float
 ):
-    if CONF_CUSTOM_COMMAND in config:
-        cg.add(var.set_custom_data(config[CONF_CUSTOM_COMMAND]))
+    if CONF_CUSTOM_PDU in config:
+        cg.add(var.set_custom_pdu(config[CONF_CUSTOM_PDU]))
 
     if config[CONF_RESPONSE_SIZE] > 0:
         cg.add(var.set_register_size(config[CONF_RESPONSE_SIZE]))
diff --git a/esphome/components/modbus_controller/binary_sensor/__init__.py b/esphome/components/modbus_controller/binary_sensor/__init__.py
index 18d017e13f..6ff1975b1e 100644
--- a/esphome/components/modbus_controller/binary_sensor/__init__.py
+++ b/esphome/components/modbus_controller/binary_sensor/__init__.py
@@ -8,6 +8,7 @@ from .. import (
     ModbusItemBaseSchema,
     SensorItem,
     add_modbus_base_properties,
+    migrate_custom_command,
     modbus_calc_properties,
     modbus_controller_ns,
     validate_modbus_register,
@@ -17,7 +18,6 @@ from ..const import (
     CONF_FORCE_NEW_RANGE,
     CONF_MODBUS_CONTROLLER_ID,
     CONF_REGISTER_TYPE,
-    CONF_SKIP_UPDATES,
 )
 
 DEPENDENCIES = ["modbus_controller"]
@@ -40,6 +40,8 @@ CONFIG_SCHEMA = cv.All(
     validate_modbus_register,
 )
 
+FINAL_VALIDATE_SCHEMA = migrate_custom_command
+
 
 async def to_code(config):
     byte_offset, _ = modbus_calc_properties(config)
@@ -49,7 +51,6 @@ async def to_code(config):
         config[CONF_ADDRESS],
         byte_offset,
         config[CONF_BITMASK],
-        config[CONF_SKIP_UPDATES],
         config[CONF_FORCE_NEW_RANGE],
     )
     await cg.register_component(var, config)
diff --git a/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h b/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h
index 62a7fe93d3..f5ddbd82cc 100644
--- a/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h
+++ b/esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h
@@ -11,13 +11,12 @@ namespace esphome::modbus_controller {
 class ModbusBinarySensor final : public Component, public binary_sensor::BinarySensor, public SensorItem {
  public:
   ModbusBinarySensor(modbus::EntityType register_type, uint16_t start_address, uint8_t offset, uint32_t bitmask,
-                     uint16_t skip_updates, bool force_new_range) {
+                     bool force_new_range) {
     this->register_type = register_type;
     this->set_address(start_address);
     this->set_offset_from_start_address(offset);
     this->bitmask = bitmask;
     this->sensor_value_type = SensorValueType::BIT;
-    this->skip_updates = skip_updates;
     this->force_new_range = force_new_range;
 
     if (modbus::helpers::is_entity_type_binary(register_type)) {
diff --git a/esphome/components/modbus_controller/const.py b/esphome/components/modbus_controller/const.py
index 0149a3cc49..8412a651b8 100644
--- a/esphome/components/modbus_controller/const.py
+++ b/esphome/components/modbus_controller/const.py
@@ -4,6 +4,7 @@ CONF_BYTE_OFFSET = "byte_offset"
 CONF_COMMAND_THROTTLE = "command_throttle"
 CONF_OFFLINE_SKIP_UPDATES = "offline_skip_updates"
 CONF_CUSTOM_COMMAND = "custom_command"
+CONF_CUSTOM_PDU = "custom_pdu"
 CONF_FORCE_NEW_RANGE = "force_new_range"
 CONF_MAX_CMD_RETRIES = "max_cmd_retries"
 CONF_MODBUS_CONTROLLER_ID = "modbus_controller_id"
diff --git a/esphome/components/modbus_controller/modbus_controller.cpp b/esphome/components/modbus_controller/modbus_controller.cpp
index 515459f62a..fb7010cb4e 100644
--- a/esphome/components/modbus_controller/modbus_controller.cpp
+++ b/esphome/components/modbus_controller/modbus_controller.cpp
@@ -14,7 +14,6 @@ ModbusCommandItem::ModbusCommandItem(ModbusController &controller, modbus::Modbu
                                      RegisterRange &&range)
     : modbus::ModbusClientDevice(parent, address),
       sensors(std::move(range.sensors)),
-      skip_updates(range.skip_updates),
       register_type_(range.register_type),
       start_address_(range.start_address),
       register_count_(range.register_count),
@@ -24,12 +23,14 @@ ModbusCommandItem::ModbusCommandItem(ModbusController &controller, modbus::Modbu
 ModbusCommandItem::ModbusCommandItem(ModbusController &controller, modbus::ModbusClientHub *parent, uint8_t address,
                                      SensorItem *sensor)
     : modbus::ModbusClientDevice(parent, address),
-      skip_updates(sensor->skip_updates),
       start_address_(sensor->start_address),
       register_count_(sensor->register_count),
-      function_code_(FunctionCode::CUSTOM),
-      custom_data_(&sensor->custom_data),
+      custom_pdu_(&sensor->custom_pdu),
       controller_(&controller) {
+  // The PDU's first byte is its real function code; carry it so dump_config, the on_command_sent
+  // trigger and the response callbacks report the actual code instead of CUSTOM.
+  if (!sensor->custom_pdu.empty())
+    this->function_code_ = static_cast<FunctionCode>(sensor->custom_pdu.data()[0]);
   this->sensors.insert(sensor);
 }
 
@@ -40,13 +41,12 @@ ModbusCommandItem::ModbusCommandItem(ModbusController &controller, modbus::Modbu
 ModbusCommandItem::ModbusCommandItem(const ModbusCommandItem &other)
     : modbus::ModbusClientDevice(other.parent_, other.address_),
       sensors(other.sensors),
-      skip_updates(other.skip_updates),
       on_data_func(other.on_data_func),
       register_type_(other.register_type_),
       start_address_(other.start_address_),
       register_count_(other.register_count_),
       function_code_(other.function_code_),
-      custom_data_(other.custom_data_),
+      custom_pdu_(other.custom_pdu_),
       controller_(other.controller_) {
   // SmallInlineBuffer is move-only, so deep-copy the bytes explicitly.
   this->payload.set(other.payload.data(), other.payload.size());
@@ -55,14 +55,13 @@ ModbusCommandItem::ModbusCommandItem(const ModbusCommandItem &other)
 ModbusCommandItem::ModbusCommandItem(ModbusCommandItem &&other) noexcept
     : modbus::ModbusClientDevice(other.parent_, other.address_),
       sensors(std::move(other.sensors)),
-      skip_updates(other.skip_updates),
       on_data_func(std::move(other.on_data_func)),
       payload(std::move(other.payload)),
       register_type_(other.register_type_),
       start_address_(other.start_address_),
       register_count_(other.register_count_),
       function_code_(other.function_code_),
-      custom_data_(other.custom_data_),
+      custom_pdu_(other.custom_pdu_),
       controller_(other.controller_) {
   other.parent_ = nullptr;
 }
@@ -74,11 +73,14 @@ void ModbusCommandItem::on_response(std::span<const uint8_t> request_pdu, std::s
   auto data = modbus::helpers::server_pdu_payload(response_pdu);
   if (this->on_data_func) {
     this->on_data_func(this->register_type_, this->start_address_, data);
-  } else if (modbus::helpers::is_function_code_write(static_cast<uint8_t>(this->function_code_))) {
-    // write acknowledgement - nothing to publish
-  } else {
+  } else if (!this->sensors.empty()) {
+    // A polling command always has sensors; a factory/write command never does. Test this before the
+    // write-code branch so a custom_pdu whose function code is a write (e.g. 0x17, whose response
+    // carries read data) still reaches its sensor instead of being treated as a bare write ack.
     for (auto *sensor : this->sensors)
       sensor->parse_and_publish(data);
+  } else if (modbus::helpers::is_function_code_write(static_cast<uint8_t>(this->function_code_))) {
+    // write acknowledgement - nothing to publish
   }
   if (this->controller_ != nullptr)
     this->controller_->unqueue_command(this);
@@ -116,13 +118,11 @@ void ModbusCommandItem::on_sent(std::span<const uint8_t> request_pdu) {
   // on_sent is this command's only callback, so drop the one-shot from the queue here, or it would leak.
   // Test the address the frame went to, not address_: a custom command's frame carries its own address
   // (frame[0]), which may differ from this controller's. (unqueue_command() is a no-op for a poll.)
+  // A custom polling command sends its PDU to this controller's own address, so only a factory custom
+  // command (a raw frame staged in payload) can carry a different address byte.
   uint8_t wire_address = this->address_;
-  if (this->function_code_ == FunctionCode::CUSTOM) {
-    std::span<const uint8_t> frame =
-        this->custom_data_ != nullptr ? std::span<const uint8_t>(*this->custom_data_) : this->payload;
-    if (!frame.empty())
-      wire_address = frame[0];
-  }
+  if (this->function_code_ == FunctionCode::CUSTOM && !this->payload.empty())
+    wire_address = this->payload.data()[0];
   if (wire_address == modbus::BROADCAST_ADDRESS)
     this->controller_->unqueue_command(this);
 }
@@ -194,23 +194,11 @@ void ModbusController::sweep_completed_one_shots_() {
       [](const std::unique_ptr<ModbusCommandItem> &item) { return item->pending_removal; });
 }
 
-void ModbusController::update_range_(ModbusCommandItem &cmd) {
-  if (this->update_counter_ % (cmd.skip_updates + 1) != 0) {
-    ESP_LOGVV(TAG, "Skipping update for range 0x%X", cmd.register_address());
-    return;
-  }
-  // A refusal is already logged by the hub; note the affected range for controller-level diagnostics.
-  if (!cmd.send()) {
-    ESP_LOGD(TAG, "Poll refused by hub for range 0x%X", cmd.register_address());
-  }
-}
-
 void ModbusController::update() {
   this->sweep_completed_one_shots_();  // reclaim one-shots deferred out of their own callbacks
   if (this->module_offline_) {
-    // Offline probing follows the offline cadence alone; per-range skip_updates resumes once the
-    // device is back online. Requiring both cadences to coincide would leave phase combinations
-    // where a probe never goes out.
+    // Offline probing follows the offline cadence alone; regular every-update polling resumes once
+    // the device is back online.
     if (offline_retry_due(this->update_counter_, this->module_offline_at_, this->offline_skip_updates_)) {
       ESP_LOGV(TAG, "Module offline - retrying");
       this->cmd_non_responses_ = 0;  // allow the probe through can_send()
@@ -229,7 +217,9 @@ void ModbusController::update() {
   if (this->can_send()) {
     for (auto &cmd : this->polling_command_items_) {
       ESP_LOGVV(TAG, "Updating range 0x%X", cmd.register_address());
-      this->update_range_(cmd);
+      // A refusal is already logged by the hub; note the affected range for controller-level diagnostics.
+      if (!cmd.send())
+        ESP_LOGD(TAG, "Poll refused by hub for range 0x%X", cmd.register_address());
     }
   }
   this->update_counter_++;
@@ -264,8 +254,8 @@ void ModbusController::create_polling_commands_() {
   bool range_custom_size = false;
   SensorItem *prev = nullptr;
   for (SensorItem *curr : this->sensorset_) {
-    ESP_LOGV(TAG, "Register: 0x%X count=%d size=%zu offset=%u skip=%u addr=%p", curr->start_address,
-             curr->register_count, curr->get_register_size(), curr->offset, curr->skip_updates, curr);
+    ESP_LOGV(TAG, "Register: 0x%X count=%d size=%zu offset=%u addr=%p", curr->start_address, curr->register_count,
+             curr->get_register_size(), curr->offset, curr);
 
     const bool custom_size = curr->get_register_size() != static_cast<size_t>(curr->register_count) * 2;
 
@@ -296,14 +286,12 @@ void ModbusController::create_polling_commands_() {
         ESP_LOGV(TAG, "Extend range to include 0x%X", curr->start_address);
       } else if (range_shared && !range_forced && curr->start_address >= r.start_address &&
                  curr->start_address + curr->register_count <= r.start_address + r.register_count &&
-                 !range_custom_size && !custom_size && curr->skip_updates == r.skip_updates) {
+                 !range_custom_size && !custom_size) {
         // The registers already fall inside a range that a shared-address join widened, so this sensor
         // reads its slice of that response instead of adding an overlapping second poll. The guards keep
         // it narrow: only a widened range, never a force-isolated one; only where every register in the
         // range returns two bytes, so interior positions follow from the addresses; only sensors genuinely
-        // inside it, which is why the lower bound is needed given the walk is not address-ordered; and
-        // only where the polling rates already match, since joining runs this sensor through the rate
-        // merge below and would otherwise change one of them.
+        // inside it, which is why the lower bound is needed given the walk is not address-ordered.
         const uint16_t addr_delta = curr->start_address - r.start_address;
         curr->offset = static_cast<uint8_t>((curr->addresses_bits() ? addr_delta : addr_delta * 2) +
                                             curr->offset_from_start_address);
@@ -329,7 +317,7 @@ void ModbusController::create_polling_commands_() {
 
     if (!join) {
       if (have_range) {
-        ESP_LOGV(TAG, "Add range 0x%X %d skip:%d", r.start_address, r.register_count, r.skip_updates);
+        ESP_LOGV(TAG, "Add range 0x%X %d", r.start_address, r.register_count);
         this->create_polling_command_(std::move(r));
       }
       r = {};
@@ -341,11 +329,7 @@ void ModbusController::create_polling_commands_() {
       r.start_address = curr->start_address;
       r.register_count = curr->register_count;
       r.register_type = curr->register_type;
-      r.skip_updates = curr->skip_updates;
       have_range = true;
-    } else if (curr->skip_updates != 0) {
-      // use the lowest non-zero skip_updates for the whole range (0 is the default and is excluded)
-      r.skip_updates = (r.skip_updates != 0) ? std::min(r.skip_updates, curr->skip_updates) : curr->skip_updates;
     }
 
     // Every member records its range's first register. The resolved offset is relative to it, so the
@@ -355,7 +339,7 @@ void ModbusController::create_polling_commands_() {
     prev = curr;
   }
   if (have_range) {
-    ESP_LOGV(TAG, "Add last range 0x%X %d skip:%d", r.start_address, r.register_count, r.skip_updates);
+    ESP_LOGV(TAG, "Add last range 0x%X %d", r.start_address, r.register_count);
     this->create_polling_command_(std::move(r));
   }
   // Reclaim growth slack; safe here because nothing has registered with the hub yet (see the
@@ -380,8 +364,8 @@ void ModbusController::dump_config() {
   }
   ESP_LOGCONFIG(TAG, "ranges");
   for (auto &it : this->polling_command_items_) {
-    ESP_LOGCONFIG(TAG, "  Range type=%u start=0x%X count=%d skip_updates=%d", static_cast<uint8_t>(it.register_type()),
-                  it.register_address(), it.register_count(), it.skip_updates);
+    ESP_LOGCONFIG(TAG, "  Range type=%u start=0x%X count=%d", static_cast<uint8_t>(it.register_type()),
+                  it.register_address(), it.register_count());
   }
 #endif
 }
@@ -513,17 +497,19 @@ ModbusCommandItem ModbusCommandItem::create_custom_command(
 
 bool ModbusCommandItem::send() {
   bool accepted;
-  if (this->function_code_ != FunctionCode::CUSTOM) {
+  if (this->custom_pdu_ != nullptr) {
+    // Custom polling command: send the sensor's ready-made PDU (function code + data, no address byte)
+    // to this controller's own device address; the hub prepends the address and appends the CRC.
+    accepted = modbus::ModbusClientDevice::queue_pdu(std::span<const uint8_t>(*this->custom_pdu_));
+  } else if (this->function_code_ != FunctionCode::CUSTOM) {
     accepted = this->queue_pdu(modbus::helpers::create_client_pdu(
         this->function_code_, this->start_address_, this->register_count_,
         this->payload.empty() ? nullptr : this->payload.data(), this->payload.size()));
   } else {
-    // Custom command: the bytes are a complete raw frame (address + PDU). Send the PDU to the frame's own
-    // address (which may differ from this controller's); the hub appends the CRC and routes the response
-    // back to this item by pointer. (send_raw() is deprecated, so queue_pdu() is called with the extracted
-    // address. Raw-frame semantics are kept here; the custom_pdu migration is a later step.)
-    std::span<const uint8_t> frame =
-        this->custom_data_ != nullptr ? std::span<const uint8_t>(*this->custom_data_) : this->payload;
+    // Factory custom command: payload holds a complete raw frame (address + PDU). Send the PDU to the
+    // frame's own address (which may differ from this controller's); the hub appends the CRC and routes
+    // the response back to this item by pointer.
+    std::span<const uint8_t> frame = this->payload;
     if (frame.empty()) {
       ESP_LOGW(TAG, "Empty custom command frame, not sent");
       accepted = false;
diff --git a/esphome/components/modbus_controller/modbus_controller.h b/esphome/components/modbus_controller/modbus_controller.h
index fb0037a0e6..f36705cda4 100644
--- a/esphome/components/modbus_controller/modbus_controller.h
+++ b/esphome/components/modbus_controller/modbus_controller.h
@@ -157,7 +157,7 @@ class SensorItem {
     this->range_start_address = address;
   }
 
-  void set_custom_data(const std::vector<uint8_t> &data) { custom_data = data; }
+  void set_custom_pdu(std::initializer_list<uint8_t> pdu) { this->custom_pdu.set(pdu.begin(), pdu.size()); }
   size_t virtual get_register_size() const {
     if (this->addresses_bits()) {
       return 1;
@@ -186,8 +186,7 @@ class SensorItem {
   uint8_t offset_from_start_address{0};
   /// First register of the range this sensor is polled in; equals start_address for an unpolled item.
   uint16_t range_start_address{0};
-  uint16_t skip_updates{0};
-  std::vector<uint8_t> custom_data{};
+  SmallInlineBuffer<8> custom_pdu{};
   bool force_new_range{false};
 };
 
@@ -230,8 +229,7 @@ struct RegisterRange {
   uint16_t start_address;
   modbus::EntityType register_type;
   uint8_t register_count;
-  uint16_t skip_updates;  // the config value
-  SensorSet sensors;      // all sensors of this range
+  SensorSet sensors;  // all sensors of this range
 };
 
 /// A single modbus command. Each command is its own ModbusClientDevice: it sends its frame to the hub
@@ -257,7 +255,6 @@ class ModbusCommandItem : public modbus::ModbusClientDevice {
   ModbusCommandItem &operator=(ModbusCommandItem &&) = delete;
 
   SensorSet sensors;  // sensors served by this command (empty for factory/write commands)
-  uint16_t skip_updates{0};
   std::function<void(EntityType register_type, uint16_t start_address, std::span<const uint8_t> data)> on_data_func;
   /// Write data bytes for the command (register/coil values), or the raw frame of a one-shot custom
   /// command; reads leave it empty. Small-buffer optimized: fixed-size commands (single-register/coil
@@ -378,7 +375,7 @@ class ModbusCommandItem : public modbus::ModbusClientDevice {
   uint16_t register_count_{0};
   FunctionCode function_code_{FunctionCode::CUSTOM};
   /// Custom polling commands reference the PDU bytes owned by their SensorItem instead of copying them.
-  const std::vector<uint8_t> *custom_data_{nullptr};
+  const SmallInlineBuffer<8> *custom_pdu_{nullptr};
   ModbusController *controller_{nullptr};
 };
 
@@ -462,19 +459,15 @@ class ModbusController final : public PollingComponent {
   void create_polling_commands_();
   /// build one persistent polling command from a range and add it to polling_command_items_
   void create_polling_command_(RegisterRange &&range) {
-    // A custom range polls the first sensor's custom_data (a ready-made raw frame); it needs the
-    // sensor constructor so the command references those bytes and decodes the real function code.
-    // The response still dispatches to every sensor in the range.
+    // A custom range polls the first sensor's custom_pdu (referenced, not copied); the sensor constructor
+    // decodes the real function code. The response still dispatches to every sensor in the range.
     if (range.register_type == EntityType::CUSTOM && !range.sensors.empty()) {
       auto &cmd = this->polling_command_items_.emplace_back(*this, this->hub_, this->address_, *range.sensors.begin());
       cmd.sensors = std::move(range.sensors);
-      cmd.skip_updates = range.skip_updates;  // the range's merged rate, not the first sensor's
     } else {
       this->polling_command_items_.emplace_back(*this, this->hub_, this->address_, std::move(range));
     }
   }
-  /// send a range's polling command if it is due this update
-  void update_range_(ModbusCommandItem &cmd);
   /// The hub this controller's commands/entities send through, and the modbus address they target.
   modbus::ModbusClientHub *hub_{nullptr};
   uint8_t address_{0};
@@ -496,7 +489,7 @@ class ModbusController final : public PollingComponent {
   bool module_offline_{false};
   /// update_counter_ value at which the module went offline (for offline_skip_updates timing)
   uint16_t module_offline_at_{0};
-  /// counts update() cycles; drives skip_updates and offline timing
+  /// counts update() cycles; drives the offline-retry cadence
   uint16_t update_counter_{0};
   /// consecutive non-responses; drives can_send() and offline detection
   uint8_t cmd_non_responses_{0};
diff --git a/esphome/components/modbus_controller/number/__init__.py b/esphome/components/modbus_controller/number/__init__.py
index 7563adfad9..39d04e8d91 100644
--- a/esphome/components/modbus_controller/number/__init__.py
+++ b/esphome/components/modbus_controller/number/__init__.py
@@ -18,16 +18,17 @@ from .. import (
     ModbusItemBaseSchema,
     SensorItem,
     add_modbus_base_properties,
+    migrate_custom_command,
     modbus_calc_properties,
     modbus_controller_ns,
 )
 from ..const import (
     CONF_BITMASK,
     CONF_CUSTOM_COMMAND,
+    CONF_CUSTOM_PDU,
     CONF_FORCE_NEW_RANGE,
     CONF_MODBUS_CONTROLLER_ID,
     CONF_REGISTER_TYPE,
-    CONF_SKIP_UPDATES,
     CONF_USE_WRITE_MULTIPLE,
     CONF_VALUE_TYPE,
     CONF_WRITE_LAMBDA,
@@ -53,9 +54,11 @@ def validate_min_max(config):
 
 
 def validate_modbus_number(config):
-    if CONF_CUSTOM_COMMAND not in config and CONF_ADDRESS not in config:
+    # custom_command is the deprecated alias for custom_pdu (migrated later in final validate).
+    has_custom = CONF_CUSTOM_PDU in config or CONF_CUSTOM_COMMAND in config
+    if not has_custom and CONF_ADDRESS not in config:
         raise cv.Invalid(
-            f" {CONF_ADDRESS} is a required property if '{CONF_CUSTOM_COMMAND}:' isn't used"
+            f" {CONF_ADDRESS} is a required property if '{CONF_CUSTOM_PDU}:' isn't used"
         )
     return config
 
@@ -83,6 +86,8 @@ CONFIG_SCHEMA = cv.All(
     validate_modbus_number,
 )
 
+FINAL_VALIDATE_SCHEMA = migrate_custom_command
+
 
 async def to_code(config):
     byte_offset, reg_count = modbus_calc_properties(config)
@@ -94,7 +99,6 @@ async def to_code(config):
         config[CONF_BITMASK],
         config[CONF_VALUE_TYPE],
         reg_count,
-        config[CONF_SKIP_UPDATES],
         config[CONF_FORCE_NEW_RANGE],
     )
 
diff --git a/esphome/components/modbus_controller/number/modbus_number.h b/esphome/components/modbus_controller/number/modbus_number.h
index 1f0d0581eb..538a982f80 100644
--- a/esphome/components/modbus_controller/number/modbus_number.h
+++ b/esphome/components/modbus_controller/number/modbus_number.h
@@ -13,14 +13,13 @@ using value_to_data_t = std::function<float>(float);
 class ModbusNumber final : public number::Number, public Component, public SensorItem {
  public:
   ModbusNumber(modbus::EntityType register_type, uint16_t start_address, uint8_t offset, uint32_t bitmask,
-               SensorValueType value_type, int register_count, uint16_t skip_updates, bool force_new_range) {
+               SensorValueType value_type, int register_count, bool force_new_range) {
     this->register_type = register_type;
     this->set_address(start_address);
     this->set_offset_from_start_address(offset);
     this->bitmask = bitmask;
     this->sensor_value_type = value_type;
     this->register_count = register_count;
-    this->skip_updates = skip_updates;
     this->force_new_range = force_new_range;
   };
 
diff --git a/esphome/components/modbus_controller/output/__init__.py b/esphome/components/modbus_controller/output/__init__.py
index 27d212d58d..178c99caa1 100644
--- a/esphome/components/modbus_controller/output/__init__.py
+++ b/esphome/components/modbus_controller/output/__init__.py
@@ -12,6 +12,7 @@ from .. import (
 )
 from ..const import (
     CONF_CUSTOM_COMMAND,
+    CONF_CUSTOM_PDU,
     CONF_MODBUS_CONTROLLER_ID,
     CONF_REGISTER_TYPE,
     CONF_USE_WRITE_MULTIPLE,
@@ -37,8 +38,11 @@ CONFIG_SCHEMA = cv.typed_schema(
             {
                 cv.GenerateID(): cv.declare_id(ModbusBinaryOutput),
                 cv.Required(CONF_ADDRESS): cv.positive_int,
+                cv.Optional(CONF_CUSTOM_PDU): cv.invalid(
+                    "custom_pdu is not supported for outputs; use a write_lambda instead"
+                ),
                 cv.Optional(CONF_CUSTOM_COMMAND): cv.invalid(
-                    "custom_command is not supported for outputs"
+                    "custom_command is not supported for outputs; use a write_lambda instead"
                 ),
                 cv.Optional(CONF_WRITE_LAMBDA): cv.returning_lambda,
                 cv.Optional(CONF_USE_WRITE_MULTIPLE, default=False): cv.boolean,
@@ -48,8 +52,11 @@ CONFIG_SCHEMA = cv.typed_schema(
             {
                 cv.GenerateID(): cv.declare_id(ModbusFloatOutput),
                 cv.Required(CONF_ADDRESS): cv.positive_int,
+                cv.Optional(CONF_CUSTOM_PDU): cv.invalid(
+                    "custom_pdu is not supported for outputs; use a write_lambda instead"
+                ),
                 cv.Optional(CONF_CUSTOM_COMMAND): cv.invalid(
-                    "custom_command is not supported for outputs"
+                    "custom_command is not supported for outputs; use a write_lambda instead"
                 ),
                 cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(
                     SENSOR_VALUE_TYPE
diff --git a/esphome/components/modbus_controller/output/modbus_output.h b/esphome/components/modbus_controller/output/modbus_output.h
index 17eb8e3a8f..e79c442aa4 100644
--- a/esphome/components/modbus_controller/output/modbus_output.h
+++ b/esphome/components/modbus_controller/output/modbus_output.h
@@ -17,7 +17,6 @@ class ModbusFloatOutput final : public output::FloatOutput, public Component, pu
     this->bitmask = 0xFFFFFFFF;
     this->register_count = register_count;
     this->sensor_value_type = value_type;
-    this->skip_updates = 0;
     this->set_address(this->start_address + offset);
     this->set_offset_from_start_address(0);
   }
@@ -48,7 +47,6 @@ class ModbusBinaryOutput final : public output::BinaryOutput, public Component,
     this->set_address(start_address);
     this->bitmask = 0xFFFFFFFF;
     this->sensor_value_type = SensorValueType::BIT;
-    this->skip_updates = 0;
     this->register_count = 1;
     this->set_address(this->start_address + offset);
     this->set_offset_from_start_address(0);
diff --git a/esphome/components/modbus_controller/select/__init__.py b/esphome/components/modbus_controller/select/__init__.py
index 5127360770..1d77f9235d 100644
--- a/esphome/components/modbus_controller/select/__init__.py
+++ b/esphome/components/modbus_controller/select/__init__.py
@@ -4,7 +4,12 @@ from esphome.components.modbus.helpers import SENSOR_VALUE_TYPE, TYPE_REGISTER_M
 import esphome.config_validation as cv
 from esphome.const import CONF_ADDRESS, CONF_ID, CONF_LAMBDA, CONF_OPTIMISTIC
 
-from .. import ModbusController, SensorItem, modbus_controller_ns
+from .. import (
+    ModbusController,
+    SensorItem,
+    modbus_controller_ns,
+    validate_skip_updates_deprecated,
+)
 from ..const import (
     CONF_FORCE_NEW_RANGE,
     CONF_MODBUS_CONTROLLER_ID,
@@ -69,7 +74,7 @@ CONFIG_SCHEMA = cv.All(
                 INTEGER_SENSOR_VALUE_TYPE
             ),
             cv.Optional(CONF_REGISTER_COUNT): cv.positive_int,
-            cv.Optional(CONF_SKIP_UPDATES, default=0): cv.positive_int,
+            cv.Optional(CONF_SKIP_UPDATES): validate_skip_updates_deprecated,
             cv.Optional(CONF_FORCE_NEW_RANGE, default=False): cv.boolean,
             cv.Required(CONF_OPTIONSMAP): ensure_option_map(),
             cv.Optional(CONF_USE_WRITE_MULTIPLE, default=False): cv.boolean,
@@ -95,7 +100,6 @@ async def to_code(config):
         value_type,
         config[CONF_ADDRESS],
         reg_count,
-        config[CONF_SKIP_UPDATES],
         config[CONF_FORCE_NEW_RANGE],
         list(options_map.values()),
     )
diff --git a/esphome/components/modbus_controller/select/modbus_select.h b/esphome/components/modbus_controller/select/modbus_select.h
index e1ae578ddf..41ebd4f658 100644
--- a/esphome/components/modbus_controller/select/modbus_select.h
+++ b/esphome/components/modbus_controller/select/modbus_select.h
@@ -11,8 +11,8 @@ namespace esphome::modbus_controller {
 
 class ModbusSelect final : public Component, public select::Select, public SensorItem {
  public:
-  ModbusSelect(SensorValueType sensor_value_type, uint16_t start_address, uint8_t register_count, uint16_t skip_updates,
-               bool force_new_range, std::vector<int64_t> mapping) {
+  ModbusSelect(SensorValueType sensor_value_type, uint16_t start_address, uint8_t register_count, bool force_new_range,
+               std::vector<int64_t> mapping) {
     this->register_type = modbus::EntityType::HOLDING;  // not configurable
     this->sensor_value_type = sensor_value_type;
     this->set_address(start_address);
@@ -20,7 +20,6 @@ class ModbusSelect final : public Component, public select::Select, public Senso
     this->bitmask = 0xFFFFFFFF;              // not configurable
     this->register_count = register_count;
     this->response_bytes = 0;  // not configurable
-    this->skip_updates = skip_updates;
     this->force_new_range = force_new_range;
     this->mapping_ = std::move(mapping);
   }
diff --git a/esphome/components/modbus_controller/sensor/__init__.py b/esphome/components/modbus_controller/sensor/__init__.py
index 5b72586c66..c3c9bd4718 100644
--- a/esphome/components/modbus_controller/sensor/__init__.py
+++ b/esphome/components/modbus_controller/sensor/__init__.py
@@ -8,6 +8,7 @@ from .. import (
     ModbusItemBaseSchema,
     SensorItem,
     add_modbus_base_properties,
+    migrate_custom_command,
     modbus_calc_properties,
     modbus_controller_ns,
     validate_modbus_register,
@@ -18,7 +19,6 @@ from ..const import (
     CONF_MODBUS_CONTROLLER_ID,
     CONF_REGISTER_COUNT,
     CONF_REGISTER_TYPE,
-    CONF_SKIP_UPDATES,
     CONF_VALUE_TYPE,
 )
 
@@ -44,6 +44,8 @@ CONFIG_SCHEMA = cv.All(
     validate_modbus_register,
 )
 
+FINAL_VALIDATE_SCHEMA = migrate_custom_command
+
 
 async def to_code(config):
     byte_offset, reg_count = modbus_calc_properties(config)
@@ -56,7 +58,6 @@ async def to_code(config):
         config[CONF_BITMASK],
         value_type,
         reg_count,
-        config[CONF_SKIP_UPDATES],
         config[CONF_FORCE_NEW_RANGE],
     )
     await cg.register_component(var, config)
diff --git a/esphome/components/modbus_controller/sensor/modbus_sensor.h b/esphome/components/modbus_controller/sensor/modbus_sensor.h
index 9d66b2afa7..68dc9e6fcc 100644
--- a/esphome/components/modbus_controller/sensor/modbus_sensor.h
+++ b/esphome/components/modbus_controller/sensor/modbus_sensor.h
@@ -11,14 +11,13 @@ namespace esphome::modbus_controller {
 class ModbusSensor final : public Component, public sensor::Sensor, public SensorItem {
  public:
   ModbusSensor(modbus::EntityType register_type, uint16_t start_address, uint8_t offset, uint32_t bitmask,
-               SensorValueType value_type, int register_count, uint16_t skip_updates, bool force_new_range) {
+               SensorValueType value_type, int register_count, bool force_new_range) {
     this->register_type = register_type;
     this->set_address(start_address);
     this->set_offset_from_start_address(offset);
     this->bitmask = bitmask;
     this->sensor_value_type = value_type;
     this->register_count = register_count;
-    this->skip_updates = skip_updates;
     this->force_new_range = force_new_range;
   }
 
diff --git a/esphome/components/modbus_controller/switch/__init__.py b/esphome/components/modbus_controller/switch/__init__.py
index a40c15ab92..35ad12087c 100644
--- a/esphome/components/modbus_controller/switch/__init__.py
+++ b/esphome/components/modbus_controller/switch/__init__.py
@@ -8,6 +8,7 @@ from .. import (
     ModbusItemBaseSchema,
     SensorItem,
     add_modbus_base_properties,
+    migrate_custom_command,
     modbus_calc_properties,
     modbus_controller_ns,
     validate_modbus_register,
@@ -17,7 +18,6 @@ from ..const import (
     CONF_FORCE_NEW_RANGE,
     CONF_MODBUS_CONTROLLER_ID,
     CONF_REGISTER_TYPE,
-    CONF_SKIP_UPDATES,
     CONF_USE_WRITE_MULTIPLE,
     CONF_WRITE_LAMBDA,
 )
@@ -45,6 +45,8 @@ CONFIG_SCHEMA = cv.All(
     validate_modbus_register,
 )
 
+FINAL_VALIDATE_SCHEMA = migrate_custom_command
+
 
 async def to_code(config):
     byte_offset, _ = modbus_calc_properties(config)
@@ -54,7 +56,6 @@ async def to_code(config):
         config[CONF_ADDRESS],
         byte_offset,
         config[CONF_BITMASK],
-        config[CONF_SKIP_UPDATES],
         config[CONF_FORCE_NEW_RANGE],
     )
     await cg.register_component(var, config)
diff --git a/esphome/components/modbus_controller/switch/modbus_switch.h b/esphome/components/modbus_controller/switch/modbus_switch.h
index e5b8cf5c21..c21a1939bc 100644
--- a/esphome/components/modbus_controller/switch/modbus_switch.h
+++ b/esphome/components/modbus_controller/switch/modbus_switch.h
@@ -11,13 +11,12 @@ namespace esphome::modbus_controller {
 class ModbusSwitch final : public Component, public switch_::Switch, public SensorItem {
  public:
   ModbusSwitch(modbus::EntityType register_type, uint16_t start_address, uint8_t offset, uint32_t bitmask,
-               uint16_t skip_updates, bool force_new_range) {
+               bool force_new_range) {
     this->register_type = register_type;
     this->set_address(start_address);
     this->set_offset_from_start_address(offset);
     this->bitmask = bitmask;
     this->sensor_value_type = SensorValueType::BIT;
-    this->skip_updates = skip_updates;
     this->register_count = 1;
     if (register_type == modbus::EntityType::HOLDING || register_type == modbus::EntityType::COIL) {
       this->set_address(this->start_address + offset);
diff --git a/esphome/components/modbus_controller/text_sensor/__init__.py b/esphome/components/modbus_controller/text_sensor/__init__.py
index 93ecd31168..e8447658e2 100644
--- a/esphome/components/modbus_controller/text_sensor/__init__.py
+++ b/esphome/components/modbus_controller/text_sensor/__init__.py
@@ -8,6 +8,7 @@ from .. import (
     ModbusItemBaseSchema,
     SensorItem,
     add_modbus_base_properties,
+    migrate_custom_command,
     modbus_calc_properties,
     modbus_controller_ns,
     validate_modbus_register,
@@ -19,7 +20,6 @@ from ..const import (
     CONF_REGISTER_COUNT,
     CONF_REGISTER_TYPE,
     CONF_RESPONSE_SIZE,
-    CONF_SKIP_UPDATES,
 )
 
 DEPENDENCIES = ["modbus_controller"]
@@ -55,6 +55,8 @@ CONFIG_SCHEMA = cv.All(
     validate_modbus_register,
 )
 
+FINAL_VALIDATE_SCHEMA = migrate_custom_command
+
 
 async def to_code(config):
     byte_offset, reg_count = modbus_calc_properties(config)
@@ -70,7 +72,6 @@ async def to_code(config):
         reg_count,
         config[CONF_RESPONSE_SIZE],
         config[CONF_RAW_ENCODE],
-        config[CONF_SKIP_UPDATES],
         config[CONF_FORCE_NEW_RANGE],
     )
 
diff --git a/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h b/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h
index 5bb16eb58a..9e8dce57e7 100644
--- a/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h
+++ b/esphome/components/modbus_controller/text_sensor/modbus_textsensor.h
@@ -13,14 +13,13 @@ enum class RawEncoding { NONE = 0, HEXBYTES = 1, COMMA = 2, ANSI = 3 };
 class ModbusTextSensor final : public Component, public text_sensor::TextSensor, public SensorItem {
  public:
   ModbusTextSensor(modbus::EntityType register_type, uint16_t start_address, uint8_t offset, uint8_t register_count,
-                   uint16_t response_bytes, RawEncoding encode, uint16_t skip_updates, bool force_new_range) {
+                   uint16_t response_bytes, RawEncoding encode, bool force_new_range) {
     this->register_type = register_type;
     this->set_address(start_address);
     this->set_offset_from_start_address(offset);
     this->response_bytes = response_bytes;
     this->register_count = register_count;
     this->encode_ = encode;
-    this->skip_updates = skip_updates;
     this->bitmask = 0xFFFFFFFF;
     this->sensor_value_type = SensorValueType::RAW;
     this->force_new_range = force_new_range;
diff --git a/tests/component_tests/modbus_controller/test_custom_pdu.py b/tests/component_tests/modbus_controller/test_custom_pdu.py
new file mode 100644
index 0000000000..a5d065c965
--- /dev/null
+++ b/tests/component_tests/modbus_controller/test_custom_pdu.py
@@ -0,0 +1,47 @@
+"""Schema-level config validation for custom_pdu and the deprecated custom_command alias.
+
+custom_command took a raw frame with a leading device address byte; custom_pdu takes the PDU only.
+The old key is still accepted at the schema level and auto-migrated later in final validate (which a
+bare-schema test can't reach), so these tests only cover what the schema itself enforces: the two keys
+are mutually exclusive, and custom_pdu takes byte-sized values.
+"""
+
+import pytest
+from voluptuous import Invalid, MultipleInvalid
+
+from esphome.components.modbus_controller import ModbusItemBaseSchema
+from esphome.components.modbus_controller.const import (
+    CONF_CUSTOM_COMMAND,
+    CONF_CUSTOM_PDU,
+)
+
+
+def test_custom_command_accepted_at_schema_level() -> None:
+    """custom_command validates at the schema level; migration/rejection happens in final validate."""
+    config = ModbusItemBaseSchema(
+        {CONF_CUSTOM_COMMAND: [0x01, 0x03, 0x00, 0x2A, 0x00, 0x01]}
+    )
+    assert config[CONF_CUSTOM_COMMAND] == [0x01, 0x03, 0x00, 0x2A, 0x00, 0x01]
+
+
+def test_custom_pdu_and_custom_command_mutually_exclusive() -> None:
+    """Only one custom source may be given; supplying both is a schema error."""
+    with pytest.raises((Invalid, MultipleInvalid)):
+        ModbusItemBaseSchema(
+            {
+                CONF_CUSTOM_PDU: [0x03, 0x00, 0x2A, 0x00, 0x01],
+                CONF_CUSTOM_COMMAND: [0x01, 0x03, 0x00, 0x2A, 0x00, 0x01],
+            }
+        )
+
+
+def test_custom_pdu_accepted() -> None:
+    """The new key takes PDU bytes (function code + data, no address byte)."""
+    config = ModbusItemBaseSchema({CONF_CUSTOM_PDU: [0x03, 0x00, 0x2A, 0x00, 0x01]})
+    assert config[CONF_CUSTOM_PDU] == [0x03, 0x00, 0x2A, 0x00, 0x01]
+
+
+def test_custom_pdu_rejects_non_byte_values() -> None:
+    """PDU entries are bytes; a word-sized value is a sign the old raw format is being used."""
+    with pytest.raises((Invalid, MultipleInvalid)):
+        ModbusItemBaseSchema({CONF_CUSTOM_PDU: [0x0103, 0x002A]})
diff --git a/tests/components/modbus_controller/common.yaml b/tests/components/modbus_controller/common.yaml
index 67b022cdf5..9c35a2f868 100644
--- a/tests/components/modbus_controller/common.yaml
+++ b/tests/components/modbus_controller/common.yaml
@@ -108,6 +108,22 @@ select:
       return value;
 
 sensor:
+  # custom_pdu polls a ready-made PDU (function code + data - no device address byte, no CRC); covers
+  # the set_custom_pdu codegen path and the custom-range polling constructor.
+  - platform: modbus_controller
+    modbus_controller_id: modbus_controller1
+    id: modbus_sensor_custom_pdu
+    name: Test Custom PDU Sensor
+    custom_pdu: [0x03, 0x00, 0x2A, 0x00, 0x01]
+    value_type: U_WORD
+  # Deprecated custom_command (leading byte 0x02 == modbus_controller1's address) drives the
+  # migrate_custom_command final-validate auto-migration path in CI.
+  - platform: modbus_controller
+    modbus_controller_id: modbus_controller1
+    id: modbus_sensor_custom_command
+    name: Test Custom Command Sensor
+    custom_command: [0x02, 0x03, 0x00, 0x2B, 0x00, 0x01]
+    value_type: U_WORD
   - platform: modbus_controller
     modbus_controller_id: modbus_controller1
     id: modbus_sensor1
diff --git a/tests/integration/fixtures/uart_mock_modbus_custom_command.yaml b/tests/integration/fixtures/uart_mock_modbus_custom_pdu.yaml
similarity index 83%
rename from tests/integration/fixtures/uart_mock_modbus_custom_command.yaml
rename to tests/integration/fixtures/uart_mock_modbus_custom_pdu.yaml
index 738e691110..188abf90f1 100644
--- a/tests/integration/fixtures/uart_mock_modbus_custom_command.yaml
+++ b/tests/integration/fixtures/uart_mock_modbus_custom_pdu.yaml
@@ -1,5 +1,5 @@
 esphome:
-  name: uart-mock-modbus-custom-command
+  name: uart-mock-modbus-custom-pdu
 
 host:
 api:
@@ -69,13 +69,14 @@ sensor:
     address: 0x01
     register_type: holding
     value_type: U_WORD
-  # Custom command: a raw frame {device address, function code, address hi, address lo,
-  # count hi, count lo}; the CRC is appended by the hub. Reads holding register 0x0001,
-  # count 1; the lambda parses the response payload (the register value, big-endian).
+  # Custom PDU: read holding register 0x0001, count 1. The PDU is
+  # {function code, address hi, address lo, count hi, count lo}; the device
+  # address and CRC are added by the hub. The lambda parses the response payload
+  # (the register value, big-endian).
   - platform: modbus_controller
     modbus_controller_id: modbus_controller_1
     name: "custom_read"
-    custom_command: [0x01, 0x03, 0x00, 0x01, 0x00, 0x01]
+    custom_pdu: [0x03, 0x00, 0x01, 0x00, 0x01]
     lambda: |-
       if (data.size() < 2) return {};
       return (float) ((data[0] << 8) | data[1]);
diff --git a/tests/integration/fixtures/uart_mock_modbus_grouping.yaml b/tests/integration/fixtures/uart_mock_modbus_grouping.yaml
index a5394f1d05..d580f5c2e2 100644
--- a/tests/integration/fixtures/uart_mock_modbus_grouping.yaml
+++ b/tests/integration/fixtures/uart_mock_modbus_grouping.yaml
@@ -134,7 +134,8 @@ sensor:
     value_type: U_WORD
     modbus_controller_id: modbus_controller_ok
 
-  # F - contiguous registers where the second asks for a slower rate.
+  # F - contiguous registers that historically carried differing skip_updates rates and were split by
+  # the rate merge; with per-range rates gone they group like any contiguous pair.
   - platform: modbus_controller
     name: "rate_first"
     address: 0x150
@@ -146,7 +147,6 @@ sensor:
     address: 0x151
     register_type: holding
     value_type: U_WORD
-    skip_updates: 5
     modbus_controller_id: modbus_controller_ok
 
   # B - a wide value and one of its halves share a start address, with a contiguous sensor after them.
diff --git a/tests/integration/fixtures/uart_mock_modbus_offline.yaml b/tests/integration/fixtures/uart_mock_modbus_offline.yaml
index e4d2dfa294..c34890cd02 100644
--- a/tests/integration/fixtures/uart_mock_modbus_offline.yaml
+++ b/tests/integration/fixtures/uart_mock_modbus_offline.yaml
@@ -51,9 +51,8 @@ modbus_controller:
     modbus_id: virtual_modbus_client
     id: ctl
     max_cmd_retries: 1
-    # offline_skip_updates and the sensor's skip_updates deliberately share a period: offline
-    # probing must follow the offline cadence alone, or phase combinations like this one can
-    # leave the device never probing again.
+    # offline_skip_updates: 1 -> once offline, the controller re-probes every second update cycle;
+    # the test silences the device to force it offline, then answers again and checks it recovers.
     offline_skip_updates: 1
     update_interval: never
     on_offline:
@@ -71,7 +70,6 @@ sensor:
     address: 0x03
     register_type: holding
     value_type: U_WORD
-    skip_updates: 1
   # Mirrors the controller's online state so the test can await the transitions.
   - platform: template
     name: link_state
diff --git a/tests/integration/fixtures/uart_mock_modbus_shared_address.yaml b/tests/integration/fixtures/uart_mock_modbus_shared_address.yaml
index 25574d0c42..109603f3b6 100644
--- a/tests/integration/fixtures/uart_mock_modbus_shared_address.yaml
+++ b/tests/integration/fixtures/uart_mock_modbus_shared_address.yaml
@@ -49,14 +49,10 @@ uart_mock:
         inject_rx: [0x01, 0x03, 0x02, 0x01, 0x41, 0x79, 0xE4] # 0x101 = 0x0141 = 321
       - expect_tx: [0x01, 0x03, 0x01, 0x03, 0x00, 0x01, 0x75, 0xF6] # Read holding 0x103 count 1
         inject_rx: [0x01, 0x03, 0x02, 0x01, 0xA5, 0x79, 0xAF] # 0x103 = 0x01A5 = 421
-      # A widened shared-address range at 0x200 plus a sensor at 0x201 carrying its own skip_updates.
-      # The sensor must keep its own range so the polling rates stay independent; if it were folded into
-      # the widened range it would decode 0x201 from THAT response (2, not 777) and drag the range's
-      # rate down to its own.
+      # Two sensors sharing start address 0x200 (a word and a dword) widen the range to 2 registers
+      # and both decode from the single response.
       - expect_tx: [0x01, 0x03, 0x02, 0x00, 0x00, 0x02, 0xC5, 0xB3] # Read holding 0x200 count 2
         inject_rx: [0x01, 0x03, 0x04, 0x01, 0x41, 0x00, 0x02, 0x2A, 0x1A] # 0x200=0x0141, 0x201=0x0002
-      - expect_tx: [0x01, 0x03, 0x02, 0x01, 0x00, 0x01, 0xD4, 0x72] # Read holding 0x201 count 1
-        inject_rx: [0x01, 0x03, 0x02, 0x03, 0x09, 0x78, 0xB2] # 0x201 = 0x0309 = 777
 
 modbus:
   uart_id: virtual_uart_dev
@@ -128,26 +124,17 @@ sensor:
     modbus_controller_id: modbus_controller_ok
   # Shared address 0x200: the dword widens the range the word opened (or vice versa)
   - platform: modbus_controller
-    name: "rate_word"
+    name: "widen_word"
     address: 0x200
     register_type: holding
     value_type: U_WORD
     modbus_controller_id: modbus_controller_ok
   - platform: modbus_controller
-    name: "rate_dword"
+    name: "widen_dword"
     address: 0x200
     register_type: holding
     value_type: U_DWORD
     modbus_controller_id: modbus_controller_ok
-  # Inside the widened range but with its own skip_updates: must NOT be folded in, or the two sensors
-  # above would silently drop to this sensor's polling rate
-  - platform: modbus_controller
-    name: "own_rate"
-    address: 0x201
-    register_type: holding
-    value_type: U_WORD
-    skip_updates: 100
-    modbus_controller_id: modbus_controller_ok
 
 button:
   - platform: template
diff --git a/tests/integration/test_uart_mock_modbus.py b/tests/integration/test_uart_mock_modbus.py
index d0b375dd25..09e841b4bb 100644
--- a/tests/integration/test_uart_mock_modbus.py
+++ b/tests/integration/test_uart_mock_modbus.py
@@ -675,9 +675,7 @@ async def test_uart_mock_modbus_shared_address(
     wide sensor's span keep polling separately, and that the sensor at the span's tail address does not
     anchor a re-use join on a mid-range predecessor (which would make it decode that sensor's bytes).
 
-    A sensor at 0x201 carrying skip_updates sits inside a widened shared-address range at 0x200 but
-    keeps its own range, so polling rates stay independent; folding it in would also make it decode
-    0x201 out of the shared response (2) instead of its own poll (777).
+    A word and a dword sharing 0x200 widen that range to two registers and both decode from the one read.
     """
 
     line_callback, error_log_lines, warning_log_lines = _make_modbus_line_callback()
@@ -693,9 +691,8 @@ async def test_uart_mock_modbus_shared_address(
         "wide_qword": 100,
         "inside_wide": 321,
         "tail_of_wide": 421,
-        "rate_word": 321,
-        "rate_dword": pytest.approx(21037058),
-        "own_rate": 777,
+        "widen_word": 321,
+        "widen_dword": pytest.approx(21037058),
     }
     tracker = SensorTracker(list(expected_values.keys()))
     futures = tracker.expect_all(expected_values)
@@ -710,18 +707,18 @@ async def test_uart_mock_modbus_shared_address(
 
 
 @pytest.mark.asyncio
-async def test_uart_mock_modbus_custom_command(
+async def test_uart_mock_modbus_custom_pdu(
     yaml_config: str,
     run_compiled: RunCompiledFunction,
     api_client_connected: APIClientConnectedFactory,
 ) -> None:
-    """Test a custom_command sensor polling a register served by the mock server.
+    """Test a custom_pdu sensor reading a register served by the mock server.
 
-    The custom_command is a raw frame (device address + PDU); the hub appends the CRC and
-    routes the response back to the polling command, whose sensor lambda parses the payload.
-    Guards the custom polling wiring: the command must reference the sensor's custom_data and
-    decode the real function code, or nothing is ever transmitted. A plain read on the same
-    register anchors the bus.
+    The custom_pdu is a raw read-holding PDU (function code + address + count); the
+    controller prepends its own device address and appends the CRC, sends it, and the
+    sensor's lambda parses the response payload. Confirms the custom PDU path decodes
+    the function code and routes the response to the sensor (the gap that hid the
+    step-2 raw-vs-PDU bug). A plain read on the same register anchors the bus.
     """
 
     line_callback, error_log_lines, warning_log_lines = _make_modbus_line_callback()
@@ -754,9 +751,8 @@ async def test_uart_mock_modbus_offline(
     publishes. This pins the pooled non-response counter, can_send() gating, the
     offline retry cadence, and recovery - none of which the responding-path tests touch.
 
-    The fixture gives offline_skip_updates and the sensor's skip_updates the same period
-    on purpose: offline probing must follow the offline cadence alone, since requiring
-    both cadences to coincide leaves phase combinations where no probe ever goes out.
+    Offline probing follows the offline cadence alone; regular every-update polling
+    resumes once the device answers again.
     """
 
     tracker = SensorTracker(["link_state", "reg"])

From 3c56b9e66e1070b732c0fec1e779f6d1bbe64d43 Mon Sep 17 00:00:00 2001
From: Brandon Harvey <8107750+bharvey88@users.noreply.github.com>
Date: Sun, 23 Aug 2026 20:05:35 -0500
Subject: [PATCH 136/155] [wifi] Share the scan list dedupe helper with
 improv_serial (#18612)

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Co-authored-by: J. Nick Koston <nick@koston.org>
Co-authored-by: Bluetooth Devices Bot <bluetooth@koston.org>
---
 .../captive_portal/captive_portal.cpp         |  4 +--
 .../improv_serial/improv_serial_component.cpp | 25 +++++--------------
 .../{captive_portal => wifi}/scan_list.h      |  4 +--
 tests/components/captive_portal/__init__.py   | 10 --------
 .../scan_list_test.cpp                        | 12 ++++-----
 5 files changed, 16 insertions(+), 39 deletions(-)
 rename esphome/components/{captive_portal => wifi}/scan_list.h (92%)
 delete mode 100644 tests/components/captive_portal/__init__.py
 rename tests/components/{captive_portal => wifi}/scan_list_test.cpp (93%)

diff --git a/esphome/components/captive_portal/captive_portal.cpp b/esphome/components/captive_portal/captive_portal.cpp
index ffd121499b..e80f9e669f 100644
--- a/esphome/components/captive_portal/captive_portal.cpp
+++ b/esphome/components/captive_portal/captive_portal.cpp
@@ -4,9 +4,9 @@
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/string_ref.h"
+#include "esphome/components/wifi/scan_list.h"
 #include "esphome/components/wifi/wifi_component.h"
 #include "captive_index.h"
-#include "scan_list.h"
 
 namespace esphome::captive_portal {
 
@@ -37,7 +37,7 @@ void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
     const auto &results = wifi::global_wifi_component->get_scan_result();
     for (const auto &scan : results) {
       bool with_auth = false;
-      if (!should_show_scan_entry(results, scan, with_auth))
+      if (!wifi::should_show_scan_entry(results, scan, with_auth))
         continue;
 
       json_escape_into_buffer(escaped_ssid, scan.get_ssid());
diff --git a/esphome/components/improv_serial/improv_serial_component.cpp b/esphome/components/improv_serial/improv_serial_component.cpp
index a191889138..de9c7899cd 100644
--- a/esphome/components/improv_serial/improv_serial_component.cpp
+++ b/esphome/components/improv_serial/improv_serial_component.cpp
@@ -7,6 +7,7 @@
 #include "esphome/core/version.h"
 
 #include "esphome/components/logger/logger.h"
+#include "esphome/components/wifi/scan_list.h"
 
 namespace esphome::improv_serial {
 
@@ -230,31 +231,17 @@ bool ImprovSerialComponent::parse_improv_payload_(improv::ImprovCommand &command
       return true;
     }
     case improv::GET_WIFI_NETWORKS: {
-      std::vector<std::string> networks;
       const auto &results = wifi::global_wifi_component->get_scan_result();
-      for (auto &scan : results) {
-        if (scan.get_is_hidden())
+      for (const auto &scan : results) {
+        bool with_auth = false;
+        if (!wifi::should_show_scan_entry(results, scan, with_auth))
           continue;
-        const char *ssid_cstr = scan.get_ssid().c_str();
-        // Check if we've already sent this SSID
-        bool duplicate = false;
-        for (const auto &seen : networks) {
-          if (strcmp(seen.c_str(), ssid_cstr) == 0) {
-            duplicate = true;
-            break;
-          }
-        }
-        if (duplicate)
-          continue;
-        // Only allocate std::string after confirming it's not a duplicate
-        std::string ssid(ssid_cstr);
         // Send each ssid separately to avoid overflowing the buffer
         char rssi_buf[5];  // int8_t: -128 to 127, max 4 chars + null
         *int8_to_str(rssi_buf, scan.get_rssi()) = '\0';
-        std::vector<uint8_t> data =
-            improv::build_rpc_response(improv::GET_WIFI_NETWORKS, {ssid, rssi_buf, YESNO(scan.get_with_auth())}, false);
+        std::vector<uint8_t> data = improv::build_rpc_response(
+            improv::GET_WIFI_NETWORKS, {scan.get_ssid().str(), rssi_buf, YESNO(with_auth)}, false);
         this->send_response_(data);
-        networks.push_back(std::move(ssid));
       }
       // Send empty response to signify the end of the list.
       std::vector<uint8_t> data =
diff --git a/esphome/components/captive_portal/scan_list.h b/esphome/components/wifi/scan_list.h
similarity index 92%
rename from esphome/components/captive_portal/scan_list.h
rename to esphome/components/wifi/scan_list.h
index d24a88a670..8a11c745da 100644
--- a/esphome/components/captive_portal/scan_list.h
+++ b/esphome/components/wifi/scan_list.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>
 
-namespace esphome::captive_portal {
+namespace esphome::wifi {
 
 // A scan lists every BSSID, so one SSID can appear several times. Returns true for
 // the strongest entry per SSID (earliest on ties), never for hidden entries. scan
@@ -25,4 +25,4 @@ bool should_show_scan_entry(const Results &results, const Entry &scan, bool &wit
   return true;
 }
 
-}  // namespace esphome::captive_portal
+}  // namespace esphome::wifi
diff --git a/tests/components/captive_portal/__init__.py b/tests/components/captive_portal/__init__.py
deleted file mode 100644
index 1ac0704a59..0000000000
--- a/tests/components/captive_portal/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from tests.testing_helpers import ComponentManifestOverride
-
-
-def override_manifest(manifest: ComponentManifestOverride) -> None:
-    # The scan list helper is header-only and needs none of the component's real
-    # dependencies. Pulling them in breaks the host build: web_server_base
-    # includes ESPAsyncWebServer.h and ota.web_server includes md5/md5.h, neither
-    # of which exists there.
-    manifest.dependencies = []
-    manifest.auto_load = []
diff --git a/tests/components/captive_portal/scan_list_test.cpp b/tests/components/wifi/scan_list_test.cpp
similarity index 93%
rename from tests/components/captive_portal/scan_list_test.cpp
rename to tests/components/wifi/scan_list_test.cpp
index f67581dc0b..47427f063f 100644
--- a/tests/components/captive_portal/scan_list_test.cpp
+++ b/tests/components/wifi/scan_list_test.cpp
@@ -4,13 +4,13 @@
 #include <string>
 #include <vector>
 
-#include "esphome/components/captive_portal/scan_list.h"
+#include "esphome/components/wifi/scan_list.h"
 
-namespace esphome::captive_portal::testing {
+namespace esphome::wifi::testing {
 
 namespace {
 
-// Stand-in for wifi::WiFiScanResult, which does not compile on the host.
+// Stand-in for WiFiScanResult, which does not compile on the host.
 struct Entry {
   std::string ssid;
   int8_t rssi;
@@ -24,7 +24,7 @@ struct Entry {
   bool get_is_hidden() const { return this->is_hidden; }
 };
 
-// One row as the portal would emit it.
+// One network as a consumer would emit it.
 struct Row {
   std::string ssid;
   int8_t rssi;
@@ -33,7 +33,7 @@ struct Row {
   bool operator==(const Row &rhs) const { return ssid == rhs.ssid && rssi == rhs.rssi && lock == rhs.lock; }
 };
 
-// Walk the results the way handle_config does and collect the rows that survive.
+// Walk the results the way the consumers do and collect the rows that survive.
 std::vector<Row> rows(const std::vector<Entry> &results) {
   std::vector<Row> out;
   for (size_t i = 0; i < results.size(); i++) {
@@ -127,4 +127,4 @@ TEST(ScanList, EmptyListShowsNothing) {
   EXPECT_TRUE(rows(results).empty());
 }
 
-}  // namespace esphome::captive_portal::testing
+}  // namespace esphome::wifi::testing

From d877fb021c9776650803ee6f95bd490d5969917d Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 20:24:00 -0500
Subject: [PATCH 137/155] [time] Remove C++ POSIX TZ string parser (#18383)

---
 esphome/components/api/api.proto              |    8 +-
 esphome/components/api/api_connection.cpp     |   45 +-
 esphome/components/api/api_options.proto      |    6 +
 esphome/components/api/api_pb2.cpp            |    5 +-
 esphome/components/api/api_pb2.h              |    4 +-
 esphome/components/api/api_pb2_dump.cpp       |    2 +-
 esphome/components/time/__init__.py           |   22 +-
 esphome/components/time/posix_tz.cpp          |  198 ---
 esphome/components/time/posix_tz.h            |   45 +-
 esphome/components/time/real_time_clock.cpp   |   31 -
 esphome/components/time/real_time_clock.h     |   34 +-
 script/api_protobuf/api_protobuf.py           |   40 +-
 .../{posix_tz_parser.cpp => posix_tz.cpp}     | 1142 ++++++-----------
 tests/components/time/test.host.yaml          |   10 +
 .../api_get_time_response_timezone.yaml       |   20 +
 .../test_api_get_time_response_timezone.py    |   67 +
 16 files changed, 604 insertions(+), 1075 deletions(-)
 rename tests/components/time/{posix_tz_parser.cpp => posix_tz.cpp} (56%)
 create mode 100644 tests/components/time/test.host.yaml
 create mode 100644 tests/integration/fixtures/api_get_time_response_timezone.yaml
 create mode 100644 tests/integration/test_api_get_time_response_timezone.py

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index f1bc9b003a..6ea124d155 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -1002,8 +1002,12 @@ message GetTimeResponse {
   option (no_delay) = true;
 
   fixed32 epoch_seconds = 1;
-  string timezone = 2;
-  ParsedTimezone parsed_timezone = 3;
+  // Deprecated in 2026.9.0: clients still send this string for older firmware,
+  // but new firmware only reads parsed_timezone. Clients older than Home
+  // Assistant 2026.3.0 that send only the string leave the device on its
+  // codegen-configured timezone (or UTC).
+  string timezone = 2 [deprecated = true];
+  ParsedTimezone parsed_timezone = 3 [(track_presence) = true];
 }
 
 // ==================== USER-DEFINES SERVICES ====================
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 91d13eed65..bb6c1695dd 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1204,31 +1204,28 @@ void APIConnection::on_get_time_response(const GetTimeResponse &value) {
   if (homeassistant::global_homeassistant_time != nullptr) {
     homeassistant::global_homeassistant_time->set_epoch_time(value.epoch_seconds);
 #if defined(USE_HOMEASSISTANT_TIMEZONE) && defined(USE_TIME_TIMEZONE)
-    if (!value.timezone.empty()) {
-      // Check if the sender provided pre-parsed timezone data.
-      // If std_offset is non-zero or DST rules are present, the parsed data was populated.
-      // For UTC (all zeros), string parsing produces the same result, so the fallback is equivalent.
+    // Apply only if the sender provided pre-parsed timezone data (Home Assistant 2026.3.0
+    // and newer); field presence distinguishes a genuine all-zero UTC timezone from an
+    // absent field. Older clients send only the deprecated timezone string, which is no
+    // longer decoded; for them the device keeps its codegen-configured timezone.
+    if (value.has_parsed_timezone) {
       const auto &pt = value.parsed_timezone;
-      if (pt.std_offset_seconds != 0 || pt.dst_start.type != enums::DST_RULE_TYPE_NONE) {
-        time::ParsedTimezone tz{};
-        tz.std_offset_seconds = pt.std_offset_seconds;
-        tz.dst_offset_seconds = pt.dst_offset_seconds;
-        tz.dst_start.time_seconds = pt.dst_start.time_seconds;
-        tz.dst_start.day = static_cast<uint16_t>(pt.dst_start.day);
-        tz.dst_start.type = static_cast<time::DSTRuleType>(pt.dst_start.type);
-        tz.dst_start.month = static_cast<uint8_t>(pt.dst_start.month);
-        tz.dst_start.week = static_cast<uint8_t>(pt.dst_start.week);
-        tz.dst_start.day_of_week = static_cast<uint8_t>(pt.dst_start.day_of_week);
-        tz.dst_end.time_seconds = pt.dst_end.time_seconds;
-        tz.dst_end.day = static_cast<uint16_t>(pt.dst_end.day);
-        tz.dst_end.type = static_cast<time::DSTRuleType>(pt.dst_end.type);
-        tz.dst_end.month = static_cast<uint8_t>(pt.dst_end.month);
-        tz.dst_end.week = static_cast<uint8_t>(pt.dst_end.week);
-        tz.dst_end.day_of_week = static_cast<uint8_t>(pt.dst_end.day_of_week);
-        time::set_global_tz(tz);
-      } else {
-        homeassistant::global_homeassistant_time->set_timezone(value.timezone.c_str(), value.timezone.size());
-      }
+      time::ParsedTimezone tz{};
+      tz.std_offset_seconds = pt.std_offset_seconds;
+      tz.dst_offset_seconds = pt.dst_offset_seconds;
+      tz.dst_start.time_seconds = pt.dst_start.time_seconds;
+      tz.dst_start.day = static_cast<uint16_t>(pt.dst_start.day);
+      tz.dst_start.type = static_cast<time::DSTRuleType>(pt.dst_start.type);
+      tz.dst_start.month = static_cast<uint8_t>(pt.dst_start.month);
+      tz.dst_start.week = static_cast<uint8_t>(pt.dst_start.week);
+      tz.dst_start.day_of_week = static_cast<uint8_t>(pt.dst_start.day_of_week);
+      tz.dst_end.time_seconds = pt.dst_end.time_seconds;
+      tz.dst_end.day = static_cast<uint16_t>(pt.dst_end.day);
+      tz.dst_end.type = static_cast<time::DSTRuleType>(pt.dst_end.type);
+      tz.dst_end.month = static_cast<uint8_t>(pt.dst_end.month);
+      tz.dst_end.week = static_cast<uint8_t>(pt.dst_end.week);
+      tz.dst_end.day_of_week = static_cast<uint8_t>(pt.dst_end.day_of_week);
+      time::set_global_tz(tz);
     }
 #endif
   }
diff --git a/esphome/components/api/api_options.proto b/esphome/components/api/api_options.proto
index ac9c4e59cc..66295b3d53 100644
--- a/esphome/components/api/api_options.proto
+++ b/esphome/components/api/api_options.proto
@@ -116,4 +116,10 @@ extend google.protobuf.FieldOptions {
     // the per-byte loop when the upper bits are non-zero (the common case
     // for real MAC addresses, since OUIs occupy the top 24 bits).
     optional bool mac_address = 50019 [default=false];
+
+    // track_presence: Track whether this message-typed field was present on the wire.
+    // Generates a `bool has_<field>{false};` member on the decoding side that is set
+    // to true when the field arrives, so an all-default submessage can be told apart
+    // from an absent one (e.g. a UTC ParsedTimezone, which is all zeros).
+    optional bool track_presence = 50020 [default=false];
 }
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 1b8c6b05bd..33611c5ee1 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -1249,12 +1249,9 @@ bool ParsedTimezone::decode_length(uint32_t field_id, ProtoLengthDelimited value
 }
 bool GetTimeResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
-    case 2: {
-      this->timezone = StringRef(reinterpret_cast<const char *>(value.data()), value.size());
-      break;
-    }
     case 3:
       value.decode_to_message(this->parsed_timezone);
+      this->has_parsed_timezone = true;
       break;
     default:
       return false;
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 8335dae1f2..13db857467 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1283,13 +1283,13 @@ class ParsedTimezone final : public ProtoDecodableMessage {
 class GetTimeResponse final : public ProtoDecodableMessage {
  public:
   static constexpr uint8_t MESSAGE_TYPE = 37;
-  static constexpr uint8_t ESTIMATED_SIZE = 31;
+  static constexpr uint8_t ESTIMATED_SIZE = 22;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   const LogString *message_name() const override { return LOG_STR("get_time_response"); }
 #endif
   uint32_t epoch_seconds{0};
-  StringRef timezone{};
   ParsedTimezone parsed_timezone{};
+  bool has_parsed_timezone{false};
 #ifdef HAS_PROTO_MESSAGE_DUMP
   const char *dump_to(DumpBuffer &out) const override;
 #endif
diff --git a/esphome/components/api/api_pb2_dump.cpp b/esphome/components/api/api_pb2_dump.cpp
index 4d5829e45d..d54215ba2e 100644
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
@@ -1468,7 +1468,7 @@ const char *ParsedTimezone::dump_to(DumpBuffer &out) const {
 const char *GetTimeResponse::dump_to(DumpBuffer &out) const {
   MessageDumpHelper helper(out, ESPHOME_PSTR("GetTimeResponse"));
   dump_field(out, ESPHOME_PSTR("epoch_seconds"), this->epoch_seconds);
-  dump_field(out, ESPHOME_PSTR("timezone"), this->timezone);
+  dump_field(out, ESPHOME_PSTR("has_parsed_timezone"), this->has_parsed_timezone);
   out.append(2, ' ').append_p(ESPHOME_PSTR("parsed_timezone")).append(": ");
   this->parsed_timezone.dump_to(out);
   out.append("\n");
diff --git a/esphome/components/time/__init__.py b/esphome/components/time/__init__.py
index 35fad0a450..94ff6ab051 100644
--- a/esphome/components/time/__init__.py
+++ b/esphome/components/time/__init__.py
@@ -36,6 +36,7 @@ from esphome.const import (
     PLATFORM_RTL87XX,
 )
 from esphome.core import CORE, CoroPriority, EsphomeError, coroutine_with_priority
+from esphome.helpers import cpp_string_escape
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -411,17 +412,18 @@ async def setup_time_core_(time_var, config):
         cg.add_define("USE_TIME_TIMEZONE")
 
         if CORE.is_host:
-            # Host platform needs setenv("TZ")/tzset() for libc compatibility
-            cg.add(time_var.set_timezone(timezone))
-        else:
-            # Embedded: pre-parse at codegen time, emit struct directly
-            from aioesphomeapi.posix_tz import parse_posix_tz as parse_posix_tz_python
+            # Host platform also needs setenv("TZ")/tzset() for libc compatibility
+            cg.add(cg.RawExpression(f'setenv("TZ", {cpp_string_escape(timezone)}, 1)'))
+            cg.add(cg.RawExpression("tzset()"))
 
-            try:
-                parsed = parse_posix_tz_python(timezone)
-                _emit_parsed_timezone_fields(parsed)
-            except ValueError as e:
-                raise EsphomeError(f"Invalid timezone: {timezone}") from e
+        # Pre-parse at codegen time, emit struct directly
+        from aioesphomeapi.posix_tz import parse_posix_tz as parse_posix_tz_python
+
+        try:
+            parsed = parse_posix_tz_python(timezone)
+        except ValueError as e:
+            raise EsphomeError(f"Invalid timezone: {timezone}") from e
+        _emit_parsed_timezone_fields(parsed)
 
     for conf in config.get(CONF_ON_TIME, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], time_var)
diff --git a/esphome/components/time/posix_tz.cpp b/esphome/components/time/posix_tz.cpp
index c25248e457..188df599f6 100644
--- a/esphome/components/time/posix_tz.cpp
+++ b/esphome/components/time/posix_tz.cpp
@@ -3,7 +3,6 @@
 #ifdef USE_TIME_TIMEZONE
 
 #include "posix_tz.h"
-#include <cctype>
 #include <cstdio>
 
 namespace esphome::time {
@@ -18,17 +17,6 @@ const ParsedTimezone &get_global_tz() { return global_tz_; }
 
 namespace internal {
 
-// Remove before 2026.9.0: parse_uint, skip_tz_name, parse_offset, parse_dst_rule,
-// and parse_transition_time are only used by parse_posix_tz() (bridge code).
-static uint32_t parse_uint(const char *&p) {
-  uint32_t value = 0;
-  while (std::isdigit(static_cast<unsigned char>(*p))) {
-    value = value * 10 + (*p - '0');
-    p++;
-  }
-  return value;
-}
-
 bool is_leap_year(int year) { return (year % 4 == 0 && year % 100 != 0) || (year % 400 == 0); }
 
 // Get days in year (avoids duplicate is_leap_year calls)
@@ -140,62 +128,6 @@ void __attribute__((noinline)) epoch_to_tm_utc(time_t epoch, struct tm *out_tm)
   out_tm->tm_isdst = 0;
 }
 
-bool skip_tz_name(const char *&p) {
-  if (*p == '<') {
-    // Angle-bracket quoted name: <+07>, <-03>, <AEST>
-    p++;  // skip '<'
-    while (*p && *p != '>') {
-      p++;
-    }
-    if (*p == '>') {
-      p++;  // skip '>'
-      return true;
-    }
-    return false;  // Unterminated
-  }
-
-  // Standard name: 3+ letters
-  const char *start = p;
-  while (*p && std::isalpha(static_cast<unsigned char>(*p))) {
-    p++;
-  }
-  return (p - start) >= 3;
-}
-
-int32_t __attribute__((noinline)) parse_offset(const char *&p) {
-  int sign = 1;
-  if (*p == '-') {
-    sign = -1;
-    p++;
-  } else if (*p == '+') {
-    p++;
-  }
-
-  int hours = parse_uint(p);
-  int minutes = 0;
-  int seconds = 0;
-
-  if (*p == ':') {
-    p++;
-    minutes = parse_uint(p);
-    if (*p == ':') {
-      p++;
-      seconds = parse_uint(p);
-    }
-  }
-
-  return sign * (hours * 3600 + minutes * 60 + seconds);
-}
-
-// Helper to parse the optional /time suffix (reuses parse_offset logic)
-static void parse_transition_time(const char *&p, DSTRule &rule) {
-  rule.time_seconds = 2 * 3600;  // Default 02:00
-  if (*p == '/') {
-    p++;
-    rule.time_seconds = parse_offset(p);
-  }
-}
-
 void __attribute__((noinline)) julian_to_month_day(int julian_day, int &out_month, int &out_day) {
   // J format: day 1-365, Feb 29 is NOT counted even in leap years
   // So day 60 is always March 1
@@ -236,59 +168,6 @@ void __attribute__((noinline)) day_of_year_to_month_day(int day_of_year, int yea
   out_day = 31;
 }
 
-bool parse_dst_rule(const char *&p, DSTRule &rule) {
-  rule = {};  // Zero initialize
-
-  if (*p == 'M' || *p == 'm') {
-    // M format: Mm.w.d (month.week.day)
-    rule.type = DSTRuleType::MONTH_WEEK_DAY;
-    p++;
-
-    rule.month = parse_uint(p);
-    if (rule.month < 1 || rule.month > 12)
-      return false;
-
-    if (*p++ != '.')
-      return false;
-
-    rule.week = parse_uint(p);
-    if (rule.week < 1 || rule.week > 5)
-      return false;
-
-    if (*p++ != '.')
-      return false;
-
-    rule.day_of_week = parse_uint(p);
-    if (rule.day_of_week > 6)
-      return false;
-
-  } else if (*p == 'J' || *p == 'j') {
-    // J format: Jn (Julian day 1-365, not counting Feb 29)
-    rule.type = DSTRuleType::JULIAN_NO_LEAP;
-    p++;
-
-    rule.day = parse_uint(p);
-    if (rule.day < 1 || rule.day > 365)
-      return false;
-
-  } else if (std::isdigit(static_cast<unsigned char>(*p))) {
-    // Plain number format: n (day 0-365, counting Feb 29)
-    rule.type = DSTRuleType::DAY_OF_YEAR;
-
-    rule.day = parse_uint(p);
-    if (rule.day > 365)
-      return false;
-
-  } else {
-    return false;
-  }
-
-  // Parse optional /time suffix
-  parse_transition_time(p, rule);
-
-  return true;
-}
-
 // Calculate days from Jan 1 of given year to given month/day
 static int __attribute__((noinline)) days_from_year_start(int year, int month, int day) {
   int days = day - 1;
@@ -373,83 +252,6 @@ bool __attribute__((noinline)) is_in_dst(time_t utc_epoch, const ParsedTimezone
   }
 }
 
-// Remove before 2026.9.0: This parser is bridge code for backward compatibility with
-// older Home Assistant clients that send the timezone as a POSIX TZ string instead of
-// the pre-parsed ParsedTimezone protobuf struct. Once all clients send the struct
-// directly, this function and the parsing helpers above (skip_tz_name, parse_offset,
-// parse_dst_rule, parse_transition_time) can be removed.
-// See https://github.com/esphome/backlog/issues/91
-bool parse_posix_tz(const char *tz_string, ParsedTimezone &result) {
-  if (!tz_string || !*tz_string) {
-    return false;
-  }
-
-  const char *p = tz_string;
-
-  // Initialize result (dst_start/dst_end default to type=NONE, so has_dst() returns false)
-  result.std_offset_seconds = 0;
-  result.dst_offset_seconds = 0;
-  result.dst_start = {};
-  result.dst_end = {};
-
-  // Skip standard timezone name
-  if (!internal::skip_tz_name(p)) {
-    return false;
-  }
-
-  // Parse standard offset (required)
-  if (!*p || (!std::isdigit(static_cast<unsigned char>(*p)) && *p != '+' && *p != '-')) {
-    return false;
-  }
-  result.std_offset_seconds = internal::parse_offset(p);
-
-  // Check for DST name
-  if (!*p) {
-    return true;  // No DST
-  }
-
-  // If next char is comma, there's no DST name but there are rules (invalid)
-  if (*p == ',') {
-    return false;
-  }
-
-  // Check if there's something that looks like a DST name start
-  // (letter or angle bracket). If not, treat as trailing garbage and return success.
-  if (!std::isalpha(static_cast<unsigned char>(*p)) && *p != '<') {
-    return true;  // No DST, trailing characters ignored
-  }
-
-  if (!internal::skip_tz_name(p)) {
-    return false;  // Invalid DST name (started but malformed)
-  }
-
-  // Optional DST offset (default is std - 1 hour)
-  if (*p && *p != ',' && (std::isdigit(static_cast<unsigned char>(*p)) || *p == '+' || *p == '-')) {
-    result.dst_offset_seconds = internal::parse_offset(p);
-  } else {
-    result.dst_offset_seconds = result.std_offset_seconds - 3600;
-  }
-
-  // Parse DST rules (required when DST name is present)
-  if (*p != ',') {
-    // DST name without rules - treat as no DST since we can't determine transitions
-    return true;
-  }
-
-  p++;
-  if (!internal::parse_dst_rule(p, result.dst_start)) {
-    return false;
-  }
-
-  // Second rule is required per POSIX
-  if (*p != ',') {
-    return false;
-  }
-  p++;
-  // has_dst() now returns true since dst_start.type was set by parse_dst_rule
-  return internal::parse_dst_rule(p, result.dst_end);
-}
-
 // Format a POSIX offset (positive = west) as "+HHMM" / "-HHMM" for display.
 // Convention: negate POSIX sign so east-of-UTC is positive (ISO 8601 / RFC 2822).
 void format_designation(int32_t posix_offset, char *buf, size_t buf_size) {
diff --git a/esphome/components/time/posix_tz.h b/esphome/components/time/posix_tz.h
index be1ddfd689..249f597166 100644
--- a/esphome/components/time/posix_tz.h
+++ b/esphome/components/time/posix_tz.h
@@ -39,28 +39,6 @@ struct ParsedTimezone {
 /// Format a POSIX offset as "+HHMM"/"-HHMM" into buf (must be >= 6 bytes).
 void format_designation(int32_t posix_offset, char *buf, size_t buf_size);
 
-/// Parse a POSIX TZ string into a ParsedTimezone struct.
-///
-/// @deprecated Remove before 2026.9.0 (bridge code for backward compatibility).
-/// This parser only exists so that older Home Assistant clients that send the timezone
-/// as a string (instead of the pre-parsed ParsedTimezone protobuf struct) can still
-/// set the timezone on the device. Once all clients are updated to send the struct
-/// directly, this function and all internal parsing helpers will be removed.
-/// See https://github.com/esphome/backlog/issues/91
-///
-/// Supports formats like:
-///   - "EST5" (simple offset, no DST)
-///   - "EST5EDT,M3.2.0,M11.1.0" (with DST, M-format rules)
-///   - "CST6CDT,M3.2.0/2,M11.1.0/2" (with transition times)
-///   - "<+07>-7" (angle-bracket notation for special names)
-///   - "IST-5:30" (half-hour offsets)
-///   - "EST5EDT,J60,J300" (J-format: Julian day without leap day)
-///   - "EST5EDT,60,300" (plain day number: day of year with leap day)
-/// @param tz_string The POSIX TZ string to parse
-/// @param result Output: the parsed timezone data
-/// @return true if parsing succeeded, false on error
-bool parse_posix_tz(const char *tz_string, ParsedTimezone &result);
-
 /// Convert a UTC epoch to local time using the parsed timezone.
 /// This replaces libc's localtime() to avoid scanf dependency.
 /// @param utc_epoch Unix timestamp in UTC
@@ -70,8 +48,7 @@ bool parse_posix_tz(const char *tz_string, ParsedTimezone &result);
 bool epoch_to_local_tm(time_t utc_epoch, const ParsedTimezone &tz, struct tm *out_tm);
 
 /// Set the global timezone used by epoch_to_local_tm() when called without a timezone.
-/// This is called by RealTimeClock::apply_timezone_() to enable ESPTime::from_epoch_local()
-/// to work without libc's localtime().
+/// This enables ESPTime::from_epoch_local() to work without libc's localtime().
 void set_global_tz(const ParsedTimezone &tz);
 
 /// Get the global timezone.
@@ -84,29 +61,9 @@ const ParsedTimezone &get_global_tz();
 bool is_in_dst(time_t utc_epoch, const ParsedTimezone &tz);
 
 // Internal helper functions exposed for testing.
-// Remove before 2026.9.0: skip_tz_name, parse_offset, parse_dst_rule are only
-// used by parse_posix_tz() which is bridge code for backward compatibility.
-// The remaining helpers (epoch_to_tm_utc, day_of_week, days_in_month, etc.)
-// are used by the conversion functions and will stay.
 
 namespace internal {
 
-/// Skip a timezone name (letters or <...> quoted format)
-/// @param p Pointer to current position, updated on return
-/// @return true if a valid name was found
-bool skip_tz_name(const char *&p);
-
-/// Parse an offset in format [-]hh[:mm[:ss]]
-/// @param p Pointer to current position, updated on return
-/// @return Offset in seconds
-int32_t parse_offset(const char *&p);
-
-/// Parse a DST rule in format Mm.w.d[/time], Jn[/time], or n[/time]
-/// @param p Pointer to current position, updated on return
-/// @param rule Output: the parsed rule
-/// @return true if parsing succeeded
-bool parse_dst_rule(const char *&p, DSTRule &rule);
-
 /// Convert Julian day (J format, 1-365 not counting Feb 29) to month/day
 /// @param julian_day Day number 1-365
 /// @param[out] month Output: month 1-12
diff --git a/esphome/components/time/real_time_clock.cpp b/esphome/components/time/real_time_clock.cpp
index 6a52348ae9..4f32560525 100644
--- a/esphome/components/time/real_time_clock.cpp
+++ b/esphome/components/time/real_time_clock.cpp
@@ -107,35 +107,4 @@ void RealTimeClock::synchronize_epoch_(uint32_t epoch) {
   this->time_sync_callback_.call();
 }
 
-#ifdef USE_TIME_TIMEZONE
-void RealTimeClock::apply_timezone_(const char *tz) {
-  ParsedTimezone parsed{};
-
-  // Handle null or empty input - use UTC
-  if (tz == nullptr || *tz == '\0') {
-    // Skip if already UTC
-    if (!get_global_tz().has_dst() && get_global_tz().std_offset_seconds == 0) {
-      return;
-    }
-    set_global_tz(parsed);
-    return;
-  }
-
-#ifdef USE_HOST
-  // On host platform, also set TZ environment variable for libc compatibility
-  setenv("TZ", tz, 1);
-  tzset();
-#endif
-
-  // Parse the POSIX TZ string using our custom parser
-  if (!parse_posix_tz(tz, parsed)) {
-    ESP_LOGW(TAG, "Failed to parse timezone: %s", tz);
-    return;
-  }
-
-  // Set global timezone for all time conversions
-  set_global_tz(parsed);
-}
-#endif
-
 }  // namespace esphome::time
diff --git a/esphome/components/time/real_time_clock.h b/esphome/components/time/real_time_clock.h
index 7a9175f39c..c449309c9f 100644
--- a/esphome/components/time/real_time_clock.h
+++ b/esphome/components/time/real_time_clock.h
@@ -15,37 +15,13 @@ namespace esphome::time {
 /// The RealTimeClock class exposes common timekeeping functions via the device's local real-time clock.
 ///
 /// \note
-/// The C library (newlib) available on ESPs only supports TZ strings that specify an offset and DST info;
-/// you cannot specify zone names or paths to zoneinfo files.
-/// \see https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
+/// The timezone is pre-parsed into a ParsedTimezone struct: at codegen time from the YAML
+/// configuration, or at runtime by API clients that send the parsed struct (Home Assistant
+/// 2026.3.0 and newer). See set_global_tz() in posix_tz.h.
 class RealTimeClock : public PollingComponent {
  public:
   explicit RealTimeClock();
 
-#ifdef USE_TIME_TIMEZONE
-  /// Set the time zone from a POSIX TZ string.
-  void set_timezone(const char *tz) { this->apply_timezone_(tz); }
-
-  /// Set the time zone from a character buffer with known length.
-  /// The buffer does not need to be null-terminated.
-  void set_timezone(const char *tz, size_t len) {
-    if (tz == nullptr) {
-      this->apply_timezone_(nullptr);
-      return;
-    }
-    // Stack buffer - TZ strings from tzdata are typically short (< 50 chars)
-    char buf[128];
-    if (len >= sizeof(buf))
-      len = sizeof(buf) - 1;
-    memcpy(buf, tz, len);
-    buf[len] = '\0';
-    this->apply_timezone_(buf);
-  }
-
-  /// Set the time zone from a std::string.
-  void set_timezone(const std::string &tz) { this->apply_timezone_(tz.c_str()); }
-#endif
-
   /// Get the time in the currently defined timezone.
   ESPTime now();
 
@@ -65,10 +41,6 @@ class RealTimeClock : public PollingComponent {
   /// Report a unix epoch as current time.
   void synchronize_epoch_(uint32_t epoch);
 
-#ifdef USE_TIME_TIMEZONE
-  void apply_timezone_(const char *tz);
-#endif
-
   LazyCallbackManager<void()> time_sync_callback_;
 };
 
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index f4eff4a254..dc3dd4b868 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -498,6 +498,15 @@ def create_field_type_info(
     needs_encode: bool = True,
 ) -> TypeInfo:
     """Create the appropriate TypeInfo instance for a field, handling repeated fields and custom options."""
+    if get_field_opt(field, pb.track_presence, False) and (
+        field.label == FieldDescriptorProto.LABEL_REPEATED
+        or field.type != 11
+        or not needs_decode
+    ):
+        raise ValueError(
+            f"track_presence on field '{field.name}' has no effect; it requires "
+            "a non-repeated message field in a message that is decoded"
+        )
     if field.label == FieldDescriptorProto.LABEL_REPEATED:
         # Check if this is a packed_buffer field (zero-copy packed repeated)
         if get_field_opt(field, pb.packed_buffer, False):
@@ -541,6 +550,8 @@ def create_field_type_info(
         return PointerToStringBufferType(field, None)
 
     validate_field_type(field.type, field.name)
+    if field.type == 11:
+        return MessageType(field, needs_decode, needs_encode)
     return TYPE_INFO[field.type](field)
 
 
@@ -937,9 +948,33 @@ class MessageType(TypeInfo):
         # runtime polymorphism through virtual function calls.
         return None
 
+    @property
+    def public_content(self) -> list[str]:
+        content = [self.class_member]
+        if self._track_presence:
+            content.append(f"bool has_{self.name}{{false}};")
+        return content
+
+    @property
+    def _track_presence(self) -> bool:
+        # Presence is only observable on the decode side
+        return self._needs_decode and get_field_opt(
+            self._field, pb.track_presence, False
+        )
+
     @property
     def decode_length_content(self) -> str:
         # Custom decode that doesn't use templates
+        if self._track_presence:
+            # decode_to_message() cannot report failure, so setting the flag
+            # afterwards only documents intent; a status-returning decode could
+            # gate it for real without touching callers.
+            return (
+                f"case {self.number}:\n"
+                f"      value.decode_to_message(this->{self.field_name});\n"
+                f"      this->has_{self.name} = true;\n"
+                f"      break;"
+            )
         return f"case {self.number}: value.decode_to_message(this->{self.field_name}); break;"
 
     def dump(self, name: str) -> str:
@@ -947,7 +982,10 @@ class MessageType(TypeInfo):
 
     @property
     def dump_content(self) -> str:
-        o = f'out.append(2, \' \').append_p(ESPHOME_PSTR("{self.name}")).append(": ");\n'
+        o = ""
+        if self._track_presence:
+            o += f'dump_field(out, ESPHOME_PSTR("has_{self.name}"), this->has_{self.name});\n'
+        o += f'out.append(2, \' \').append_p(ESPHOME_PSTR("{self.name}")).append(": ");\n'
         o += f"this->{self.field_name}.dump_to(out);\n"
         o += 'out.append("\\n");'
         return o
diff --git a/tests/components/time/posix_tz_parser.cpp b/tests/components/time/posix_tz.cpp
similarity index 56%
rename from tests/components/time/posix_tz_parser.cpp
rename to tests/components/time/posix_tz.cpp
index 440eea608d..760328a518 100644
--- a/tests/components/time/posix_tz_parser.cpp
+++ b/tests/components/time/posix_tz.cpp
@@ -1,14 +1,7 @@
-// Tests for the POSIX TZ parser, time conversion functions, and ESPTime::strptime.
+// Tests for time conversion functions, DST detection, and ESPTime::strptime.
 //
-// Most tests here cover the C++ POSIX TZ string parser (parse_posix_tz), which is
-// bridge code for backward compatibility — it will be removed before ESPHome 2026.9.0.
-// After https://github.com/esphome/esphome/pull/14233 merges, the parser is solely
-// used to handle timezone strings from Home Assistant clients older than 2026.3.0
-// that haven't been updated to send the pre-parsed ParsedTimezone protobuf struct.
-// See https://github.com/esphome/backlog/issues/91
-//
-// The epoch_to_local_tm, is_in_dst, and ESPTime::strptime tests cover conversion
-// functions that will remain permanently.
+// These tests cover the permanent timezone functions: epoch_to_local_tm, is_in_dst,
+// calculate_dst_transition, and the internal helper functions they depend on.
 
 // Enable USE_TIME_TIMEZONE for tests
 #define USE_TIME_TIMEZONE
@@ -16,6 +9,8 @@
 #include <gtest/gtest.h>
 #include <cstdlib>
 #include <ctime>
+#include <string>
+#include <tuple>
 #include "esphome/components/time/posix_tz.h"
 #include "esphome/core/time.h"
 
@@ -35,435 +30,83 @@ static time_t make_utc(int year, int month, int day, int hour = 0, int min = 0,
   return days * 86400 + hour * 3600 + min * 60 + sec;
 }
 
-// ============================================================================
-// Basic TZ string parsing tests
-// ============================================================================
-
-TEST(PosixTzParser, ParseSimpleOffsetEST5) {
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("EST5", tz));
-  EXPECT_EQ(tz.std_offset_seconds, 5 * 3600);  // +5 hours (west of UTC)
-  EXPECT_FALSE(tz.has_dst());
+// Helper to build a US Eastern timezone (EST5EDT,M3.2.0/2,M11.1.0/2)
+static ParsedTimezone make_us_eastern() {
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = 5 * 3600;
+  tz.dst_offset_seconds = 4 * 3600;
+  tz.dst_start.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_start.month = 3;
+  tz.dst_start.week = 2;
+  tz.dst_start.day_of_week = 0;
+  tz.dst_start.time_seconds = 2 * 3600;
+  tz.dst_end.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_end.month = 11;
+  tz.dst_end.week = 1;
+  tz.dst_end.day_of_week = 0;
+  tz.dst_end.time_seconds = 2 * 3600;
+  return tz;
 }
 
-TEST(PosixTzParser, ParseNegativeOffsetCET) {
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("CET-1", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -1 * 3600);  // -1 hour (east of UTC)
-  EXPECT_FALSE(tz.has_dst());
+// Helper to build a US Central timezone (CST6CDT,M3.2.0,M11.1.0)
+static ParsedTimezone make_us_central() {
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = 6 * 3600;
+  tz.dst_offset_seconds = 5 * 3600;
+  tz.dst_start.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_start.month = 3;
+  tz.dst_start.week = 2;
+  tz.dst_start.day_of_week = 0;
+  tz.dst_start.time_seconds = 2 * 3600;
+  tz.dst_end.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_end.month = 11;
+  tz.dst_end.week = 1;
+  tz.dst_end.day_of_week = 0;
+  tz.dst_end.time_seconds = 2 * 3600;
+  return tz;
 }
 
-TEST(PosixTzParser, ParseExplicitPositiveOffset) {
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("TEST+5", tz));
-  EXPECT_EQ(tz.std_offset_seconds, 5 * 3600);
-  EXPECT_FALSE(tz.has_dst());
+// Helper to build New Zealand timezone (NZST-12NZDT,M9.5.0,M4.1.0/3)
+static ParsedTimezone make_new_zealand() {
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = -12 * 3600;
+  tz.dst_offset_seconds = -13 * 3600;
+  tz.dst_start.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_start.month = 9;
+  tz.dst_start.week = 5;
+  tz.dst_start.day_of_week = 0;
+  tz.dst_start.time_seconds = 2 * 3600;
+  tz.dst_end.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_end.month = 4;
+  tz.dst_end.week = 1;
+  tz.dst_end.day_of_week = 0;
+  tz.dst_end.time_seconds = 3 * 3600;
+  return tz;
 }
 
-TEST(PosixTzParser, ParseZeroOffset) {
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("UTC0", tz));
-  EXPECT_EQ(tz.std_offset_seconds, 0);
-  EXPECT_FALSE(tz.has_dst());
-}
-
-TEST(PosixTzParser, ParseUSEasternWithDST) {
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,M3.2.0,M11.1.0", tz));
-  EXPECT_EQ(tz.std_offset_seconds, 5 * 3600);
-  EXPECT_EQ(tz.dst_offset_seconds, 4 * 3600);  // Default: STD - 1hr
-  EXPECT_TRUE(tz.has_dst());
-  EXPECT_EQ(tz.dst_start.month, 3);
-  EXPECT_EQ(tz.dst_start.week, 2);
-  EXPECT_EQ(tz.dst_start.day_of_week, 0);          // Sunday
-  EXPECT_EQ(tz.dst_start.time_seconds, 2 * 3600);  // Default 2:00 AM
-  EXPECT_EQ(tz.dst_end.month, 11);
-  EXPECT_EQ(tz.dst_end.week, 1);
-  EXPECT_EQ(tz.dst_end.day_of_week, 0);
-}
-
-TEST(PosixTzParser, ParseUSCentralWithTime) {
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("CST6CDT,M3.2.0/2,M11.1.0/2", tz));
-  EXPECT_EQ(tz.std_offset_seconds, 6 * 3600);
-  EXPECT_EQ(tz.dst_offset_seconds, 5 * 3600);
-  EXPECT_EQ(tz.dst_start.time_seconds, 2 * 3600);  // 2:00 AM
-  EXPECT_EQ(tz.dst_end.time_seconds, 2 * 3600);
-}
-
-TEST(PosixTzParser, ParseEuropeBerlin) {
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("CET-1CEST,M3.5.0,M10.5.0/3", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -1 * 3600);
-  EXPECT_EQ(tz.dst_offset_seconds, -2 * 3600);  // Default: STD - 1hr
-  EXPECT_TRUE(tz.has_dst());
-  EXPECT_EQ(tz.dst_start.month, 3);
-  EXPECT_EQ(tz.dst_start.week, 5);  // Last week
-  EXPECT_EQ(tz.dst_end.month, 10);
-  EXPECT_EQ(tz.dst_end.week, 5);                 // Last week
-  EXPECT_EQ(tz.dst_end.time_seconds, 3 * 3600);  // 3:00 AM
-}
-
-TEST(PosixTzParser, ParseNewZealand) {
-  ParsedTimezone tz;
-  // Southern hemisphere - DST starts in Sept, ends in April
-  ASSERT_TRUE(parse_posix_tz("NZST-12NZDT,M9.5.0,M4.1.0/3", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -12 * 3600);
-  EXPECT_EQ(tz.dst_offset_seconds, -13 * 3600);  // Default: STD - 1hr
-  EXPECT_TRUE(tz.has_dst());
-  EXPECT_EQ(tz.dst_start.month, 9);  // September
-  EXPECT_EQ(tz.dst_end.month, 4);    // April
-}
-
-TEST(PosixTzParser, ParseExplicitDstOffset) {
-  ParsedTimezone tz;
-  // Some places have non-standard DST offsets
-  ASSERT_TRUE(parse_posix_tz("TEST5DST4,M3.2.0,M11.1.0", tz));
-  EXPECT_EQ(tz.std_offset_seconds, 5 * 3600);
-  EXPECT_EQ(tz.dst_offset_seconds, 4 * 3600);
-  EXPECT_TRUE(tz.has_dst());
-}
-
-// ============================================================================
-// Angle-bracket notation tests (espressif/newlib-esp32#8)
-// ============================================================================
-
-TEST(PosixTzParser, ParseAngleBracketPositive) {
-  // Format: <+07>-7 means UTC+7 (name is "+07", offset is -7 hours east)
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("<+07>-7", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -7 * 3600);  // -7 = 7 hours east of UTC
-  EXPECT_FALSE(tz.has_dst());
-}
-
-TEST(PosixTzParser, ParseAngleBracketNegative) {
-  // <-03>3 means UTC-3 (name is "-03", offset is 3 hours west)
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("<-03>3", tz));
-  EXPECT_EQ(tz.std_offset_seconds, 3 * 3600);
-  EXPECT_FALSE(tz.has_dst());
-}
-
-TEST(PosixTzParser, ParseAngleBracketWithDST) {
-  // <+10>-10<+11>,M10.1.0,M4.1.0/3 (Australia/Sydney style)
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("<+10>-10<+11>,M10.1.0,M4.1.0/3", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -10 * 3600);
-  EXPECT_EQ(tz.dst_offset_seconds, -11 * 3600);
-  EXPECT_TRUE(tz.has_dst());
-  EXPECT_EQ(tz.dst_start.month, 10);
-  EXPECT_EQ(tz.dst_end.month, 4);
-}
-
-TEST(PosixTzParser, ParseAngleBracketNamed) {
-  // <AEST>-10 (Australian Eastern Standard Time)
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("<AEST>-10", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -10 * 3600);
-  EXPECT_FALSE(tz.has_dst());
-}
-
-TEST(PosixTzParser, ParseAngleBracketWithMinutes) {
-  // <+0545>-5:45 (Nepal)
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("<+0545>-5:45", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -(5 * 3600 + 45 * 60));
-  EXPECT_FALSE(tz.has_dst());
-}
-
-// ============================================================================
-// Half-hour and unusual offset tests
-// ============================================================================
-
-TEST(PosixTzParser, ParseOffsetWithMinutesIndia) {
-  ParsedTimezone tz;
-  // India: UTC+5:30
-  ASSERT_TRUE(parse_posix_tz("IST-5:30", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -(5 * 3600 + 30 * 60));
-  EXPECT_FALSE(tz.has_dst());
-}
-
-TEST(PosixTzParser, ParseOffsetWithMinutesNepal) {
-  ParsedTimezone tz;
-  // Nepal: UTC+5:45
-  ASSERT_TRUE(parse_posix_tz("NPT-5:45", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -(5 * 3600 + 45 * 60));
-  EXPECT_FALSE(tz.has_dst());
-}
-
-TEST(PosixTzParser, ParseOffsetWithSeconds) {
-  ParsedTimezone tz;
-  // Unusual but valid: offset with seconds
-  ASSERT_TRUE(parse_posix_tz("TEST-1:30:30", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -(1 * 3600 + 30 * 60 + 30));
-}
-
-TEST(PosixTzParser, ParseChathamIslands) {
-  // Chatham Islands: UTC+12:45 with DST
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("<+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -(12 * 3600 + 45 * 60));
-  EXPECT_EQ(tz.dst_offset_seconds, -(13 * 3600 + 45 * 60));
-  EXPECT_TRUE(tz.has_dst());
-}
-
-// ============================================================================
-// Invalid input tests
-// ============================================================================
-
-TEST(PosixTzParser, ParseEmptyStringFails) {
-  ParsedTimezone tz;
-  EXPECT_FALSE(parse_posix_tz("", tz));
-}
-
-TEST(PosixTzParser, ParseNullFails) {
-  ParsedTimezone tz;
-  EXPECT_FALSE(parse_posix_tz(nullptr, tz));
-}
-
-TEST(PosixTzParser, ParseShortNameFails) {
-  ParsedTimezone tz;
-  // TZ name must be at least 3 characters
-  EXPECT_FALSE(parse_posix_tz("AB5", tz));
-}
-
-TEST(PosixTzParser, ParseMissingOffsetFails) {
-  ParsedTimezone tz;
-  EXPECT_FALSE(parse_posix_tz("EST", tz));
-}
-
-TEST(PosixTzParser, ParseUnterminatedBracketFails) {
-  ParsedTimezone tz;
-  EXPECT_FALSE(parse_posix_tz("<+07-7", tz));  // Missing closing >
-}
-
-// ============================================================================
-// J-format and plain day number tests
-// ============================================================================
-
-TEST(PosixTzParser, ParseJFormatBasic) {
-  ParsedTimezone tz;
-  // J format: Julian day 1-365, not counting Feb 29
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,J60,J305", tz));
-  EXPECT_TRUE(tz.has_dst());
-  EXPECT_EQ(tz.dst_start.type, DSTRuleType::JULIAN_NO_LEAP);
-  EXPECT_EQ(tz.dst_start.day, 60);  // March 1
-  EXPECT_EQ(tz.dst_end.type, DSTRuleType::JULIAN_NO_LEAP);
-  EXPECT_EQ(tz.dst_end.day, 305);  // November 1
-}
-
-TEST(PosixTzParser, ParseJFormatWithTime) {
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,J60/2,J305/2", tz));
-  EXPECT_EQ(tz.dst_start.day, 60);
-  EXPECT_EQ(tz.dst_start.time_seconds, 2 * 3600);
-  EXPECT_EQ(tz.dst_end.day, 305);
-  EXPECT_EQ(tz.dst_end.time_seconds, 2 * 3600);
-}
-
-TEST(PosixTzParser, ParsePlainDayNumber) {
-  ParsedTimezone tz;
-  // Plain format: day 0-365, counting Feb 29 in leap years
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,59,304", tz));
-  EXPECT_TRUE(tz.has_dst());
-  EXPECT_EQ(tz.dst_start.type, DSTRuleType::DAY_OF_YEAR);
-  EXPECT_EQ(tz.dst_start.day, 59);
-  EXPECT_EQ(tz.dst_end.type, DSTRuleType::DAY_OF_YEAR);
-  EXPECT_EQ(tz.dst_end.day, 304);
-}
-
-TEST(PosixTzParser, JFormatInvalidDayZero) {
-  ParsedTimezone tz;
-  // J format day must be 1-365, not 0
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,J0,J305", tz));
-}
-
-TEST(PosixTzParser, JFormatInvalidDay366) {
-  ParsedTimezone tz;
-  // J format day must be 1-365
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,J366,J305", tz));
-}
-
-TEST(PosixTzParser, ParsePlainDayNumberWithTime) {
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,59/3,304/1:30", tz));
-  EXPECT_EQ(tz.dst_start.day, 59);
-  EXPECT_EQ(tz.dst_start.time_seconds, 3 * 3600);
-  EXPECT_EQ(tz.dst_end.day, 304);
-  EXPECT_EQ(tz.dst_end.time_seconds, 1 * 3600 + 30 * 60);
-}
-
-TEST(PosixTzParser, PlainDayInvalidDay366) {
-  ParsedTimezone tz;
-  // Plain format day must be 0-365
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,366,304", tz));
-}
-
-// ============================================================================
-// Transition time edge cases (POSIX V3 allows -167 to +167 hours)
-// ============================================================================
-
-TEST(PosixTzParser, NegativeTransitionTime) {
-  ParsedTimezone tz;
-  // Negative transition time: /-1 means 11 PM (23:00) the previous day
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,M3.2.0/-1,M11.1.0/2", tz));
-  EXPECT_EQ(tz.dst_start.time_seconds, -1 * 3600);  // -1 hour = 11 PM previous day
-  EXPECT_EQ(tz.dst_end.time_seconds, 2 * 3600);
-}
-
-TEST(PosixTzParser, NegativeTransitionTimeWithMinutes) {
-  ParsedTimezone tz;
-  // /-1:30 means 10:30 PM the previous day
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,M3.2.0/-1:30,M11.1.0", tz));
-  EXPECT_EQ(tz.dst_start.time_seconds, -(1 * 3600 + 30 * 60));
-}
-
-TEST(PosixTzParser, LargeTransitionTime) {
-  ParsedTimezone tz;
-  // POSIX V3 allows transition times from -167 to +167 hours
-  // /25 means 1:00 AM the next day
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,M3.2.0/25,M11.1.0", tz));
-  EXPECT_EQ(tz.dst_start.time_seconds, 25 * 3600);
-}
-
-TEST(PosixTzParser, MaxTransitionTime167Hours) {
-  ParsedTimezone tz;
-  // Maximum allowed transition time per POSIX V3
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,M3.2.0/167,M11.1.0", tz));
-  EXPECT_EQ(tz.dst_start.time_seconds, 167 * 3600);
-}
-
-TEST(PosixTzParser, TransitionTimeWithHoursMinutesSeconds) {
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,M3.2.0/2:30:45,M11.1.0", tz));
-  EXPECT_EQ(tz.dst_start.time_seconds, 2 * 3600 + 30 * 60 + 45);
-}
-
-// ============================================================================
-// Invalid M format tests
-// ============================================================================
-
-TEST(PosixTzParser, MFormatInvalidMonth13) {
-  ParsedTimezone tz;
-  // Month must be 1-12
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,M13.1.0,M11.1.0", tz));
-}
-
-TEST(PosixTzParser, MFormatInvalidMonth0) {
-  ParsedTimezone tz;
-  // Month must be 1-12
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,M0.1.0,M11.1.0", tz));
-}
-
-TEST(PosixTzParser, MFormatInvalidWeek6) {
-  ParsedTimezone tz;
-  // Week must be 1-5
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,M3.6.0,M11.1.0", tz));
-}
-
-TEST(PosixTzParser, MFormatInvalidWeek0) {
-  ParsedTimezone tz;
-  // Week must be 1-5
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,M3.0.0,M11.1.0", tz));
-}
-
-TEST(PosixTzParser, MFormatInvalidDayOfWeek7) {
-  ParsedTimezone tz;
-  // Day of week must be 0-6
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,M3.2.7,M11.1.0", tz));
-}
-
-TEST(PosixTzParser, MissingEndRule) {
-  ParsedTimezone tz;
-  // POSIX requires both start and end rules if any rules are specified
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,M3.2.0", tz));
-}
-
-TEST(PosixTzParser, MissingEndRuleJFormat) {
-  ParsedTimezone tz;
-  // POSIX requires both start and end rules if any rules are specified
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,J60", tz));
-}
-
-TEST(PosixTzParser, MissingEndRulePlainDay) {
-  ParsedTimezone tz;
-  // POSIX requires both start and end rules if any rules are specified
-  EXPECT_FALSE(parse_posix_tz("EST5EDT,60", tz));
-}
-
-TEST(PosixTzParser, LowercaseMFormat) {
-  ParsedTimezone tz;
-  // Lowercase 'm' should be accepted
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,m3.2.0,m11.1.0", tz));
-  EXPECT_TRUE(tz.has_dst());
-  EXPECT_EQ(tz.dst_start.month, 3);
-  EXPECT_EQ(tz.dst_end.month, 11);
-}
-
-TEST(PosixTzParser, LowercaseJFormat) {
-  ParsedTimezone tz;
-  // Lowercase 'j' should be accepted
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,j60,j305", tz));
-  EXPECT_EQ(tz.dst_start.type, DSTRuleType::JULIAN_NO_LEAP);
-  EXPECT_EQ(tz.dst_start.day, 60);
-}
-
-TEST(PosixTzParser, DstNameWithoutRules) {
-  ParsedTimezone tz;
-  // DST name present but no rules - treat as no DST since we can't determine transitions
-  ASSERT_TRUE(parse_posix_tz("EST5EDT", tz));
-  EXPECT_FALSE(tz.has_dst());
-  EXPECT_EQ(tz.std_offset_seconds, 5 * 3600);
-}
-
-TEST(PosixTzParser, TrailingCharactersIgnored) {
-  ParsedTimezone tz;
-  // Trailing characters after valid TZ should be ignored (parser stops at end of valid input)
-  // This matches libc behavior
-  ASSERT_TRUE(parse_posix_tz("EST5 extra garbage here", tz));
-  EXPECT_EQ(tz.std_offset_seconds, 5 * 3600);
-  EXPECT_FALSE(tz.has_dst());
-}
-
-TEST(PosixTzParser, PlainDay365LeapYear) {
-  // Day 365 in leap year is Dec 31
-  int month, day;
-  internal::day_of_year_to_month_day(365, 2024, month, day);
-  EXPECT_EQ(month, 12);
-  EXPECT_EQ(day, 31);
-}
-
-TEST(PosixTzParser, PlainDay364NonLeapYear) {
-  // Day 364 (0-indexed) is Dec 31 in non-leap year (last valid day)
-  int month, day;
-  internal::day_of_year_to_month_day(364, 2025, month, day);
-  EXPECT_EQ(month, 12);
-  EXPECT_EQ(day, 31);
-}
-
-// ============================================================================
-// Large offset tests
-// ============================================================================
-
-TEST(PosixTzParser, MaxOffset14Hours) {
-  ParsedTimezone tz;
-  // Line Islands (Kiribati) is UTC+14, the maximum offset
-  ASSERT_TRUE(parse_posix_tz("<+14>-14", tz));
-  EXPECT_EQ(tz.std_offset_seconds, -14 * 3600);
-}
-
-TEST(PosixTzParser, MaxNegativeOffset12Hours) {
-  ParsedTimezone tz;
-  // Baker Island is UTC-12
-  ASSERT_TRUE(parse_posix_tz("<-12>12", tz));
-  EXPECT_EQ(tz.std_offset_seconds, 12 * 3600);
+// Helper to build Australia/Sydney timezone (AEST-10AEDT,M10.1.0,M4.1.0/3)
+static ParsedTimezone make_australia_sydney() {
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = -10 * 3600;
+  tz.dst_offset_seconds = -11 * 3600;
+  tz.dst_start.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_start.month = 10;
+  tz.dst_start.week = 1;
+  tz.dst_start.day_of_week = 0;
+  tz.dst_start.time_seconds = 2 * 3600;
+  tz.dst_end.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_end.month = 4;
+  tz.dst_end.week = 1;
+  tz.dst_end.day_of_week = 0;
+  tz.dst_end.time_seconds = 3 * 3600;
+  return tz;
 }
 
 // ============================================================================
 // Helper function tests
 // ============================================================================
 
-TEST(PosixTzParser, JulianDay60IsMarch1) {
+TEST(PosixTz, JulianDay60IsMarch1) {
   // J60 is always March 1 (J format ignores leap years by design)
   int month, day;
   internal::julian_to_month_day(60, month, day);
@@ -471,7 +114,7 @@ TEST(PosixTzParser, JulianDay60IsMarch1) {
   EXPECT_EQ(day, 1);
 }
 
-TEST(PosixTzParser, DayOfYear59DiffersByLeap) {
+TEST(PosixTz, DayOfYear59DiffersByLeap) {
   int month, day;
   // Day 59 in leap year is Feb 29
   internal::day_of_year_to_month_day(59, 2024, month, day);
@@ -483,7 +126,7 @@ TEST(PosixTzParser, DayOfYear59DiffersByLeap) {
   EXPECT_EQ(day, 1);
 }
 
-TEST(PosixTzParser, DayOfWeekKnownDates) {
+TEST(PosixTz, DayOfWeekKnownDates) {
   // January 1, 1970 was Thursday (4)
   EXPECT_EQ(internal::day_of_week(1970, 1, 1), 4);
   // January 1, 2000 was Saturday (6)
@@ -492,56 +135,56 @@ TEST(PosixTzParser, DayOfWeekKnownDates) {
   EXPECT_EQ(internal::day_of_week(2026, 3, 8), 0);
 }
 
-TEST(PosixTzParser, LeapYearDetection) {
+TEST(PosixTz, LeapYearDetection) {
   EXPECT_FALSE(internal::is_leap_year(1900));  // Divisible by 100 but not 400
   EXPECT_TRUE(internal::is_leap_year(2000));   // Divisible by 400
   EXPECT_TRUE(internal::is_leap_year(2024));   // Divisible by 4
   EXPECT_FALSE(internal::is_leap_year(2025));  // Not divisible by 4
 }
 
-TEST(PosixTzParser, JulianDay1IsJan1) {
+TEST(PosixTz, JulianDay1IsJan1) {
   int month, day;
   internal::julian_to_month_day(1, month, day);
   EXPECT_EQ(month, 1);
   EXPECT_EQ(day, 1);
 }
 
-TEST(PosixTzParser, JulianDay31IsJan31) {
+TEST(PosixTz, JulianDay31IsJan31) {
   int month, day;
   internal::julian_to_month_day(31, month, day);
   EXPECT_EQ(month, 1);
   EXPECT_EQ(day, 31);
 }
 
-TEST(PosixTzParser, JulianDay32IsFeb1) {
+TEST(PosixTz, JulianDay32IsFeb1) {
   int month, day;
   internal::julian_to_month_day(32, month, day);
   EXPECT_EQ(month, 2);
   EXPECT_EQ(day, 1);
 }
 
-TEST(PosixTzParser, JulianDay59IsFeb28) {
+TEST(PosixTz, JulianDay59IsFeb28) {
   int month, day;
   internal::julian_to_month_day(59, month, day);
   EXPECT_EQ(month, 2);
   EXPECT_EQ(day, 28);
 }
 
-TEST(PosixTzParser, JulianDay365IsDec31) {
+TEST(PosixTz, JulianDay365IsDec31) {
   int month, day;
   internal::julian_to_month_day(365, month, day);
   EXPECT_EQ(month, 12);
   EXPECT_EQ(day, 31);
 }
 
-TEST(PosixTzParser, DayOfYear0IsJan1) {
+TEST(PosixTz, DayOfYear0IsJan1) {
   int month, day;
   internal::day_of_year_to_month_day(0, 2025, month, day);
   EXPECT_EQ(month, 1);
   EXPECT_EQ(day, 1);
 }
 
-TEST(PosixTzParser, DaysInMonthRegular) {
+TEST(PosixTz, DaysInMonthRegular) {
   // Test all 12 months to ensure switch coverage
   EXPECT_EQ(internal::days_in_month(2025, 1), 31);   // Jan - default case
   EXPECT_EQ(internal::days_in_month(2025, 2), 28);   // Feb - case 2
@@ -557,19 +200,32 @@ TEST(PosixTzParser, DaysInMonthRegular) {
   EXPECT_EQ(internal::days_in_month(2025, 12), 31);  // Dec - default case
 }
 
-TEST(PosixTzParser, DaysInMonthLeapYear) {
+TEST(PosixTz, DaysInMonthLeapYear) {
   EXPECT_EQ(internal::days_in_month(2024, 2), 29);
   EXPECT_EQ(internal::days_in_month(2025, 2), 28);
 }
 
+TEST(PosixTz, PlainDay365LeapYear) {
+  int month, day;
+  internal::day_of_year_to_month_day(365, 2024, month, day);
+  EXPECT_EQ(month, 12);
+  EXPECT_EQ(day, 31);
+}
+
+TEST(PosixTz, PlainDay364NonLeapYear) {
+  int month, day;
+  internal::day_of_year_to_month_day(364, 2025, month, day);
+  EXPECT_EQ(month, 12);
+  EXPECT_EQ(day, 31);
+}
+
 // ============================================================================
 // DST transition calculation tests
 // ============================================================================
 
-TEST(PosixTzParser, DstStartUSEastern2026) {
+TEST(PosixTz, DstStartUSEastern2026) {
   // March 8, 2026 is 2nd Sunday of March
-  ParsedTimezone tz;
-  parse_posix_tz("EST5EDT,M3.2.0/2,M11.1.0/2", tz);
+  auto tz = make_us_eastern();
 
   time_t dst_start = internal::calculate_dst_transition(2026, tz.dst_start, tz.std_offset_seconds);
   struct tm tm;
@@ -582,10 +238,9 @@ TEST(PosixTzParser, DstStartUSEastern2026) {
   EXPECT_EQ(tm.tm_hour, 7);     // 7:00 UTC = 2:00 EST
 }
 
-TEST(PosixTzParser, DstEndUSEastern2026) {
+TEST(PosixTz, DstEndUSEastern2026) {
   // November 1, 2026 is 1st Sunday of November
-  ParsedTimezone tz;
-  parse_posix_tz("EST5EDT,M3.2.0/2,M11.1.0/2", tz);
+  auto tz = make_us_eastern();
 
   time_t dst_end = internal::calculate_dst_transition(2026, tz.dst_end, tz.dst_offset_seconds);
   struct tm tm;
@@ -598,7 +253,7 @@ TEST(PosixTzParser, DstEndUSEastern2026) {
   EXPECT_EQ(tm.tm_hour, 6);      // 6:00 UTC = 2:00 EDT
 }
 
-TEST(PosixTzParser, LastSundayOfMarch2026) {
+TEST(PosixTz, LastSundayOfMarch2026) {
   // Europe: M3.5.0 = last Sunday of March = March 29, 2026
   DSTRule rule{};
   rule.type = DSTRuleType::MONTH_WEEK_DAY;
@@ -613,7 +268,7 @@ TEST(PosixTzParser, LastSundayOfMarch2026) {
   EXPECT_EQ(tm.tm_wday, 0);  // Sunday
 }
 
-TEST(PosixTzParser, LastSundayOfOctober2026) {
+TEST(PosixTz, LastSundayOfOctober2026) {
   // Europe: M10.5.0 = last Sunday of October = October 25, 2026
   DSTRule rule{};
   rule.type = DSTRuleType::MONTH_WEEK_DAY;
@@ -628,7 +283,7 @@ TEST(PosixTzParser, LastSundayOfOctober2026) {
   EXPECT_EQ(tm.tm_wday, 0);  // Sunday
 }
 
-TEST(PosixTzParser, FirstSundayOfApril2026) {
+TEST(PosixTz, FirstSundayOfApril2026) {
   // April 5, 2026 is 1st Sunday
   DSTRule rule{};
   rule.type = DSTRuleType::MONTH_WEEK_DAY;
@@ -647,46 +302,39 @@ TEST(PosixTzParser, FirstSundayOfApril2026) {
 // DST detection tests
 // ============================================================================
 
-TEST(PosixTzParser, IsInDstUSEasternSummer) {
-  ParsedTimezone tz;
-  parse_posix_tz("EST5EDT,M3.2.0/2,M11.1.0/2", tz);
-
+TEST(PosixTz, IsInDstUSEasternSummer) {
+  auto tz = make_us_eastern();
   // July 4, 2026 12:00 UTC - definitely in DST
   time_t summer = make_utc(2026, 7, 4, 12);
   EXPECT_TRUE(is_in_dst(summer, tz));
 }
 
-TEST(PosixTzParser, IsInDstUSEasternWinter) {
-  ParsedTimezone tz;
-  parse_posix_tz("EST5EDT,M3.2.0/2,M11.1.0/2", tz);
-
+TEST(PosixTz, IsInDstUSEasternWinter) {
+  auto tz = make_us_eastern();
   // January 15, 2026 12:00 UTC - definitely not in DST
   time_t winter = make_utc(2026, 1, 15, 12);
   EXPECT_FALSE(is_in_dst(winter, tz));
 }
 
-TEST(PosixTzParser, IsInDstNoDstTimezone) {
-  ParsedTimezone tz;
-  parse_posix_tz("IST-5:30", tz);
+TEST(PosixTz, IsInDstNoDstTimezone) {
+  // India: IST-5:30 (no DST)
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = -(5 * 3600 + 30 * 60);
+  // No DST rules
 
-  // July 15, 2026 12:00 UTC
   time_t epoch = make_utc(2026, 7, 15, 12);
   EXPECT_FALSE(is_in_dst(epoch, tz));
 }
 
-TEST(PosixTzParser, SouthernHemisphereDstSummer) {
-  ParsedTimezone tz;
-  parse_posix_tz("NZST-12NZDT,M9.5.0,M4.1.0/3", tz);
-
+TEST(PosixTz, SouthernHemisphereDstSummer) {
+  auto tz = make_new_zealand();
   // December 15, 2025 12:00 UTC - summer in NZ, should be in DST
   time_t nz_summer = make_utc(2025, 12, 15, 12);
   EXPECT_TRUE(is_in_dst(nz_summer, tz));
 }
 
-TEST(PosixTzParser, SouthernHemisphereDstWinter) {
-  ParsedTimezone tz;
-  parse_posix_tz("NZST-12NZDT,M9.5.0,M4.1.0/3", tz);
-
+TEST(PosixTz, SouthernHemisphereDstWinter) {
+  auto tz = make_new_zealand();
   // July 15, 2026 12:00 UTC - winter in NZ, should NOT be in DST
   time_t nz_winter = make_utc(2026, 7, 15, 12);
   EXPECT_FALSE(is_in_dst(nz_winter, tz));
@@ -696,9 +344,8 @@ TEST(PosixTzParser, SouthernHemisphereDstWinter) {
 // epoch_to_local_tm tests
 // ============================================================================
 
-TEST(PosixTzParser, EpochToLocalBasic) {
-  ParsedTimezone tz;
-  parse_posix_tz("UTC0", tz);
+TEST(PosixTz, EpochToLocalBasic) {
+  ParsedTimezone tz{};  // UTC
 
   time_t epoch = 0;  // Jan 1, 1970 00:00:00 UTC
   struct tm local;
@@ -709,9 +356,8 @@ TEST(PosixTzParser, EpochToLocalBasic) {
   EXPECT_EQ(local.tm_hour, 0);
 }
 
-TEST(PosixTzParser, EpochToLocalNegativeEpoch) {
-  ParsedTimezone tz;
-  parse_posix_tz("UTC0", tz);
+TEST(PosixTz, EpochToLocalNegativeEpoch) {
+  ParsedTimezone tz{};  // UTC
 
   // Dec 31, 1969 23:59:59 UTC (1 second before epoch)
   time_t epoch = -1;
@@ -725,15 +371,15 @@ TEST(PosixTzParser, EpochToLocalNegativeEpoch) {
   EXPECT_EQ(local.tm_sec, 59);
 }
 
-TEST(PosixTzParser, EpochToLocalNullTmFails) {
-  ParsedTimezone tz;
-  parse_posix_tz("UTC0", tz);
+TEST(PosixTz, EpochToLocalNullTmFails) {
+  ParsedTimezone tz{};
   EXPECT_FALSE(epoch_to_local_tm(0, tz, nullptr));
 }
 
-TEST(PosixTzParser, EpochToLocalWithOffset) {
-  ParsedTimezone tz;
-  parse_posix_tz("EST5", tz);  // UTC-5
+TEST(PosixTz, EpochToLocalWithOffset) {
+  // EST5 (UTC-5, no DST)
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = 5 * 3600;
 
   // Jan 1, 2026 05:00:00 UTC should be Jan 1, 2026 00:00:00 EST
   time_t utc_epoch = make_utc(2026, 1, 1, 5);
@@ -745,9 +391,8 @@ TEST(PosixTzParser, EpochToLocalWithOffset) {
   EXPECT_EQ(local.tm_isdst, 0);
 }
 
-TEST(PosixTzParser, EpochToLocalDstTransition) {
-  ParsedTimezone tz;
-  parse_posix_tz("EST5EDT,M3.2.0/2,M11.1.0/2", tz);
+TEST(PosixTz, EpochToLocalDstTransition) {
+  auto tz = make_us_eastern();
 
   // July 4, 2026 16:00 UTC = 12:00 EDT (noon)
   time_t utc_epoch = make_utc(2026, 7, 4, 16);
@@ -758,210 +403,12 @@ TEST(PosixTzParser, EpochToLocalDstTransition) {
   EXPECT_EQ(local.tm_isdst, 1);
 }
 
-// ============================================================================
-// Leap year edge cases for closed-form year arithmetic
-// ============================================================================
-
-TEST(PosixTzParser, EpochToLocalLeapYear2000) {
-  // 2000 is a leap year (divisible by 400)
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("UTC0", tz));
-
-  // Feb 29, 2000 12:00:00 UTC
-  time_t epoch = make_utc(2000, 2, 29, 12);
-  struct tm local;
-  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
-  EXPECT_EQ(local.tm_year, 100);  // 2000
-  EXPECT_EQ(local.tm_mon, 1);     // February
-  EXPECT_EQ(local.tm_mday, 29);
-  EXPECT_EQ(local.tm_hour, 12);
-}
-
-TEST(PosixTzParser, EpochToLocalNonLeapYear2100) {
-  // 2100 is NOT a leap year (divisible by 100 but not 400)
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("UTC0", tz));
-
-  // Mar 1, 2100 00:00:00 UTC — the day after what would be Feb 29
-  time_t epoch = make_utc(2100, 3, 1);
-  struct tm local;
-  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
-  EXPECT_EQ(local.tm_year, 200);  // 2100
-  EXPECT_EQ(local.tm_mon, 2);     // March
-  EXPECT_EQ(local.tm_mday, 1);
-
-  // Feb 28, 2100 23:59:59 UTC — last second of February (no Feb 29)
-  epoch = make_utc(2100, 2, 28, 23, 59, 59);
-  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
-  EXPECT_EQ(local.tm_year, 200);
-  EXPECT_EQ(local.tm_mon, 1);  // February
-  EXPECT_EQ(local.tm_mday, 28);
-}
-
-TEST(PosixTzParser, EpochToLocalLeapYear2400) {
-  // 2400 is a leap year (divisible by 400)
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("UTC0", tz));
-
-  time_t epoch = make_utc(2400, 2, 29, 6);
-  struct tm local;
-  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
-  EXPECT_EQ(local.tm_year, 500);  // 2400
-  EXPECT_EQ(local.tm_mon, 1);     // February
-  EXPECT_EQ(local.tm_mday, 29);
-  EXPECT_EQ(local.tm_hour, 6);
-}
-
-TEST(PosixTzParser, EpochToLocalNewYearBoundaries) {
-  // Test year boundary — last second of 2099 and first second of 2100
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("UTC0", tz));
-  struct tm local;
-
-  // Dec 31, 2099 23:59:59 UTC
-  time_t epoch = make_utc(2099, 12, 31, 23, 59, 59);
-  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
-  EXPECT_EQ(local.tm_year, 199);  // 2099
-  EXPECT_EQ(local.tm_mon, 11);    // December
-  EXPECT_EQ(local.tm_mday, 31);
-
-  // Jan 1, 2100 00:00:00 UTC
-  epoch = make_utc(2100, 1, 1);
-  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
-  EXPECT_EQ(local.tm_year, 200);  // 2100
-  EXPECT_EQ(local.tm_mon, 0);     // January
-  EXPECT_EQ(local.tm_mday, 1);
-}
-
-TEST(PosixTzParser, EpochToLocalDstAcrossCenturyBoundary) {
-  // DST transition in year 2100 (non-leap) with US Eastern rules
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("EST5EDT,M3.2.0/2,M11.1.0/2", tz));
-
-  // July 4, 2100 16:00 UTC = 12:00 EDT
-  time_t epoch = make_utc(2100, 7, 4, 16);
-  struct tm local;
-  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
-  EXPECT_EQ(local.tm_hour, 12);
-  EXPECT_EQ(local.tm_isdst, 1);
-
-  // Jan 15, 2100 10:00 UTC = 05:00 EST
-  epoch = make_utc(2100, 1, 15, 10);
-  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
-  EXPECT_EQ(local.tm_hour, 5);
-  EXPECT_EQ(local.tm_isdst, 0);
-}
-
-TEST(PosixTzParser, EpochToLocalFarFutureYear5000) {
-  // Year 5000 — days/365 estimate overshoots by ~2 years due to leap days,
-  // requiring multiple correction steps in days_to_year.
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz("UTC0", tz));
-
-  time_t epoch = make_utc(5000, 6, 15, 12);
-  struct tm local;
-  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
-  EXPECT_EQ(local.tm_year, 3100);  // 5000
-  EXPECT_EQ(local.tm_mon, 5);      // June
-  EXPECT_EQ(local.tm_mday, 15);
-  EXPECT_EQ(local.tm_hour, 12);
-}
-
-// ============================================================================
-// Verification against libc
-// ============================================================================
-
-class LibcVerificationTest : public ::testing::TestWithParam<std::tuple<const char *, time_t>> {
- protected:
-  // NOLINTNEXTLINE(readability-identifier-naming) - Google Test requires this name
-  void SetUp() override {
-    // Save current TZ
-    const char *current_tz = getenv("TZ");
-    saved_tz_ = current_tz ? current_tz : "";
-    had_tz_ = current_tz != nullptr;
-  }
-
-  // NOLINTNEXTLINE(readability-identifier-naming) - Google Test requires this name
-  void TearDown() override {
-    // Restore TZ
-    if (had_tz_) {
-      setenv("TZ", saved_tz_.c_str(), 1);
-    } else {
-      unsetenv("TZ");
-    }
-    tzset();
-  }
-
- private:
-  std::string saved_tz_;
-  bool had_tz_{false};
-};
-
-TEST_P(LibcVerificationTest, MatchesLibc) {
-  auto [tz_str, epoch] = GetParam();
-
-  ParsedTimezone tz;
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
-
-  // Our implementation
-  struct tm our_tm {};
-  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &our_tm));
-
-  // libc implementation
-  setenv("TZ", tz_str, 1);
-  tzset();
-  struct tm *libc_tm = localtime(&epoch);
-  ASSERT_NE(libc_tm, nullptr);
-
-  EXPECT_EQ(our_tm.tm_year, libc_tm->tm_year);
-  EXPECT_EQ(our_tm.tm_mon, libc_tm->tm_mon);
-  EXPECT_EQ(our_tm.tm_mday, libc_tm->tm_mday);
-  EXPECT_EQ(our_tm.tm_hour, libc_tm->tm_hour);
-  EXPECT_EQ(our_tm.tm_min, libc_tm->tm_min);
-  EXPECT_EQ(our_tm.tm_sec, libc_tm->tm_sec);
-  EXPECT_EQ(our_tm.tm_isdst, libc_tm->tm_isdst);
-}
-
-INSTANTIATE_TEST_SUITE_P(USEastern, LibcVerificationTest,
-                         ::testing::Values(std::make_tuple("EST5EDT,M3.2.0/2,M11.1.0/2", 1704067200),
-                                           std::make_tuple("EST5EDT,M3.2.0/2,M11.1.0/2", 1720000000),
-                                           std::make_tuple("EST5EDT,M3.2.0/2,M11.1.0/2", 1735689600)));
-
-INSTANTIATE_TEST_SUITE_P(AngleBracket, LibcVerificationTest,
-                         ::testing::Values(std::make_tuple("<+07>-7", 1704067200),
-                                           std::make_tuple("<+07>-7", 1720000000)));
-
-INSTANTIATE_TEST_SUITE_P(India, LibcVerificationTest,
-                         ::testing::Values(std::make_tuple("IST-5:30", 1704067200),
-                                           std::make_tuple("IST-5:30", 1720000000)));
-
-INSTANTIATE_TEST_SUITE_P(NewZealand, LibcVerificationTest,
-                         ::testing::Values(std::make_tuple("NZST-12NZDT,M9.5.0,M4.1.0/3", 1704067200),
-                                           std::make_tuple("NZST-12NZDT,M9.5.0,M4.1.0/3", 1720000000)));
-
-INSTANTIATE_TEST_SUITE_P(USCentral, LibcVerificationTest,
-                         ::testing::Values(std::make_tuple("CST6CDT,M3.2.0/2,M11.1.0/2", 1704067200),
-                                           std::make_tuple("CST6CDT,M3.2.0/2,M11.1.0/2", 1720000000),
-                                           std::make_tuple("CST6CDT,M3.2.0/2,M11.1.0/2", 1735689600)));
-
-INSTANTIATE_TEST_SUITE_P(EuropeBerlin, LibcVerificationTest,
-                         ::testing::Values(std::make_tuple("CET-1CEST,M3.5.0,M10.5.0/3", 1704067200),
-                                           std::make_tuple("CET-1CEST,M3.5.0,M10.5.0/3", 1720000000),
-                                           std::make_tuple("CET-1CEST,M3.5.0,M10.5.0/3", 1735689600)));
-
-INSTANTIATE_TEST_SUITE_P(AustraliaSydney, LibcVerificationTest,
-                         ::testing::Values(std::make_tuple("AEST-10AEDT,M10.1.0,M4.1.0/3", 1704067200),
-                                           std::make_tuple("AEST-10AEDT,M10.1.0,M4.1.0/3", 1720000000),
-                                           std::make_tuple("AEST-10AEDT,M10.1.0,M4.1.0/3", 1735689600)));
-
 // ============================================================================
 // DST boundary edge cases
 // ============================================================================
 
-TEST(PosixTzParser, DstBoundaryJustBeforeSpringForward) {
-  // Test 1 second before DST starts
-  ParsedTimezone tz;
-  parse_posix_tz("EST5EDT,M3.2.0/2,M11.1.0/2", tz);
+TEST(PosixTz, DstBoundaryJustBeforeSpringForward) {
+  auto tz = make_us_eastern();
 
   // March 8, 2026 06:59:59 UTC = 01:59:59 EST (1 second before spring forward)
   time_t before_epoch = make_utc(2026, 3, 8, 6, 59, 59);
@@ -972,10 +419,8 @@ TEST(PosixTzParser, DstBoundaryJustBeforeSpringForward) {
   EXPECT_TRUE(is_in_dst(after_epoch, tz));
 }
 
-TEST(PosixTzParser, DstBoundaryJustBeforeFallBack) {
-  // Test 1 second before DST ends
-  ParsedTimezone tz;
-  parse_posix_tz("EST5EDT,M3.2.0/2,M11.1.0/2", tz);
+TEST(PosixTz, DstBoundaryJustBeforeFallBack) {
+  auto tz = make_us_eastern();
 
   // November 1, 2026 05:59:59 UTC = 01:59:59 EDT (1 second before fall back)
   time_t before_epoch = make_utc(2026, 11, 1, 5, 59, 59);
@@ -1102,7 +547,6 @@ TEST(ESPTimeStrptime, PartialTimeFails) {
 
 TEST(ESPTimeStrptime, ExtraCharactersFails) {
   ESPTime t{};
-  // Full datetime with extra characters should fail
   EXPECT_FALSE(ESPTime::strptime("2026-03-15 14:30:45x", 20, t));
 }
 
@@ -1123,6 +567,12 @@ TEST(ESPTimeStrptime, LeadingZeroTime) {
 // recalc_timestamp_local() tests - verify behavior matches libc mktime()
 // ============================================================================
 
+}  // namespace esphome::testing
+
+namespace esphome::time::testing {
+
+using esphome::ESPTime;
+
 // Helper to call libc mktime with same fields
 static time_t libc_mktime(int year, int month, int day, int hour, int min, int sec) {
   struct tm tm {};
@@ -1154,8 +604,7 @@ TEST(RecalcTimestampLocal, NormalTimeMatchesLibc) {
   const char *tz_str = "CST6CDT,M3.2.0,M11.1.0";
   setenv("TZ", tz_str, 1);
   tzset();
-  time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  auto tz = make_us_central();
   set_global_tz(tz);
 
   // Test a normal time in winter (no DST)
@@ -1177,8 +626,7 @@ TEST(RecalcTimestampLocal, SpringForwardSkippedHour) {
   const char *tz_str = "CST6CDT,M3.2.0,M11.1.0";
   setenv("TZ", tz_str, 1);
   tzset();
-  time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  auto tz = make_us_central();
   set_global_tz(tz);
 
   // Test time before the transition (1:30 AM CST exists)
@@ -1204,8 +652,7 @@ TEST(RecalcTimestampLocal, FallBackRepeatedHour) {
   const char *tz_str = "CST6CDT,M3.2.0,M11.1.0";
   setenv("TZ", tz_str, 1);
   tzset();
-  time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  auto tz = make_us_central();
   set_global_tz(tz);
 
   // Test time before the transition (midnight CDT)
@@ -1227,13 +674,12 @@ TEST(RecalcTimestampLocal, FallBackRepeatedHour) {
 }
 
 TEST(RecalcTimestampLocal, SouthernHemisphereDST) {
-  // Set timezone to Australia/Sydney (AEST-10AEDT,M10.1.0,M4.1.0)
+  // Set timezone to Australia/Sydney (AEST-10AEDT,M10.1.0,M4.1.0/3)
   // DST starts first Sunday of October, ends first Sunday of April
-  const char *tz_str = "AEST-10AEDT,M10.1.0,M4.1.0";
+  const char *tz_str = "AEST-10AEDT,M10.1.0,M4.1.0/3";
   setenv("TZ", tz_str, 1);
   tzset();
-  time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  auto tz = make_australia_sydney();
   set_global_tz(tz);
 
   // Test winter time (July - no DST in southern hemisphere)
@@ -1253,8 +699,7 @@ TEST(RecalcTimestampLocal, ExactTransitionBoundary) {
   const char *tz_str = "CST6CDT,M3.2.0,M11.1.0";
   setenv("TZ", tz_str, 1);
   tzset();
-  time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  auto tz = make_us_central();
   set_global_tz(tz);
 
   // 1:59:59 AM CST - last second before transition (still standard time)
@@ -1279,8 +724,19 @@ TEST(RecalcTimestampLocal, NonDefaultTransitionTime) {
   const char *tz_str = "CST6CDT,M3.2.0/3,M11.1.0/3";
   setenv("TZ", tz_str, 1);
   tzset();
-  time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = 6 * 3600;
+  tz.dst_offset_seconds = 5 * 3600;
+  tz.dst_start.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_start.month = 3;
+  tz.dst_start.week = 2;
+  tz.dst_start.day_of_week = 0;
+  tz.dst_start.time_seconds = 3 * 3600;
+  tz.dst_end.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_end.month = 11;
+  tz.dst_end.week = 1;
+  tz.dst_end.day_of_week = 0;
+  tz.dst_end.time_seconds = 3 * 3600;
   set_global_tz(tz);
 
   // 2:30 AM should still be standard time (transition at 3:00 AM)
@@ -1298,11 +754,21 @@ TEST(RecalcTimestampLocal, MinimalFieldsWithoutDayOfWeekOrYear) {
   // Regression test for issue #15115: DateTimeEntity::state_as_esptime() constructs
   // an ESPTime with only year/month/day/hour/minute/second set (no day_of_week or
   // day_of_year). recalc_timestamp_local() must work without those fields.
-  const char *tz_str = "CET-1CEST,M3.5.0,M10.5.0";
-  setenv("TZ", tz_str, 1);
+  setenv("TZ", "CET-1CEST,M3.5.0,M10.5.0", 1);
   tzset();
   time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  tz.std_offset_seconds = -1 * 3600;  // CET-1 = UTC+1
+  tz.dst_offset_seconds = -2 * 3600;  // CEST = UTC+2
+  tz.dst_start.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_start.month = 3;
+  tz.dst_start.week = 5;
+  tz.dst_start.day_of_week = 0;
+  tz.dst_start.time_seconds = 2 * 3600;
+  tz.dst_end.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_end.month = 10;
+  tz.dst_end.week = 5;
+  tz.dst_end.day_of_week = 0;
+  tz.dst_end.time_seconds = 2 * 3600;
   set_global_tz(tz);
 
   // Construct ESPTime with only date/time fields (like state_as_esptime does)
@@ -1326,11 +792,11 @@ TEST(RecalcTimestampLocal, MinimalFieldsWithoutDayOfWeekOrYear) {
 
 TEST(RecalcTimestampLocal, MinimalFieldsNoDST) {
   // Same test but with a timezone that has no DST
-  const char *tz_str = "IST-5:30";
-  setenv("TZ", tz_str, 1);
+  setenv("TZ", "IST-5:30", 1);
   tzset();
   time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  tz.std_offset_seconds = -(5 * 3600 + 30 * 60);  // IST-5:30 = UTC+5:30
+  // No DST
   set_global_tz(tz);
 
   ESPTime t{};
@@ -1351,11 +817,10 @@ TEST(RecalcTimestampLocal, MinimalFieldsNoDST) {
 TEST(RecalcTimestampLocal, YearBoundaryDST) {
   // Test southern hemisphere DST across year boundary
   // Australia/Sydney: DST active from October to April (spans Jan 1)
-  const char *tz_str = "AEST-10AEDT,M10.1.0,M4.1.0";
+  const char *tz_str = "AEST-10AEDT,M10.1.0,M4.1.0/3";
   setenv("TZ", tz_str, 1);
   tzset();
-  time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  auto tz = make_australia_sydney();
   set_global_tz(tz);
 
   // Dec 31, 2025 at 23:30 - DST should be active
@@ -1380,8 +845,7 @@ TEST(RecalcTimestampLocal, YearBoundaryDST) {
 // ============================================================================
 
 TEST(TimezoneOffset, NoTimezone) {
-  // When no timezone is set, offset should be 0
-  time::ParsedTimezone tz{};
+  ParsedTimezone tz{};
   set_global_tz(tz);
 
   int32_t offset = ESPTime::timezone_offset();
@@ -1389,34 +853,28 @@ TEST(TimezoneOffset, NoTimezone) {
 }
 
 TEST(TimezoneOffset, FixedOffsetPositive) {
-  // India: UTC+5:30 (no DST)
-  const char *tz_str = "IST-5:30";
-  time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  // India: IST-5:30 (no DST)
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = -(5 * 3600 + 30 * 60);
   set_global_tz(tz);
 
   int32_t offset = ESPTime::timezone_offset();
-  // Offset should be +5:30 = 19800 seconds (to add to UTC to get local)
   EXPECT_EQ(offset, 5 * 3600 + 30 * 60);
 }
 
 TEST(TimezoneOffset, FixedOffsetNegative) {
-  // US Eastern Standard Time: UTC-5 (testing without DST rules)
-  const char *tz_str = "EST5";
-  time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  // EST5 (no DST)
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = 5 * 3600;
   set_global_tz(tz);
 
   int32_t offset = ESPTime::timezone_offset();
-  // Offset should be -5 hours = -18000 seconds
   EXPECT_EQ(offset, -5 * 3600);
 }
 
 TEST(TimezoneOffset, WithDstReturnsCorrectOffsetBasedOnCurrentTime) {
   // US Eastern with DST
-  const char *tz_str = "EST5EDT,M3.2.0,M11.1.0";
-  time::ParsedTimezone tz{};
-  ASSERT_TRUE(parse_posix_tz(tz_str, tz));
+  auto tz = make_us_eastern();
   set_global_tz(tz);
 
   // Get current time and check offset matches expected based on DST status
@@ -1424,7 +882,7 @@ TEST(TimezoneOffset, WithDstReturnsCorrectOffsetBasedOnCurrentTime) {
   int32_t offset = ESPTime::timezone_offset();
 
   // Verify offset matches what is_in_dst says
-  if (time::is_in_dst(now, tz)) {
+  if (is_in_dst(now, tz)) {
     // During DST, offset should be -4 hours (EDT)
     EXPECT_EQ(offset, -4 * 3600);
   } else {
@@ -1433,4 +891,234 @@ TEST(TimezoneOffset, WithDstReturnsCorrectOffsetBasedOnCurrentTime) {
   }
 }
 
-}  // namespace esphome::testing
+// ============================================================================
+// Leap year edge cases for closed-form year arithmetic
+// ============================================================================
+
+TEST(PosixTz, EpochToLocalLeapYear2000) {
+  // 2000 is a leap year (divisible by 400)
+  ParsedTimezone tz{};  // UTC
+
+  // Feb 29, 2000 12:00:00 UTC
+  time_t epoch = make_utc(2000, 2, 29, 12);
+  struct tm local;
+  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
+  EXPECT_EQ(local.tm_year, 100);  // 2000
+  EXPECT_EQ(local.tm_mon, 1);     // February
+  EXPECT_EQ(local.tm_mday, 29);
+  EXPECT_EQ(local.tm_hour, 12);
+}
+
+TEST(PosixTz, EpochToLocalNonLeapYear2100) {
+  // 2100 is NOT a leap year (divisible by 100 but not 400)
+  ParsedTimezone tz{};  // UTC
+
+  // Mar 1, 2100 00:00:00 UTC — the day after what would be Feb 29
+  time_t epoch = make_utc(2100, 3, 1);
+  struct tm local;
+  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
+  EXPECT_EQ(local.tm_year, 200);  // 2100
+  EXPECT_EQ(local.tm_mon, 2);     // March
+  EXPECT_EQ(local.tm_mday, 1);
+
+  // Feb 28, 2100 23:59:59 UTC — last second of February (no Feb 29)
+  epoch = make_utc(2100, 2, 28, 23, 59, 59);
+  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
+  EXPECT_EQ(local.tm_year, 200);
+  EXPECT_EQ(local.tm_mon, 1);  // February
+  EXPECT_EQ(local.tm_mday, 28);
+}
+
+TEST(PosixTz, EpochToLocalLeapYear2400) {
+  // 2400 is a leap year (divisible by 400)
+  ParsedTimezone tz{};  // UTC
+
+  time_t epoch = make_utc(2400, 2, 29, 6);
+  struct tm local;
+  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
+  EXPECT_EQ(local.tm_year, 500);  // 2400
+  EXPECT_EQ(local.tm_mon, 1);     // February
+  EXPECT_EQ(local.tm_mday, 29);
+  EXPECT_EQ(local.tm_hour, 6);
+}
+
+TEST(PosixTz, EpochToLocalNewYearBoundaries) {
+  // Test year boundary — last second of 2099 and first second of 2100
+  ParsedTimezone tz{};  // UTC
+  struct tm local;
+
+  // Dec 31, 2099 23:59:59 UTC
+  time_t epoch = make_utc(2099, 12, 31, 23, 59, 59);
+  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
+  EXPECT_EQ(local.tm_year, 199);  // 2099
+  EXPECT_EQ(local.tm_mon, 11);    // December
+  EXPECT_EQ(local.tm_mday, 31);
+
+  // Jan 1, 2100 00:00:00 UTC
+  epoch = make_utc(2100, 1, 1);
+  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
+  EXPECT_EQ(local.tm_year, 200);  // 2100
+  EXPECT_EQ(local.tm_mon, 0);     // January
+  EXPECT_EQ(local.tm_mday, 1);
+}
+
+TEST(PosixTz, EpochToLocalDstAcrossCenturyBoundary) {
+  // DST transition in year 2100 (non-leap) with US Eastern rules
+  ParsedTimezone tz = make_us_eastern();
+
+  // July 4, 2100 16:00 UTC = 12:00 EDT
+  time_t epoch = make_utc(2100, 7, 4, 16);
+  struct tm local;
+  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
+  EXPECT_EQ(local.tm_hour, 12);
+  EXPECT_EQ(local.tm_isdst, 1);
+
+  // Jan 15, 2100 10:00 UTC = 05:00 EST
+  epoch = make_utc(2100, 1, 15, 10);
+  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
+  EXPECT_EQ(local.tm_hour, 5);
+  EXPECT_EQ(local.tm_isdst, 0);
+}
+
+TEST(PosixTz, EpochToLocalFarFutureYear5000) {
+  // Year 5000 — days/365 estimate overshoots by ~2 years due to leap days,
+  // requiring multiple correction steps in days_to_year.
+  ParsedTimezone tz{};  // UTC
+
+  time_t epoch = make_utc(5000, 6, 15, 12);
+  struct tm local;
+  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &local));
+  EXPECT_EQ(local.tm_year, 3100);  // 5000
+  EXPECT_EQ(local.tm_mon, 5);      // June
+  EXPECT_EQ(local.tm_mday, 15);
+  EXPECT_EQ(local.tm_hour, 12);
+}
+
+// ============================================================================
+// Verification against libc
+// ============================================================================
+
+// Helper to build the <+07>-7 timezone (UTC+7, no DST)
+static ParsedTimezone make_plus_seven() {
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = -7 * 3600;
+  return tz;
+}
+
+// Helper to build the India timezone (IST-5:30, no DST)
+static ParsedTimezone make_india() {
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = -(5 * 3600 + 30 * 60);
+  return tz;
+}
+
+// Helper to build the Europe/Berlin timezone (CET-1CEST,M3.5.0,M10.5.0/3)
+static ParsedTimezone make_europe_berlin() {
+  ParsedTimezone tz{};
+  tz.std_offset_seconds = -1 * 3600;
+  tz.dst_offset_seconds = -2 * 3600;
+  tz.dst_start.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_start.month = 3;
+  tz.dst_start.week = 5;
+  tz.dst_start.day_of_week = 0;
+  tz.dst_start.time_seconds = 2 * 3600;
+  tz.dst_end.type = DSTRuleType::MONTH_WEEK_DAY;
+  tz.dst_end.month = 10;
+  tz.dst_end.week = 5;
+  tz.dst_end.day_of_week = 0;
+  tz.dst_end.time_seconds = 3 * 3600;
+  return tz;
+}
+
+// Compares our converter against libc for the same zone: the struct drives
+// epoch_to_local_tm() and the equivalent POSIX TZ string drives libc localtime().
+using LibcVerificationParam = std::tuple<ParsedTimezone (*)(), const char *, time_t>;
+
+class LibcVerificationTest : public ::testing::TestWithParam<LibcVerificationParam> {
+ protected:
+  // NOLINTNEXTLINE(readability-identifier-naming) - Google Test requires this name
+  void SetUp() override {
+    // Save current TZ
+    const char *current_tz = getenv("TZ");
+    saved_tz_ = current_tz ? current_tz : "";
+    had_tz_ = current_tz != nullptr;
+  }
+
+  // NOLINTNEXTLINE(readability-identifier-naming) - Google Test requires this name
+  void TearDown() override {
+    // Restore TZ
+    if (had_tz_) {
+      setenv("TZ", saved_tz_.c_str(), 1);
+    } else {
+      unsetenv("TZ");
+    }
+    tzset();
+  }
+
+ private:
+  std::string saved_tz_;
+  bool had_tz_{false};
+};
+
+TEST_P(LibcVerificationTest, MatchesLibc) {
+  auto [make_tz, tz_str, epoch] = GetParam();
+
+  ParsedTimezone tz = make_tz();
+
+  // Our implementation
+  struct tm our_tm {};
+  ASSERT_TRUE(epoch_to_local_tm(epoch, tz, &our_tm));
+
+  // libc implementation
+  setenv("TZ", tz_str, 1);
+  tzset();
+  struct tm *libc_tm = localtime(&epoch);
+  ASSERT_NE(libc_tm, nullptr);
+
+  EXPECT_EQ(our_tm.tm_year, libc_tm->tm_year);
+  EXPECT_EQ(our_tm.tm_mon, libc_tm->tm_mon);
+  EXPECT_EQ(our_tm.tm_mday, libc_tm->tm_mday);
+  EXPECT_EQ(our_tm.tm_hour, libc_tm->tm_hour);
+  EXPECT_EQ(our_tm.tm_min, libc_tm->tm_min);
+  EXPECT_EQ(our_tm.tm_sec, libc_tm->tm_sec);
+  EXPECT_EQ(our_tm.tm_isdst, libc_tm->tm_isdst);
+}
+
+INSTANTIATE_TEST_SUITE_P(USEastern, LibcVerificationTest,
+                         ::testing::Values(std::make_tuple(&make_us_eastern, "EST5EDT,M3.2.0/2,M11.1.0/2", 1704067200),
+                                           std::make_tuple(&make_us_eastern, "EST5EDT,M3.2.0/2,M11.1.0/2", 1720000000),
+                                           std::make_tuple(&make_us_eastern, "EST5EDT,M3.2.0/2,M11.1.0/2",
+                                                           1735689600)));
+
+INSTANTIATE_TEST_SUITE_P(AngleBracket, LibcVerificationTest,
+                         ::testing::Values(std::make_tuple(&make_plus_seven, "<+07>-7", 1704067200),
+                                           std::make_tuple(&make_plus_seven, "<+07>-7", 1720000000)));
+
+INSTANTIATE_TEST_SUITE_P(India, LibcVerificationTest,
+                         ::testing::Values(std::make_tuple(&make_india, "IST-5:30", 1704067200),
+                                           std::make_tuple(&make_india, "IST-5:30", 1720000000)));
+
+INSTANTIATE_TEST_SUITE_P(
+    NewZealand, LibcVerificationTest,
+    ::testing::Values(std::make_tuple(&make_new_zealand, "NZST-12NZDT,M9.5.0,M4.1.0/3", 1704067200),
+                      std::make_tuple(&make_new_zealand, "NZST-12NZDT,M9.5.0,M4.1.0/3", 1720000000)));
+
+INSTANTIATE_TEST_SUITE_P(USCentral, LibcVerificationTest,
+                         ::testing::Values(std::make_tuple(&make_us_central, "CST6CDT,M3.2.0/2,M11.1.0/2", 1704067200),
+                                           std::make_tuple(&make_us_central, "CST6CDT,M3.2.0/2,M11.1.0/2", 1720000000),
+                                           std::make_tuple(&make_us_central, "CST6CDT,M3.2.0/2,M11.1.0/2",
+                                                           1735689600)));
+
+INSTANTIATE_TEST_SUITE_P(
+    EuropeBerlin, LibcVerificationTest,
+    ::testing::Values(std::make_tuple(&make_europe_berlin, "CET-1CEST,M3.5.0,M10.5.0/3", 1704067200),
+                      std::make_tuple(&make_europe_berlin, "CET-1CEST,M3.5.0,M10.5.0/3", 1720000000),
+                      std::make_tuple(&make_europe_berlin, "CET-1CEST,M3.5.0,M10.5.0/3", 1735689600)));
+
+INSTANTIATE_TEST_SUITE_P(
+    AustraliaSydney, LibcVerificationTest,
+    ::testing::Values(std::make_tuple(&make_australia_sydney, "AEST-10AEDT,M10.1.0,M4.1.0/3", 1704067200),
+                      std::make_tuple(&make_australia_sydney, "AEST-10AEDT,M10.1.0,M4.1.0/3", 1720000000),
+                      std::make_tuple(&make_australia_sydney, "AEST-10AEDT,M10.1.0,M4.1.0/3", 1735689600)));
+
+}  // namespace esphome::time::testing
diff --git a/tests/components/time/test.host.yaml b/tests/components/time/test.host.yaml
new file mode 100644
index 0000000000..f6bec9fd1d
--- /dev/null
+++ b/tests/components/time/test.host.yaml
@@ -0,0 +1,10 @@
+network:
+
+api:
+
+time:
+  - platform: homeassistant
+    # Angle-bracket name pins the explicit-timezone host codegen path
+    # (setenv/tzset plus pre-parsed struct emission) with characters that
+    # would break unescaped string interpolation.
+    timezone: "<+07>-7"
diff --git a/tests/integration/fixtures/api_get_time_response_timezone.yaml b/tests/integration/fixtures/api_get_time_response_timezone.yaml
new file mode 100644
index 0000000000..bece0c5684
--- /dev/null
+++ b/tests/integration/fixtures/api_get_time_response_timezone.yaml
@@ -0,0 +1,20 @@
+esphome:
+  name: get-time-tz-test
+host:
+api:
+logger:
+
+time:
+  - platform: homeassistant
+    id: ha_time
+
+sensor:
+  # Exposes the standard offset of the effective timezone so the test can
+  # observe which GetTimeResponse messages changed it
+  - platform: template
+    name: "TZ Offset"
+    id: tz_offset
+    accuracy_decimals: 0
+    update_interval: 100ms
+    lambda: |-
+      return time::get_global_tz().std_offset_seconds;
diff --git a/tests/integration/test_api_get_time_response_timezone.py b/tests/integration/test_api_get_time_response_timezone.py
new file mode 100644
index 0000000000..c90380607f
--- /dev/null
+++ b/tests/integration/test_api_get_time_response_timezone.py
@@ -0,0 +1,67 @@
+"""Integration test for GetTimeResponse parsed_timezone presence handling."""
+
+from __future__ import annotations
+
+from aioesphomeapi import connection as api_connection
+from aioesphomeapi.api_pb2 import GetTimeResponse
+import pytest
+
+from .state_utils import SensorTracker, build_key_to_entity_mapping
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+# 2024-01-01 00:00:00 UTC
+EPOCH = 1704067200
+# POSIX offsets are positive west of UTC, so UTC+7 is -25200 and UTC-5 is 18000
+UTC_PLUS_7 = -25200
+UTC_MINUS_5 = 18000
+
+
+@pytest.mark.asyncio
+async def test_api_get_time_response_timezone(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """A present parsed_timezone is applied even when all zero; an absent one is ignored."""
+    # The client answers the device's own GetTimeRequest with the host timezone;
+    # strip the parsed field from that reply so only the messages sent below
+    # can change the device timezone.
+    monkeypatch.setattr(api_connection, "_build_parsed_tz_proto", lambda tz: None)
+
+    async with run_compiled(yaml_config), api_client_connected() as client:
+        entities, _ = await client.list_entities_services()
+        tracker = SensorTracker(["tz_offset"])
+        tracker.key_to_sensor = build_key_to_entity_mapping(entities, ["tz_offset"])
+        client.subscribe_states(tracker.on_state)
+
+        await tracker.await_change(tracker.expect_any("tz_offset"), "tz_offset")
+        initial = tracker.sensor_states["tz_offset"][-1]
+        # Pick a zone that differs from the codegen default so the change is visible
+        target = UTC_PLUS_7 if initial != UTC_PLUS_7 else UTC_MINUS_5
+
+        # Present, non-zero: applied
+        future = tracker.expect("tz_offset", target)
+        resp = GetTimeResponse(epoch_seconds=EPOCH)
+        resp.parsed_timezone.std_offset_seconds = target
+        resp.parsed_timezone.dst_offset_seconds = target
+        client._connection.send_messages((resp,))
+        await tracker.await_change(future, "tz_offset")
+
+        # Absent (legacy client with only the deprecated string): ignored, and in
+        # particular not mistaken for an all-zero UTC zone
+        future = tracker.expect("tz_offset", 0)
+        resp = GetTimeResponse(epoch_seconds=EPOCH, timezone="UTC0")
+        client._connection.send_messages((resp,))
+        await tracker.await_must_not_change(future, "tz_offset", timeout=1.0)
+        assert tracker.sensor_states["tz_offset"][-1] == target
+        # Retire the expectation so it cannot swallow the first matching state
+        # meant for the next phase
+        future.cancel()
+
+        # Present but all zero (genuine UTC): applied
+        future = tracker.expect("tz_offset", 0)
+        resp = GetTimeResponse(epoch_seconds=EPOCH)
+        resp.parsed_timezone.SetInParent()
+        client._connection.send_messages((resp,))
+        await tracker.await_change(future, "tz_offset")

From de1361ac0e2777a13ec7275ca014da890da2f626 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 24 Aug 2026 13:50:27 +1200
Subject: [PATCH 138/155] [core] Add type annotations to component Python
 (#18697)

Co-authored-by: J. Nick Koston <nick@koston.org>
---
 esphome/components/a01nyub/sensor.py                      | 3 ++-
 esphome/components/a02yyuw/sensor.py                      | 3 ++-
 esphome/components/a4988/stepper.py                       | 3 ++-
 esphome/components/absolute_humidity/sensor.py            | 3 ++-
 esphome/components/ac_dimmer/output.py                    | 3 ++-
 esphome/components/adalight/__init__.py                   | 5 ++++-
 esphome/components/adc128s102/__init__.py                 | 3 ++-
 esphome/components/adc128s102/sensor/__init__.py          | 3 ++-
 esphome/components/addressable_light/display.py           | 3 ++-
 esphome/components/ade7880/sensor.py                      | 7 ++++---
 esphome/components/ade7953_base/__init__.py               | 4 +++-
 esphome/components/ade7953_i2c/sensor.py                  | 3 ++-
 esphome/components/ade7953_spi/sensor.py                  | 3 ++-
 esphome/components/ads1115/__init__.py                    | 3 ++-
 esphome/components/ads1115/sensor/__init__.py             | 3 ++-
 esphome/components/ads1118/__init__.py                    | 3 ++-
 esphome/components/ads1118/sensor/__init__.py             | 3 ++-
 esphome/components/aht10/sensor.py                        | 3 ++-
 esphome/components/airthings_ble/__init__.py              | 3 ++-
 esphome/components/airthings_wave_base/__init__.py        | 4 +++-
 esphome/components/airthings_wave_mini/sensor.py          | 3 ++-
 esphome/components/airthings_wave_plus/sensor.py          | 2 +-
 esphome/components/alpha3/sensor.py                       | 3 ++-
 esphome/components/am2315c/sensor.py                      | 3 ++-
 esphome/components/am2320/sensor.py                       | 3 ++-
 esphome/components/am43/cover/__init__.py                 | 3 ++-
 esphome/components/am43/sensor/__init__.py                | 3 ++-
 esphome/components/analog_threshold/binary_sensor.py      | 3 ++-
 esphome/components/anova/climate.py                       | 3 ++-
 esphome/components/apds9306/sensor.py                     | 8 ++++++--
 esphome/components/aqi/sensor.py                          | 5 +++--
 esphome/components/as3935_i2c/__init__.py                 | 3 ++-
 esphome/components/as3935_spi/__init__.py                 | 3 ++-
 esphome/components/as7341/sensor.py                       | 3 ++-
 esphome/components/async_tcp/__init__.py                  | 3 ++-
 esphome/components/atc_mithermometer/sensor.py            | 3 ++-
 esphome/components/atm90e26/sensor.py                     | 3 ++-
 esphome/components/axs15231/touchscreen/__init__.py       | 3 ++-
 esphome/components/b_parasite/sensor.py                   | 3 ++-
 esphome/components/ballu/climate.py                       | 3 ++-
 esphome/components/bang_bang/climate.py                   | 3 ++-
 esphome/components/beken_spi_led_strip/light.py           | 2 +-
 esphome/components/bh1750/sensor.py                       | 3 ++-
 esphome/components/bh1900nux/sensor.py                    | 3 ++-
 esphome/components/binary/fan/__init__.py                 | 3 ++-
 esphome/components/binary/light/__init__.py               | 3 ++-
 esphome/components/binary_sensor_map/sensor.py            | 3 ++-
 esphome/components/bk72xx/__init__.py                     | 8 +++++---
 esphome/components/bl0939/sensor.py                       | 3 ++-
 esphome/components/bl0942/sensor.py                       | 3 ++-
 esphome/components/ble_device_base/automation.py          | 7 ++++---
 esphome/components/ble_presence/binary_sensor.py          | 5 +++--
 esphome/components/ble_rssi/sensor.py                     | 5 +++--
 esphome/components/ble_scanner/text_sensor.py             | 3 ++-
 esphome/components/bluetooth_proxy/__init__.py            | 2 +-
 esphome/components/bme280_base/__init__.py                | 4 +++-
 esphome/components/bme280_i2c/sensor.py                   | 3 ++-
 esphome/components/bme280_spi/sensor.py                   | 3 ++-
 esphome/components/bme680/sensor.py                       | 3 ++-
 esphome/components/bme68x_bsec2_i2c/__init__.py           | 3 ++-
 esphome/components/bmi160/sensor.py                       | 3 ++-
 esphome/components/bmi270/motion.py                       | 3 ++-
 esphome/components/bmi270/sensor.py                       | 3 ++-
 esphome/components/bmp085/sensor.py                       | 3 ++-
 esphome/components/bmp280_base/__init__.py                | 4 +++-
 esphome/components/bmp280_i2c/sensor.py                   | 3 ++-
 esphome/components/bmp280_spi/sensor.py                   | 3 ++-
 esphome/components/bmp3xx_base/__init__.py                | 4 +++-
 esphome/components/bmp3xx_i2c/sensor.py                   | 3 ++-
 esphome/components/bmp3xx_spi/sensor.py                   | 3 ++-
 esphome/components/bmp581_base/__init__.py                | 6 ++++--
 esphome/components/bmp581_i2c/sensor.py                   | 3 ++-
 esphome/components/bmp581_spi/sensor.py                   | 5 +++--
 esphome/components/bp1658cj/__init__.py                   | 3 ++-
 esphome/components/bp1658cj/output.py                     | 3 ++-
 esphome/components/bp5758d/__init__.py                    | 3 ++-
 esphome/components/bp5758d/output.py                      | 3 ++-
 esphome/components/cap1188/__init__.py                    | 3 ++-
 esphome/components/cap1188/binary_sensor.py               | 3 ++-
 esphome/components/captive_portal/__init__.py             | 2 +-
 esphome/components/ccs811/sensor.py                       | 3 ++-
 esphome/components/cd74hc4067/__init__.py                 | 3 ++-
 esphome/components/cd74hc4067/sensor.py                   | 3 ++-
 esphome/components/ch422g/__init__.py                     | 8 +++++---
 esphome/components/ch423/__init__.py                      | 8 +++++---
 esphome/components/chsc6x/touchscreen.py                  | 3 ++-
 esphome/components/climate_ir/__init__.py                 | 7 ++++---
 esphome/components/climate_ir_lg/climate.py               | 3 ++-
 esphome/components/color_temperature/light.py             | 3 ++-
 esphome/components/combination/sensor.py                  | 5 +++--
 esphome/components/coolix/climate.py                      | 3 ++-
 esphome/components/cse7761/sensor.py                      | 3 ++-
 esphome/components/cse7766/sensor.py                      | 3 ++-
 esphome/components/cst226/binary_sensor/__init__.py       | 3 ++-
 esphome/components/cst226/touchscreen/__init__.py         | 3 ++-
 esphome/components/cst328/binary_sensor/__init__.py       | 3 ++-
 esphome/components/cst328/touchscreen/__init__.py         | 3 ++-
 esphome/components/cst816/touchscreen/__init__.py         | 3 ++-
 esphome/components/cst9220/touchscreen/__init__.py        | 3 ++-
 esphome/components/ct_clamp/sensor.py                     | 3 ++-
 esphome/components/current_based/cover.py                 | 3 ++-
 esphome/components/cwww/light.py                          | 3 ++-
 esphome/components/dac7678/__init__.py                    | 4 +++-
 esphome/components/dac7678/output.py                      | 4 +++-
 esphome/components/daikin/climate.py                      | 3 ++-
 esphome/components/daikin_arc/climate.py                  | 3 ++-
 esphome/components/daikin_brc/climate.py                  | 3 ++-
 esphome/components/dallas_temp/sensor.py                  | 3 ++-
 esphome/components/delonghi/climate.py                    | 3 ++-
 esphome/components/demo/__init__.py                       | 3 ++-
 esphome/components/dew_point/sensor.py                    | 3 ++-
 esphome/components/dht/sensor.py                          | 3 ++-
 esphome/components/dht12/sensor.py                        | 3 ++-
 esphome/components/dps310/sensor.py                       | 3 ++-
 esphome/components/ds2484/one_wire.py                     | 3 ++-
 esphome/components/dsmr/__init__.py                       | 2 +-
 esphome/components/dsmr/sensor.py                         | 3 ++-
 esphome/components/dsmr/text_sensor.py                    | 3 ++-
 esphome/components/duty_cycle/sensor.py                   | 3 ++-
 esphome/components/e131/__init__.py                       | 7 +++++--
 esphome/components/ee895/sensor.py                        | 3 ++-
 esphome/components/ektf2232/touchscreen/__init__.py       | 3 ++-
 esphome/components/emmeti/climate.py                      | 3 ++-
 esphome/components/endstop/cover.py                       | 3 ++-
 esphome/components/ens160_base/__init__.py                | 4 +++-
 esphome/components/ens160_i2c/sensor.py                   | 3 ++-
 esphome/components/ens160_spi/sensor.py                   | 3 ++-
 esphome/components/ens210/sensor.py                       | 3 ++-
 esphome/components/es7210/audio_adc.py                    | 3 ++-
 esphome/components/es7243e/audio_adc.py                   | 3 ++-
 esphome/components/es8156/audio_dac.py                    | 5 +++--
 esphome/components/es8311/audio_dac.py                    | 3 ++-
 esphome/components/es8388/audio_dac.py                    | 3 ++-
 esphome/components/es8388/select/__init__.py              | 3 ++-
 esphome/components/esp32_ble_beacon/__init__.py           | 5 +++--
 esphome/components/esp32_camera/__init__.py               | 8 +++++---
 esphome/components/esp32_camera_web_server/__init__.py    | 2 +-
 esphome/components/esp32_can/canbus.py                    | 8 +++++---
 esphome/components/esp32_dac/output.py                    | 5 +++--
 esphome/components/esp32_improv/__init__.py               | 3 ++-
 esphome/components/esphome/ota/__init__.py                | 2 +-
 esphome/components/ethernet_info/text_sensor.py           | 3 ++-
 esphome/components/exposure_notifications/__init__.py     | 2 +-
 esphome/components/ezo/sensor.py                          | 3 ++-
 esphome/components/fastled_base/__init__.py               | 4 +++-
 esphome/components/fastled_clockless/light.py             | 5 +++--
 esphome/components/fastled_spi/light.py                   | 3 ++-
 esphome/components/feedback/cover.py                      | 5 +++--
 esphome/components/fs3000/sensor.py                       | 3 ++-
 esphome/components/ft5x06/touchscreen/__init__.py         | 3 ++-
 esphome/components/ft63x6/touchscreen.py                  | 3 ++-
 esphome/components/fujitsu_general/climate.py             | 3 ++-
 esphome/components/gcja5/sensor.py                        | 3 ++-
 esphome/components/gl_r01_i2c/sensor.py                   | 3 ++-
 esphome/components/gp2y1010au0f/sensor.py                 | 3 ++-
 esphome/components/gp8403/__init__.py                     | 3 ++-
 esphome/components/gp8403/output/__init__.py              | 3 ++-
 esphome/components/gps/__init__.py                        | 3 ++-
 esphome/components/gps/time/__init__.py                   | 3 ++-
 esphome/components/graphical_display_menu/__init__.py     | 3 ++-
 esphome/components/gree/climate.py                        | 3 ++-
 esphome/components/gree/switch/__init__.py                | 5 +++--
 esphome/components/grove_gas_mc_v2/sensor.py              | 3 ++-
 esphome/components/growatt_solar/sensor.py                | 2 +-
 esphome/components/gsl3670/touchscreen.py                 | 6 +++---
 esphome/components/gt911/binary_sensor/__init__.py        | 3 ++-
 esphome/components/gt911/touchscreen/__init__.py          | 3 ++-
 esphome/components/havells_solar/sensor.py                | 2 +-
 esphome/components/hdc1080/sensor.py                      | 3 ++-
 esphome/components/hdc2010/sensor.py                      | 3 ++-
 esphome/components/hdc2080/sensor.py                      | 3 ++-
 esphome/components/he60r/cover.py                         | 3 ++-
 esphome/components/heatpumpir/climate.py                  | 2 +-
 esphome/components/hitachi_ac344/climate.py               | 3 ++-
 esphome/components/hitachi_ac424/climate.py               | 3 ++-
 esphome/components/hlw8012/sensor.py                      | 3 ++-
 esphome/components/hlw8032/sensor.py                      | 3 ++-
 esphome/components/hm3301/sensor.py                       | 5 +++--
 esphome/components/honeywell_hih_i2c/sensor.py            | 3 ++-
 esphome/components/honeywellabp/sensor.py                 | 3 ++-
 esphome/components/honeywellabp2_i2c/sensor.py            | 3 ++-
 esphome/components/hrxl_maxsonar_wr/sensor.py             | 3 ++-
 esphome/components/hte501/sensor.py                       | 3 ++-
 esphome/components/htu31d/sensor.py                       | 3 ++-
 esphome/components/hub75/boards/__init__.py               | 2 +-
 esphome/components/hub75/display.py                       | 4 ++--
 esphome/components/hx711/sensor.py                        | 3 ++-
 esphome/components/hydreon_rgxx/binary_sensor.py          | 3 ++-
 esphome/components/hydreon_rgxx/sensor.py                 | 5 +++--
 esphome/components/hyt271/sensor.py                       | 3 ++-
 esphome/components/i2c_device/__init__.py                 | 3 ++-
 esphome/components/iaqcore/sensor.py                      | 3 ++-
 esphome/components/improv_base/__init__.py                | 7 ++++---
 esphome/components/improv_serial/__init__.py              | 5 +++--
 esphome/components/ina219/sensor.py                       | 3 ++-
 esphome/components/ina226/sensor.py                       | 7 +++++--
 esphome/components/ina260/sensor.py                       | 3 ++-
 esphome/components/ina2xx_i2c/sensor.py                   | 3 ++-
 esphome/components/ina2xx_spi/sensor.py                   | 3 ++-
 esphome/components/ina3221/sensor.py                      | 3 ++-
 esphome/components/infrared/__init__.py                   | 8 ++++----
 esphome/components/inkbird_ibsth1_mini/sensor.py          | 3 ++-
 esphome/components/inkplate/display.py                    | 7 ++++---
 esphome/components/internal_temperature/sensor.py         | 3 ++-
 esphome/components/interval/__init__.py                   | 3 ++-
 esphome/components/jsn_sr04t/sensor.py                    | 3 ++-
 esphome/components/json/__init__.py                       | 3 ++-
 esphome/components/kamstrup_kmp/sensor.py                 | 3 ++-
 esphome/components/kmeteriso/sensor.py                    | 3 ++-
 esphome/components/kuntze/sensor.py                       | 2 +-
 esphome/components/lc709203f/sensor.py                    | 3 ++-
 esphome/components/lcd_gpio/display.py                    | 5 +++--
 esphome/components/lcd_menu/__init__.py                   | 5 +++--
 esphome/components/lcd_pcf8574/display.py                 | 3 ++-
 esphome/components/lilygo_t5_47/touchscreen/__init__.py   | 3 ++-
 esphome/components/lm75b/sensor.py                        | 3 ++-
 esphome/components/ln882x/__init__.py                     | 8 +++++---
 esphome/components/lps22/sensor.py                        | 3 ++-
 esphome/components/lsm6ds/motion.py                       | 3 ++-
 esphome/components/lsm6ds/sensor.py                       | 3 ++-
 esphome/components/ltr390/sensor.py                       | 3 ++-
 esphome/components/max31855/sensor.py                     | 3 ++-
 esphome/components/max31856/sensor.py                     | 3 ++-
 esphome/components/max31865/sensor.py                     | 3 ++-
 esphome/components/max44009/sensor.py                     | 3 ++-
 esphome/components/max6675/sensor.py                      | 3 ++-
 esphome/components/max7219/display.py                     | 3 ++-
 esphome/components/max9611/sensor.py                      | 3 ++-
 esphome/components/mcp23008/__init__.py                   | 3 ++-
 esphome/components/mcp23016/__init__.py                   | 8 +++++---
 esphome/components/mcp23017/__init__.py                   | 3 ++-
 esphome/components/mcp23s08/__init__.py                   | 3 ++-
 esphome/components/mcp23s17/__init__.py                   | 3 ++-
 esphome/components/mcp2515/canbus.py                      | 3 ++-
 esphome/components/mcp3008/__init__.py                    | 3 ++-
 esphome/components/mcp3008/sensor/__init__.py             | 3 ++-
 esphome/components/mcp3204/__init__.py                    | 3 ++-
 esphome/components/mcp3204/sensor/__init__.py             | 3 ++-
 esphome/components/mcp3221/sensor.py                      | 3 ++-
 esphome/components/mcp4725/output.py                      | 3 ++-
 esphome/components/mcp4728/__init__.py                    | 3 ++-
 esphome/components/mcp4728/output/__init__.py             | 3 ++-
 esphome/components/mcp47a1/output.py                      | 3 ++-
 esphome/components/mcp9600/sensor.py                      | 3 ++-
 esphome/components/mcp9808/sensor.py                      | 3 ++-
 esphome/components/md5/__init__.py                        | 3 ++-
 esphome/components/mdns/__init__.py                       | 8 ++++----
 esphome/components/media_source/__init__.py               | 7 ++++---
 esphome/components/mics_4514/sensor.py                    | 3 ++-
 esphome/components/midea_ir/climate.py                    | 3 ++-
 esphome/components/mitsubishi/climate.py                  | 3 ++-
 esphome/components/mlx90393/sensor.py                     | 7 ++++---
 esphome/components/mlx90614/sensor.py                     | 3 ++-
 esphome/components/mmc5603/sensor.py                      | 6 ++++--
 esphome/components/mmc5983/sensor.py                      | 3 ++-
 esphome/components/modbus_server/__init__.py              | 2 +-
 esphome/components/monochromatic/light.py                 | 3 ++-
 esphome/components/mopeka_ble/__init__.py                 | 3 ++-
 esphome/components/mopeka_pro_check/sensor.py             | 7 +++++--
 esphome/components/mopeka_std_check/sensor.py             | 7 +++++--
 esphome/components/mpl3115a2/sensor.py                    | 3 ++-
 esphome/components/mpu6050/sensor.py                      | 3 ++-
 esphome/components/mpu6886/sensor.py                      | 3 ++-
 esphome/components/mqtt_subscribe/sensor/__init__.py      | 3 ++-
 esphome/components/mqtt_subscribe/text_sensor/__init__.py | 3 ++-
 esphome/components/ms5611/sensor.py                       | 3 ++-
 esphome/components/ms8607/sensor.py                       | 3 ++-
 esphome/components/my9231/__init__.py                     | 3 ++-
 esphome/components/my9231/output.py                       | 3 ++-
 esphome/components/network/__init__.py                    | 2 +-
 esphome/components/nfc/binary_sensor/__init__.py          | 7 +++++--
 esphome/components/noblex/climate.py                      | 3 ++-
 esphome/components/npi19/sensor.py                        | 3 ++-
 esphome/components/one_wire/__init__.py                   | 6 ++++--
 esphome/components/opt3001/sensor.py                      | 3 ++-
 esphome/components/packages/__init__.py                   | 6 +++---
 esphome/components/partition/light.py                     | 7 ++++---
 esphome/components/pca6416a/__init__.py                   | 8 +++++---
 esphome/components/pca9685/__init__.py                    | 5 +++--
 esphome/components/pca9685/output.py                      | 3 ++-
 esphome/components/pcd8544/display.py                     | 3 ++-
 esphome/components/pcf8574/__init__.py                    | 8 +++++---
 esphome/components/pi4ioe5v6408/__init__.py               | 8 +++++---
 esphome/components/pm1006/sensor.py                       | 5 +++--
 esphome/components/pm2005/sensor.py                       | 3 ++-
 esphome/components/pmsa003i/sensor.py                     | 3 ++-
 esphome/components/pn532_i2c/__init__.py                  | 3 ++-
 esphome/components/pn532_spi/__init__.py                  | 3 ++-
 esphome/components/pn7150_i2c/__init__.py                 | 3 ++-
 esphome/components/pn7160_i2c/__init__.py                 | 3 ++-
 esphome/components/pn7160_spi/__init__.py                 | 3 ++-
 esphome/components/power_supply/__init__.py               | 3 ++-
 esphome/components/preferences/__init__.py                | 3 ++-
 esphome/components/prometheus/__init__.py                 | 3 ++-
 esphome/components/psram/__init__.py                      | 6 +++---
 esphome/components/pulse_width/sensor.py                  | 3 ++-
 esphome/components/pvvx_mithermometer/display/__init__.py | 3 ++-
 esphome/components/pvvx_mithermometer/sensor.py           | 3 ++-
 esphome/components/pzem004t/sensor.py                     | 3 ++-
 esphome/components/qmi8658/motion.py                      | 3 ++-
 esphome/components/qmi8658/sensor.py                      | 3 ++-
 esphome/components/qmp6988/sensor.py                      | 3 ++-
 esphome/components/qr_code/__init__.py                    | 3 ++-
 esphome/components/qwiic_pir/binary_sensor.py             | 5 +++--
 esphome/components/radio_frequency/__init__.py            | 8 ++++----
 esphome/components/radon_eye_ble/__init__.py              | 3 ++-
 esphome/components/radon_eye_rd200/sensor.py              | 3 ++-
 esphome/components/rc522_i2c/__init__.py                  | 3 ++-
 esphome/components/rc522_spi/__init__.py                  | 3 ++-
 esphome/components/rc522_spi/binary_sensor.py             | 3 ++-
 esphome/components/rdm6300/__init__.py                    | 3 ++-
 esphome/components/rdm6300/binary_sensor.py               | 3 ++-
 esphome/components/resistance/sensor.py                   | 3 ++-
 esphome/components/restart/button/__init__.py             | 3 ++-
 esphome/components/restart/switch/__init__.py             | 3 ++-
 esphome/components/rgb/light.py                           | 3 ++-
 esphome/components/rgbct/light.py                         | 3 ++-
 esphome/components/rgbw/light.py                          | 3 ++-
 esphome/components/rgbww/light.py                         | 3 ++-
 esphome/components/rp2_pio/__init__.py                    | 3 ++-
 esphome/components/rtl87xx/__init__.py                    | 8 +++++---
 esphome/components/runtime_image/__init__.py              | 8 ++++----
 esphome/components/runtime_stats/__init__.py              | 3 ++-
 esphome/components/ruuvi_ble/__init__.py                  | 3 ++-
 esphome/components/ruuvitag/sensor.py                     | 3 ++-
 esphome/components/sdm_meter/sensor.py                    | 2 +-
 esphome/components/sdp3x/sensor.py                        | 3 ++-
 esphome/components/sds011/sensor.py                       | 7 ++++---
 esphome/components/selec_meter/sensor.py                  | 2 +-
 esphome/components/sen0321/sensor.py                      | 3 ++-
 esphome/components/sen21231/sensor.py                     | 3 ++-
 esphome/components/sen6x/sensor.py                        | 3 ++-
 esphome/components/serial_proxy/__init__.py               | 5 +++--
 esphome/components/sfa30/sensor.py                        | 3 ++-
 esphome/components/sgp30/sensor.py                        | 3 ++-
 esphome/components/sgp4x/sensor.py                        | 7 ++++---
 esphome/components/sht3xd/sensor.py                       | 3 ++-
 esphome/components/sht4x/sensor.py                        | 3 ++-
 esphome/components/shtcx/sensor.py                        | 3 ++-
 esphome/components/shutdown/button/__init__.py            | 3 ++-
 esphome/components/shutdown/switch/__init__.py            | 3 ++-
 esphome/components/sigma_delta_output/output.py           | 3 ++-
 esphome/components/slow_pwm/output.py                     | 3 ++-
 esphome/components/sm10bit_base/__init__.py               | 4 +++-
 esphome/components/sm16716/__init__.py                    | 3 ++-
 esphome/components/sm16716/output.py                      | 3 ++-
 esphome/components/sm2135/__init__.py                     | 3 ++-
 esphome/components/sm2135/output.py                       | 3 ++-
 esphome/components/sm2235/__init__.py                     | 3 ++-
 esphome/components/sm2235/output.py                       | 3 ++-
 esphome/components/sm2335/__init__.py                     | 3 ++-
 esphome/components/sm2335/output.py                       | 3 ++-
 esphome/components/sm300d2/sensor.py                      | 3 ++-
 esphome/components/smt100/sensor.py                       | 3 ++-
 esphome/components/sntp/time.py                           | 2 +-
 esphome/components/socket/__init__.py                     | 3 ++-
 esphome/components/sonoff_d1/light.py                     | 3 ++-
 esphome/components/spa06_i2c/sensor.py                    | 3 ++-
 esphome/components/spa06_spi/sensor.py                    | 5 +++--
 esphome/components/speed/fan/__init__.py                  | 3 ++-
 esphome/components/spi_device/__init__.py                 | 3 ++-
 esphome/components/spi_led_strip/light.py                 | 3 ++-
 esphome/components/ssd1306_base/__init__.py               | 6 ++++--
 esphome/components/ssd1306_i2c/display.py                 | 3 ++-
 esphome/components/ssd1306_spi/display.py                 | 3 ++-
 esphome/components/ssd1322_base/__init__.py               | 4 +++-
 esphome/components/ssd1322_spi/display.py                 | 3 ++-
 esphome/components/ssd1325_base/__init__.py               | 4 +++-
 esphome/components/ssd1325_spi/display.py                 | 3 ++-
 esphome/components/ssd1327_base/__init__.py               | 4 +++-
 esphome/components/ssd1327_i2c/display.py                 | 3 ++-
 esphome/components/ssd1327_spi/display.py                 | 3 ++-
 esphome/components/ssd1331_base/__init__.py               | 4 +++-
 esphome/components/ssd1331_spi/display.py                 | 3 ++-
 esphome/components/ssd1351_base/__init__.py               | 4 +++-
 esphome/components/ssd1351_spi/display.py                 | 3 ++-
 esphome/components/st7123/touchscreen/__init__.py         | 3 ++-
 esphome/components/st7567_base/__init__.py                | 4 +++-
 esphome/components/st7567_i2c/display.py                  | 3 ++-
 esphome/components/st7567_spi/display.py                  | 3 ++-
 esphome/components/st7735/display.py                      | 6 ++++--
 esphome/components/st7920/display.py                      | 3 ++-
 esphome/components/statsd/__init__.py                     | 3 ++-
 esphome/components/status/binary_sensor.py                | 3 ++-
 esphome/components/status_led/__init__.py                 | 3 ++-
 esphome/components/status_led/light/__init__.py           | 3 ++-
 esphome/components/sts3x/sensor.py                        | 3 ++-
 esphome/components/stts22h/sensor.py                      | 3 ++-
 esphome/components/sx126x/packet_transport/__init__.py    | 3 ++-
 esphome/components/syslog/__init__.py                     | 3 ++-
 esphome/components/t6615/sensor.py                        | 3 ++-
 esphome/components/tc74/sensor.py                         | 3 ++-
 esphome/components/tca9548a/__init__.py                   | 3 ++-
 esphome/components/tca9555/__init__.py                    | 8 +++++---
 esphome/components/tcl112/climate.py                      | 3 ++-
 esphome/components/tcs34725/sensor.py                     | 3 ++-
 esphome/components/tee501/sensor.py                       | 3 ++-
 esphome/components/tem3200/sensor.py                      | 3 ++-
 esphome/components/thermopro_ble/sensor.py                | 3 ++-
 esphome/components/time_based/cover/__init__.py           | 3 ++-
 esphome/components/tinyusb/__init__.py                    | 5 +++--
 esphome/components/tlc59208f/__init__.py                  | 3 ++-
 esphome/components/tlc59208f/output.py                    | 3 ++-
 esphome/components/tlc5947/__init__.py                    | 3 ++-
 esphome/components/tlc5947/output/__init__.py             | 3 ++-
 esphome/components/tlc5971/__init__.py                    | 3 ++-
 esphome/components/tlc5971/output/__init__.py             | 3 ++-
 esphome/components/tm1621/display.py                      | 3 ++-
 esphome/components/tm1637/binary_sensor.py                | 3 ++-
 esphome/components/tm1637/display.py                      | 3 ++-
 esphome/components/tmp102/sensor.py                       | 3 ++-
 esphome/components/tmp1075/sensor.py                      | 3 ++-
 esphome/components/tmp117/sensor.py                       | 5 +++--
 esphome/components/tof10120/sensor.py                     | 3 ++-
 esphome/components/tormatic/cover.py                      | 3 ++-
 esphome/components/toshiba/climate.py                     | 3 ++-
 esphome/components/total_daily_energy/sensor.py           | 7 ++++---
 esphome/components/tsl2561/sensor.py                      | 8 ++++++--
 esphome/components/tsl2591/sensor.py                      | 8 ++++++--
 esphome/components/tt21100/binary_sensor/__init__.py      | 3 ++-
 esphome/components/tt21100/touchscreen/__init__.py        | 3 ++-
 esphome/components/ttp229_bsf/__init__.py                 | 3 ++-
 esphome/components/ttp229_bsf/binary_sensor.py            | 3 ++-
 esphome/components/ttp229_lsf/__init__.py                 | 3 ++-
 esphome/components/ttp229_lsf/binary_sensor.py            | 3 ++-
 esphome/components/tx20/sensor.py                         | 3 ++-
 esphome/components/uln2003/stepper.py                     | 3 ++-
 esphome/components/ultrasonic/sensor.py                   | 3 ++-
 esphome/components/uptime/sensor/__init__.py              | 3 ++-
 esphome/components/uptime/text_sensor/__init__.py         | 3 ++-
 esphome/components/usb_host/__init__.py                   | 7 +++++--
 esphome/components/veml3235/sensor.py                     | 5 +++--
 esphome/components/veml7700/sensor.py                     | 8 ++++++--
 esphome/components/version/text_sensor.py                 | 3 ++-
 esphome/components/wake_on_lan/button.py                  | 5 +++--
 esphome/components/waveshare_epaper/display.py            | 7 ++++---
 esphome/components/web_server_base/__init__.py            | 7 ++++---
 esphome/components/web_server_idf/__init__.py             | 3 ++-
 esphome/components/whirlpool/climate.py                   | 3 ++-
 esphome/components/whynter/climate.py                     | 3 ++-
 esphome/components/wiegand/__init__.py                    | 3 ++-
 esphome/components/wifi_info/text_sensor.py               | 5 +++--
 esphome/components/wifi_signal/sensor.py                  | 3 ++-
 esphome/components/wk2132_i2c/__init__.py                 | 3 ++-
 esphome/components/wk2132_spi/__init__.py                 | 3 ++-
 esphome/components/wk2168_i2c/__init__.py                 | 6 ++++--
 esphome/components/wk2168_spi/__init__.py                 | 6 ++++--
 esphome/components/wk2204_i2c/__init__.py                 | 3 ++-
 esphome/components/wk2204_spi/__init__.py                 | 3 ++-
 esphome/components/wk2212_i2c/__init__.py                 | 6 ++++--
 esphome/components/wk2212_spi/__init__.py                 | 6 ++++--
 esphome/components/wl_134/text_sensor.py                  | 3 ++-
 esphome/components/wled/__init__.py                       | 5 +++--
 esphome/components/wts01/sensor.py                        | 3 ++-
 esphome/components/x9c/output.py                          | 3 ++-
 esphome/components/xdb401/sensor.py                       | 3 ++-
 esphome/components/xgzp68xx/sensor.py                     | 3 ++-
 esphome/components/xiaomi_ble/__init__.py                 | 3 ++-
 esphome/components/xiaomi_cgd1/sensor.py                  | 3 ++-
 esphome/components/xiaomi_cgdk2/sensor.py                 | 3 ++-
 esphome/components/xiaomi_cgg1/sensor.py                  | 3 ++-
 esphome/components/xiaomi_cgpr1/binary_sensor.py          | 3 ++-
 esphome/components/xiaomi_gcls002/sensor.py               | 3 ++-
 esphome/components/xiaomi_hhccjcy01/sensor.py             | 3 ++-
 esphome/components/xiaomi_hhccjcy10/sensor.py             | 3 ++-
 esphome/components/xiaomi_hhccpot002/sensor.py            | 3 ++-
 esphome/components/xiaomi_jqjcy01ym/sensor.py             | 3 ++-
 esphome/components/xiaomi_lywsd02/sensor.py               | 3 ++-
 esphome/components/xiaomi_lywsd02mmc/sensor.py            | 3 ++-
 esphome/components/xiaomi_lywsd03mmc/sensor.py            | 3 ++-
 esphome/components/xiaomi_lywsdcgq/sensor.py              | 3 ++-
 esphome/components/xiaomi_mhoc303/sensor.py               | 3 ++-
 esphome/components/xiaomi_mhoc401/sensor.py               | 3 ++-
 esphome/components/xiaomi_miscale/sensor.py               | 3 ++-
 esphome/components/xiaomi_mjyd02yla/binary_sensor.py      | 3 ++-
 esphome/components/xiaomi_mue4094rt/binary_sensor.py      | 3 ++-
 esphome/components/xiaomi_wx08zm/binary_sensor.py         | 3 ++-
 esphome/components/xiaomi_xmwsdj04mmc/sensor.py           | 3 ++-
 esphome/components/xpt2046/touchscreen/__init__.py        | 3 ++-
 esphome/components/yashima/climate.py                     | 3 ++-
 esphome/components/zephyr/__init__.py                     | 6 +++---
 esphome/components/zephyr_mcumgr/ota/__init__.py          | 2 +-
 esphome/components/zephyr_pwm/output.py                   | 7 ++++---
 esphome/components/zhlt01/climate.py                      | 3 ++-
 esphome/components/zio_ultrasonic/sensor.py               | 3 ++-
 esphome/components/zwave_proxy/__init__.py                | 5 +++--
 esphome/components/zyaura/sensor.py                       | 3 ++-
 487 files changed, 1129 insertions(+), 607 deletions(-)

diff --git a/esphome/components/a01nyub/sensor.py b/esphome/components/a01nyub/sensor.py
index e5f4f7ef30..f84091d688 100644
--- a/esphome/components/a01nyub/sensor.py
+++ b/esphome/components/a01nyub/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_METER,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@MrSuicideParrot"]
 DEPENDENCIES = ["uart"]
@@ -35,7 +36,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
diff --git a/esphome/components/a02yyuw/sensor.py b/esphome/components/a02yyuw/sensor.py
index f0bc59ae6c..7372f8f760 100644
--- a/esphome/components/a02yyuw/sensor.py
+++ b/esphome/components/a02yyuw/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_MILLIMETER,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@TH-Braemer"]
 DEPENDENCIES = ["uart"]
@@ -35,7 +36,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
diff --git a/esphome/components/a4988/stepper.py b/esphome/components/a4988/stepper.py
index 97f5a6fe0f..7a19bd550d 100644
--- a/esphome/components/a4988/stepper.py
+++ b/esphome/components/a4988/stepper.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import stepper
 import esphome.config_validation as cv
 from esphome.const import CONF_DIR_PIN, CONF_ID, CONF_SLEEP_PIN, CONF_STEP_PIN
+from esphome.types import ConfigType
 
 a4988_ns = cg.esphome_ns.namespace("a4988")
 A4988 = a4988_ns.class_("A4988", stepper.Stepper, cg.Component)
@@ -17,7 +18,7 @@ CONFIG_SCHEMA = stepper.STEPPER_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await stepper.register_stepper(var, config)
diff --git a/esphome/components/absolute_humidity/sensor.py b/esphome/components/absolute_humidity/sensor.py
index caaa546e25..84a69dfa23 100644
--- a/esphome/components/absolute_humidity/sensor.py
+++ b/esphome/components/absolute_humidity/sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_GRAMS_PER_CUBIC_METER,
 )
+from esphome.types import ConfigType
 
 absolute_humidity_ns = cg.esphome_ns.namespace("absolute_humidity")
 AbsoluteHumidityComponent = absolute_humidity_ns.class_(
@@ -43,7 +44,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/ac_dimmer/output.py b/esphome/components/ac_dimmer/output.py
index 48bef2c317..498565b0ea 100644
--- a/esphome/components/ac_dimmer/output.py
+++ b/esphome/components/ac_dimmer/output.py
@@ -4,6 +4,7 @@ from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_METHOD, CONF_MIN_POWER
 from esphome.core import CORE
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@glmnet"]
 
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if CORE.is_esp32:
         from esphome.components.esp32 import include_builtin_idf_component
 
diff --git a/esphome/components/adalight/__init__.py b/esphome/components/adalight/__init__.py
index 5e122676cd..afdfefaba6 100644
--- a/esphome/components/adalight/__init__.py
+++ b/esphome/components/adalight/__init__.py
@@ -4,6 +4,9 @@ from esphome.components.light.effects import register_addressable_effect
 from esphome.components.light.types import AddressableLightEffect
 import esphome.config_validation as cv
 from esphome.const import CONF_NAME, CONF_UART_ID
+from esphome.core import ID
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -21,7 +24,7 @@ CONFIG_SCHEMA = cv.Schema({})
     "Adalight",
     {cv.GenerateID(CONF_UART_ID): cv.use_id(uart.UARTComponent)},
 )
-async def adalight_light_effect_to_code(config, effect_id):
+async def adalight_light_effect_to_code(config: ConfigType, effect_id: ID) -> MockObj:
     effect = cg.new_Pvariable(effect_id, config[CONF_NAME])
     await uart.register_uart_device(effect, config)
     return effect
diff --git a/esphome/components/adc128s102/__init__.py b/esphome/components/adc128s102/__init__.py
index a5281aacc7..684147752d 100644
--- a/esphome/components/adc128s102/__init__.py
+++ b/esphome/components/adc128s102/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
 MULTI_CONF = True
@@ -17,7 +18,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(spi.spi_device_schema(cs_pin_required=True))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/adc128s102/sensor/__init__.py b/esphome/components/adc128s102/sensor/__init__.py
index a65ae9d537..04589a7ce2 100644
--- a/esphome/components/adc128s102/sensor/__init__.py
+++ b/esphome/components/adc128s102/sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import sensor, voltage_sampler
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from .. import ADC128S102, adc128s102_ns
 
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(
         config[CONF_ID],
         config[CONF_CHANNEL],
diff --git a/esphome/components/addressable_light/display.py b/esphome/components/addressable_light/display.py
index 929d45121c..1db01b40f9 100644
--- a/esphome/components/addressable_light/display.py
+++ b/esphome/components/addressable_light/display.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_UPDATE_INTERVAL,
     CONF_WIDTH,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@justfalter"]
 
@@ -38,7 +39,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     wrapped_light = await cg.get_variable(config[CONF_ADDRESSABLE_LIGHT_ID])
     cg.add(var.set_width(config[CONF_WIDTH]))
diff --git a/esphome/components/ade7880/sensor.py b/esphome/components/ade7880/sensor.py
index beb74d7310..93c279e235 100644
--- a/esphome/components/ade7880/sensor.py
+++ b/esphome/components/ade7880/sensor.py
@@ -36,6 +36,7 @@ from esphome.const import (
     UNIT_WATT,
     UNIT_WATT_HOURS,
 )
+from esphome.cpp_generator import MockObj
 from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
@@ -243,7 +244,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def neutral_channel(config):
+async def neutral_channel(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
 
     current = config[CONF_CURRENT]
@@ -257,7 +258,7 @@ async def neutral_channel(config):
     return var
 
 
-async def power_channel(config):
+async def power_channel(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
 
     for sensor_type in POWER_SENSOR_TYPES:
@@ -280,7 +281,7 @@ async def power_channel(config):
     return var
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ade7953_base/__init__.py b/esphome/components/ade7953_base/__init__.py
index 4fc35352f9..71250ac94e 100644
--- a/esphome/components/ade7953_base/__init__.py
+++ b/esphome/components/ade7953_base/__init__.py
@@ -23,6 +23,8 @@ from esphome.const import (
     UNIT_VOLT_AMPS_REACTIVE,
     UNIT_WATT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@angelnu"]
 
@@ -163,7 +165,7 @@ ADE7953_CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def register_ade7953(var, config):
+async def register_ade7953(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
 
     if irq_pin_config := config.get(CONF_IRQ_PIN):
diff --git a/esphome/components/ade7953_i2c/sensor.py b/esphome/components/ade7953_i2c/sensor.py
index 4b55acdafa..8447042d30 100644
--- a/esphome/components/ade7953_i2c/sensor.py
+++ b/esphome/components/ade7953_i2c/sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ade7953_base, i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["ade7953_base"]
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await i2c.register_i2c_device(var, config)
     await ade7953_base.register_ade7953(var, config)
diff --git a/esphome/components/ade7953_spi/sensor.py b/esphome/components/ade7953_spi/sensor.py
index dce021daad..6fdf2147f3 100644
--- a/esphome/components/ade7953_spi/sensor.py
+++ b/esphome/components/ade7953_spi/sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ade7953_base, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
 AUTO_LOAD = ["ade7953_base"]
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await spi.register_spi_device(var, config)
     await ade7953_base.register_ade7953(var, config)
diff --git a/esphome/components/ads1115/__init__.py b/esphome/components/ads1115/__init__.py
index 6d52fc83fd..b42ee918c5 100644
--- a/esphome/components/ads1115/__init__.py
+++ b/esphome/components/ads1115/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 MULTI_CONF = True
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ads1115/sensor/__init__.py b/esphome/components/ads1115/sensor/__init__.py
index afb70d07c8..742f82d302 100644
--- a/esphome/components/ads1115/sensor/__init__.py
+++ b/esphome/components/ads1115/sensor/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 from .. import CONF_ADS1115_ID, ADS1115Component, ads1115_ns
 
@@ -86,7 +87,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await sensor.register_sensor(var, config)
     await cg.register_component(var, config)
diff --git a/esphome/components/ads1118/__init__.py b/esphome/components/ads1118/__init__.py
index 45d47a329e..956b9a0c1f 100644
--- a/esphome/components/ads1118/__init__.py
+++ b/esphome/components/ads1118/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@solomondg1"]
 DEPENDENCIES = ["spi"]
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/ads1118/sensor/__init__.py b/esphome/components/ads1118/sensor/__init__.py
index 33bfe97789..6bc3baa2e4 100644
--- a/esphome/components/ads1118/sensor/__init__.py
+++ b/esphome/components/ads1118/sensor/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 from .. import ADS1118, CONF_ADS1118_ID, ads1118_ns
 
@@ -86,7 +87,7 @@ CONFIG_SCHEMA = cv.typed_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await cg.register_parented(var, config[CONF_ADS1118_ID])
diff --git a/esphome/components/aht10/sensor.py b/esphome/components/aht10/sensor.py
index a5b1cf0ffb..ae669d0000 100644
--- a/esphome/components/aht10/sensor.py
+++ b/esphome/components/aht10/sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -50,7 +51,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/airthings_ble/__init__.py b/esphome/components/airthings_ble/__init__.py
index d0cb7631d2..44534b80e9 100644
--- a/esphome/components/airthings_ble/__init__.py
+++ b/esphome/components/airthings_ble/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ble_device_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base"]
 CODEOWNERS = ["@jeromelaban"]
@@ -21,6 +22,6 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/airthings_wave_base/__init__.py b/esphome/components/airthings_wave_base/__init__.py
index dee26b524a..58fde11a3d 100644
--- a/esphome/components/airthings_wave_base/__init__.py
+++ b/esphome/components/airthings_wave_base/__init__.py
@@ -20,6 +20,8 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ncareau", "@jeromelaban"]
 
@@ -78,7 +80,7 @@ BASE_SCHEMA = (
 )
 
 
-async def wave_base_to_code(var, config):
+async def wave_base_to_code(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
 
     await ble_client.register_ble_node(var, config)
diff --git a/esphome/components/airthings_wave_mini/sensor.py b/esphome/components/airthings_wave_mini/sensor.py
index f231be6670..9136b333e2 100644
--- a/esphome/components/airthings_wave_mini/sensor.py
+++ b/esphome/components/airthings_wave_mini/sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import airthings_wave_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = airthings_wave_base.DEPENDENCIES
 
@@ -20,6 +21,6 @@ CONFIG_SCHEMA = airthings_wave_base.BASE_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await airthings_wave_base.wave_base_to_code(var, config)
diff --git a/esphome/components/airthings_wave_plus/sensor.py b/esphome/components/airthings_wave_plus/sensor.py
index a12c70f04c..8ea79e644f 100644
--- a/esphome/components/airthings_wave_plus/sensor.py
+++ b/esphome/components/airthings_wave_plus/sensor.py
@@ -83,7 +83,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await airthings_wave_base.wave_base_to_code(var, config)
 
diff --git a/esphome/components/alpha3/sensor.py b/esphome/components/alpha3/sensor.py
index 279ab214cf..2c1a04ef27 100644
--- a/esphome/components/alpha3/sensor.py
+++ b/esphome/components/alpha3/sensor.py
@@ -20,6 +20,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 alpha3_ns = cg.esphome_ns.namespace("alpha3")
 Alpha3 = alpha3_ns.class_("Alpha3", ble_client.BLEClientNode, cg.PollingComponent)
@@ -68,7 +69,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_client.register_ble_node(var, config)
diff --git a/esphome/components/am2315c/sensor.py b/esphome/components/am2315c/sensor.py
index ec12ab717e..febb11409c 100644
--- a/esphome/components/am2315c/sensor.py
+++ b/esphome/components/am2315c/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -40,7 +41,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/am2320/sensor.py b/esphome/components/am2320/sensor.py
index ed4a5fd922..ffac0e6407 100644
--- a/esphome/components/am2320/sensor.py
+++ b/esphome/components/am2320/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/am43/cover/__init__.py b/esphome/components/am43/cover/__init__.py
index e4ecf1444f..d1783b77df 100644
--- a/esphome/components/am43/cover/__init__.py
+++ b/esphome/components/am43/cover/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ble_client, cover
 import esphome.config_validation as cv
 from esphome.const import CONF_PIN
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@buxtronix"]
 DEPENDENCIES = ["ble_client"]
@@ -27,7 +28,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await cover.new_cover(config)
     cg.add(var.set_pin(config[CONF_PIN]))
     cg.add(var.set_invert_position(config[CONF_INVERT_POSITION]))
diff --git a/esphome/components/am43/sensor/__init__.py b/esphome/components/am43/sensor/__init__.py
index 2697d364ad..80341972a9 100644
--- a/esphome/components/am43/sensor/__init__.py
+++ b/esphome/components/am43/sensor/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["am43"]
 CODEOWNERS = ["@buxtronix"]
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_client.register_ble_node(var, config)
diff --git a/esphome/components/analog_threshold/binary_sensor.py b/esphome/components/analog_threshold/binary_sensor.py
index 8c13727755..b2de1d6184 100644
--- a/esphome/components/analog_threshold/binary_sensor.py
+++ b/esphome/components/analog_threshold/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor, sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_SENSOR_ID, CONF_THRESHOLD
+from esphome.types import ConfigType
 
 analog_threshold_ns = cg.esphome_ns.namespace("analog_threshold")
 
@@ -32,7 +33,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/anova/climate.py b/esphome/components/anova/climate.py
index e1fd38fddc..5590b18a83 100644
--- a/esphome/components/anova/climate.py
+++ b/esphome/components/anova/climate.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ble_client, climate
 import esphome.config_validation as cv
 from esphome.const import CONF_UNIT_OF_MEASUREMENT
+from esphome.types import ConfigType
 
 UNITS = {
     "f": "f",
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate.new_climate(config)
     await cg.register_component(var, config)
     await ble_client.register_ble_node(var, config)
diff --git a/esphome/components/apds9306/sensor.py b/esphome/components/apds9306/sensor.py
index c3cba96fbf..4f165eec0b 100644
--- a/esphome/components/apds9306/sensor.py
+++ b/esphome/components/apds9306/sensor.py
@@ -1,6 +1,8 @@
 # Based on this datasheet:
 # https://www.mouser.ca/datasheet/2/678/AVGO_S_A0002854364_1-2574547.pdf
 
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
@@ -11,6 +13,8 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_LUX,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -55,7 +59,7 @@ AMBIENT_LIGHT_GAINS = {
 }
 
 
-def _validate_measurement_rate(value):
+def _validate_measurement_rate(value: Any) -> MockObj:
     value = cv.positive_time_period_milliseconds(value)
     return cv.enum(MEASUREMENT_RATES, int=True)(value.total_milliseconds)
 
@@ -85,7 +89,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/aqi/sensor.py b/esphome/components/aqi/sensor.py
index 9c361560df..a98d977227 100644
--- a/esphome/components/aqi/sensor.py
+++ b/esphome/components/aqi/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     DEVICE_CLASS_AQI,
     STATE_CLASS_MEASUREMENT,
 )
+from esphome.types import ConfigType
 
 from . import AQI_CALCULATION_TYPE, CONF_CALCULATION_TYPE, CONF_EXTENDED_RANGE, aqi_ns
 
@@ -16,7 +17,7 @@ DEPENDENCIES = ["sensor"]
 AQISensor = aqi_ns.class_("AQISensor", sensor.Sensor, cg.Component)
 
 
-def _validate_extended_range(config):
+def _validate_extended_range(config: ConfigType) -> ConfigType:
     if CONF_EXTENDED_RANGE in config and config[CONF_CALCULATION_TYPE] == "CAQI":
         raise cv.Invalid(
             f"'{CONF_EXTENDED_RANGE}' is not supported with 'calculation_type: CAQI'. "
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/as3935_i2c/__init__.py b/esphome/components/as3935_i2c/__init__.py
index 09b588cb0c..83924de760 100644
--- a/esphome/components/as3935_i2c/__init__.py
+++ b/esphome/components/as3935_i2c/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import as3935, i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["as3935"]
 DEPENDENCIES = ["i2c"]
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await as3935.setup_as3935(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/as3935_spi/__init__.py b/esphome/components/as3935_spi/__init__.py
index f4cf07a906..332a51c7a9 100644
--- a/esphome/components/as3935_spi/__init__.py
+++ b/esphome/components/as3935_spi/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import as3935, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["as3935"]
 DEPENDENCIES = ["spi"]
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await as3935.setup_as3935(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/as7341/sensor.py b/esphome/components/as7341/sensor.py
index 8b6cf61028..f70c5e999f 100644
--- a/esphome/components/as7341/sensor.py
+++ b/esphome/components/as7341/sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     ICON_BRIGHTNESS_5,
     STATE_CLASS_MEASUREMENT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@mrgnr"]
 DEPENDENCIES = ["i2c"]
@@ -96,7 +97,7 @@ SENSORS = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/async_tcp/__init__.py b/esphome/components/async_tcp/__init__.py
index 22d544ba37..31007022d5 100644
--- a/esphome/components/async_tcp/__init__.py
+++ b/esphome/components/async_tcp/__init__.py
@@ -2,6 +2,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
 DEPENDENCIES = ["network"]
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = cv.Schema({})
 
 
 @coroutine_with_priority(CoroPriority.NETWORK_TRANSPORT)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if CORE.is_esp32:
         # https://github.com/ESP32Async/AsyncTCP
         from esphome.components.esp32 import add_idf_component
diff --git a/esphome/components/atc_mithermometer/sensor.py b/esphome/components/atc_mithermometer/sensor.py
index 5c2d75753c..184b2e8733 100644
--- a/esphome/components/atc_mithermometer/sensor.py
+++ b/esphome/components/atc_mithermometer/sensor.py
@@ -21,6 +21,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ahpohl"]
 
@@ -77,7 +78,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/atm90e26/sensor.py b/esphome/components/atm90e26/sensor.py
index 5941cb35b4..87db214233 100644
--- a/esphome/components/atm90e26/sensor.py
+++ b/esphome/components/atm90e26/sensor.py
@@ -30,6 +30,7 @@ from esphome.const import (
     UNIT_WATT,
     UNIT_WATT_HOURS,
 )
+from esphome.types import ConfigType
 
 CONF_METER_CONSTANT = "meter_constant"
 CONF_PL_CONST = "pl_const"
@@ -123,7 +124,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/axs15231/touchscreen/__init__.py b/esphome/components/axs15231/touchscreen/__init__.py
index 8c18d8ca75..2616cb281b 100644
--- a/esphome/components/axs15231/touchscreen/__init__.py
+++ b/esphome/components/axs15231/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+from esphome.types import ConfigType
 
 from .. import axs15231_ns
 
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/b_parasite/sensor.py b/esphome/components/b_parasite/sensor.py
index 673c5981b7..cb8f569c0d 100644
--- a/esphome/components/b_parasite/sensor.py
+++ b/esphome/components/b_parasite/sensor.py
@@ -20,6 +20,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@rbaron"]
 
@@ -74,7 +75,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/ballu/climate.py b/esphome/components/ballu/climate.py
index 1127084632..c4d64cd692 100644
--- a/esphome/components/ballu/climate.py
+++ b/esphome/components/ballu/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 CODEOWNERS = ["@bazuchan"]
@@ -10,5 +11,5 @@ BalluClimate = ballu_ns.class_("BalluClimate", climate_ir.ClimateIR)
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(BalluClimate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/bang_bang/climate.py b/esphome/components/bang_bang/climate.py
index bfdb12278f..65c5eaed18 100644
--- a/esphome/components/bang_bang/climate.py
+++ b/esphome/components/bang_bang/climate.py
@@ -12,6 +12,7 @@ from esphome.const import (
     CONF_IDLE_ACTION,
     CONF_SENSOR,
 )
+from esphome.types import ConfigType
 
 bang_bang_ns = cg.esphome_ns.namespace("bang_bang")
 BangBangClimate = bang_bang_ns.class_("BangBangClimate", climate.Climate, cg.Component)
@@ -41,7 +42,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate.new_climate(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/beken_spi_led_strip/light.py b/esphome/components/beken_spi_led_strip/light.py
index 2be5842818..5576f286f1 100644
--- a/esphome/components/beken_spi_led_strip/light.py
+++ b/esphome/components/beken_spi_led_strip/light.py
@@ -56,7 +56,7 @@ SUPPORTED_PINS = {
 }
 
 
-def _validate_pin(value):
+def _validate_pin(value: int) -> int:
     family = libretiny.get_libretiny_family()
     if family not in SUPPORTED_PINS:
         raise cv.Invalid(f"Chip family {family} is not supported.")
diff --git a/esphome/components/bh1750/sensor.py b/esphome/components/bh1750/sensor.py
index 36af5aeef9..07272b3b4f 100644
--- a/esphome/components/bh1750/sensor.py
+++ b/esphome/components/bh1750/sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_ILLUMINANCE, STATE_CLASS_MEASUREMENT, UNIT_LUX
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@OttoWinter"]
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/bh1900nux/sensor.py b/esphome/components/bh1900nux/sensor.py
index a70db3555a..4ddffb7940 100644
--- a/esphome/components/bh1900nux/sensor.py
+++ b/esphome/components/bh1900nux/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@B48D81EFCC"]
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/binary/fan/__init__.py b/esphome/components/binary/fan/__init__.py
index dadcf52372..03a03ec7ca 100644
--- a/esphome/components/binary/fan/__init__.py
+++ b/esphome/components/binary/fan/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import fan, output
 import esphome.config_validation as cv
 from esphome.const import CONF_DIRECTION_OUTPUT, CONF_OSCILLATION_OUTPUT, CONF_OUTPUT
+from esphome.types import ConfigType
 
 from .. import binary_ns
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await fan.new_fan(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/binary/light/__init__.py b/esphome/components/binary/light/__init__.py
index ebb22f4409..b6eddac341 100644
--- a/esphome/components/binary/light/__init__.py
+++ b/esphome/components/binary/light/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import light, output
 import esphome.config_validation as cv
 from esphome.const import CONF_OUTPUT, CONF_OUTPUT_ID
+from esphome.types import ConfigType
 
 from .. import binary_ns
 
@@ -15,7 +16,7 @@ CONFIG_SCHEMA = light.BINARY_LIGHT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await light.register_light(var, config)
 
diff --git a/esphome/components/binary_sensor_map/sensor.py b/esphome/components/binary_sensor_map/sensor.py
index 965e332e28..f3133c0621 100644
--- a/esphome/components/binary_sensor_map/sensor.py
+++ b/esphome/components/binary_sensor_map/sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_VALUE,
     ICON_CHECK_CIRCLE_OUTLINE,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["binary_sensor"]
 
@@ -82,7 +83,7 @@ CONFIG_SCHEMA = cv.typed_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/bk72xx/__init__.py b/esphome/components/bk72xx/__init__.py
index ee9bf1e0d4..e64237c95a 100644
--- a/esphome/components/bk72xx/__init__.py
+++ b/esphome/components/bk72xx/__init__.py
@@ -28,6 +28,8 @@ from esphome.components.libretiny.const import (
     LibreTinyComponent,
 )
 from esphome.core import CORE
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from .boards import BK72XX_BOARD_PINS, BK72XX_BOARDS
 
@@ -45,7 +47,7 @@ COMPONENT_DATA = LibreTinyComponent(
 )
 
 
-def _set_core_data(config):
+def _set_core_data(config: ConfigType) -> ConfigType:
     CORE.data[KEY_LIBRETINY] = {}
     CORE.data[KEY_LIBRETINY][KEY_COMPONENT_DATA] = COMPONENT_DATA
     return config
@@ -62,12 +64,12 @@ PIN_SCHEMA = libretiny.gpio.BASE_PIN_SCHEMA
 CONFIG_SCHEMA.prepend_extra(_set_core_data)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> MockObj:
     return await libretiny.component_to_code(config)
 
 
 @pins.PIN_SCHEMA_REGISTRY.register("bk72xx", PIN_SCHEMA)
-async def pin_to_code(config):
+async def pin_to_code(config: ConfigType) -> MockObj:
     return await libretiny.gpio.component_pin_to_code(config)
 
 
diff --git a/esphome/components/bl0939/sensor.py b/esphome/components/bl0939/sensor.py
index bd4bdd93e5..ec17ef2c7e 100644
--- a/esphome/components/bl0939/sensor.py
+++ b/esphome/components/bl0939/sensor.py
@@ -15,6 +15,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -88,7 +89,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/bl0942/sensor.py b/esphome/components/bl0942/sensor.py
index f9fe7f5a5e..5531fe411b 100644
--- a/esphome/components/bl0942/sensor.py
+++ b/esphome/components/bl0942/sensor.py
@@ -24,6 +24,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 CONF_CURRENT_REFERENCE = "current_reference"
 CONF_ENERGY_REFERENCE = "energy_reference"
@@ -95,7 +96,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/ble_device_base/automation.py b/esphome/components/ble_device_base/automation.py
index eb63061a8d..6acc4edb92 100644
--- a/esphome/components/ble_device_base/automation.py
+++ b/esphome/components/ble_device_base/automation.py
@@ -1,5 +1,6 @@
 """Shared codegen for the neutral BLE advertisement triggers (automation.h)."""
 
+from collections.abc import Callable
 from typing import Any
 
 from esphome import automation
@@ -52,7 +53,7 @@ _UUID_WIDTHS = {
 
 def uuid_trigger_schema(
     trigger_class: MockObjClass, extra: dict[Any, Any] | None = None
-):
+) -> Callable[[Any], Any]:
     """Schema for a UUID-filtered trigger — pairs with uuid_trigger_to_code().
 
     `extra` carries the required UUID key (a cv marker, so a dict rather than
@@ -68,7 +69,7 @@ def uuid_trigger_schema(
     )
 
 
-def advertise_trigger_schema(trigger_class: MockObjClass):
+def advertise_trigger_schema(trigger_class: MockObjClass) -> Callable[[Any], Any]:
     """on_ble_advertise schema: multi-mac list filter, unlike the single-mac
     uuid_trigger_schema() — pairs with advertise_trigger_to_code()."""
     return automation.validate_automation(
@@ -79,7 +80,7 @@ def advertise_trigger_schema(trigger_class: MockObjClass):
     )
 
 
-def scan_end_trigger_schema(trigger_class: MockObjClass):
+def scan_end_trigger_schema(trigger_class: MockObjClass) -> Callable[[Any], Any]:
     """on_scan_end schema: id only — pairs with scan_end_trigger_to_code()."""
     return automation.validate_automation(
         {cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(trigger_class)}
diff --git a/esphome/components/ble_presence/binary_sensor.py b/esphome/components/ble_presence/binary_sensor.py
index a7713d9a4b..a43d3561f8 100644
--- a/esphome/components/ble_presence/binary_sensor.py
+++ b/esphome/components/ble_presence/binary_sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_SERVICE_UUID,
     CONF_TIMEOUT,
 )
+from esphome.types import ConfigType
 
 CONF_IRK = "irk"
 
@@ -24,7 +25,7 @@ BLEPresenceDevice = ble_presence_ns.class_(
 )
 
 
-def _validate(config):
+def _validate(config: ConfigType) -> ConfigType:
     if CONF_IBEACON_MAJOR in config and CONF_IBEACON_UUID not in config:
         raise cv.Invalid("iBeacon major identifier requires iBeacon UUID")
     if CONF_IBEACON_MINOR in config and CONF_IBEACON_UUID not in config:
@@ -58,7 +59,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/ble_rssi/sensor.py b/esphome/components/ble_rssi/sensor.py
index 43e5813ea2..6813505d58 100644
--- a/esphome/components/ble_rssi/sensor.py
+++ b/esphome/components/ble_rssi/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_DECIBEL_MILLIWATT,
 )
+from esphome.types import ConfigType
 
 CONF_IRK = "irk"
 
@@ -22,7 +23,7 @@ BLERSSISensor = ble_rssi_ns.class_(
 )
 
 
-def _validate(config):
+def _validate(config: ConfigType) -> ConfigType:
     if CONF_IBEACON_MAJOR in config and CONF_IBEACON_UUID not in config:
         raise cv.Invalid("iBeacon major identifier requires iBeacon UUID")
     if CONF_IBEACON_MINOR in config and CONF_IBEACON_UUID not in config:
@@ -58,7 +59,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/ble_scanner/text_sensor.py b/esphome/components/ble_scanner/text_sensor.py
index 0c08e1f734..0c60b53783 100644
--- a/esphome/components/ble_scanner/text_sensor.py
+++ b/esphome/components/ble_scanner/text_sensor.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import ble_device_base, text_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base"]
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await text_sensor.new_text_sensor(config)
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/bluetooth_proxy/__init__.py b/esphome/components/bluetooth_proxy/__init__.py
index 95f71fc8ea..1b761849a5 100644
--- a/esphome/components/bluetooth_proxy/__init__.py
+++ b/esphome/components/bluetooth_proxy/__init__.py
@@ -92,7 +92,7 @@ def _esp32_config_schema() -> cv.All:
 
     CONNECTION_SCHEMA = bluetooth_connection.hub_connection_schema(PLATFORM_ESP32)
 
-    def validate_connections(config):
+    def validate_connections(config: ConfigType) -> ConfigType:
         if CONF_CONNECTIONS in config:
             if not config[CONF_ACTIVE]:
                 raise cv.Invalid(
diff --git a/esphome/components/bme280_base/__init__.py b/esphome/components/bme280_base/__init__.py
index c37191bc07..287946801e 100644
--- a/esphome/components/bme280_base/__init__.py
+++ b/esphome/components/bme280_base/__init__.py
@@ -16,6 +16,8 @@ from esphome.const import (
     UNIT_HECTOPASCAL,
     UNIT_PERCENT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
 
@@ -84,7 +86,7 @@ CONFIG_SCHEMA_BASE = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def to_code_base(config):
+async def to_code_base(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/bme280_i2c/sensor.py b/esphome/components/bme280_i2c/sensor.py
index 1c37033613..536e8ec794 100644
--- a/esphome/components/bme280_i2c/sensor.py
+++ b/esphome/components/bme280_i2c/sensor.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from ..bme280_base import CONFIG_SCHEMA_BASE, to_code_base
 
@@ -17,6 +18,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
 ).extend({cv.GenerateID(): cv.declare_id(BME280I2CComponent)})
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/bme280_spi/sensor.py b/esphome/components/bme280_spi/sensor.py
index 7f4fb5cf44..1d53fe25fa 100644
--- a/esphome/components/bme280_spi/sensor.py
+++ b/esphome/components/bme280_spi/sensor.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import spi
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from ..bme280_base import CONFIG_SCHEMA_BASE, to_code_base
 
@@ -19,6 +20,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(spi.spi_device_schema()).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/bme680/sensor.py b/esphome/components/bme680/sensor.py
index f41aefcec3..dce5c88cfa 100644
--- a/esphome/components/bme680/sensor.py
+++ b/esphome/components/bme680/sensor.py
@@ -22,6 +22,7 @@ from esphome.const import (
     UNIT_OHM,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -125,7 +126,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/bme68x_bsec2_i2c/__init__.py b/esphome/components/bme68x_bsec2_i2c/__init__.py
index dacd4e32ad..1da3bdbd6c 100644
--- a/esphome/components/bme68x_bsec2_i2c/__init__.py
+++ b/esphome/components/bme68x_bsec2_i2c/__init__.py
@@ -6,6 +6,7 @@ from esphome.components.bme68x_bsec2 import (
     to_code_base,
 )
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@neffs", "@kbx81"]
 
@@ -29,6 +30,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
 ).extend(i2c.i2c_device_schema(0x76))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/bmi160/sensor.py b/esphome/components/bmi160/sensor.py
index cc4037c1ee..4309f0a79f 100644
--- a/esphome/components/bmi160/sensor.py
+++ b/esphome/components/bmi160/sensor.py
@@ -22,6 +22,7 @@ from esphome.const import (
     UNIT_DEGREE_PER_SECOND,
     UNIT_METER_PER_SECOND_SQUARED,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -82,7 +83,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/bmi270/motion.py b/esphome/components/bmi270/motion.py
index c1616665f9..ad36e592d1 100644
--- a/esphome/components/bmi270/motion.py
+++ b/esphome/components/bmi270/motion.py
@@ -8,6 +8,7 @@ from esphome.components.const import (
 )
 from esphome.components.motion import motion_schema, new_motion_component
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from . import BMI270Component, bmi270_ns
 
@@ -79,7 +80,7 @@ CONFIG_SCHEMA = (
 
 
 #  Code generation
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await new_motion_component(config)
     await i2c.register_i2c_device(var, config)
 
diff --git a/esphome/components/bmi270/sensor.py b/esphome/components/bmi270/sensor.py
index 69235ed8dc..0e1b0604a3 100644
--- a/esphome/components/bmi270/sensor.py
+++ b/esphome/components/bmi270/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
 )
 from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_BMI270_ID, BMI270Component
 
@@ -30,7 +31,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     parent = await cg.get_variable(config[CONF_BMI270_ID])
     data = MockObj("data")
diff --git a/esphome/components/bmp085/sensor.py b/esphome/components/bmp085/sensor.py
index 6e51984e1f..e4e559844e 100644
--- a/esphome/components/bmp085/sensor.py
+++ b/esphome/components/bmp085/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_HECTOPASCAL,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/bmp280_base/__init__.py b/esphome/components/bmp280_base/__init__.py
index d612920dd4..c0f0ae90bf 100644
--- a/esphome/components/bmp280_base/__init__.py
+++ b/esphome/components/bmp280_base/__init__.py
@@ -13,6 +13,8 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_HECTOPASCAL,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ademuri"]
 
@@ -69,7 +71,7 @@ CONFIG_SCHEMA_BASE = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def to_code_base(config):
+async def to_code_base(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/bmp280_i2c/sensor.py b/esphome/components/bmp280_i2c/sensor.py
index 3ff556d51a..8e3c14f50a 100644
--- a/esphome/components/bmp280_i2c/sensor.py
+++ b/esphome/components/bmp280_i2c/sensor.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from ..bmp280_base import CONFIG_SCHEMA_BASE, to_code_base
 
@@ -18,6 +19,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
 ).extend({cv.GenerateID(): cv.declare_id(BMP280I2CComponent)})
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/bmp280_spi/sensor.py b/esphome/components/bmp280_spi/sensor.py
index b3678ec01d..d97a6ea579 100644
--- a/esphome/components/bmp280_spi/sensor.py
+++ b/esphome/components/bmp280_spi/sensor.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import spi
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from ..bmp280_base import CONFIG_SCHEMA_BASE, to_code_base
 
@@ -18,6 +19,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
 ).extend({cv.GenerateID(): cv.declare_id(BMP280SPIComponent)})
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/bmp3xx_base/__init__.py b/esphome/components/bmp3xx_base/__init__.py
index c31db31761..75e168378e 100644
--- a/esphome/components/bmp3xx_base/__init__.py
+++ b/esphome/components/bmp3xx_base/__init__.py
@@ -13,6 +13,8 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_HECTOPASCAL,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@martgras", "@latonita"]
 
@@ -73,7 +75,7 @@ CONFIG_SCHEMA_BASE = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def to_code_base(config):
+async def to_code_base(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/bmp3xx_i2c/sensor.py b/esphome/components/bmp3xx_i2c/sensor.py
index 6fed9fc9ee..46e50ea39f 100644
--- a/esphome/components/bmp3xx_i2c/sensor.py
+++ b/esphome/components/bmp3xx_i2c/sensor.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import i2c
+from esphome.types import ConfigType
 
 from ..bmp3xx_base import CONFIG_SCHEMA_BASE, cv, to_code_base
 
@@ -18,6 +19,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
 ).extend({cv.GenerateID(): cv.declare_id(BMP3XXI2CComponent)})
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/bmp3xx_spi/sensor.py b/esphome/components/bmp3xx_spi/sensor.py
index 22aab71977..fb3580bbad 100644
--- a/esphome/components/bmp3xx_spi/sensor.py
+++ b/esphome/components/bmp3xx_spi/sensor.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import spi
+from esphome.types import ConfigType
 
 from ..bmp3xx_base import CONFIG_SCHEMA_BASE, cv, to_code_base
 
@@ -18,6 +19,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(spi.spi_device_schema()).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/bmp581_base/__init__.py b/esphome/components/bmp581_base/__init__.py
index 6a7cf45089..1c2c5c37d4 100644
--- a/esphome/components/bmp581_base/__init__.py
+++ b/esphome/components/bmp581_base/__init__.py
@@ -15,6 +15,8 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PASCAL,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kahrendt", "@danielkent-net"]
 
@@ -47,7 +49,7 @@ IIR_FILTER_OPTIONS = {
 BMP581Component = bmp581_ns.class_("BMP581Component", cg.PollingComponent)
 
 
-def compute_measurement_conversion_time(config):
+def compute_measurement_conversion_time(config: ConfigType) -> int:
     # - adds up sensor conversion time based on temperature and pressure oversampling rates given in datasheet
     # - returns a rounded up time in ms
 
@@ -132,7 +134,7 @@ CONFIG_SCHEMA_BASE = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def to_code_base(config):
+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):
diff --git a/esphome/components/bmp581_i2c/sensor.py b/esphome/components/bmp581_i2c/sensor.py
index 42645022a6..b4cd00325d 100644
--- a/esphome/components/bmp581_i2c/sensor.py
+++ b/esphome/components/bmp581_i2c/sensor.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from ..bmp581_base import CONFIG_SCHEMA_BASE, to_code_base
 
@@ -18,6 +19,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
 ).extend({cv.GenerateID(): cv.declare_id(BMP581I2CComponent)})
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/bmp581_spi/sensor.py b/esphome/components/bmp581_spi/sensor.py
index db0d0cd529..435c5cd6f9 100644
--- a/esphome/components/bmp581_spi/sensor.py
+++ b/esphome/components/bmp581_spi/sensor.py
@@ -4,6 +4,7 @@ import esphome.codegen as cg
 from esphome.components import spi
 from esphome.components.spi import CONF_SPI_MODE
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from ..bmp581_base import CONFIG_SCHEMA_BASE, to_code_base
 
@@ -28,7 +29,7 @@ BMP581SPIComponent = bmp581_ns.class_(
 )
 
 
-def check_spi_mode(config):
+def check_spi_mode(config: ConfigType) -> ConfigType:
     spi_mode = config.get(CONF_SPI_MODE)
     if spi_mode not in VALID_SPI_MODES:
         raise cv.Invalid("BMP581 only supports SPI mode 0 or mode 3")
@@ -43,6 +44,6 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/bp1658cj/__init__.py b/esphome/components/bp1658cj/__init__.py
index dc80c67b44..b45272d2ea 100644
--- a/esphome/components/bp1658cj/__init__.py
+++ b/esphome/components/bp1658cj/__init__.py
@@ -2,6 +2,7 @@ from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_CLOCK_PIN, CONF_DATA_PIN, CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Cossid"]
 MULTI_CONF = True
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/bp1658cj/output.py b/esphome/components/bp1658cj/output.py
index 78cf717aba..93e3c75daf 100644
--- a/esphome/components/bp1658cj/output.py
+++ b/esphome/components/bp1658cj/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from . import BP1658CJ
 
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
 
diff --git a/esphome/components/bp5758d/__init__.py b/esphome/components/bp5758d/__init__.py
index af78b38ef5..fa4e8a231b 100644
--- a/esphome/components/bp5758d/__init__.py
+++ b/esphome/components/bp5758d/__init__.py
@@ -2,6 +2,7 @@ from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_CLOCK_PIN, CONF_DATA_PIN, CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Cossid"]
 MULTI_CONF = True
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/bp5758d/output.py b/esphome/components/bp5758d/output.py
index 9adf13de55..bbca7c18cc 100644
--- a/esphome/components/bp5758d/output.py
+++ b/esphome/components/bp5758d/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_CURRENT, CONF_ID
+from esphome.types import ConfigType
 
 from . import BP5758D
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
 
diff --git a/esphome/components/cap1188/__init__.py b/esphome/components/cap1188/__init__.py
index cde9dd46ae..eff0a05163 100644
--- a/esphome/components/cap1188/__init__.py
+++ b/esphome/components/cap1188/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_RESET_PIN
+from esphome.types import ConfigType
 
 CONF_TOUCH_THRESHOLD = "touch_threshold"
 CONF_ALLOW_MULTIPLE_TOUCHES = "allow_multiple_touches"
@@ -32,7 +33,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_touch_threshold(config[CONF_TOUCH_THRESHOLD]))
     cg.add(var.set_allow_multiple_touches(config[CONF_ALLOW_MULTIPLE_TOUCHES]))
diff --git a/esphome/components/cap1188/binary_sensor.py b/esphome/components/cap1188/binary_sensor.py
index b7af53638a..21fd98ed41 100644
--- a/esphome/components/cap1188/binary_sensor.py
+++ b/esphome/components/cap1188/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL
+from esphome.types import ConfigType
 
 from . import CONF_CAP1188_ID, CAP1188Component, cap1188_ns
 
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(CAP1188Channel).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     hub = await cg.get_variable(config[CONF_CAP1188_ID])
     cg.add(var.set_channel(config[CONF_CHANNEL]))
diff --git a/esphome/components/captive_portal/__init__.py b/esphome/components/captive_portal/__init__.py
index 8e5274f58f..e490d89062 100644
--- a/esphome/components/captive_portal/__init__.py
+++ b/esphome/components/captive_portal/__init__.py
@@ -93,7 +93,7 @@ FINAL_VALIDATE_SCHEMA = _final_validate
 
 
 @coroutine_with_priority(CoroPriority.CAPTIVE_PORTAL)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_WEB_SERVER_BASE_ID])
 
     var = cg.new_Pvariable(config[CONF_ID], paren)
diff --git a/esphome/components/ccs811/sensor.py b/esphome/components/ccs811/sensor.py
index d9023a415f..d134d2cf21 100644
--- a/esphome/components/ccs811/sensor.py
+++ b/esphome/components/ccs811/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     UNIT_PARTS_PER_BILLION,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["text_sensor"]
 CODEOWNERS = ["@habbie"]
@@ -59,7 +60,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/cd74hc4067/__init__.py b/esphome/components/cd74hc4067/__init__.py
index af6866df78..5f7778e186 100644
--- a/esphome/components/cd74hc4067/__init__.py
+++ b/esphome/components/cd74hc4067/__init__.py
@@ -2,6 +2,7 @@ from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_DELAY, CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["sensor", "voltage_sampler"]
 CODEOWNERS = ["@asoehlke"]
@@ -33,7 +34,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/cd74hc4067/sensor.py b/esphome/components/cd74hc4067/sensor.py
index dceaf6f371..670b050271 100644
--- a/esphome/components/cd74hc4067/sensor.py
+++ b/esphome/components/cd74hc4067/sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 from . import CD74HC4067Component, cd74hc4067_ns
 
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_CD74HC4067_ID])
 
     var = cg.new_Pvariable(config[CONF_ID], parent)
diff --git a/esphome/components/ch422g/__init__.py b/esphome/components/ch422g/__init__.py
index 6a7bace0a2..7f0c5bb95e 100644
--- a/esphome/components/ch422g/__init__.py
+++ b/esphome/components/ch422g/__init__.py
@@ -13,6 +13,8 @@ from esphome.const import (
     CONF_OPEN_DRAIN,
     CONF_OUTPUT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesterret", "@clydebarrow"]
 DEPENDENCIES = ["i2c"]
@@ -35,7 +37,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     # Can't use register_i2c_device because there is no CONF_ADDRESS
@@ -44,7 +46,7 @@ async def to_code(config):
 
 
 # This is used as a final validation step so that modes have been fully transformed.
-def pin_mode_check(pin_config, _):
+def pin_mode_check(pin_config: ConfigType, _: ConfigType) -> None:
     if pin_config[CONF_MODE][CONF_INPUT] and pin_config[CONF_NUMBER] >= 8:
         raise cv.Invalid("CH422G only supports input on pins 0-7")
     if pin_config[CONF_MODE][CONF_OPEN_DRAIN] and pin_config[CONF_NUMBER] < 8:
@@ -63,7 +65,7 @@ CH422G_PIN_SCHEMA = pins.gpio_base_schema(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_CH422G, CH422G_PIN_SCHEMA, pin_mode_check)
-async def ch422g_pin_to_code(config):
+async def ch422g_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_CH422G])
 
diff --git a/esphome/components/ch423/__init__.py b/esphome/components/ch423/__init__.py
index e3990ee631..9fbf3ea515 100644
--- a/esphome/components/ch423/__init__.py
+++ b/esphome/components/ch423/__init__.py
@@ -14,6 +14,8 @@ from esphome.const import (
     CONF_OUTPUT,
 )
 from esphome.core import CORE
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@dwmw2"]
 DEPENDENCIES = ["i2c"]
@@ -36,7 +38,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     # Can't use register_i2c_device because there is no CONF_ADDRESS
@@ -45,7 +47,7 @@ async def to_code(config):
 
 
 # This is used as a final validation step so that modes have been fully transformed.
-def pin_mode_check(pin_config, _):
+def pin_mode_check(pin_config: ConfigType, _: ConfigType) -> None:
     if pin_config[CONF_MODE][CONF_INPUT] and pin_config[CONF_NUMBER] >= 8:
         raise cv.Invalid("CH423 only supports input on pins 0-7")
     if pin_config[CONF_MODE][CONF_OPEN_DRAIN] and pin_config[CONF_NUMBER] < 8:
@@ -90,7 +92,7 @@ CH423_PIN_SCHEMA = pins.gpio_base_schema(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_CH423, CH423_PIN_SCHEMA, pin_mode_check)
-async def ch423_pin_to_code(config):
+async def ch423_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_CH423])
 
diff --git a/esphome/components/chsc6x/touchscreen.py b/esphome/components/chsc6x/touchscreen.py
index 759e38609e..de974d2a79 100644
--- a/esphome/components/chsc6x/touchscreen.py
+++ b/esphome/components/chsc6x/touchscreen.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN
+from esphome.types import ConfigType
 
 chsc6x_ns = cg.esphome_ns.namespace("chsc6x")
 
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/climate_ir/__init__.py b/esphome/components/climate_ir/__init__.py
index 5315be3db6..0667bd91a2 100644
--- a/esphome/components/climate_ir/__init__.py
+++ b/esphome/components/climate_ir/__init__.py
@@ -9,7 +9,8 @@ from esphome.const import (
     CONF_SUPPORTS_COOL,
     CONF_SUPPORTS_HEAT,
 )
-from esphome.cpp_generator import MockObjClass
+from esphome.cpp_generator import MockObj, MockObjClass
+from esphome.types import ConfigType, SafeExpType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -57,7 +58,7 @@ def climate_ir_with_receiver_schema(
     )
 
 
-async def register_climate_ir(var, config):
+async def register_climate_ir(var: MockObj, config: ConfigType) -> None:
     await cg.register_component(var, config)
     await remote_base.register_transmittable(var, config)
     cg.add(var.set_supports_cool(config[CONF_SUPPORTS_COOL]))
@@ -72,7 +73,7 @@ async def register_climate_ir(var, config):
         cg.add(var.set_humidity_sensor(sens))
 
 
-async def new_climate_ir(config, *args):
+async def new_climate_ir(config: ConfigType, *args: SafeExpType) -> MockObj:
     var = await climate.new_climate(config, *args)
     await register_climate_ir(var, config)
     return var
diff --git a/esphome/components/climate_ir_lg/climate.py b/esphome/components/climate_ir_lg/climate.py
index 9c832642ce..48fd373b78 100644
--- a/esphome/components/climate_ir_lg/climate.py
+++ b/esphome/components/climate_ir_lg/climate.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 
@@ -34,7 +35,7 @@ CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(LgIrClimate).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate_ir.new_climate_ir(config)
 
     cg.add(var.set_header_high(config[CONF_HEADER_HIGH]))
diff --git a/esphome/components/color_temperature/light.py b/esphome/components/color_temperature/light.py
index 045ab265cd..7686ede155 100644
--- a/esphome/components/color_temperature/light.py
+++ b/esphome/components/color_temperature/light.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_OUTPUT_ID,
     CONF_WARM_WHITE_COLOR_TEMPERATURE,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await light.register_light(var, config)
 
diff --git a/esphome/components/combination/sensor.py b/esphome/components/combination/sensor.py
index 327cedee1e..ccc5a03964 100644
--- a/esphome/components/combination/sensor.py
+++ b/esphome/components/combination/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     CONF_UNIT_OF_MEASUREMENT,
 )
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -74,7 +75,7 @@ KALMAN_SOURCE_SCHEMA = cv.Schema(
 )
 
 
-def _migrate_coeffecient(config):
+def _migrate_coeffecient(config: ConfigType) -> ConfigType:
     """Migrate deprecated 'coeffecient' spelling to 'coefficient'."""
     if CONF_COEFFECIENT in config:
         if CONF_COEFFICIENT in config:
@@ -172,7 +173,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await sensor.register_sensor(var, config)
diff --git a/esphome/components/coolix/climate.py b/esphome/components/coolix/climate.py
index 1ebcff3c1b..3eb8dbe2f4 100644
--- a/esphome/components/coolix/climate.py
+++ b/esphome/components/coolix/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 CODEOWNERS = ["@glmnet"]
@@ -10,5 +11,5 @@ CoolixClimate = coolix_ns.class_("CoolixClimate", climate_ir.ClimateIR)
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(CoolixClimate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/cse7761/sensor.py b/esphome/components/cse7761/sensor.py
index 7e8caf1ae1..b53ed26ca3 100644
--- a/esphome/components/cse7761/sensor.py
+++ b/esphome/components/cse7761/sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@berfenger"]
 DEPENDENCIES = ["uart"]
@@ -71,7 +72,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/cse7766/sensor.py b/esphome/components/cse7766/sensor.py
index 94ed66d7cc..a1a68e18e8 100644
--- a/esphome/components/cse7766/sensor.py
+++ b/esphome/components/cse7766/sensor.py
@@ -26,6 +26,7 @@ from esphome.const import (
     UNIT_WATT,
     UNIT_WATT_HOURS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -87,7 +88,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/cst226/binary_sensor/__init__.py b/esphome/components/cst226/binary_sensor/__init__.py
index 324d794772..7fd81f6c18 100644
--- a/esphome/components/cst226/binary_sensor/__init__.py
+++ b/esphome/components/cst226/binary_sensor/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import cst226_ns
 from ..touchscreen import CST226ButtonListener, CST226Touchscreen
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await cg.register_parented(var, config[CONF_CST226_ID])
diff --git a/esphome/components/cst226/touchscreen/__init__.py b/esphome/components/cst226/touchscreen/__init__.py
index 62c2e3b20a..459cba61cd 100644
--- a/esphome/components/cst226/touchscreen/__init__.py
+++ b/esphome/components/cst226/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+from esphome.types import ConfigType
 
 from .. import cst226_ns
 
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/cst328/binary_sensor/__init__.py b/esphome/components/cst328/binary_sensor/__init__.py
index 6d881cc6c1..33e68a112b 100644
--- a/esphome/components/cst328/binary_sensor/__init__.py
+++ b/esphome/components/cst328/binary_sensor/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from .. import cst328_ns
 from ..touchscreen import CST328ButtonListener, CST328Touchscreen
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(CST328Button).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await cg.register_parented(var, config[CONF_CST328_ID])
diff --git a/esphome/components/cst328/touchscreen/__init__.py b/esphome/components/cst328/touchscreen/__init__.py
index 18c00bb6c5..9bc7744b7c 100644
--- a/esphome/components/cst328/touchscreen/__init__.py
+++ b/esphome/components/cst328/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+from esphome.types import ConfigType
 
 from .. import cst328_ns
 
@@ -27,7 +28,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/cst816/touchscreen/__init__.py b/esphome/components/cst816/touchscreen/__init__.py
index 288ca17593..029a544a91 100644
--- a/esphome/components/cst816/touchscreen/__init__.py
+++ b/esphome/components/cst816/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+from esphome.types import ConfigType
 
 from .. import cst816_ns
 
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
 ).extend(i2c.i2c_device_schema(0x15))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/cst9220/touchscreen/__init__.py b/esphome/components/cst9220/touchscreen/__init__.py
index 6d8fc5e2f6..393685e67b 100644
--- a/esphome/components/cst9220/touchscreen/__init__.py
+++ b/esphome/components/cst9220/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+from esphome.types import ConfigType
 
 from .. import cst9220_ns
 
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ct_clamp/sensor.py b/esphome/components/ct_clamp/sensor.py
index 6ad7990e80..8ef211cb24 100644
--- a/esphome/components/ct_clamp/sensor.py
+++ b/esphome/components/ct_clamp/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_AMPERE,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["voltage_sampler"]
 CODEOWNERS = ["@jesserockz"]
@@ -36,7 +37,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/current_based/cover.py b/esphome/components/current_based/cover.py
index 99952adb12..a552956082 100644
--- a/esphome/components/current_based/cover.py
+++ b/esphome/components/current_based/cover.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_OPEN_DURATION,
     CONF_STOP_ACTION,
 )
+from esphome.types import ConfigType
 
 CONF_OPEN_SENSOR = "open_sensor"
 CONF_OPEN_MOVING_CURRENT_THRESHOLD = "open_moving_current_threshold"
@@ -67,7 +68,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await cover.new_cover(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/cwww/light.py b/esphome/components/cwww/light.py
index 50d84a582d..90fe6d0bad 100644
--- a/esphome/components/cwww/light.py
+++ b/esphome/components/cwww/light.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_WARM_WHITE,
     CONF_WARM_WHITE_COLOR_TEMPERATURE,
 )
+from esphome.types import ConfigType
 
 cwww_ns = cg.esphome_ns.namespace("cwww")
 CWWWLightOutput = cwww_ns.class_("CWWWLightOutput", light.LightOutput)
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await light.register_light(var, config)
 
diff --git a/esphome/components/dac7678/__init__.py b/esphome/components/dac7678/__init__.py
index 842c84832e..668cc87cec 100644
--- a/esphome/components/dac7678/__init__.py
+++ b/esphome/components/dac7678/__init__.py
@@ -2,6 +2,8 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["output"]
 CODEOWNERS = ["@NickB1"]
@@ -24,7 +26,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     cg.add(var.set_internal_reference(config[CONF_INTERNAL_REFERENCE]))
diff --git a/esphome/components/dac7678/output.py b/esphome/components/dac7678/output.py
index cb7739242c..8bc9e119c2 100644
--- a/esphome/components/dac7678/output.py
+++ b/esphome/components/dac7678/output.py
@@ -2,6 +2,8 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import DAC7678Output, dac7678_ns
 
@@ -19,7 +21,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> MockObj:
     paren = await cg.get_variable(config[CONF_DAC7678_ID])
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_channel(config[CONF_CHANNEL]))
diff --git a/esphome/components/daikin/climate.py b/esphome/components/daikin/climate.py
index 7f0226143b..c9f9cb189f 100644
--- a/esphome/components/daikin/climate.py
+++ b/esphome/components/daikin/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 
@@ -9,5 +10,5 @@ DaikinClimate = daikin_ns.class_("DaikinClimate", climate_ir.ClimateIR)
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(DaikinClimate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/daikin_arc/climate.py b/esphome/components/daikin_arc/climate.py
index dbaf12d959..210ec6987e 100644
--- a/esphome/components/daikin_arc/climate.py
+++ b/esphome/components/daikin_arc/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 
@@ -9,5 +10,5 @@ DaikinArcClimate = daikin_arc_ns.class_("DaikinArcClimate", climate_ir.ClimateIR
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(DaikinArcClimate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/daikin_brc/climate.py b/esphome/components/daikin_brc/climate.py
index 5b7a4631a9..c5c1d3739e 100644
--- a/esphome/components/daikin_brc/climate.py
+++ b/esphome/components/daikin_brc/climate.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import climate_ir
 import esphome.config_validation as cv
 from esphome.const import CONF_USE_FAHRENHEIT
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 
@@ -16,6 +17,6 @@ CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(DaikinBrcClimate).ext
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate_ir.new_climate_ir(config)
     cg.add(var.set_fahrenheit(config[CONF_USE_FAHRENHEIT]))
diff --git a/esphome/components/dallas_temp/sensor.py b/esphome/components/dallas_temp/sensor.py
index 3d35881722..c441504947 100644
--- a/esphome/components/dallas_temp/sensor.py
+++ b/esphome/components/dallas_temp/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 dallas_temp_ns = cg.esphome_ns.namespace("dallas_temp")
 
@@ -35,7 +36,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await one_wire.register_one_wire_device(var, config)
diff --git a/esphome/components/delonghi/climate.py b/esphome/components/delonghi/climate.py
index 63576f032d..919bf7b806 100644
--- a/esphome/components/delonghi/climate.py
+++ b/esphome/components/delonghi/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 
@@ -9,5 +10,5 @@ DelonghiClimate = delonghi_ns.class_("DelonghiClimate", climate_ir.ClimateIR)
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(DelonghiClimate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/demo/__init__.py b/esphome/components/demo/__init__.py
index 2af0c18c18..75feaa65af 100644
--- a/esphome/components/demo/__init__.py
+++ b/esphome/components/demo/__init__.py
@@ -55,6 +55,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_WATT_HOURS,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = [
     "alarm_control_panel",
@@ -550,7 +551,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     for conf in config[CONF_ALARM_CONTROL_PANELS]:
         var = await alarm_control_panel.new_alarm_control_panel(conf)
         cg.add(var.set_type(conf[CONF_TYPE]))
diff --git a/esphome/components/dew_point/sensor.py b/esphome/components/dew_point/sensor.py
index 4fee095602..555fdef289 100644
--- a/esphome/components/dew_point/sensor.py
+++ b/esphome/components/dew_point/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["sensor"]
 
@@ -35,7 +36,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/dht/sensor.py b/esphome/components/dht/sensor.py
index d907495ba2..7376adb287 100644
--- a/esphome/components/dht/sensor.py
+++ b/esphome/components/dht/sensor.py
@@ -15,6 +15,7 @@ from esphome.const import (
     UNIT_PERCENT,
 )
 from esphome.cpp_helpers import gpio_pin_expression
+from esphome.types import ConfigType
 
 dht_ns = cg.esphome_ns.namespace("dht")
 DHTModel = dht_ns.enum("DHTModel")
@@ -53,7 +54,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/dht12/sensor.py b/esphome/components/dht12/sensor.py
index eb93cbae2c..2bc6e94515 100644
--- a/esphome/components/dht12/sensor.py
+++ b/esphome/components/dht12/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -40,7 +41,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/dps310/sensor.py b/esphome/components/dps310/sensor.py
index 605812beaa..8b8fd8373b 100644
--- a/esphome/components/dps310/sensor.py
+++ b/esphome/components/dps310/sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_HECTOPASCAL,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ds2484/one_wire.py b/esphome/components/ds2484/one_wire.py
index 384b2d01e6..f6277cd68e 100644
--- a/esphome/components/ds2484/one_wire.py
+++ b/esphome/components/ds2484/one_wire.py
@@ -3,6 +3,7 @@ from esphome.components import i2c
 from esphome.components.one_wire import OneWireBus
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 ds2484_ns = cg.esphome_ns.namespace("ds2484")
 
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await i2c.register_i2c_device(var, config)
     await cg.register_component(var, config)
diff --git a/esphome/components/dsmr/__init__.py b/esphome/components/dsmr/__init__.py
index eaf36d34fa..96a1e75668 100644
--- a/esphome/components/dsmr/__init__.py
+++ b/esphome/components/dsmr/__init__.py
@@ -60,7 +60,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     uart_component = await cg.get_variable(config[CONF_UART_ID])
     if CONF_REQUEST_PIN in config:
         request_pin = await cg.gpio_pin_expression(config[CONF_REQUEST_PIN])
diff --git a/esphome/components/dsmr/sensor.py b/esphome/components/dsmr/sensor.py
index 7d93ee62e1..6aecc62d6b 100644
--- a/esphome/components/dsmr/sensor.py
+++ b/esphome/components/dsmr/sensor.py
@@ -27,6 +27,7 @@ from esphome.const import (
     UNIT_SECOND,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 from . import CONF_DSMR_ID, Dsmr
 
@@ -812,7 +813,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_DSMR_ID])
 
     sensors = []
diff --git a/esphome/components/dsmr/text_sensor.py b/esphome/components/dsmr/text_sensor.py
index 54b5711923..4945ba965c 100644
--- a/esphome/components/dsmr/text_sensor.py
+++ b/esphome/components/dsmr/text_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_INTERNAL
+from esphome.types import ConfigType
 
 from . import CONF_DSMR_ID, Dsmr
 
@@ -39,7 +40,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     hub = await cg.get_variable(config[CONF_DSMR_ID])
 
     text_sensors = []
diff --git a/esphome/components/duty_cycle/sensor.py b/esphome/components/duty_cycle/sensor.py
index 37c889cd85..b7aa1777c8 100644
--- a/esphome/components/duty_cycle/sensor.py
+++ b/esphome/components/duty_cycle/sensor.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_PIN, ICON_PERCENT, STATE_CLASS_MEASUREMENT, UNIT_PERCENT
+from esphome.types import ConfigType
 
 duty_cycle_ns = cg.esphome_ns.namespace("duty_cycle")
 DutyCycleSensor = duty_cycle_ns.class_(
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/e131/__init__.py b/esphome/components/e131/__init__.py
index a1a8e0aec5..3b1eb99e60 100644
--- a/esphome/components/e131/__init__.py
+++ b/esphome/components/e131/__init__.py
@@ -3,6 +3,9 @@ from esphome.components.light.effects import register_addressable_effect
 from esphome.components.light.types import AddressableLightEffect
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNELS, CONF_ID, CONF_METHOD, CONF_NAME
+from esphome.core import ID
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["socket"]
 DEPENDENCIES = ["network"]
@@ -32,7 +35,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     cg.add(var.set_method(METHODS[config[CONF_METHOD]]))
@@ -48,7 +51,7 @@ async def to_code(config):
         cv.Optional(CONF_CHANNELS, default="RGB"): cv.one_of(*CHANNELS, upper=True),
     },
 )
-async def e131_light_effect_to_code(config, effect_id):
+async def e131_light_effect_to_code(config: ConfigType, effect_id: ID) -> MockObj:
     parent = await cg.get_variable(config[CONF_E131_ID])
 
     effect = cg.new_Pvariable(effect_id, config[CONF_NAME])
diff --git a/esphome/components/ee895/sensor.py b/esphome/components/ee895/sensor.py
index 8c9c7e7238..fdad47fb05 100644
--- a/esphome/components/ee895/sensor.py
+++ b/esphome/components/ee895/sensor.py
@@ -14,6 +14,7 @@ from esphome.const import (
     UNIT_HECTOPASCAL,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Stock-M"]
 
@@ -51,7 +52,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ektf2232/touchscreen/__init__.py b/esphome/components/ektf2232/touchscreen/__init__.py
index 64bb17a7db..7636b6993a 100644
--- a/esphome/components/ektf2232/touchscreen/__init__.py
+++ b/esphome/components/ektf2232/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["i2c"]
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/emmeti/climate.py b/esphome/components/emmeti/climate.py
index 56e8e2b804..ea44606300 100644
--- a/esphome/components/emmeti/climate.py
+++ b/esphome/components/emmeti/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@E440QF"]
 AUTO_LOAD = ["climate_ir"]
@@ -10,5 +11,5 @@ EmmetiClimate = emmeti_ns.class_("EmmetiClimate", climate_ir.ClimateIR)
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(EmmetiClimate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/endstop/cover.py b/esphome/components/endstop/cover.py
index c16680b6af..0e27189500 100644
--- a/esphome/components/endstop/cover.py
+++ b/esphome/components/endstop/cover.py
@@ -12,6 +12,7 @@ from esphome.const import (
     CONF_OPEN_ENDSTOP,
     CONF_STOP_ACTION,
 )
+from esphome.types import ConfigType
 
 endstop_ns = cg.esphome_ns.namespace("endstop")
 EndstopCover = endstop_ns.class_("EndstopCover", cover.Cover, cg.Component)
@@ -34,7 +35,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await cover.new_cover(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/ens160_base/__init__.py b/esphome/components/ens160_base/__init__.py
index 46c53c3b10..1bdfb0c0a6 100644
--- a/esphome/components/ens160_base/__init__.py
+++ b/esphome/components/ens160_base/__init__.py
@@ -18,6 +18,8 @@ from esphome.const import (
     UNIT_PARTS_PER_BILLION,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@vincentscode", "@latonita"]
 
@@ -57,7 +59,7 @@ CONFIG_SCHEMA_BASE = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def to_code_base(config):
+async def to_code_base(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/ens160_i2c/sensor.py b/esphome/components/ens160_i2c/sensor.py
index cad4e81afc..398b9b4804 100644
--- a/esphome/components/ens160_i2c/sensor.py
+++ b/esphome/components/ens160_i2c/sensor.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import i2c
+from esphome.types import ConfigType
 
 from ..ens160_base import CONFIG_SCHEMA_BASE, cv, to_code_base
 
@@ -18,6 +19,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
 ).extend({cv.GenerateID(): cv.declare_id(ENS160I2CComponent)})
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ens160_spi/sensor.py b/esphome/components/ens160_spi/sensor.py
index 1bda05c7bb..cc6a90a33e 100644
--- a/esphome/components/ens160_spi/sensor.py
+++ b/esphome/components/ens160_spi/sensor.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import spi
+from esphome.types import ConfigType
 
 from ..ens160_base import CONFIG_SCHEMA_BASE, cv, to_code_base
 
@@ -18,6 +19,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(spi.spi_device_schema()).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/ens210/sensor.py b/esphome/components/ens210/sensor.py
index 289a559673..bfd758f92f 100644
--- a/esphome/components/ens210/sensor.py
+++ b/esphome/components/ens210/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@itn3rd77"]
 DEPENDENCIES = ["i2c"]
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/es7210/audio_adc.py b/esphome/components/es7210/audio_adc.py
index f0bd8bc25a..2defdb0c35 100644
--- a/esphome/components/es7210/audio_adc.py
+++ b/esphome/components/es7210/audio_adc.py
@@ -3,6 +3,7 @@ from esphome.components import i2c
 from esphome.components.audio_adc import AudioAdc
 import esphome.config_validation as cv
 from esphome.const import CONF_BITS_PER_SAMPLE, CONF_ID, CONF_MIC_GAIN, CONF_SAMPLE_RATE
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kahrendt"]
 DEPENDENCIES = ["i2c"]
@@ -41,7 +42,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/es7243e/audio_adc.py b/esphome/components/es7243e/audio_adc.py
index c305d60172..4916133982 100644
--- a/esphome/components/es7243e/audio_adc.py
+++ b/esphome/components/es7243e/audio_adc.py
@@ -3,6 +3,7 @@ from esphome.components import i2c
 from esphome.components.audio_adc import AudioAdc
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MIC_GAIN
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 DEPENDENCIES = ["i2c"]
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/es8156/audio_dac.py b/esphome/components/es8156/audio_dac.py
index c5fb6096da..305aa92125 100644
--- a/esphome/components/es8156/audio_dac.py
+++ b/esphome/components/es8156/audio_dac.py
@@ -4,6 +4,7 @@ from esphome.components.audio_dac import AudioDac
 import esphome.config_validation as cv
 from esphome.const import CONF_AUDIO_DAC, CONF_BITS_PER_SAMPLE, CONF_ID
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 DEPENDENCIES = ["i2c"]
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = (
 )
 
 
-def _final_validate(config):
+def _final_validate(config: ConfigType) -> None:
     full_config = fv.full_config.get()
 
     # Check all speaker configurations for ones that reference this es8156
@@ -45,7 +46,7 @@ def _final_validate(config):
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/es8311/audio_dac.py b/esphome/components/es8311/audio_dac.py
index 5941a81935..f9cfb822cc 100644
--- a/esphome/components/es8311/audio_dac.py
+++ b/esphome/components/es8311/audio_dac.py
@@ -3,6 +3,7 @@ from esphome.components import i2c
 from esphome.components.audio_dac import AudioDac
 import esphome.config_validation as cv
 from esphome.const import CONF_BITS_PER_SAMPLE, CONF_ID, CONF_MIC_GAIN, CONF_SAMPLE_RATE
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kroimon", "@kahrendt"]
 DEPENDENCIES = ["i2c"]
@@ -55,7 +56,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/es8388/audio_dac.py b/esphome/components/es8388/audio_dac.py
index 77e07b2e01..2616cbfa53 100644
--- a/esphome/components/es8388/audio_dac.py
+++ b/esphome/components/es8388/audio_dac.py
@@ -3,6 +3,7 @@ from esphome.components import i2c
 from esphome.components.audio_dac import AudioDac
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@P4uLT"]
 CONF_ES8388_ID = "es8388_id"
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/es8388/select/__init__.py b/esphome/components/es8388/select/__init__.py
index 068d9f9fb8..b81bcd13cf 100644
--- a/esphome/components/es8388/select/__init__.py
+++ b/esphome/components/es8388/select/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import select
 import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_CONFIG, ICON_CHIP  # noqa: F401
+from esphome.types import ConfigType
 
 from ..audio_dac import CONF_ES8388_ID, ES8388, es8388_ns
 
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+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(
diff --git a/esphome/components/esp32_ble_beacon/__init__.py b/esphome/components/esp32_ble_beacon/__init__.py
index d762255040..e9c44284e4 100644
--- a/esphome/components/esp32_ble_beacon/__init__.py
+++ b/esphome/components/esp32_ble_beacon/__init__.py
@@ -5,6 +5,7 @@ from esphome.components.esp32_ble import CONF_BLE_ID
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_TX_POWER, CONF_TYPE, CONF_UUID
 from esphome.core import TimePeriod
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["esp32_ble"]
 DEPENDENCIES = ["esp32"]
@@ -18,7 +19,7 @@ CONF_MAX_INTERVAL = "max_interval"
 CONF_MEASURED_POWER = "measured_power"
 
 
-def validate_config(config):
+def validate_config(config: ConfigType) -> ConfigType:
     if config[CONF_MIN_INTERVAL] > config.get(CONF_MAX_INTERVAL):
         raise cv.Invalid("min_interval must be <= max_interval")
     return config
@@ -61,7 +62,7 @@ CONFIG_SCHEMA = cv.All(
 FINAL_VALIDATE_SCHEMA = esp32_ble.validate_variant
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_ESP32_BLE_UUID")
 
     uuid = config[CONF_UUID].hex
diff --git a/esphome/components/esp32_camera/__init__.py b/esphome/components/esp32_camera/__init__.py
index c3b35a8279..3c41d22903 100644
--- a/esphome/components/esp32_camera/__init__.py
+++ b/esphome/components/esp32_camera/__init__.py
@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 from esphome import automation, pins
 import esphome.codegen as cg
@@ -24,6 +25,7 @@ from esphome.const import (
 )
 from esphome.core import CORE
 from esphome.core.entity_helpers import setup_entity
+from esphome.cpp_generator import MockObj
 import esphome.final_validate as fv
 from esphome.types import ConfigType
 
@@ -179,7 +181,7 @@ CONF_ON_IMAGE = "on_image"
 camera_range_param = cv.int_range(min=-2, max=2)
 
 
-def validate_fb_location_(value):
+def validate_fb_location_(value: Any) -> MockObj:
     validator = cv.enum(ENUM_FB_LOCATION, upper=True)
     if value.lower() == psram_domain:
         validator = cv.All(validator, cv.requires_component(psram_domain))
@@ -310,7 +312,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate(config):
+def _final_validate(config: ConfigType) -> None:
     # Check psram requirement for non-JPEG formats
     if (
         config.get(CONF_PIXEL_FORMAT, "JPEG") != "JPEG"
@@ -368,7 +370,7 @@ SETTERS = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_CAMERA")
     var = cg.new_Pvariable(config[CONF_ID])
     await setup_entity(var, config, "camera")
diff --git a/esphome/components/esp32_camera_web_server/__init__.py b/esphome/components/esp32_camera_web_server/__init__.py
index da260ad7a1..55ace66681 100644
--- a/esphome/components/esp32_camera_web_server/__init__.py
+++ b/esphome/components/esp32_camera_web_server/__init__.py
@@ -39,7 +39,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     server = cg.new_Pvariable(config[CONF_ID])
     cg.add(server.set_port(config[CONF_PORT]))
     cg.add(server.set_mode(config[CONF_MODE]))
diff --git a/esphome/components/esp32_can/canbus.py b/esphome/components/esp32_can/canbus.py
index 7245ba7513..2272459fb8 100644
--- a/esphome/components/esp32_can/canbus.py
+++ b/esphome/components/esp32_can/canbus.py
@@ -1,4 +1,5 @@
 import math
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -26,6 +27,7 @@ from esphome.const import (
     CONF_TX_PIN,
     CONF_TX_QUEUE_LEN,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Sympatron"]
 DEPENDENCIES = ["esp32"]
@@ -88,7 +90,7 @@ CAN_SPEEDS = {
 }
 
 
-def validate_bit_rate(value):
+def validate_bit_rate(value: Any) -> str:
     variant = get_esp32_variant()
     if variant not in CAN_SPEEDS:
         raise cv.Invalid(f"{variant} is not supported by component {esp32_can_ns}")
@@ -112,7 +114,7 @@ CONFIG_SCHEMA = canbus.CANBUS_SCHEMA.extend(
 )
 
 
-def get_default_tx_enqueue_timeout(bit_rate):
+def get_default_tx_enqueue_timeout(bit_rate: str) -> int:
     bit_rate_numeric = canbus.get_rate(bit_rate)
     bits_per_packet = 140  # ~max CAN message length
     ms_per_packet = bits_per_packet / bit_rate_numeric * 1000
@@ -121,7 +123,7 @@ def get_default_tx_enqueue_timeout(bit_rate):
     )  # ~10 packet lengths, min 1ms, max 1000ms
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # Legacy driver component provides driver/twai.h header
     include_builtin_idf_component("driver")
     # Also enable esp_driver_twai for future migration to new API
diff --git a/esphome/components/esp32_dac/output.py b/esphome/components/esp32_dac/output.py
index 7c63d7bd11..c87a9e2a1d 100644
--- a/esphome/components/esp32_dac/output.py
+++ b/esphome/components/esp32_dac/output.py
@@ -9,6 +9,7 @@ from esphome.components.esp32 import (
 )
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_NUMBER, CONF_PIN
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["esp32"]
 
@@ -18,7 +19,7 @@ DAC_PINS = {
 }
 
 
-def valid_dac_pin(value):
+def valid_dac_pin(value: ConfigType) -> ConfigType:
     variant = get_esp32_variant()
     try:
         valid_pins = DAC_PINS[variant]
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     include_builtin_idf_component("esp_driver_dac")
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/esp32_improv/__init__.py b/esphome/components/esp32_improv/__init__.py
index ad2f057163..32eb166014 100644
--- a/esphome/components/esp32_improv/__init__.py
+++ b/esphome/components/esp32_improv/__init__.py
@@ -4,6 +4,7 @@ from esphome.components import binary_sensor, esp32_ble, improv_base, output
 from esphome.components.esp32_ble import BTLoggers
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_ON_START, CONF_ON_STATE, CONF_TRIGGER_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["esp32_ble_server", "improv_base"]
 CODEOWNERS = ["@jesserockz"]
@@ -106,7 +107,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # Register the loggers this component needs
     esp32_ble.register_bt_logger(BTLoggers.GATT, BTLoggers.SMP)
 
diff --git a/esphome/components/esphome/ota/__init__.py b/esphome/components/esphome/ota/__init__.py
index d5f4efbc02..3ef4c7ba13 100644
--- a/esphome/components/esphome/ota/__init__.py
+++ b/esphome/components/esphome/ota/__init__.py
@@ -37,7 +37,7 @@ esphome = cg.esphome_ns.namespace("esphome")
 ESPHomeOTAComponent = esphome.class_("ESPHomeOTAComponent", OTAComponent)
 
 
-def ota_esphome_final_validate(config):
+def ota_esphome_final_validate(config: ConfigType) -> None:
     full_conf = fv.full_config.get()
     full_ota_conf = full_conf[CONF_OTA]
     new_ota_conf = []
diff --git a/esphome/components/ethernet_info/text_sensor.py b/esphome/components/ethernet_info/text_sensor.py
index 8c20cf332c..66483cdb85 100644
--- a/esphome/components/ethernet_info/text_sensor.py
+++ b/esphome/components/ethernet_info/text_sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     CONF_MAC_ADDRESS,
     ENTITY_CATEGORY_DIAGNOSTIC,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["ethernet"]
 
@@ -46,7 +47,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # Request Ethernet IP state listener slots - one per sensor type
     if CONF_IP_ADDRESS in config:
         ethernet.request_ethernet_ip_state_listener()
diff --git a/esphome/components/exposure_notifications/__init__.py b/esphome/components/exposure_notifications/__init__.py
index 6cb5b750dd..4f7e698e23 100644
--- a/esphome/components/exposure_notifications/__init__.py
+++ b/esphome/components/exposure_notifications/__init__.py
@@ -58,7 +58,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     for conf in config.get(CONF_ON_EXPOSURE_NOTIFICATION, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
         await automation.build_automation(trigger, [(ExposureNotification, "x")], conf)
diff --git a/esphome/components/ezo/sensor.py b/esphome/components/ezo/sensor.py
index b931885149..d1ee57a09b 100644
--- a/esphome/components/ezo/sensor.py
+++ b/esphome/components/ezo/sensor.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ssieb"]
 
@@ -58,7 +59,7 @@ _CALLBACK_AUTOMATIONS = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await sensor.register_sensor(var, config)
diff --git a/esphome/components/fastled_base/__init__.py b/esphome/components/fastled_base/__init__.py
index a26a235da7..e2fc8578cd 100644
--- a/esphome/components/fastled_base/__init__.py
+++ b/esphome/components/fastled_base/__init__.py
@@ -8,6 +8,8 @@ from esphome.const import (
     CONF_RGB_ORDER,
 )
 from esphome.core import CORE
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@OttoWinter"]
 fastled_base_ns = cg.esphome_ns.namespace("fastled_base")
@@ -34,7 +36,7 @@ BASE_SCHEMA = light.ADDRESSABLE_LIGHT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def new_fastled_light(config):
+async def new_fastled_light(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/fastled_clockless/light.py b/esphome/components/fastled_clockless/light.py
index aa2172bf88..56c1ee93fa 100644
--- a/esphome/components/fastled_clockless/light.py
+++ b/esphome/components/fastled_clockless/light.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_RGB_ORDER,
     Framework,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["fastled_base"]
 
@@ -41,7 +42,7 @@ CHIPSETS = [
 ]
 
 
-def _validate(value):
+def _validate(value: ConfigType) -> ConfigType:
     if value[CONF_CHIPSET] == "NEOPIXEL" and CONF_RGB_ORDER in value:
         raise cv.Invalid("NEOPIXEL doesn't support RGB order")
     return value
@@ -73,7 +74,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await fastled_base.new_fastled_light(config)
 
     rgb_order = None
diff --git a/esphome/components/fastled_spi/light.py b/esphome/components/fastled_spi/light.py
index e863d33846..1c6b6e7148 100644
--- a/esphome/components/fastled_spi/light.py
+++ b/esphome/components/fastled_spi/light.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_RGB_ORDER,
     Framework,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["fastled_base"]
 
@@ -52,7 +53,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await fastled_base.new_fastled_light(config)
 
     rgb_order = cg.RawExpression(config.get(CONF_RGB_ORDER, "RGB"))
diff --git a/esphome/components/feedback/cover.py b/esphome/components/feedback/cover.py
index 856818280f..032d01c8e5 100644
--- a/esphome/components/feedback/cover.py
+++ b/esphome/components/feedback/cover.py
@@ -14,6 +14,7 @@ from esphome.const import (
     CONF_STOP_ACTION,
     CONF_UPDATE_INTERVAL,
 )
+from esphome.types import ConfigType
 
 CONF_OPEN_SENSOR = "open_sensor"
 CONF_CLOSE_SENSOR = "close_sensor"
@@ -29,7 +30,7 @@ endstop_ns = cg.esphome_ns.namespace("feedback")
 FeedbackCover = endstop_ns.class_("FeedbackCover", cover.Cover, cg.Component)
 
 
-def validate_infer_endstop(config):
+def validate_infer_endstop(config: ConfigType) -> ConfigType:
     if config[CONF_INFER_ENDSTOP_FROM_MOVEMENT] is True:
         if config[CONF_HAS_BUILT_IN_ENDSTOP] is False:
             raise cv.Invalid(
@@ -95,7 +96,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await cover.new_cover(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/fs3000/sensor.py b/esphome/components/fs3000/sensor.py
index a168a36c31..8c389a2593 100644
--- a/esphome/components/fs3000/sensor.py
+++ b/esphome/components/fs3000/sensor.py
@@ -4,6 +4,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_MODEL, DEVICE_CLASS_WIND_SPEED, STATE_CLASS_MEASUREMENT
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@kahrendt"]
@@ -38,7 +39,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ft5x06/touchscreen/__init__.py b/esphome/components/ft5x06/touchscreen/__init__.py
index e94791da4e..3ebff693c0 100644
--- a/esphome/components/ft5x06/touchscreen/__init__.py
+++ b/esphome/components/ft5x06/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN
+from esphome.types import ConfigType
 
 from .. import ft5x06_ns
 
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
 ).extend(i2c.i2c_device_schema(0x48))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await i2c.register_i2c_device(var, config)
     await touchscreen.register_touchscreen(var, config)
diff --git a/esphome/components/ft63x6/touchscreen.py b/esphome/components/ft63x6/touchscreen.py
index 7615b3046f..0d8537bde9 100644
--- a/esphome/components/ft63x6/touchscreen.py
+++ b/esphome/components/ft63x6/touchscreen.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN, CONF_THRESHOLD
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@gpambrozio"]
 DEPENDENCIES = ["i2c"]
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/fujitsu_general/climate.py b/esphome/components/fujitsu_general/climate.py
index a104eafbcc..c2c41730e3 100644
--- a/esphome/components/fujitsu_general/climate.py
+++ b/esphome/components/fujitsu_general/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 
@@ -11,5 +12,5 @@ FujitsuGeneralClimate = fujitsu_general_ns.class_(
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(FujitsuGeneralClimate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/gcja5/sensor.py b/esphome/components/gcja5/sensor.py
index e4de7721c6..49907443ff 100644
--- a/esphome/components/gcja5/sensor.py
+++ b/esphome/components/gcja5/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_MICROGRAMS_PER_CUBIC_METER,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@gcormier"]
 DEPENDENCIES = ["uart"]
@@ -111,7 +112,7 @@ TYPES = {
 }
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/gl_r01_i2c/sensor.py b/esphome/components/gl_r01_i2c/sensor.py
index 6a8d47213c..73f7339e66 100644
--- a/esphome/components/gl_r01_i2c/sensor.py
+++ b/esphome/components/gl_r01_i2c/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_MILLIMETER,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@pkejval"]
 DEPENDENCIES = ["i2c"]
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await sensor.register_sensor(var, config)
diff --git a/esphome/components/gp2y1010au0f/sensor.py b/esphome/components/gp2y1010au0f/sensor.py
index 4ff8a38226..3121aa1de5 100644
--- a/esphome/components/gp2y1010au0f/sensor.py
+++ b/esphome/components/gp2y1010au0f/sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_MICROGRAMS_PER_CUBIC_METER,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["output"]
 AUTO_LOAD = ["voltage_sampler"]
@@ -43,7 +44,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/gp8403/__init__.py b/esphome/components/gp8403/__init__.py
index 83859a4030..17c88b6875 100644
--- a/esphome/components/gp8403/__init__.py
+++ b/esphome/components/gp8403/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MODEL, CONF_VOLTAGE
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz", "@sebydocky"]
 DEPENDENCIES = ["i2c"]
@@ -38,7 +39,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/gp8403/output/__init__.py b/esphome/components/gp8403/output/__init__.py
index 5245c405db..432f387b1b 100644
--- a/esphome/components/gp8403/output/__init__.py
+++ b/esphome/components/gp8403/output/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from .. import CONF_GP8403_ID, GP8403Component, gp8403_ns
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await output.register_output(var, config)
diff --git a/esphome/components/gps/__init__.py b/esphome/components/gps/__init__.py
index ab48417a4e..94a36a0afa 100644
--- a/esphome/components/gps/__init__.py
+++ b/esphome/components/gps/__init__.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_KILOMETER_PER_HOUR,
     UNIT_METER,
 )
+from esphome.types import ConfigType
 
 CONF_GPS_ID = "gps_id"
 CONF_HDOP = "hdop"
@@ -93,7 +94,7 @@ CONFIG_SCHEMA = cv.All(
 FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema("gps", require_rx=True)
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/gps/time/__init__.py b/esphome/components/gps/time/__init__.py
index bdeeb86e00..faa06e6ae3 100644
--- a/esphome/components/gps/time/__init__.py
+++ b/esphome/components/gps/time/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import time as time_
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 from .. import CONF_GPS_ID, GPS, GPSListener, gps_ns
 
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = time_.TIME_SCHEMA.extend(
 ).extend(cv.polling_component_schema("5min"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await time_.register_time(var, config)
     await cg.register_component(var, config)
diff --git a/esphome/components/graphical_display_menu/__init__.py b/esphome/components/graphical_display_menu/__init__.py
index 56b720e75c..668a0d74d1 100644
--- a/esphome/components/graphical_display_menu/__init__.py
+++ b/esphome/components/graphical_display_menu/__init__.py
@@ -15,6 +15,7 @@ from esphome.const import (
     CONF_ID,
     CONF_TRIGGER_ID,
 )
+from esphome.types import ConfigType
 
 CONF_MENU_ITEM_VALUE = "menu_item_value"
 CONF_ON_REDRAW = "on_redraw"
@@ -59,7 +60,7 @@ CONFIG_SCHEMA = DISPLAY_MENU_BASE_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/gree/climate.py b/esphome/components/gree/climate.py
index 0892155fd2..356845a7a6 100644
--- a/esphome/components/gree/climate.py
+++ b/esphome/components/gree/climate.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import climate_ir
 import esphome.config_validation as cv
 from esphome.const import CONF_MODEL
+from esphome.types import ConfigType
 
 from . import gree_ns
 
@@ -28,6 +29,6 @@ CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(GreeClimate).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate_ir.new_climate_ir(config)
     cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/esphome/components/gree/switch/__init__.py b/esphome/components/gree/switch/__init__.py
index 111fea65d2..9bec3751d6 100644
--- a/esphome/components/gree/switch/__init__.py
+++ b/esphome/components/gree/switch/__init__.py
@@ -3,6 +3,7 @@ from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import CONF_LIGHT, DEVICE_CLASS_SWITCH, ENTITY_CATEGORY_CONFIG
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 from .. import gree_ns
 from ..climate import CONF_MODEL, GreeClimate
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-def _validate_model(config):
+def _validate_model(config: ConfigType) -> None:
     full_config = fv.full_config.get()
     climate_path = full_config.get_path_for_id(config[CONF_GREE_ID])[:-1]
     climate_conf = full_config.get_config_for_path(climate_path)
@@ -63,7 +64,7 @@ def _validate_model(config):
 FINAL_VALIDATE_SCHEMA = _validate_model
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_GREE_ID])
 
     for conf_key, name, bit_mask, _ in SWITCH_CONFIGS:
diff --git a/esphome/components/grove_gas_mc_v2/sensor.py b/esphome/components/grove_gas_mc_v2/sensor.py
index 0c35047850..da687c4cd3 100644
--- a/esphome/components/grove_gas_mc_v2/sensor.py
+++ b/esphome/components/grove_gas_mc_v2/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     UNIT_MICROGRAMS_PER_CUBIC_METER,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@YorkshireIoT"]
 DEPENDENCIES = ["i2c"]
@@ -66,7 +67,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/growatt_solar/sensor.py b/esphome/components/growatt_solar/sensor.py
index d62486f5ec..2e2b218730 100644
--- a/esphome/components/growatt_solar/sensor.py
+++ b/esphome/components/growatt_solar/sensor.py
@@ -170,7 +170,7 @@ def _final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await modbus.register_modbus_client_device(var, config)
diff --git a/esphome/components/gsl3670/touchscreen.py b/esphome/components/gsl3670/touchscreen.py
index ccccf06d69..703887864b 100644
--- a/esphome/components/gsl3670/touchscreen.py
+++ b/esphome/components/gsl3670/touchscreen.py
@@ -174,7 +174,7 @@ def _extract_firmware_ref(entry: ConfigType) -> RemoteFile | None:
 PREFETCH_FILES = external_files.single_stage_prefetch(_extract_firmware_ref)
 
 
-def _config_schema(config):
+def _config_schema(config: ConfigType) -> ConfigType:
     model_option = {
         cv.Optional(CONF_MODEL, default="CUSTOM"): cv.one_of(*MODELS, upper=True)
     }
@@ -206,7 +206,7 @@ def _config_schema(config):
 CONFIG_SCHEMA = _config_schema
 
 
-def _read_firmware(config) -> bytes:
+def _read_firmware(config: ConfigType) -> bytes:
     path = firmware_path(config[CONF_FIRMWARE])
     data = path.read_bytes()
     LOGGER.info(
@@ -221,7 +221,7 @@ def _read_firmware(config) -> bytes:
 # ---------------------------------------------------------------------------
 # Code generation
 # ---------------------------------------------------------------------------
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/gt911/binary_sensor/__init__.py b/esphome/components/gt911/binary_sensor/__init__.py
index 941b7bb847..95c072977e 100644
--- a/esphome/components/gt911/binary_sensor/__init__.py
+++ b/esphome/components/gt911/binary_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_INDEX
+from esphome.types import ConfigType
 
 from .. import gt911_ns
 from ..touchscreen import GT911ButtonListener, GT911Touchscreen
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(GT911Button).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await cg.register_parented(var, config[CONF_GT911_ID])
diff --git a/esphome/components/gt911/touchscreen/__init__.py b/esphome/components/gt911/touchscreen/__init__.py
index b850eeea8b..fa929d4ba0 100644
--- a/esphome/components/gt911/touchscreen/__init__.py
+++ b/esphome/components/gt911/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+from esphome.types import ConfigType
 
 from .. import gt911_ns
 
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
 ).extend(i2c.i2c_device_schema(0x5D))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/havells_solar/sensor.py b/esphome/components/havells_solar/sensor.py
index 8eafe1d9d6..dcea1afd04 100644
--- a/esphome/components/havells_solar/sensor.py
+++ b/esphome/components/havells_solar/sensor.py
@@ -224,7 +224,7 @@ def _final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await modbus.register_modbus_client_device(var, config)
diff --git a/esphome/components/hdc1080/sensor.py b/esphome/components/hdc1080/sensor.py
index e47a88545b..b2b6dc533a 100644
--- a/esphome/components/hdc1080/sensor.py
+++ b/esphome/components/hdc1080/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/hdc2010/sensor.py b/esphome/components/hdc2010/sensor.py
index 15e19f2cc8..ad0311fb4f 100644
--- a/esphome/components/hdc2010/sensor.py
+++ b/esphome/components/hdc2010/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/hdc2080/sensor.py b/esphome/components/hdc2080/sensor.py
index 777fc51cba..b5388b4c2b 100644
--- a/esphome/components/hdc2080/sensor.py
+++ b/esphome/components/hdc2080/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -43,7 +44,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/he60r/cover.py b/esphome/components/he60r/cover.py
index a3a1b19f5a..4cb635b047 100644
--- a/esphome/components/he60r/cover.py
+++ b/esphome/components/he60r/cover.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import cover, uart
 import esphome.config_validation as cv
 from esphome.const import CONF_CLOSE_DURATION, CONF_OPEN_DURATION
+from esphome.types import ConfigType
 
 he60r_ns = cg.esphome_ns.namespace("he60r")
 HE60rCover = he60r_ns.class_("HE60rCover", cover.Cover, cg.Component)
@@ -33,7 +34,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await cover.new_cover(config)
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
diff --git a/esphome/components/heatpumpir/climate.py b/esphome/components/heatpumpir/climate.py
index 21f7ea6393..2583839ca8 100644
--- a/esphome/components/heatpumpir/climate.py
+++ b/esphome/components/heatpumpir/climate.py
@@ -125,7 +125,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate_ir.new_climate_ir(config)
     cg.add(var.set_protocol(config[CONF_PROTOCOL]))
     cg.add(var.set_horizontal_default(config[CONF_HORIZONTAL_DEFAULT]))
diff --git a/esphome/components/hitachi_ac344/climate.py b/esphome/components/hitachi_ac344/climate.py
index ebdf4e8db4..15da73b79c 100644
--- a/esphome/components/hitachi_ac344/climate.py
+++ b/esphome/components/hitachi_ac344/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 
@@ -9,5 +10,5 @@ HitachiClimate = hitachi_ac344_ns.class_("HitachiClimate", climate_ir.ClimateIR)
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(HitachiClimate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/hitachi_ac424/climate.py b/esphome/components/hitachi_ac424/climate.py
index fde4e77545..d2a66223b1 100644
--- a/esphome/components/hitachi_ac424/climate.py
+++ b/esphome/components/hitachi_ac424/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 
@@ -9,5 +10,5 @@ HitachiClimate = hitachi_ac424_ns.class_("HitachiClimate", climate_ir.ClimateIR)
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(HitachiClimate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/hlw8012/sensor.py b/esphome/components/hlw8012/sensor.py
index 1d793ac6b1..384477be3d 100644
--- a/esphome/components/hlw8012/sensor.py
+++ b/esphome/components/hlw8012/sensor.py
@@ -27,6 +27,7 @@ from esphome.const import (
     UNIT_WATT_HOURS,
 )
 from esphome.core import CORE
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["pulse_counter"]
 
@@ -92,7 +93,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if CORE.is_esp32:
         include_builtin_idf_component("esp_driver_pcnt")
 
diff --git a/esphome/components/hlw8032/sensor.py b/esphome/components/hlw8032/sensor.py
index 846c9a398b..7b069d85d0 100644
--- a/esphome/components/hlw8032/sensor.py
+++ b/esphome/components/hlw8032/sensor.py
@@ -21,6 +21,7 @@ from esphome.const import (
     UNIT_VOLT_AMPS,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -73,7 +74,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/hm3301/sensor.py b/esphome/components/hm3301/sensor.py
index 9546ae1c3c..2fa82b2710 100644
--- a/esphome/components/hm3301/sensor.py
+++ b/esphome/components/hm3301/sensor.py
@@ -17,6 +17,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_MICROGRAMS_PER_CUBIC_METER,
 )
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -32,7 +33,7 @@ HM3301Component = hm3301_ns.class_(
 UNIT_INDEX = "index"
 
 
-def _validate(config):
+def _validate(config: ConfigType) -> ConfigType:
     if CONF_AQI in config and CONF_PM_2_5 not in config:
         raise cv.Invalid("AQI sensor requires PM 2.5")
     if CONF_AQI in config and CONF_PM_10_0 not in config:
@@ -86,7 +87,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/honeywell_hih_i2c/sensor.py b/esphome/components/honeywell_hih_i2c/sensor.py
index 93ae2b6056..5250e1c1c7 100644
--- a/esphome/components/honeywell_hih_i2c/sensor.py
+++ b/esphome/components/honeywell_hih_i2c/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/honeywellabp/sensor.py b/esphome/components/honeywellabp/sensor.py
index 25d03d31a6..4b116f0f16 100644
--- a/esphome/components/honeywellabp/sensor.py
+++ b/esphome/components/honeywellabp/sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
 CODEOWNERS = ["@RubyBailey"]
@@ -50,7 +51,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/honeywellabp2_i2c/sensor.py b/esphome/components/honeywellabp2_i2c/sensor.py
index 2708e5d423..299acd4b52 100644
--- a/esphome/components/honeywellabp2_i2c/sensor.py
+++ b/esphome/components/honeywellabp2_i2c/sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -57,7 +58,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/hrxl_maxsonar_wr/sensor.py b/esphome/components/hrxl_maxsonar_wr/sensor.py
index d335d76dfa..e4daacd869 100644
--- a/esphome/components/hrxl_maxsonar_wr/sensor.py
+++ b/esphome/components/hrxl_maxsonar_wr/sensor.py
@@ -5,6 +5,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_METER,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@netmikey"]
 DEPENDENCIES = ["uart"]
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
 ).extend(uart.UART_DEVICE_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
diff --git a/esphome/components/hte501/sensor.py b/esphome/components/hte501/sensor.py
index 17ae3a3d1b..bf9fe4000e 100644
--- a/esphome/components/hte501/sensor.py
+++ b/esphome/components/hte501/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Stock-M"]
 
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/htu31d/sensor.py b/esphome/components/htu31d/sensor.py
index 638a8d77c5..8960759d9b 100644
--- a/esphome/components/htu31d/sensor.py
+++ b/esphome/components/htu31d/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/hub75/boards/__init__.py b/esphome/components/hub75/boards/__init__.py
index 52f8864c60..818ee732a3 100644
--- a/esphome/components/hub75/boards/__init__.py
+++ b/esphome/components/hub75/boards/__init__.py
@@ -49,7 +49,7 @@ class BoardConfig:
     # Derived field for pin lookup
     pins: dict[str, int | None] = field(default_factory=dict, init=False, repr=False)
 
-    def __post_init__(self):
+    def __post_init__(self) -> None:
         """Initialize derived fields and register board."""
         self.name = self.name.lower()
         self.pins = {
diff --git a/esphome/components/hub75/display.py b/esphome/components/hub75/display.py
index 24b8197073..3522acf049 100644
--- a/esphome/components/hub75/display.py
+++ b/esphome/components/hub75/display.py
@@ -131,7 +131,7 @@ SCAN_WIRINGS = {
 }
 
 
-def _validate_scan_wiring(value):
+def _validate_scan_wiring(value: Any) -> str:
     """Validate scan_wiring against the allowed names."""
     value = cv.string(value).upper().replace(" ", "_")
 
@@ -477,7 +477,7 @@ def _build_pins_struct(
 ) -> cg.StructInitializer:
     """Build Hub75Pins struct from pin expressions."""
 
-    def pin_cast(pin):
+    def pin_cast(pin: Any) -> cg.RawExpression:
         return cg.RawExpression(f"static_cast<int8_t>({pin.get_pin()})")
 
     return cg.StructInitializer(
diff --git a/esphome/components/hx711/sensor.py b/esphome/components/hx711/sensor.py
index a5d11e9241..2739589c66 100644
--- a/esphome/components/hx711/sensor.py
+++ b/esphome/components/hx711/sensor.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_CLK_PIN, CONF_GAIN, ICON_SCALE, STATE_CLASS_MEASUREMENT
+from esphome.types import ConfigType
 
 hx711_ns = cg.esphome_ns.namespace("hx711")
 HX711Sensor = hx711_ns.class_("HX711Sensor", sensor.Sensor, cg.PollingComponent)
@@ -34,7 +35,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/hydreon_rgxx/binary_sensor.py b/esphome/components/hydreon_rgxx/binary_sensor.py
index f899ce71ce..193db9b20d 100644
--- a/esphome/components/hydreon_rgxx/binary_sensor.py
+++ b/esphome/components/hydreon_rgxx/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, DEVICE_CLASS_COLD, DEVICE_CLASS_PROBLEM
+from esphome.types import ConfigType
 
 from . import HydreonRGxxComponent, hydreon_rgxx_ns
 
@@ -32,7 +33,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     main_sensor = await cg.get_variable(config[CONF_HYDREON_RGXX_ID])
     bin_component = cg.new_Pvariable(config[CONF_ID], main_sensor)
     await cg.register_component(bin_component, config)
diff --git a/esphome/components/hydreon_rgxx/sensor.py b/esphome/components/hydreon_rgxx/sensor.py
index fdb606182f..58e72571ff 100644
--- a/esphome/components/hydreon_rgxx/sensor.py
+++ b/esphome/components/hydreon_rgxx/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_MILLIMETER,
 )
+from esphome.types import ConfigType
 
 from . import HydreonRGxxComponent, RG15Resolution, RGModel
 
@@ -65,7 +66,7 @@ PROTOCOL_NAMES = {
 }
 
 
-def _validate(config):
+def _validate(config: ConfigType) -> ConfigType:
     for conf, models in SUPPORTED_OPTIONS.items():
         if conf in config and config[CONF_MODEL] not in models:
             raise cv.Invalid(
@@ -130,7 +131,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/hyt271/sensor.py b/esphome/components/hyt271/sensor.py
index bf37646d4f..3f006a65fe 100644
--- a/esphome/components/hyt271/sensor.py
+++ b/esphome/components/hyt271/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/i2c_device/__init__.py b/esphome/components/i2c_device/__init__.py
index 531c363bd1..f890fefdb9 100644
--- a/esphome/components/i2c_device/__init__.py
+++ b/esphome/components/i2c_device/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@gabest11"]
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(i2c.i2c_device_schema(None))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/iaqcore/sensor.py b/esphome/components/iaqcore/sensor.py
index d3306fd0f8..1b905e4c63 100644
--- a/esphome/components/iaqcore/sensor.py
+++ b/esphome/components/iaqcore/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_PARTS_PER_BILLION,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@yozik04"]
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/improv_base/__init__.py b/esphome/components/improv_base/__init__.py
index 5929f2b60a..f132dbacb0 100644
--- a/esphome/components/improv_base/__init__.py
+++ b/esphome/components/improv_base/__init__.py
@@ -1,4 +1,5 @@
 import re
+from typing import Any
 
 import esphome.codegen as cg
 import esphome.config_validation as cv
@@ -13,7 +14,7 @@ CONF_NEXT_URL = "next_url"
 VALID_SUBSTITUTIONS = ["esphome_version", "ip_address", "device_name"]
 
 
-def validate_next_url(value):
+def validate_next_url(value: Any) -> str:
     value = cv.url(value)
     test = r"{{(?!" + r"\b|".join(VALID_SUBSTITUTIONS) + r"\b)(\w+)}}"
     result = re.search(test, value)
@@ -31,13 +32,13 @@ IMPROV_SCHEMA = cv.Schema(
 )
 
 
-def _process_next_url(url: str):
+def _process_next_url(url: str) -> str:
     if "{{esphome_version}}" in url:
         url = url.replace("{{esphome_version}}", __version__)
     return url
 
 
-async def setup_improv_core(var: MockObj, config: ConfigType, component: str):
+async def setup_improv_core(var: MockObj, config: ConfigType, component: str) -> None:
     if next_url := config.get(CONF_NEXT_URL):
         cg.add(var.set_next_url(_process_next_url(next_url)))
         cg.add_define(f"USE_{component.upper()}_NEXT_URL")
diff --git a/esphome/components/improv_serial/__init__.py b/esphome/components/improv_serial/__init__.py
index 3e2a6db1bc..40ef14c6bc 100644
--- a/esphome/components/improv_serial/__init__.py
+++ b/esphome/components/improv_serial/__init__.py
@@ -6,6 +6,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_BAUD_RATE, CONF_HARDWARE_UART, CONF_ID, CONF_LOGGER
 from esphome.core import CORE
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["improv_base"]
 CODEOWNERS = ["@esphome/core"]
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = (
 )
 
 
-def validate_logger(config) -> None:
+def validate_logger(config: ConfigType) -> None:
     logger_conf = fv.full_config.get()[CONF_LOGGER]
     if logger_conf[CONF_BAUD_RATE] == 0:
         raise cv.Invalid("improv_serial requires the logger baud_rate to be not 0")
@@ -38,7 +39,7 @@ def validate_logger(config) -> None:
 FINAL_VALIDATE_SCHEMA = validate_logger
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await improv_base.setup_improv_core(var, config, "improv_serial")
diff --git a/esphome/components/ina219/sensor.py b/esphome/components/ina219/sensor.py
index 621fd62e82..97482f81a0 100644
--- a/esphome/components/ina219/sensor.py
+++ b/esphome/components/ina219/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -70,7 +71,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ina226/sensor.py b/esphome/components/ina226/sensor.py
index 2a7b3fc212..4fd98fbcd4 100644
--- a/esphome/components/ina226/sensor.py
+++ b/esphome/components/ina226/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
@@ -18,6 +20,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -54,7 +57,7 @@ ADC_AVG_SAMPLES = {
 }
 
 
-def validate_adc_time(value):
+def validate_adc_time(value: Any) -> int:
     value = cv.positive_time_period_microseconds(value).total_microseconds
     return cv.enum(ADC_TIMES, int=True)(value)
 
@@ -112,7 +115,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ina260/sensor.py b/esphome/components/ina260/sensor.py
index b98b4ce6cb..b7b94a248b 100644
--- a/esphome/components/ina260/sensor.py
+++ b/esphome/components/ina260/sensor.py
@@ -14,6 +14,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@mreditor97"]
@@ -52,7 +53,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
 
     await cg.register_component(var, config)
diff --git a/esphome/components/ina2xx_i2c/sensor.py b/esphome/components/ina2xx_i2c/sensor.py
index 1a470aa628..4bcbca8762 100644
--- a/esphome/components/ina2xx_i2c/sensor.py
+++ b/esphome/components/ina2xx_i2c/sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, ina2xx_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MODEL
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ina2xx_base"]
 CODEOWNERS = ["@latonita"]
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ina2xx_base.setup_ina2xx(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ina2xx_spi/sensor.py b/esphome/components/ina2xx_spi/sensor.py
index 3ebe2cac73..dc72dce7a9 100644
--- a/esphome/components/ina2xx_spi/sensor.py
+++ b/esphome/components/ina2xx_spi/sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ina2xx_base, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MODEL
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ina2xx_base"]
 CODEOWNERS = ["@latonita"]
@@ -27,7 +28,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ina2xx_base.setup_ina2xx(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/ina3221/sensor.py b/esphome/components/ina3221/sensor.py
index acf7d7cdf0..db8dad2f54 100644
--- a/esphome/components/ina3221/sensor.py
+++ b/esphome/components/ina3221/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -74,7 +75,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/infrared/__init__.py b/esphome/components/infrared/__init__.py
index f8e77209b2..d04c82ea96 100644
--- a/esphome/components/infrared/__init__.py
+++ b/esphome/components/infrared/__init__.py
@@ -14,7 +14,7 @@ from esphome.const import CONF_ID
 from esphome.core import CORE, coroutine_with_priority
 from esphome.core.entity_helpers import queue_entity_register, setup_entity
 from esphome.coroutine import CoroPriority
-from esphome.types import ConfigType
+from esphome.types import ConfigType, SafeExpType
 
 CODEOWNERS = ["@kbx81"]
 AUTO_LOAD = ["remote_base"]
@@ -46,11 +46,11 @@ def infrared_schema(class_: type[cg.MockObjClass]) -> cv.Schema:
 
 
 @setup_entity("infrared")
-async def setup_infrared_core_(var: cg.Pvariable, config: ConfigType) -> None:
+async def setup_infrared_core_(var: cg.MockObj, config: ConfigType) -> None:
     """Set up core infrared configuration."""
 
 
-async def register_infrared(var: cg.Pvariable, config: ConfigType) -> None:
+async def register_infrared(var: cg.MockObj, config: ConfigType) -> None:
     """Register an infrared device with the core."""
     cg.add_define("USE_IR_RF")
     await cg.register_component(var, config)
@@ -59,7 +59,7 @@ async def register_infrared(var: cg.Pvariable, config: ConfigType) -> None:
     CORE.register_platform_component("infrared", var)
 
 
-async def new_infrared(config: ConfigType, *args) -> cg.Pvariable:
+async def new_infrared(config: ConfigType, *args: SafeExpType) -> cg.MockObj:
     """Create a new Infrared instance.
 
     :param config: Configuration dictionary.
diff --git a/esphome/components/inkbird_ibsth1_mini/sensor.py b/esphome/components/inkbird_ibsth1_mini/sensor.py
index 2dcdb9a118..84a207020e 100644
--- a/esphome/components/inkbird_ibsth1_mini/sensor.py
+++ b/esphome/components/inkbird_ibsth1_mini/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@fkirill"]
 AUTO_LOAD = ["ble_device_base"]
@@ -63,7 +64,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/inkplate/display.py b/esphome/components/inkplate/display.py
index a0c0d5dc18..350a0c1652 100644
--- a/esphome/components/inkplate/display.py
+++ b/esphome/components/inkplate/display.py
@@ -19,6 +19,7 @@ from esphome.const import (
     PLATFORM_ESP32,
 )
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 from .const import INKPLATE_10_CUSTOM_WAVEFORMS, WAVEFORMS
 
@@ -68,7 +69,7 @@ MODELS = {
 CONF_CUSTOM_WAVEFORM = "custom_waveform"
 
 
-def _validate_custom_waveform(config):
+def _validate_custom_waveform(config: ConfigType) -> ConfigType:
     if CONF_CUSTOM_WAVEFORM in config and config[CONF_MODEL] != "inkplate_10":
         raise cv.Invalid("Custom waveforms are only supported on the Inkplate 10")
     return config
@@ -146,7 +147,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _validate_cpu_frequency(config) -> None:
+def _validate_cpu_frequency(config: ConfigType) -> None:
     esp32_config = fv.full_config.get()[PLATFORM_ESP32]
     if esp32_config[CONF_CPU_FREQUENCY] != "240MHZ":
         raise cv.Invalid(
@@ -157,7 +158,7 @@ def _validate_cpu_frequency(config) -> None:
 FINAL_VALIDATE_SCHEMA = _validate_cpu_frequency
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
 
     await display.register_display(var, config)
diff --git a/esphome/components/internal_temperature/sensor.py b/esphome/components/internal_temperature/sensor.py
index 805138071e..d3101f4a7c 100644
--- a/esphome/components/internal_temperature/sensor.py
+++ b/esphome/components/internal_temperature/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     PlatformFramework,
 )
 from esphome.core import CORE
+from esphome.types import ConfigType
 
 internal_temperature_ns = cg.esphome_ns.namespace("internal_temperature")
 InternalTemperatureSensor = internal_temperature_ns.class_(
@@ -43,7 +44,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/interval/__init__.py b/esphome/components/interval/__init__.py
index ac9219ff6a..11c3e15b0d 100644
--- a/esphome/components/interval/__init__.py
+++ b/esphome/components/interval/__init__.py
@@ -2,6 +2,7 @@ from esphome import automation
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERVAL, CONF_STARTUP_DELAY
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
 interval_ns = cg.esphome_ns.namespace("interval")
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = automation.validate_automation(
 )
 
 
-async def to_code(config):
+async def to_code(config: list[ConfigType]) -> None:
     for conf in config:
         var = cg.new_Pvariable(conf[CONF_ID])
         await cg.register_component(var, conf)
diff --git a/esphome/components/jsn_sr04t/sensor.py b/esphome/components/jsn_sr04t/sensor.py
index 214724aa3f..0c4187b823 100644
--- a/esphome/components/jsn_sr04t/sensor.py
+++ b/esphome/components/jsn_sr04t/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_METER,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Mafus1"]
 DEPENDENCIES = ["uart"]
@@ -49,7 +50,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
diff --git a/esphome/components/json/__init__.py b/esphome/components/json/__init__.py
index 3cb89a6cd9..af7eb7e733 100644
--- a/esphome/components/json/__init__.py
+++ b/esphome/components/json/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
 json_ns = cg.esphome_ns.namespace("json")
@@ -11,7 +12,7 @@ CONFIG_SCHEMA = cv.All(
 
 
 @coroutine_with_priority(CoroPriority.BUS)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if CORE.is_esp32:
         from esphome.components.esp32 import add_idf_component
 
diff --git a/esphome/components/kamstrup_kmp/sensor.py b/esphome/components/kamstrup_kmp/sensor.py
index 75ec432ad9..6465012897 100644
--- a/esphome/components/kamstrup_kmp/sensor.py
+++ b/esphome/components/kamstrup_kmp/sensor.py
@@ -23,6 +23,7 @@ from esphome.const import (
     UNIT_KILOWATT,
     UNIT_LITRE_PER_HOUR,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@cfeenstra1024"]
 DEPENDENCIES = ["uart"]
@@ -105,7 +106,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/kmeteriso/sensor.py b/esphome/components/kmeteriso/sensor.py
index 4f6cb7d091..3e007d1310 100644
--- a/esphome/components/kmeteriso/sensor.py
+++ b/esphome/components/kmeteriso/sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/kuntze/sensor.py b/esphome/components/kuntze/sensor.py
index 2b53e70756..51d23991e2 100644
--- a/esphome/components/kuntze/sensor.py
+++ b/esphome/components/kuntze/sensor.py
@@ -96,7 +96,7 @@ def _final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await modbus.register_modbus_client_device(var, config)
diff --git a/esphome/components/lc709203f/sensor.py b/esphome/components/lc709203f/sensor.py
index d4e6213425..3319c9be4b 100644
--- a/esphome/components/lc709203f/sensor.py
+++ b/esphome/components/lc709203f/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -71,7 +72,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/lcd_gpio/display.py b/esphome/components/lcd_gpio/display.py
index 0a77daf336..10e21c87d1 100644
--- a/esphome/components/lcd_gpio/display.py
+++ b/esphome/components/lcd_gpio/display.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_RS_PIN,
     CONF_RW_PIN,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["lcd_base"]
 
@@ -17,7 +18,7 @@ lcd_gpio_ns = cg.esphome_ns.namespace("lcd_gpio")
 GPIOLCDDisplay = lcd_gpio_ns.class_("GPIOLCDDisplay", lcd_base.LCDDisplay)
 
 
-def validate_pin_length(value):
+def validate_pin_length(value: list[ConfigType]) -> list[ConfigType]:
     if len(value) != 4 and len(value) != 8:
         raise cv.Invalid(
             f"LCD Displays can either operate in 4-pin or 8-pin mode,not {len(value)}-pin mode"
@@ -38,7 +39,7 @@ CONFIG_SCHEMA = lcd_base.LCD_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await lcd_base.setup_lcd_display(var, config)
     pins_ = [await cg.gpio_pin_expression(conf) for conf in config[CONF_DATA_PINS]]
diff --git a/esphome/components/lcd_menu/__init__.py b/esphome/components/lcd_menu/__init__.py
index 3f3162e31e..88b8ac21d4 100644
--- a/esphome/components/lcd_menu/__init__.py
+++ b/esphome/components/lcd_menu/__init__.py
@@ -8,6 +8,7 @@ from esphome.components.display_menu_base import (
 import esphome.config_validation as cv
 from esphome.const import CONF_DIMENSIONS, CONF_DISPLAY_ID, CONF_ID
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@numo68"]
 
@@ -29,7 +30,7 @@ LCDCharacterMenuComponent = lcd_menu_ns.class_(
 MULTI_CONF = True
 
 
-def validate_lcd_dimensions(config):
+def validate_lcd_dimensions(config: ConfigType) -> ConfigType:
     if config[CONF_DIMENSIONS][0] < MINIMUM_COLUMNS:
         raise cv.Invalid(
             f"LCD display must have at least {MINIMUM_COLUMNS} columns to be usable with the menu"
@@ -56,7 +57,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     disp = await cg.get_variable(config[CONF_DISPLAY_ID])
diff --git a/esphome/components/lcd_pcf8574/display.py b/esphome/components/lcd_pcf8574/display.py
index 410c7f81b7..85a79e99ce 100644
--- a/esphome/components/lcd_pcf8574/display.py
+++ b/esphome/components/lcd_pcf8574/display.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, lcd_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_LAMBDA
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["lcd_base"]
@@ -18,7 +19,7 @@ CONFIG_SCHEMA = lcd_base.LCD_SCHEMA.extend(
 ).extend(i2c.i2c_device_schema(0x3F))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await lcd_base.setup_lcd_display(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/lilygo_t5_47/touchscreen/__init__.py b/esphome/components/lilygo_t5_47/touchscreen/__init__.py
index 93687846e2..1e70f379a1 100644
--- a/esphome/components/lilygo_t5_47/touchscreen/__init__.py
+++ b/esphome/components/lilygo_t5_47/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN
+from esphome.types import ConfigType
 
 from .. import lilygo_t5_47_ns
 
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = touchscreen.touchscreen_schema("250ms").extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/lm75b/sensor.py b/esphome/components/lm75b/sensor.py
index 335446b62f..c59515b5b0 100644
--- a/esphome/components/lm75b/sensor.py
+++ b/esphome/components/lm75b/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@beormund"]
 DEPENDENCIES = ["i2c"]
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ln882x/__init__.py b/esphome/components/ln882x/__init__.py
index 6da5a4969c..b4e179c4a9 100644
--- a/esphome/components/ln882x/__init__.py
+++ b/esphome/components/ln882x/__init__.py
@@ -28,6 +28,8 @@ from esphome.components.libretiny.const import (
     LibreTinyComponent,
 )
 from esphome.core import CORE
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from .boards import LN882X_BOARD_PINS, LN882X_BOARDS
 
@@ -45,7 +47,7 @@ COMPONENT_DATA = LibreTinyComponent(
 )
 
 
-def _set_core_data(config):
+def _set_core_data(config: ConfigType) -> ConfigType:
     CORE.data[KEY_LIBRETINY] = {}
     CORE.data[KEY_LIBRETINY][KEY_COMPONENT_DATA] = COMPONENT_DATA
     return config
@@ -62,12 +64,12 @@ PIN_SCHEMA = libretiny.gpio.BASE_PIN_SCHEMA
 CONFIG_SCHEMA.prepend_extra(_set_core_data)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> MockObj:
     return await libretiny.component_to_code(config)
 
 
 @pins.PIN_SCHEMA_REGISTRY.register("ln882x", PIN_SCHEMA)
-async def pin_to_code(config):
+async def pin_to_code(config: ConfigType) -> MockObj:
     return await libretiny.gpio.component_pin_to_code(config)
 
 
diff --git a/esphome/components/lps22/sensor.py b/esphome/components/lps22/sensor.py
index 08e97ee7b7..2eec2c586c 100644
--- a/esphome/components/lps22/sensor.py
+++ b/esphome/components/lps22/sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_HECTOPASCAL,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@nagisa"]
 DEPENDENCIES = ["i2c"]
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/lsm6ds/motion.py b/esphome/components/lsm6ds/motion.py
index 8c2c5198ea..064cd312a9 100644
--- a/esphome/components/lsm6ds/motion.py
+++ b/esphome/components/lsm6ds/motion.py
@@ -8,6 +8,7 @@ from esphome.components.const import (
 )
 from esphome.components.motion import motion_schema, new_motion_component
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from . import LSM6DSComponent, lsm6ds_ns
 
@@ -93,7 +94,7 @@ CONFIG_SCHEMA = (
 
 
 # ── Code generation ──────────────────────────────────────────────────────────
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await new_motion_component(config)
 
     # Let the motion platform handle sensor wiring, axis mapping, and polling
diff --git a/esphome/components/lsm6ds/sensor.py b/esphome/components/lsm6ds/sensor.py
index 980e84a2e9..c0c37f8527 100644
--- a/esphome/components/lsm6ds/sensor.py
+++ b/esphome/components/lsm6ds/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
 )
 from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_LSM6DS_ID, LSM6DSComponent
 
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     parent = await cg.get_variable(config[CONF_LSM6DS_ID])
     data = MockObj("data")
diff --git a/esphome/components/ltr390/sensor.py b/esphome/components/ltr390/sensor.py
index 37fceaf984..c3ac90ad11 100644
--- a/esphome/components/ltr390/sensor.py
+++ b/esphome/components/ltr390/sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_LUX,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@sjtrny", "@latonita"]
 DEPENDENCIES = ["i2c"]
@@ -117,7 +118,7 @@ TYPES = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/max31855/sensor.py b/esphome/components/max31855/sensor.py
index 35ae28d04c..a52f45a18f 100644
--- a/esphome/components/max31855/sensor.py
+++ b/esphome/components/max31855/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 max31855_ns = cg.esphome_ns.namespace("max31855")
 MAX31855Sensor = max31855_ns.class_(
@@ -36,7 +37,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/max31856/sensor.py b/esphome/components/max31856/sensor.py
index 679e02b11d..43a2e18db8 100644
--- a/esphome/components/max31856/sensor.py
+++ b/esphome/components/max31856/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 max31856_ns = cg.esphome_ns.namespace("max31856")
 MAX31856Sensor = max31856_ns.class_(
@@ -58,7 +59,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/max31865/sensor.py b/esphome/components/max31865/sensor.py
index d4498b062f..167a0997e4 100644
--- a/esphome/components/max31865/sensor.py
+++ b/esphome/components/max31865/sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@DAVe3283"]
 DEPENDENCIES = ["spi"]
@@ -52,7 +53,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/max44009/sensor.py b/esphome/components/max44009/sensor.py
index 5aea7f0be2..88673c5d00 100644
--- a/esphome/components/max44009/sensor.py
+++ b/esphome/components/max44009/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_LUX,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@berfenger"]
 DEPENDENCIES = ["i2c"]
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/max6675/sensor.py b/esphome/components/max6675/sensor.py
index e42abb68d1..94d857cab9 100644
--- a/esphome/components/max6675/sensor.py
+++ b/esphome/components/max6675/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 max6675_ns = cg.esphome_ns.namespace("max6675")
 MAX6675Sensor = max6675_ns.class_(
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/max7219/display.py b/esphome/components/max7219/display.py
index abb20702bd..b21f66b553 100644
--- a/esphome/components/max7219/display.py
+++ b/esphome/components/max7219/display.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import display, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTENSITY, CONF_LAMBDA, CONF_NUM_CHIPS
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
 
@@ -27,7 +28,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID], config[CONF_NUM_CHIPS])
     await spi.register_spi_device(var, config, write_only=True)
     await display.register_display(var, config)
diff --git a/esphome/components/max9611/sensor.py b/esphome/components/max9611/sensor.py
index b3a73d8c10..9332274a95 100644
--- a/esphome/components/max9611/sensor.py
+++ b/esphome/components/max9611/sensor.py
@@ -19,6 +19,7 @@ from esphome.const import (
     UNIT_VOLT,
     UNIT_WATT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 max9611_ns = cg.esphome_ns.namespace("max9611")
@@ -70,7 +71,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mcp23008/__init__.py b/esphome/components/mcp23008/__init__.py
index 8ff938114a..3d1480a6f7 100644
--- a/esphome/components/mcp23008/__init__.py
+++ b/esphome/components/mcp23008/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, mcp23x08_base, mcp23xxx_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["mcp23x08_base"]
 CODEOWNERS = ["@jesserockz"]
@@ -23,6 +24,6 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await mcp23xxx_base.register_mcp23xxx(config, mcp23x08_base.NUM_PINS)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mcp23016/__init__.py b/esphome/components/mcp23016/__init__.py
index 37c5205fe8..5f4b7276d8 100644
--- a/esphome/components/mcp23016/__init__.py
+++ b/esphome/components/mcp23016/__init__.py
@@ -11,6 +11,8 @@ from esphome.const import (
     CONF_NUMBER,
     CONF_OUTPUT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["gpio_expander"]
 DEPENDENCIES = ["i2c"]
@@ -33,7 +35,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -41,7 +43,7 @@ async def to_code(config):
         cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -64,7 +66,7 @@ MCP23016_PIN_SCHEMA = pins.gpio_base_schema(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_MCP23016, MCP23016_PIN_SCHEMA)
-async def mcp23016_pin_to_code(config):
+async def mcp23016_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_MCP23016])
 
diff --git a/esphome/components/mcp23017/__init__.py b/esphome/components/mcp23017/__init__.py
index e5cc1856eb..474d75f6ff 100644
--- a/esphome/components/mcp23017/__init__.py
+++ b/esphome/components/mcp23017/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, mcp23x17_base, mcp23xxx_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["mcp23x17_base"]
 CODEOWNERS = ["@jesserockz"]
@@ -23,6 +24,6 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await mcp23xxx_base.register_mcp23xxx(config, mcp23x17_base.NUM_PINS)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mcp23s08/__init__.py b/esphome/components/mcp23s08/__init__.py
index 312da79b75..ffc51b8146 100644
--- a/esphome/components/mcp23s08/__init__.py
+++ b/esphome/components/mcp23s08/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import mcp23x08_base, mcp23xxx_base, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["mcp23x08_base"]
 CODEOWNERS = ["@SenexCrenshaw", "@jesserockz"]
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await mcp23xxx_base.register_mcp23xxx(config, mcp23x08_base.NUM_PINS)
     cg.add(var.set_device_address(config[CONF_DEVICEADDRESS]))
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/mcp23s17/__init__.py b/esphome/components/mcp23s17/__init__.py
index 599bfa0851..d693a64ce8 100644
--- a/esphome/components/mcp23s17/__init__.py
+++ b/esphome/components/mcp23s17/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import mcp23x17_base, mcp23xxx_base, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["mcp23x17_base"]
 CODEOWNERS = ["@SenexCrenshaw", "@jesserockz"]
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await mcp23xxx_base.register_mcp23xxx(config, mcp23x17_base.NUM_PINS)
     cg.add(var.set_device_address(config[CONF_DEVICEADDRESS]))
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/mcp2515/canbus.py b/esphome/components/mcp2515/canbus.py
index d34a77248c..8bb8918f96 100644
--- a/esphome/components/mcp2515/canbus.py
+++ b/esphome/components/mcp2515/canbus.py
@@ -3,6 +3,7 @@ from esphome.components import canbus, spi
 from esphome.components.canbus import CanbusComponent
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MODE
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@mvturnho", "@danielschramm"]
 DEPENDENCIES = ["spi"]
@@ -36,7 +37,7 @@ CONFIG_SCHEMA = canbus.CANBUS_SCHEMA.extend(
 ).extend(spi.spi_device_schema(True))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     rhs = mcp2515.new()
     var = cg.Pvariable(config[CONF_ID], rhs)
     await canbus.register_canbus(var, config)
diff --git a/esphome/components/mcp3008/__init__.py b/esphome/components/mcp3008/__init__.py
index 41ccdd403a..6d1bd5a970 100644
--- a/esphome/components/mcp3008/__init__.py
+++ b/esphome/components/mcp3008/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
 AUTO_LOAD = ["sensor"]
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(spi.spi_device_schema(cs_pin_required=True))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/mcp3008/sensor/__init__.py b/esphome/components/mcp3008/sensor/__init__.py
index 2576ef50e5..de31f81345 100644
--- a/esphome/components/mcp3008/sensor/__init__.py
+++ b/esphome/components/mcp3008/sensor/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 from .. import MCP3008, mcp3008_ns
 
@@ -43,7 +44,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_MCP3008_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/mcp3204/__init__.py b/esphome/components/mcp3204/__init__.py
index 612297f934..5757bdbfa9 100644
--- a/esphome/components/mcp3204/__init__.py
+++ b/esphome/components/mcp3204/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_REFERENCE_VOLTAGE
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
 MULTI_CONF = True
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(spi.spi_device_schema(cs_pin_required=True))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_reference_voltage(config[CONF_REFERENCE_VOLTAGE]))
     await cg.register_component(var, config)
diff --git a/esphome/components/mcp3204/sensor/__init__.py b/esphome/components/mcp3204/sensor/__init__.py
index 5f9aa9fdb6..728a1c0611 100644
--- a/esphome/components/mcp3204/sensor/__init__.py
+++ b/esphome/components/mcp3204/sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import sensor, voltage_sampler
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_NUMBER
+from esphome.types import ConfigType
 
 from .. import MCP3204, mcp3204_ns
 
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(
         config[CONF_ID],
         config[CONF_NUMBER],
diff --git a/esphome/components/mcp3221/sensor.py b/esphome/components/mcp3221/sensor.py
index 993876c2c8..30e972d808 100644
--- a/esphome/components/mcp3221/sensor.py
+++ b/esphome/components/mcp3221/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["voltage_sampler"]
 DEPENDENCIES = ["i2c"]
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     cg.add(var.set_reference_voltage(config[CONF_REFERENCE_VOLTAGE]))
     await cg.register_component(var, config)
diff --git a/esphome/components/mcp4725/output.py b/esphome/components/mcp4725/output.py
index 5ec6a9d686..0c1224a1a7 100644
--- a/esphome/components/mcp4725/output.py
+++ b/esphome/components/mcp4725/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mcp4728/__init__.py b/esphome/components/mcp4728/__init__.py
index da3244be84..f48bdde681 100644
--- a/esphome/components/mcp4728/__init__.py
+++ b/esphome/components/mcp4728/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@berfenger"]
 DEPENDENCIES = ["i2c"]
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID], config[CONF_STORE_IN_EEPROM])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mcp4728/output/__init__.py b/esphome/components/mcp4728/output/__init__.py
index 6f4a41510f..e8cb4c47d6 100644
--- a/esphome/components/mcp4728/output/__init__.py
+++ b/esphome/components/mcp4728/output/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_GAIN, CONF_ID
+from esphome.types import ConfigType
 
 from .. import CONF_MCP4728_ID, MCP4728Component, mcp4728_ns
 
@@ -50,7 +51,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_MCP4728_ID])
     var = cg.new_Pvariable(
         config[CONF_ID],
diff --git a/esphome/components/mcp47a1/output.py b/esphome/components/mcp47a1/output.py
index ebd597cfeb..91bb3b47db 100644
--- a/esphome/components/mcp47a1/output.py
+++ b/esphome/components/mcp47a1/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["i2c"]
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mcp9600/sensor.py b/esphome/components/mcp9600/sensor.py
index 65ae5f2eec..5542ffaa6c 100644
--- a/esphome/components/mcp9600/sensor.py
+++ b/esphome/components/mcp9600/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CONF_HOT_JUNCTION = "hot_junction"
 CONF_COLD_JUNCTION = "cold_junction"
@@ -62,7 +63,7 @@ FINAL_VALIDATE_SCHEMA = i2c.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
 
     await cg.register_component(var, config)
diff --git a/esphome/components/mcp9808/sensor.py b/esphome/components/mcp9808/sensor.py
index ba6718ca56..1daaa9c131 100644
--- a/esphome/components/mcp9808/sensor.py
+++ b/esphome/components/mcp9808/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@k7hpn"]
 DEPENDENCIES = ["i2c"]
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/md5/__init__.py b/esphome/components/md5/__init__.py
index 1710b00e66..6a928d1682 100644
--- a/esphome/components/md5/__init__.py
+++ b/esphome/components/md5/__init__.py
@@ -1,11 +1,12 @@
 import esphome.codegen as cg
 from esphome.core import CORE
 from esphome.helpers import IS_MACOS
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_MD5")
 
     # Add OpenSSL library for host platform
diff --git a/esphome/components/mdns/__init__.py b/esphome/components/mdns/__init__.py
index 24bce0cc3c..c9334ea97a 100644
--- a/esphome/components/mdns/__init__.py
+++ b/esphome/components/mdns/__init__.py
@@ -31,7 +31,7 @@ MDNSTXTRecord = mdns_ns.struct("MDNSTXTRecord")
 MDNSService = mdns_ns.struct("MDNSService")
 
 
-def _remove_id_if_disabled(value):
+def _remove_id_if_disabled(value: ConfigType) -> ConfigType:
     value = value.copy()
     if value[CONF_DISABLED]:
         value.pop(CONF_ID)
@@ -117,7 +117,7 @@ def mdns_txt_record(key: str, value: str) -> cg.RawExpression:
 
 
 async def _mdns_txt_record_templated(
-    mdns_comp: cg.Pvariable, key: str, value: Lambda | str
+    mdns_comp: cg.MockObj, key: str, value: Lambda | str
 ) -> cg.RawExpression:
     """Create a mDNS TXT record with support for templated values.
 
@@ -172,7 +172,7 @@ def mdns_service(
     )
 
 
-def enable_mdns_storage():
+def enable_mdns_storage() -> None:
     """Enable persistent storage of mDNS services in the MDNSComponent.
 
     Called by external components (like OpenThread) that need access to
@@ -184,7 +184,7 @@ def enable_mdns_storage():
 
 
 @coroutine_with_priority(CoroPriority.NETWORK_SERVICES)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if config[CONF_DISABLED] is True:
         return
 
diff --git a/esphome/components/media_source/__init__.py b/esphome/components/media_source/__init__.py
index 43256db4af..c9dab7e4d2 100644
--- a/esphome/components/media_source/__init__.py
+++ b/esphome/components/media_source/__init__.py
@@ -3,7 +3,8 @@ import esphome.config_validation as cv
 from esphome.const import CONF_ID
 from esphome.core import CORE
 from esphome.coroutine import CoroPriority, coroutine_with_priority
-from esphome.cpp_generator import MockObjClass
+from esphome.cpp_generator import MockObj, MockObjClass
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kahrendt"]
 
@@ -16,7 +17,7 @@ media_source_ns = cg.esphome_ns.namespace("media_source")
 MediaSource = media_source_ns.class_("MediaSource")
 
 
-async def register_media_source(var, config):
+async def register_media_source(var: MockObj, config: ConfigType) -> MockObj:
     if not CORE.has_id(config[CONF_ID]):
         var = cg.Pvariable(config[CONF_ID], var)
     CORE.register_platform_component("media_source", var)
@@ -35,6 +36,6 @@ def media_source_schema(
 
 
 @coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_global(media_source_ns.using)
     cg.add_define("USE_MEDIA_SOURCE")
diff --git a/esphome/components/mics_4514/sensor.py b/esphome/components/mics_4514/sensor.py
index 09329ebfcf..3ba560c781 100644
--- a/esphome/components/mics_4514/sensor.py
+++ b/esphome/components/mics_4514/sensor.py
@@ -14,6 +14,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["i2c"]
@@ -56,7 +57,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/midea_ir/climate.py b/esphome/components/midea_ir/climate.py
index cbf5fae6fe..84bfeab0d4 100644
--- a/esphome/components/midea_ir/climate.py
+++ b/esphome/components/midea_ir/climate.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import climate_ir
 import esphome.config_validation as cv
 from esphome.const import CONF_USE_FAHRENHEIT
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir", "coolix"]
 CODEOWNERS = ["@dudanov"]
@@ -17,6 +18,6 @@ CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(MideaIR).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate_ir.new_climate_ir(config)
     cg.add(var.set_fahrenheit(config[CONF_USE_FAHRENHEIT]))
diff --git a/esphome/components/mitsubishi/climate.py b/esphome/components/mitsubishi/climate.py
index 8291d70346..2d38351898 100644
--- a/esphome/components/mitsubishi/climate.py
+++ b/esphome/components/mitsubishi/climate.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@RubyBailey"]
 AUTO_LOAD = ["climate_ir"]
@@ -58,7 +59,7 @@ CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(MitsubishiClimate).ex
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate_ir.new_climate_ir(config)
 
     cg.add(var.set_fan_mode(config[CONF_SET_FAN_MODE]))
diff --git a/esphome/components/mlx90393/sensor.py b/esphome/components/mlx90393/sensor.py
index a6330b1cc0..59bdffc114 100644
--- a/esphome/components/mlx90393/sensor.py
+++ b/esphome/components/mlx90393/sensor.py
@@ -17,6 +17,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_MICROTESLA,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@functionpointer"]
 DEPENDENCIES = ["i2c"]
@@ -52,7 +53,7 @@ CONF_DRDY_PIN = "drdy_pin"
 CONF_HALLCONF = "hallconf"
 
 
-def _validate(config):
+def _validate(config: ConfigType) -> ConfigType:
     if config[CONF_TEMPERATURE_COMPENSATION]:
         for axis in [CONF_X_AXIS, CONF_Y_AXIS, CONF_Z_AXIS]:
             if axis not in config:
@@ -74,7 +75,7 @@ def _validate(config):
     return config
 
 
-def mlx90393_axis_schema():
+def mlx90393_axis_schema() -> cv.Schema:
     return sensor.sensor_schema(
         unit_of_measurement=UNIT_MICROTESLA,
         accuracy_decimals=0,
@@ -127,7 +128,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mlx90614/sensor.py b/esphome/components/mlx90614/sensor.py
index 6a34c4bdc0..0cf9b95dde 100644
--- a/esphome/components/mlx90614/sensor.py
+++ b/esphome/components/mlx90614/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["i2c"]
@@ -47,7 +48,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mmc5603/sensor.py b/esphome/components/mmc5603/sensor.py
index 6d2bafdd0e..a9f240508c 100644
--- a/esphome/components/mmc5603/sensor.py
+++ b/esphome/components/mmc5603/sensor.py
@@ -15,6 +15,8 @@ from esphome.const import (
     UNIT_DEGREES,
     UNIT_MICROTESLA,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CONF_AUTO_SET_RESET = "auto_set_reset"
 
@@ -65,7 +67,7 @@ CONFIG_SCHEMA = (
 )
 
 
-def auto_data_rate(config):
+def auto_data_rate(config: ConfigType) -> MockObj:
     interval_msec = config[CONF_UPDATE_INTERVAL].total_milliseconds
     interval_hz = 1000.0 / interval_msec
     for datarate in sorted(MMC5603Datarates.keys()):
@@ -74,7 +76,7 @@ def auto_data_rate(config):
     return MMC5603Datarates[75]
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mmc5983/sensor.py b/esphome/components/mmc5983/sensor.py
index aaff2946f2..797181690f 100644
--- a/esphome/components/mmc5983/sensor.py
+++ b/esphome/components/mmc5983/sensor.py
@@ -10,6 +10,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_MICROTESLA,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -39,7 +40,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/modbus_server/__init__.py b/esphome/components/modbus_server/__init__.py
index 249454b6b0..0de40a4cc1 100644
--- a/esphome/components/modbus_server/__init__.py
+++ b/esphome/components/modbus_server/__init__.py
@@ -151,7 +151,7 @@ def _final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     if server_courtesy_response := config.get(CONF_COURTESY_RESPONSE):
         cg.add(
diff --git a/esphome/components/monochromatic/light.py b/esphome/components/monochromatic/light.py
index 4ce0202d25..04336bcde1 100644
--- a/esphome/components/monochromatic/light.py
+++ b/esphome/components/monochromatic/light.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import light, output
 import esphome.config_validation as cv
 from esphome.const import CONF_OUTPUT, CONF_OUTPUT_ID
+from esphome.types import ConfigType
 
 monochromatic_ns = cg.esphome_ns.namespace("monochromatic")
 MonochromaticLightOutput = monochromatic_ns.class_(
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = light.BRIGHTNESS_ONLY_LIGHT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await light.register_light(var, config)
 
diff --git a/esphome/components/mopeka_ble/__init__.py b/esphome/components/mopeka_ble/__init__.py
index ab261142b8..ec7deb3067 100644
--- a/esphome/components/mopeka_ble/__init__.py
+++ b/esphome/components/mopeka_ble/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ble_device_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@spbrogan", "@Fabian-Schmidt"]
 AUTO_LOAD = ["ble_device_base"]
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     if CONF_SHOW_SENSORS_WITHOUT_SYNC in config:
         cg.add(
diff --git a/esphome/components/mopeka_pro_check/sensor.py b/esphome/components/mopeka_pro_check/sensor.py
index 0d10970550..5f7c9445f2 100644
--- a/esphome/components/mopeka_pro_check/sensor.py
+++ b/esphome/components/mopeka_pro_check/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import ble_device_base, sensor
 import esphome.config_validation as cv
@@ -21,6 +23,7 @@ from esphome.const import (
     UNIT_MILLIMETER,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CONF_TANK_TYPE = "tank_type"
 CONF_CUSTOM_DISTANCE_FULL = "custom_distance_full"
@@ -34,7 +37,7 @@ ICON_PROPANE_TANK = "mdi:propane-tank"
 TANK_TYPE_CUSTOM = "CUSTOM"
 
 
-def small_distance(value):
+def small_distance(value: Any) -> float:
     """small_distance is stored in mm"""
     meters = cv.distance(value)
     return meters * 1000
@@ -128,7 +131,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/mopeka_std_check/sensor.py b/esphome/components/mopeka_std_check/sensor.py
index 5cc4ea3039..d5c5d4135d 100644
--- a/esphome/components/mopeka_std_check/sensor.py
+++ b/esphome/components/mopeka_std_check/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import ble_device_base, sensor
 import esphome.config_validation as cv
@@ -17,6 +19,7 @@ from esphome.const import (
     UNIT_MILLIMETER,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CONF_TANK_TYPE = "tank_type"
 CONF_CUSTOM_DISTANCE_FULL = "custom_distance_full"
@@ -28,7 +31,7 @@ ICON_PROPANE_TANK = "mdi:propane-tank"
 TANK_TYPE_CUSTOM = "CUSTOM"
 
 
-def small_distance(value):
+def small_distance(value: Any) -> float:
     """small_distance is stored in mm"""
     meters = cv.distance(value)
     return meters * 1000
@@ -99,7 +102,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/mpl3115a2/sensor.py b/esphome/components/mpl3115a2/sensor.py
index b2cd1fb535..4fbc353644 100644
--- a/esphome/components/mpl3115a2/sensor.py
+++ b/esphome/components/mpl3115a2/sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     UNIT_HECTOPASCAL,
     UNIT_METER,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbickar"]
 DEPENDENCIES = ["i2c"]
@@ -58,7 +59,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mpu6050/sensor.py b/esphome/components/mpu6050/sensor.py
index 377958fbe7..a8370ced7f 100644
--- a/esphome/components/mpu6050/sensor.py
+++ b/esphome/components/mpu6050/sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     UNIT_DEGREE_PER_SECOND,
     UNIT_METER_PER_SECOND_SQUARED,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -64,7 +65,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mpu6886/sensor.py b/esphome/components/mpu6886/sensor.py
index 580fad7c23..5bdb836128 100644
--- a/esphome/components/mpu6886/sensor.py
+++ b/esphome/components/mpu6886/sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     UNIT_DEGREE_PER_SECOND,
     UNIT_METER_PER_SECOND_SQUARED,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@fabaff"]
 DEPENDENCIES = ["i2c"]
@@ -65,7 +66,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/mqtt_subscribe/sensor/__init__.py b/esphome/components/mqtt_subscribe/sensor/__init__.py
index 56efb3f67e..e451d2db8a 100644
--- a/esphome/components/mqtt_subscribe/sensor/__init__.py
+++ b/esphome/components/mqtt_subscribe/sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import mqtt, sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_QOS, CONF_TOPIC
+from esphome.types import ConfigType
 
 from .. import mqtt_subscribe_ns
 
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/mqtt_subscribe/text_sensor/__init__.py b/esphome/components/mqtt_subscribe/text_sensor/__init__.py
index 9c5d3a81eb..d432ef8a93 100644
--- a/esphome/components/mqtt_subscribe/text_sensor/__init__.py
+++ b/esphome/components/mqtt_subscribe/text_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import mqtt, text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_QOS, CONF_TOPIC
+from esphome.types import ConfigType
 
 from .. import mqtt_subscribe_ns
 
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await text_sensor.new_text_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/ms5611/sensor.py b/esphome/components/ms5611/sensor.py
index dfb6083bef..e42e0824dd 100644
--- a/esphome/components/ms5611/sensor.py
+++ b/esphome/components/ms5611/sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_HECTOPASCAL,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ms8607/sensor.py b/esphome/components/ms8607/sensor.py
index 038f17190a..e5d90432d8 100644
--- a/esphome/components/ms8607/sensor.py
+++ b/esphome/components/ms8607/sensor.py
@@ -14,6 +14,7 @@ from esphome.const import (
     UNIT_HECTOPASCAL,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -62,7 +63,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/my9231/__init__.py b/esphome/components/my9231/__init__.py
index e5a879a0f0..e43454d6ed 100644
--- a/esphome/components/my9231/__init__.py
+++ b/esphome/components/my9231/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_NUM_CHANNELS,
     CONF_NUM_CHIPS,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["output"]
 my9231_ns = cg.esphome_ns.namespace("my9231")
@@ -27,7 +28,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/my9231/output.py b/esphome/components/my9231/output.py
index b4fad82c5f..c2ec15d411 100644
--- a/esphome/components/my9231/output.py
+++ b/esphome/components/my9231/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from . import MY9231OutputComponent
 
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
 
diff --git a/esphome/components/network/__init__.py b/esphome/components/network/__init__.py
index 96a6f11b9a..9a47679ba3 100644
--- a/esphome/components/network/__init__.py
+++ b/esphome/components/network/__init__.py
@@ -364,7 +364,7 @@ FINAL_VALIDATE_SCHEMA = _final_validate
 
 
 @coroutine_with_priority(CoroPriority.NETWORK)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     cg.add_define("USE_NETWORK")
     # ESP32 with Arduino uses ESP-IDF network APIs directly, no Arduino Network library needed
 
diff --git a/esphome/components/nfc/binary_sensor/__init__.py b/esphome/components/nfc/binary_sensor/__init__.py
index 47cf014550..e9747d7a14 100644
--- a/esphome/components/nfc/binary_sensor/__init__.py
+++ b/esphome/components/nfc/binary_sensor/__init__.py
@@ -1,8 +1,11 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_UID
 from esphome.core import HexInt
+from esphome.types import ConfigType
 
 from .. import Nfcc, NfcTagListener, nfc_ns
 
@@ -21,7 +24,7 @@ NfcTagBinarySensor = nfc_ns.class_(
 )
 
 
-def validate_uid(value):
+def validate_uid(value: Any) -> str:
     value = cv.string_strict(value)
     for x in value.split("-"):
         if len(x) != 2:
@@ -56,7 +59,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await cg.register_parented(var, config[CONF_NFCC_ID])
diff --git a/esphome/components/noblex/climate.py b/esphome/components/noblex/climate.py
index 19c4b6a08e..89fff517fb 100644
--- a/esphome/components/noblex/climate.py
+++ b/esphome/components/noblex/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 
@@ -9,5 +10,5 @@ NoblexClimate = noblex_ns.class_("NoblexClimate", climate_ir.ClimateIR)
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(NoblexClimate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/npi19/sensor.py b/esphome/components/npi19/sensor.py
index d13e72f5f8..4c7db10ce9 100644
--- a/esphome/components/npi19/sensor.py
+++ b/esphome/components/npi19/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@bakerkj"]
 DEPENDENCIES = ["i2c"]
@@ -38,7 +39,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/one_wire/__init__.py b/esphome/components/one_wire/__init__.py
index 9173b7014b..8d35aaa34e 100644
--- a/esphome/components/one_wire/__init__.py
+++ b/esphome/components/one_wire/__init__.py
@@ -1,6 +1,8 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ADDRESS, CONF_INDEX
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ssieb"]
 
@@ -13,7 +15,7 @@ OneWireBus = one_wire_ns.class_("OneWireBus")
 OneWireDevice = one_wire_ns.class_("OneWireDevice")
 
 
-def one_wire_device_schema():
+def one_wire_device_schema() -> cv.Schema:
     """Create a schema for a 1-wire device.
 
     :return: The 1-wire device schema, `extend` this in your config schema.
@@ -27,7 +29,7 @@ def one_wire_device_schema():
     )
 
 
-async def register_one_wire_device(var, config):
+async def register_one_wire_device(var: MockObj, config: ConfigType) -> None:
     """Register an 1-wire device with the given config.
 
     Sets the 1-wire bus to use and the 1-wire address.
diff --git a/esphome/components/opt3001/sensor.py b/esphome/components/opt3001/sensor.py
index 8490b0bd49..01ea125630 100644
--- a/esphome/components/opt3001/sensor.py
+++ b/esphome/components/opt3001/sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_ILLUMINANCE, STATE_CLASS_MEASUREMENT, UNIT_LUX
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@ccutrer"]
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/packages/__init__.py b/esphome/components/packages/__init__.py
index 4d1814ac7a..171c6753ae 100644
--- a/esphome/components/packages/__init__.py
+++ b/esphome/components/packages/__init__.py
@@ -88,7 +88,7 @@ def valid_package_contents(package_config: dict) -> dict:
     return package_config
 
 
-def expand_file_to_files(config: dict):
+def expand_file_to_files(config: dict) -> dict:
     if CONF_FILE in config:
         new_config = config
         new_config[CONF_FILES] = [config[CONF_FILE]]
@@ -97,7 +97,7 @@ def expand_file_to_files(config: dict):
     return config
 
 
-def validate_yaml_filename(value):
+def validate_yaml_filename(value: Any) -> str:
     value = cv.string(value)
 
     if not value.endswith((".yaml", ".yml")):
@@ -106,7 +106,7 @@ def validate_yaml_filename(value):
     return value
 
 
-def validate_source_shorthand(value):
+def validate_source_shorthand(value: Any) -> dict:
     if not isinstance(value, str):
         raise cv.Invalid("Git URL shorthand only for strings")
 
diff --git a/esphome/components/partition/light.py b/esphome/components/partition/light.py
index 58de1183ff..b2341f95b7 100644
--- a/esphome/components/partition/light.py
+++ b/esphome/components/partition/light.py
@@ -14,6 +14,7 @@ from esphome.const import (
     CONF_TO,
 )
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 partitions_ns = cg.esphome_ns.namespace("partition")
 AddressableSegment = partitions_ns.class_("AddressableSegment")
@@ -25,7 +26,7 @@ PartitionLightOutput = partitions_ns.class_(
 )
 
 
-def validate_from_to(value):
+def validate_from_to(value: ConfigType) -> ConfigType:
     if CONF_ID in value and value[CONF_FROM] > value[CONF_TO]:
         raise cv.Invalid(
             f"From ({value[CONF_FROM]}) must not be larger than to ({value[CONF_TO]})"
@@ -33,7 +34,7 @@ def validate_from_to(value):
     return value
 
 
-def validate_segment(config):
+def validate_segment(config: ConfigType) -> None:
     fconf = fv.full_config.get()
 
     if CONF_ID in config:  # only validate addressable segments
@@ -94,7 +95,7 @@ FINAL_VALIDATE_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     segments = []
     for conf in config[CONF_SEGMENTS]:
         if CONF_SINGLE_LIGHT_ID in conf:
diff --git a/esphome/components/pca6416a/__init__.py b/esphome/components/pca6416a/__init__.py
index 1df22a8ff5..47b9118d9a 100644
--- a/esphome/components/pca6416a/__init__.py
+++ b/esphome/components/pca6416a/__init__.py
@@ -12,6 +12,8 @@ from esphome.const import (
     CONF_OUTPUT,
     CONF_PULLUP,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Mat931"]
 DEPENDENCIES = ["i2c"]
@@ -37,7 +39,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -45,7 +47,7 @@ async def to_code(config):
         cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -74,7 +76,7 @@ PCA6416A_PIN_SCHEMA = cv.All(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_PCA6416A, PCA6416A_PIN_SCHEMA)
-async def pca6416a_pin_to_code(config):
+async def pca6416a_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_PCA6416A])
 
diff --git a/esphome/components/pca9685/__init__.py b/esphome/components/pca9685/__init__.py
index 0e238ff7da..817cfd1c30 100644
--- a/esphome/components/pca9685/__init__.py
+++ b/esphome/components/pca9685/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import (
     CONF_ID,
     CONF_PHASE_BALANCER,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 MULTI_CONF = True
@@ -21,7 +22,7 @@ PHASE_BALANCERS = {
 }
 
 
-def validate_frequency(config):
+def validate_frequency(config: ConfigType) -> ConfigType:
     if config[CONF_EXTERNAL_CLOCK_INPUT]:
         if CONF_FREQUENCY in config:
             raise cv.Invalid(
@@ -52,7 +53,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     if CONF_FREQUENCY in config:
         cg.add(var.set_frequency(config[CONF_FREQUENCY]))
diff --git a/esphome/components/pca9685/output.py b/esphome/components/pca9685/output.py
index 302c2f78c0..3bb8882ed3 100644
--- a/esphome/components/pca9685/output.py
+++ b/esphome/components/pca9685/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from . import PCA9685Output, pca9685_ns
 
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_PCA9685_ID])
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_channel(config[CONF_CHANNEL]))
diff --git a/esphome/components/pcd8544/display.py b/esphome/components/pcd8544/display.py
index 2f6dcc56ed..42cef67488 100644
--- a/esphome/components/pcd8544/display.py
+++ b/esphome/components/pcd8544/display.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_PAGES,
     CONF_RESET_PIN,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
 
@@ -40,7 +41,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
 
     await display.register_display(var, config)
diff --git a/esphome/components/pcf8574/__init__.py b/esphome/components/pcf8574/__init__.py
index 559fe1d76d..9f8c7fabd2 100644
--- a/esphome/components/pcf8574/__init__.py
+++ b/esphome/components/pcf8574/__init__.py
@@ -11,6 +11,8 @@ from esphome.const import (
     CONF_NUMBER,
     CONF_OUTPUT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["gpio_expander"]
 DEPENDENCIES = ["i2c"]
@@ -36,7 +38,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -45,7 +47,7 @@ async def to_code(config):
         cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -67,7 +69,7 @@ PCF8574_PIN_SCHEMA = pins.gpio_base_schema(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_PCF8574, PCF8574_PIN_SCHEMA)
-async def pcf8574_pin_to_code(config):
+async def pcf8574_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_PCF8574])
 
diff --git a/esphome/components/pi4ioe5v6408/__init__.py b/esphome/components/pi4ioe5v6408/__init__.py
index ee270138e1..11a5dd62bb 100644
--- a/esphome/components/pi4ioe5v6408/__init__.py
+++ b/esphome/components/pi4ioe5v6408/__init__.py
@@ -14,6 +14,8 @@ from esphome.const import (
     CONF_PULLUP,
     CONF_RESET,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["gpio_expander"]
 CODEOWNERS = ["@jesserockz"]
@@ -42,7 +44,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -52,7 +54,7 @@ async def to_code(config):
         cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -78,7 +80,7 @@ PI4IOE5V6408_PIN_SCHEMA = pins.gpio_base_schema(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_PI4IOE5V6408, PI4IOE5V6408_PIN_SCHEMA)
-async def pi4ioe5v6408_pin_schema(config):
+async def pi4ioe5v6408_pin_schema(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_PI4IOE5V6408])
 
diff --git a/esphome/components/pm1006/sensor.py b/esphome/components/pm1006/sensor.py
index 8ff21ab069..8274726ac4 100644
--- a/esphome/components/pm1006/sensor.py
+++ b/esphome/components/pm1006/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_MICROGRAMS_PER_CUBIC_METER,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@habbie"]
 DEPENDENCIES = ["uart"]
@@ -40,7 +41,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def validate_interval_uart(config):
+def validate_interval_uart(config: ConfigType) -> None:
     interval = config.get(CONF_UPDATE_INTERVAL)
     uart.final_validate_device_schema(
         "pm1006",
@@ -53,7 +54,7 @@ def validate_interval_uart(config):
 FINAL_VALIDATE_SCHEMA = validate_interval_uart
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/pm2005/sensor.py b/esphome/components/pm2005/sensor.py
index 3a650560a0..f16c100e5e 100644
--- a/esphome/components/pm2005/sensor.py
+++ b/esphome/components/pm2005/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_MICROGRAMS_PER_CUBIC_METER,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@andrewjswan"]
@@ -65,7 +66,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config) -> None:
+async def to_code(config: ConfigType) -> None:
     """Code generation entry point."""
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
diff --git a/esphome/components/pmsa003i/sensor.py b/esphome/components/pmsa003i/sensor.py
index 2a5b9eeac0..14f27f89cc 100644
--- a/esphome/components/pmsa003i/sensor.py
+++ b/esphome/components/pmsa003i/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_MICROGRAMS_PER_CUBIC_METER,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@sjtrny"]
 DEPENDENCIES = ["i2c"]
@@ -114,7 +115,7 @@ TYPES = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/pn532_i2c/__init__.py b/esphome/components/pn532_i2c/__init__.py
index 7304f1b8ad..16b877b1f1 100644
--- a/esphome/components/pn532_i2c/__init__.py
+++ b/esphome/components/pn532_i2c/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, pn532
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["pn532"]
 CODEOWNERS = ["@OttoWinter", "@jesserockz"]
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await pn532.setup_pn532(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/pn532_spi/__init__.py b/esphome/components/pn532_spi/__init__.py
index 67ebc88872..734f794180 100644
--- a/esphome/components/pn532_spi/__init__.py
+++ b/esphome/components/pn532_spi/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import pn532, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["pn532"]
 CODEOWNERS = ["@OttoWinter", "@jesserockz"]
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await pn532.setup_pn532(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/pn7150_i2c/__init__.py b/esphome/components/pn7150_i2c/__init__.py
index 00a19ba03c..d15c0b431e 100644
--- a/esphome/components/pn7150_i2c/__init__.py
+++ b/esphome/components/pn7150_i2c/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, pn7150
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["pn7150"]
 CODEOWNERS = ["@kbx81", "@jesserockz"]
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await pn7150.setup_pn7150(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/pn7160_i2c/__init__.py b/esphome/components/pn7160_i2c/__init__.py
index f8f8ebef98..d711c3e48f 100644
--- a/esphome/components/pn7160_i2c/__init__.py
+++ b/esphome/components/pn7160_i2c/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, pn7160
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["pn7160"]
 CODEOWNERS = ["@kbx81", "@jesserockz"]
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await pn7160.setup_pn7160(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/pn7160_spi/__init__.py b/esphome/components/pn7160_spi/__init__.py
index 5498d0ac1b..7705dfa6f6 100644
--- a/esphome/components/pn7160_spi/__init__.py
+++ b/esphome/components/pn7160_spi/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import pn7160, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["pn7160"]
 CODEOWNERS = ["@kbx81", "@jesserockz"]
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await pn7160.setup_pn7160(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/power_supply/__init__.py b/esphome/components/power_supply/__init__.py
index 851c136493..b68118b352 100644
--- a/esphome/components/power_supply/__init__.py
+++ b/esphome/components/power_supply/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_KEEP_ON_TIME,
     CONF_PIN,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
 power_supply_ns = cg.esphome_ns.namespace("power_supply")
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/preferences/__init__.py b/esphome/components/preferences/__init__.py
index f3f2f632c9..c92903ec2e 100644
--- a/esphome/components/preferences/__init__.py
+++ b/esphome/components/preferences/__init__.py
@@ -4,6 +4,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_ID
 from esphome.core import coroutine_with_priority
 from esphome.coroutine import CoroPriority
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
 
@@ -27,7 +28,7 @@ CONFIG_SCHEMA = cv.Schema(
 
 
 @coroutine_with_priority(CoroPriority.PREFERENCES)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     write_interval = config[CONF_FLASH_WRITE_INTERVAL]
     if write_interval.total_milliseconds == 0:
diff --git a/esphome/components/prometheus/__init__.py b/esphome/components/prometheus/__init__.py
index cc1541ce80..3624fb2442 100644
--- a/esphome/components/prometheus/__init__.py
+++ b/esphome/components/prometheus/__init__.py
@@ -4,6 +4,7 @@ from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INCLUDE_INTERNAL, CONF_NAME, CONF_RELABEL
 from esphome.cpp_types import EntityBase
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["web_server_base"]
 
@@ -36,7 +37,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_WEB_SERVER_BASE_ID])
 
     cg.add_define("USE_PROMETHEUS")
diff --git a/esphome/components/psram/__init__.py b/esphome/components/psram/__init__.py
index 84683e9a25..65c55efea5 100644
--- a/esphome/components/psram/__init__.py
+++ b/esphome/components/psram/__init__.py
@@ -129,7 +129,7 @@ def validate_task_stack_in_psram(value: Any) -> bool:
     return value
 
 
-def validate_psram_mode(config):
+def validate_psram_mode(config: ConfigType) -> ConfigType:
     esp32_config = fv.full_config.get()[PLATFORM_ESP32]
     if config[CONF_SPEED] == "120MHZ":
         if esp32_config[CONF_CPU_FREQUENCY] != "240MHZ":
@@ -203,7 +203,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _store_psram_guaranteed(config):
+def _store_psram_guaranteed(config: ConfigType) -> ConfigType:
     """Store PSRAM guaranteed status in CORE.data for other components.
 
     PSRAM is "guaranteed" when it will fail if not found, ensuring safe use
@@ -220,7 +220,7 @@ def _store_psram_guaranteed(config):
 FINAL_VALIDATE_SCHEMA = cv.All(validate_psram_mode, _store_psram_guaranteed)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     if config[CONF_DISABLED]:
         return
     if CORE.using_arduino:
diff --git a/esphome/components/pulse_width/sensor.py b/esphome/components/pulse_width/sensor.py
index 120dc33b7b..dd7554c4eb 100644
--- a/esphome/components/pulse_width/sensor.py
+++ b/esphome/components/pulse_width/sensor.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_PIN, ICON_TIMER, STATE_CLASS_MEASUREMENT, UNIT_SECOND
+from esphome.types import ConfigType
 
 pulse_width_ns = cg.esphome_ns.namespace("pulse_width")
 
@@ -27,7 +28,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/pvvx_mithermometer/display/__init__.py b/esphome/components/pvvx_mithermometer/display/__init__.py
index 0cf27b9f1c..436f83630c 100644
--- a/esphome/components/pvvx_mithermometer/display/__init__.py
+++ b/esphome/components/pvvx_mithermometer/display/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_TIME_ID,
     CONF_VALIDITY_PERIOD,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["ble_client"]
 
@@ -36,7 +37,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await display.register_display(var, config)
     await ble_client.register_ble_node(var, config)
diff --git a/esphome/components/pvvx_mithermometer/sensor.py b/esphome/components/pvvx_mithermometer/sensor.py
index ee5b19ea77..ad13bdcca7 100644
--- a/esphome/components/pvvx_mithermometer/sensor.py
+++ b/esphome/components/pvvx_mithermometer/sensor.py
@@ -21,6 +21,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@pasiz"]
 
@@ -77,7 +78,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/pzem004t/sensor.py b/esphome/components/pzem004t/sensor.py
index 7e55fd9e7e..bf5e31b48a 100644
--- a/esphome/components/pzem004t/sensor.py
+++ b/esphome/components/pzem004t/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     UNIT_WATT,
     UNIT_WATT_HOURS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -63,7 +64,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/qmi8658/motion.py b/esphome/components/qmi8658/motion.py
index 26169189c2..2fd12dc921 100644
--- a/esphome/components/qmi8658/motion.py
+++ b/esphome/components/qmi8658/motion.py
@@ -8,6 +8,7 @@ from esphome.components.const import (
 )
 from esphome.components.motion import motion_schema, new_motion_component
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from . import QMI8658Component, qmi8658_ns
 
@@ -82,7 +83,7 @@ CONFIG_SCHEMA = (
 
 
 #  Code generation
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await new_motion_component(config)
     await i2c.register_i2c_device(var, config)
 
diff --git a/esphome/components/qmi8658/sensor.py b/esphome/components/qmi8658/sensor.py
index 80b0512361..96f97805c7 100644
--- a/esphome/components/qmi8658/sensor.py
+++ b/esphome/components/qmi8658/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
 )
 from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import CONF_QMI8658_ID, QMI8658Component
 
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     parent = await cg.get_variable(config[CONF_QMI8658_ID])
     data = MockObj("data")
diff --git a/esphome/components/qmp6988/sensor.py b/esphome/components/qmp6988/sensor.py
index 05eb7efa27..abc39176c1 100644
--- a/esphome/components/qmp6988/sensor.py
+++ b/esphome/components/qmp6988/sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_HECTOPASCAL,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -81,7 +82,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/qr_code/__init__.py b/esphome/components/qr_code/__init__.py
index 6ff92b8a7f..8b773dcdf5 100644
--- a/esphome/components/qr_code/__init__.py
+++ b/esphome/components/qr_code/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_VALUE
+from esphome.types import ConfigType
 
 CONF_SCALE = "scale"
 CONF_ECC = "ecc"
@@ -32,7 +33,7 @@ CONFIG_SCHEMA = cv.ensure_list(
 )
 
 
-async def to_code(config):
+async def to_code(config: list[ConfigType]) -> None:
     cg.add_library("wjtje/qr-code-generator-library", "^1.7.0")
 
     for entry in config:
diff --git a/esphome/components/qwiic_pir/binary_sensor.py b/esphome/components/qwiic_pir/binary_sensor.py
index cd3eda5ac8..71aabda349 100644
--- a/esphome/components/qwiic_pir/binary_sensor.py
+++ b/esphome/components/qwiic_pir/binary_sensor.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor, i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_DEBOUNCE, DEVICE_CLASS_MOTION
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@kahrendt"]
@@ -23,7 +24,7 @@ QwiicPIRComponent = qwiic_pir_ns.class_(
 )
 
 
-def validate_no_debounce_unless_native(config):
+def validate_no_debounce_unless_native(config: ConfigType) -> ConfigType:
     if CONF_DEBOUNCE in config and config[CONF_DEBOUNCE_MODE] != "NATIVE":
         raise cv.Invalid("debounce can only be set if debounce_mode is NATIVE")
     return config
@@ -51,7 +52,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/radio_frequency/__init__.py b/esphome/components/radio_frequency/__init__.py
index 9fdafe428a..f303a14297 100644
--- a/esphome/components/radio_frequency/__init__.py
+++ b/esphome/components/radio_frequency/__init__.py
@@ -15,7 +15,7 @@ from esphome.const import CONF_ID, CONF_ON_CONTROL
 from esphome.core import CORE, coroutine_with_priority
 from esphome.core.entity_helpers import queue_entity_register, setup_entity
 from esphome.coroutine import CoroPriority
-from esphome.types import ConfigType
+from esphome.types import ConfigType, SafeExpType
 
 CODEOWNERS = ["@kbx81"]
 AUTO_LOAD = ["remote_base"]
@@ -49,11 +49,11 @@ def radio_frequency_schema(class_: type[cg.MockObjClass]) -> cv.Schema:
 
 
 @setup_entity("radio_frequency")
-async def setup_radio_frequency_core_(var: cg.Pvariable, config: ConfigType) -> None:
+async def setup_radio_frequency_core_(var: cg.MockObj, config: ConfigType) -> None:
     """Set up core radio frequency configuration."""
 
 
-async def register_radio_frequency(var: cg.Pvariable, config: ConfigType) -> None:
+async def register_radio_frequency(var: cg.MockObj, config: ConfigType) -> None:
     """Register a radio frequency device with the core."""
     cg.add_define("USE_RADIO_FREQUENCY")
     await cg.register_component(var, config)
@@ -67,7 +67,7 @@ async def register_radio_frequency(var: cg.Pvariable, config: ConfigType) -> Non
         )
 
 
-async def new_radio_frequency(config: ConfigType, *args) -> cg.Pvariable:
+async def new_radio_frequency(config: ConfigType, *args: SafeExpType) -> cg.MockObj:
     """Create a new RadioFrequency instance.
 
     :param config: Configuration dictionary.
diff --git a/esphome/components/radon_eye_ble/__init__.py b/esphome/components/radon_eye_ble/__init__.py
index 2ba9d59d4c..0ca9f64326 100644
--- a/esphome/components/radon_eye_ble/__init__.py
+++ b/esphome/components/radon_eye_ble/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ble_device_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base"]
 CODEOWNERS = ["@jeffeb3"]
@@ -21,6 +22,6 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/radon_eye_rd200/sensor.py b/esphome/components/radon_eye_rd200/sensor.py
index da04328218..f38a035226 100644
--- a/esphome/components/radon_eye_rd200/sensor.py
+++ b/esphome/components/radon_eye_rd200/sensor.py
@@ -9,6 +9,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_BECQUEREL_PER_CUBIC_METER,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["ble_client"]
 
@@ -40,7 +41,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/rc522_i2c/__init__.py b/esphome/components/rc522_i2c/__init__.py
index c67615e2d8..c3fd368bbd 100644
--- a/esphome/components/rc522_i2c/__init__.py
+++ b/esphome/components/rc522_i2c/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, rc522
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@glmnet"]
 DEPENDENCIES = ["i2c"]
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await rc522.setup_rc522(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/rc522_spi/__init__.py b/esphome/components/rc522_spi/__init__.py
index 9ce94d7f31..f2820bbaee 100644
--- a/esphome/components/rc522_spi/__init__.py
+++ b/esphome/components/rc522_spi/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import rc522, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@glmnet"]
 DEPENDENCIES = ["spi"]
@@ -24,7 +25,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await rc522.setup_rc522(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/rc522_spi/binary_sensor.py b/esphome/components/rc522_spi/binary_sensor.py
index 8139f6d2ac..6245d5a487 100644
--- a/esphome/components/rc522_spi/binary_sensor.py
+++ b/esphome/components/rc522_spi/binary_sensor.py
@@ -1,9 +1,10 @@
 import esphome.components.rc522.binary_sensor as rc522_binary_sensor
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["rc522"]
 
 CONFIG_SCHEMA = rc522_binary_sensor.CONFIG_SCHEMA
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await rc522_binary_sensor.to_code(config)
diff --git a/esphome/components/rdm6300/__init__.py b/esphome/components/rdm6300/__init__.py
index a65213d576..d3803bd3f7 100644
--- a/esphome/components/rdm6300/__init__.py
+++ b/esphome/components/rdm6300/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_ON_TAG, CONF_TRIGGER_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 AUTO_LOAD = ["binary_sensor"]
@@ -34,7 +35,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/rdm6300/binary_sensor.py b/esphome/components/rdm6300/binary_sensor.py
index 7eb20b1302..e62b1a3623 100644
--- a/esphome/components/rdm6300/binary_sensor.py
+++ b/esphome/components/rdm6300/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor, rdm6300
 import esphome.config_validation as cv
 from esphome.const import CONF_UID
+from esphome.types import ConfigType
 
 from . import rdm6300_ns
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(RDM6300BinarySensor).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
 
     hub = await cg.get_variable(config[CONF_RDM6300_ID])
diff --git a/esphome/components/resistance/sensor.py b/esphome/components/resistance/sensor.py
index 1cb3c6020c..1333375717 100644
--- a/esphome/components/resistance/sensor.py
+++ b/esphome/components/resistance/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_OHM,
 )
+from esphome.types import ConfigType
 
 resistance_ns = cg.esphome_ns.namespace("resistance")
 ResistanceSensor = resistance_ns.class_("ResistanceSensor", cg.Component, sensor.Sensor)
@@ -41,7 +42,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/restart/button/__init__.py b/esphome/components/restart/button/__init__.py
index 76757f7504..2648d1e85d 100644
--- a/esphome/components/restart/button/__init__.py
+++ b/esphome/components/restart/button/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import (
     ENTITY_CATEGORY_CONFIG,
     ICON_RESTART,
 )
+from esphome.types import ConfigType
 
 restart_ns = cg.esphome_ns.namespace("restart")
 RestartButton = restart_ns.class_("RestartButton", button.Button, cg.Component)
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = button.button_schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await button.register_button(var, config)
diff --git a/esphome/components/restart/switch/__init__.py b/esphome/components/restart/switch/__init__.py
index e9283c9e41..9332716a9a 100644
--- a/esphome/components/restart/switch/__init__.py
+++ b/esphome/components/restart/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_CONFIG, ICON_RESTART
+from esphome.types import ConfigType
 
 restart_ns = cg.esphome_ns.namespace("restart")
 RestartSwitch = restart_ns.class_("RestartSwitch", switch.Switch, cg.Component)
@@ -14,6 +15,6 @@ CONFIG_SCHEMA = switch.switch_schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await switch.new_switch(config)
     await cg.register_component(var, config)
diff --git a/esphome/components/rgb/light.py b/esphome/components/rgb/light.py
index b6daaaaa3c..cd55329256 100644
--- a/esphome/components/rgb/light.py
+++ b/esphome/components/rgb/light.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import light, output
 import esphome.config_validation as cv
 from esphome.const import CONF_BLUE, CONF_GREEN, CONF_OUTPUT_ID, CONF_RED
+from esphome.types import ConfigType
 
 rgb_ns = cg.esphome_ns.namespace("rgb")
 RGBLightOutput = rgb_ns.class_("RGBLightOutput", light.LightOutput)
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await light.register_light(var, config)
 
diff --git a/esphome/components/rgbct/light.py b/esphome/components/rgbct/light.py
index dcd14310e3..00626ec6ba 100644
--- a/esphome/components/rgbct/light.py
+++ b/esphome/components/rgbct/light.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_RED,
     CONF_WARM_WHITE_COLOR_TEMPERATURE,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@jesserockz"]
 
@@ -37,7 +38,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await light.register_light(var, config)
 
diff --git a/esphome/components/rgbw/light.py b/esphome/components/rgbw/light.py
index 84425c23c2..7aedf4affc 100644
--- a/esphome/components/rgbw/light.py
+++ b/esphome/components/rgbw/light.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_RED,
     CONF_WHITE,
 )
+from esphome.types import ConfigType
 
 rgbw_ns = cg.esphome_ns.namespace("rgbw")
 RGBWLightOutput = rgbw_ns.class_("RGBWLightOutput", light.LightOutput)
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await light.register_light(var, config)
 
diff --git a/esphome/components/rgbww/light.py b/esphome/components/rgbww/light.py
index 882ab0cdbc..3626a57b8c 100644
--- a/esphome/components/rgbww/light.py
+++ b/esphome/components/rgbww/light.py
@@ -13,6 +13,7 @@ from esphome.const import (
     CONF_WARM_WHITE,
     CONF_WARM_WHITE_COLOR_TEMPERATURE,
 )
+from esphome.types import ConfigType
 
 rgbww_ns = cg.esphome_ns.namespace("rgbww")
 RGBWWLightOutput = rgbww_ns.class_("RGBWWLightOutput", light.LightOutput)
@@ -40,7 +41,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await light.register_light(var, config)
 
diff --git a/esphome/components/rp2_pio/__init__.py b/esphome/components/rp2_pio/__init__.py
index 9046d2ae6b..915ab73b87 100644
--- a/esphome/components/rp2_pio/__init__.py
+++ b/esphome/components/rp2_pio/__init__.py
@@ -2,6 +2,7 @@ import platform
 
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["rp2"]
 
@@ -25,7 +26,7 @@ PIOASM_DOWNLOADS = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # cg.add_platformio_option(
     #     "platform_packages",
     #     [
diff --git a/esphome/components/rtl87xx/__init__.py b/esphome/components/rtl87xx/__init__.py
index a8eabae9a0..88928b2bce 100644
--- a/esphome/components/rtl87xx/__init__.py
+++ b/esphome/components/rtl87xx/__init__.py
@@ -28,6 +28,8 @@ from esphome.components.libretiny.const import (
     LibreTinyComponent,
 )
 from esphome.core import CORE
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from .boards import RTL87XX_BOARD_PINS, RTL87XX_BOARDS
 
@@ -45,7 +47,7 @@ COMPONENT_DATA = LibreTinyComponent(
 )
 
 
-def _set_core_data(config):
+def _set_core_data(config: ConfigType) -> ConfigType:
     CORE.data[KEY_LIBRETINY] = {}
     CORE.data[KEY_LIBRETINY][KEY_COMPONENT_DATA] = COMPONENT_DATA
     return config
@@ -62,12 +64,12 @@ PIN_SCHEMA = libretiny.gpio.BASE_PIN_SCHEMA
 CONFIG_SCHEMA.prepend_extra(_set_core_data)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> MockObj:
     return await libretiny.component_to_code(config)
 
 
 @pins.PIN_SCHEMA_REGISTRY.register("rtl87xx", PIN_SCHEMA)
-async def pin_to_code(config):
+async def pin_to_code(config: ConfigType) -> MockObj:
     return await libretiny.gpio.component_pin_to_code(config)
 
 
diff --git a/esphome/components/runtime_image/__init__.py b/esphome/components/runtime_image/__init__.py
index 0d4345db5b..9277c214ff 100644
--- a/esphome/components/runtime_image/__init__.py
+++ b/esphome/components/runtime_image/__init__.py
@@ -61,7 +61,7 @@ class Format:
 class AUTOFormat(Format):
     """AUTO format - detect from MIME type."""
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__("AUTO", None)
 
     def actions(self) -> None:
@@ -73,7 +73,7 @@ class AUTOFormat(Format):
 class BMPFormat(Format):
     """BMP format decoder configuration."""
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__("BMP", BmpDecoder)
 
     def actions(self) -> None:
@@ -83,7 +83,7 @@ class BMPFormat(Format):
 class JPEGFormat(Format):
     """JPEG format decoder configuration."""
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__("JPEG", JpegDecoder)
 
     def actions(self) -> None:
@@ -106,7 +106,7 @@ class JPEGFormat(Format):
 class PNGFormat(Format):
     """PNG format decoder configuration."""
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__("PNG", PngDecoder)
 
     def actions(self) -> None:
diff --git a/esphome/components/runtime_stats/__init__.py b/esphome/components/runtime_stats/__init__.py
index a36e8bfd28..62f5f46cb4 100644
--- a/esphome/components/runtime_stats/__init__.py
+++ b/esphome/components/runtime_stats/__init__.py
@@ -5,6 +5,7 @@ Runtime statistics component for ESPHome.
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@bdraco"]
 
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     """Generate code for the runtime statistics component."""
     # Define USE_RUNTIME_STATS when this component is used
     cg.add_define("USE_RUNTIME_STATS")
diff --git a/esphome/components/ruuvi_ble/__init__.py b/esphome/components/ruuvi_ble/__init__.py
index 8ab95dcb72..ac4bafbb1a 100644
--- a/esphome/components/ruuvi_ble/__init__.py
+++ b/esphome/components/ruuvi_ble/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ble_device_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base"]
 
@@ -20,6 +21,6 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/ruuvitag/sensor.py b/esphome/components/ruuvitag/sensor.py
index e58d38ca84..1ea9c457f3 100644
--- a/esphome/components/ruuvitag/sensor.py
+++ b/esphome/components/ruuvitag/sensor.py
@@ -34,6 +34,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "ruuvi_ble"]
 
@@ -121,7 +122,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/sdm_meter/sensor.py b/esphome/components/sdm_meter/sensor.py
index 125240e891..8d7e981d93 100644
--- a/esphome/components/sdm_meter/sensor.py
+++ b/esphome/components/sdm_meter/sensor.py
@@ -155,7 +155,7 @@ def _final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await modbus.register_modbus_client_device(var, config)
diff --git a/esphome/components/sdp3x/sensor.py b/esphome/components/sdp3x/sensor.py
index be2eec7baf..8a76ba4b13 100644
--- a/esphome/components/sdp3x/sensor.py
+++ b/esphome/components/sdp3x/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_HECTOPASCAL,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["sensirion_common"]
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/sds011/sensor.py b/esphome/components/sds011/sensor.py
index 59ee6667a1..e05d3b02e6 100644
--- a/esphome/components/sds011/sensor.py
+++ b/esphome/components/sds011/sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_MICROGRAMS_PER_CUBIC_METER,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -20,7 +21,7 @@ sds011_ns = cg.esphome_ns.namespace("sds011")
 SDS011Component = sds011_ns.class_("SDS011Component", uart.UARTDevice, cg.Component)
 
 
-def validate_sds011_rx_mode(value):
+def validate_sds011_rx_mode(value: ConfigType) -> ConfigType:
     if CONF_UPDATE_INTERVAL in value and not value.get(CONF_RX_ONLY):
         update_interval = value[CONF_UPDATE_INTERVAL]
         if update_interval.total_minutes > 30:
@@ -63,7 +64,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate(config) -> None:
+def _final_validate(config: ConfigType) -> None:
     # In the default mode setup() writes config commands, so tx is required;
     # rx_only mode never writes, so tx is optional.
     uart.final_validate_device_schema(
@@ -80,7 +81,7 @@ def _final_validate(config) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # Pop update_interval before register_component so it doesn't generate
     # a set_update_interval call — sds011 handles this via set_update_interval_min
     update_interval = config.pop(CONF_UPDATE_INTERVAL, None)
diff --git a/esphome/components/selec_meter/sensor.py b/esphome/components/selec_meter/sensor.py
index 120b997605..0d4e0fafc5 100644
--- a/esphome/components/selec_meter/sensor.py
+++ b/esphome/components/selec_meter/sensor.py
@@ -171,7 +171,7 @@ def _final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await modbus.register_modbus_client_device(var, config)
diff --git a/esphome/components/sen0321/sensor.py b/esphome/components/sen0321/sensor.py
index 3910e6e4c9..58c09883b0 100644
--- a/esphome/components/sen0321/sensor.py
+++ b/esphome/components/sen0321/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_PARTS_PER_BILLION,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@notjj"]
 DEPENDENCIES = ["i2c"]
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/sen21231/sensor.py b/esphome/components/sen21231/sensor.py
index 781a1213ac..fb695b14dc 100644
--- a/esphome/components/sen21231/sensor.py
+++ b/esphome/components/sen21231/sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
 from esphome.const import ICON_MOTION_SENSOR
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@shreyaskarnik"]
 DEPENDENCIES = ["i2c"]
@@ -18,7 +19,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/sen6x/sensor.py b/esphome/components/sen6x/sensor.py
index 832a2188ee..b0ffdc53a4 100644
--- a/esphome/components/sen6x/sensor.py
+++ b/esphome/components/sen6x/sensor.py
@@ -32,6 +32,7 @@ from esphome.const import (
     UNIT_PARTS_PER_MILLION,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@martgras", "@mebner86", "@tuct"]
 DEPENDENCIES = ["i2c"]
@@ -136,7 +137,7 @@ SENSOR_MAP = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/serial_proxy/__init__.py b/esphome/components/serial_proxy/__init__.py
index f9b8c375d2..4186fcf8b1 100644
--- a/esphome/components/serial_proxy/__init__.py
+++ b/esphome/components/serial_proxy/__init__.py
@@ -21,6 +21,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_NAME
 from esphome.core import CORE, coroutine_with_priority
 from esphome.coroutine import CoroPriority
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 DEPENDENCIES = ["api", "uart"]
@@ -72,14 +73,14 @@ CONFIG_SCHEMA = (
 
 
 @coroutine_with_priority(CoroPriority.FINAL)
-async def _add_serial_proxy_count_define():
+async def _add_serial_proxy_count_define() -> None:
     """Emit the SERIAL_PROXY_COUNT define once with the final instance count."""
     count = _get_data().count
     if count > 0:
         cg.add_define("SERIAL_PROXY_COUNT", count)
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/sfa30/sensor.py b/esphome/components/sfa30/sensor.py
index 8e8a57e341..b8039af9e3 100644
--- a/esphome/components/sfa30/sensor.py
+++ b/esphome/components/sfa30/sensor.py
@@ -17,6 +17,7 @@ from esphome.const import (
     UNIT_PARTS_PER_BILLION,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ghsensdev"]
 DEPENDENCIES = ["i2c"]
@@ -66,7 +67,7 @@ SENSOR_MAP = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/sgp30/sensor.py b/esphome/components/sgp30/sensor.py
index 848e4e9f9f..beb549ce70 100644
--- a/esphome/components/sgp30/sensor.py
+++ b/esphome/components/sgp30/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     UNIT_PARTS_PER_BILLION,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["sensirion_common"]
@@ -81,7 +82,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/sgp4x/sensor.py b/esphome/components/sgp4x/sensor.py
index 87ef050bc1..1a88d190e4 100644
--- a/esphome/components/sgp4x/sensor.py
+++ b/esphome/components/sgp4x/sensor.py
@@ -19,6 +19,7 @@ from esphome.const import (
     ICON_RADIATOR,
     STATE_CLASS_MEASUREMENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["sensirion_common"]
@@ -35,7 +36,7 @@ SGP4xComponent = sgp4x_ns.class_(
 CONF_HUMIDITY_SOURCE = "humidity_source"
 
 
-def validate_sensors(config):
+def validate_sensors(config: ConfigType) -> ConfigType:
     if CONF_VOC_INDEX not in config and CONF_NOX_INDEX not in config:
         raise cv.Invalid(
             f"At least one sensor is required. Define {CONF_VOC_INDEX} and/or {CONF_NOX_INDEX}"
@@ -43,7 +44,7 @@ def validate_sensors(config):
     return config
 
 
-def _gas_sensor_schema(index_offset_default: int):
+def _gas_sensor_schema(index_offset_default: int) -> cv.Schema:
     return cv.Schema(
         {
             cv.Optional(CONF_ALGORITHM_TUNING): cv.Schema(
@@ -96,7 +97,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/sht3xd/sensor.py b/esphome/components/sht3xd/sensor.py
index 7ad34972d4..eadca15050 100644
--- a/esphome/components/sht3xd/sensor.py
+++ b/esphome/components/sht3xd/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CONF_HEATER_ENABLED = "heater_enabled"
 
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/sht4x/sensor.py b/esphome/components/sht4x/sensor.py
index 871956f783..7fb52e37d4 100644
--- a/esphome/components/sht4x/sensor.py
+++ b/esphome/components/sht4x/sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@sjtrny"]
 DEPENDENCIES = ["i2c"]
@@ -87,7 +88,7 @@ TYPES = {
 }
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/shtcx/sensor.py b/esphome/components/shtcx/sensor.py
index fdb1344fb7..bda48c07ce 100644
--- a/esphome/components/shtcx/sensor.py
+++ b/esphome/components/shtcx/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["sensirion_common"]
@@ -45,7 +46,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/shutdown/button/__init__.py b/esphome/components/shutdown/button/__init__.py
index 3423b40089..44fd819d25 100644
--- a/esphome/components/shutdown/button/__init__.py
+++ b/esphome/components/shutdown/button/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import button
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, ENTITY_CATEGORY_CONFIG, ICON_POWER
+from esphome.types import ConfigType
 
 shutdown_ns = cg.esphome_ns.namespace("shutdown")
 ShutdownButton = shutdown_ns.class_("ShutdownButton", button.Button, cg.Component)
@@ -11,7 +12,7 @@ CONFIG_SCHEMA = button.button_schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await button.register_button(var, config)
diff --git a/esphome/components/shutdown/switch/__init__.py b/esphome/components/shutdown/switch/__init__.py
index 12cc477647..78026140cb 100644
--- a/esphome/components/shutdown/switch/__init__.py
+++ b/esphome/components/shutdown/switch/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_CONFIG, ICON_POWER
+from esphome.types import ConfigType
 
 shutdown_ns = cg.esphome_ns.namespace("shutdown")
 ShutdownSwitch = shutdown_ns.class_("ShutdownSwitch", switch.Switch, cg.Component)
@@ -14,6 +15,6 @@ CONFIG_SCHEMA = switch.switch_schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await switch.new_switch(config)
     await cg.register_component(var, config)
diff --git a/esphome/components/sigma_delta_output/output.py b/esphome/components/sigma_delta_output/output.py
index ca5b7a53e0..aca5f26457 100644
--- a/esphome/components/sigma_delta_output/output.py
+++ b/esphome/components/sigma_delta_output/output.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PIN, CONF_TURN_OFF_ACTION, CONF_TURN_ON_ACTION
+from esphome.types import ConfigType
 
 DEPENDENCIES = []
 
@@ -37,7 +38,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await output.register_output(var, config)
diff --git a/esphome/components/slow_pwm/output.py b/esphome/components/slow_pwm/output.py
index 73807ba377..f3f82d7ce5 100644
--- a/esphome/components/slow_pwm/output.py
+++ b/esphome/components/slow_pwm/output.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_TURN_OFF_ACTION,
     CONF_TURN_ON_ACTION,
 )
+from esphome.types import ConfigType
 
 slow_pwm_ns = cg.esphome_ns.namespace("slow_pwm")
 SlowPWMOutput = slow_pwm_ns.class_("SlowPWMOutput", output.FloatOutput, cg.Component)
@@ -42,7 +43,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await output.register_output(var, config)
diff --git a/esphome/components/sm10bit_base/__init__.py b/esphome/components/sm10bit_base/__init__.py
index 81e7c04c0e..2b555a59df 100644
--- a/esphome/components/sm10bit_base/__init__.py
+++ b/esphome/components/sm10bit_base/__init__.py
@@ -2,6 +2,8 @@ from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_CLOCK_PIN, CONF_DATA_PIN, CONF_ID
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Cossid"]
 MULTI_CONF = True
@@ -26,7 +28,7 @@ SM10BIT_BASE_CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def register_sm10bit_base(config):
+async def register_sm10bit_base(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/sm16716/__init__.py b/esphome/components/sm16716/__init__.py
index e97bc440f4..3fb9ac3f06 100644
--- a/esphome/components/sm16716/__init__.py
+++ b/esphome/components/sm16716/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_NUM_CHANNELS,
     CONF_NUM_CHIPS,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["output"]
 sm16716_ns = cg.esphome_ns.namespace("sm16716")
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/sm16716/output.py b/esphome/components/sm16716/output.py
index 2cfc38f5cc..08cec24fd6 100644
--- a/esphome/components/sm16716/output.py
+++ b/esphome/components/sm16716/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from . import SM16716
 
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
 
diff --git a/esphome/components/sm2135/__init__.py b/esphome/components/sm2135/__init__.py
index 28c92a42a7..537db5bbe4 100644
--- a/esphome/components/sm2135/__init__.py
+++ b/esphome/components/sm2135/__init__.py
@@ -2,6 +2,7 @@ from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_CLOCK_PIN, CONF_DATA_PIN, CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["output"]
 CODEOWNERS = ["@BoukeHaarsma23", "@matika77", "@dd32"]
@@ -53,7 +54,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/sm2135/output.py b/esphome/components/sm2135/output.py
index a4ac7fc7da..80b4cb1a4f 100644
--- a/esphome/components/sm2135/output.py
+++ b/esphome/components/sm2135/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from . import SM2135
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
 
diff --git a/esphome/components/sm2235/__init__.py b/esphome/components/sm2235/__init__.py
index 1b18a1d342..95037fd275 100644
--- a/esphome/components/sm2235/__init__.py
+++ b/esphome/components/sm2235/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import sm10bit_base
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["sm10bit_base", "output"]
 CODEOWNERS = ["@Cossid"]
@@ -17,6 +18,6 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(sm10bit_base.SM10BIT_BASE_CONFIG_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sm10bit_base.register_sm10bit_base(config)
     cg.add(var.set_model(0xC0))
diff --git a/esphome/components/sm2235/output.py b/esphome/components/sm2235/output.py
index b17af2b1e0..29940a651e 100644
--- a/esphome/components/sm2235/output.py
+++ b/esphome/components/sm2235/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from . import SM2235
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
 
diff --git a/esphome/components/sm2335/__init__.py b/esphome/components/sm2335/__init__.py
index 02a6d1f697..145c5a0117 100644
--- a/esphome/components/sm2335/__init__.py
+++ b/esphome/components/sm2335/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import sm10bit_base
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["sm10bit_base", "output"]
 CODEOWNERS = ["@Cossid"]
@@ -17,6 +18,6 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(sm10bit_base.SM10BIT_BASE_CONFIG_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sm10bit_base.register_sm10bit_base(config)
     cg.add(var.set_model(0xC0))
diff --git a/esphome/components/sm2335/output.py b/esphome/components/sm2335/output.py
index 7fd00917bd..30f653b087 100644
--- a/esphome/components/sm2335/output.py
+++ b/esphome/components/sm2335/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from . import SM2335
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
 
diff --git a/esphome/components/sm300d2/sensor.py b/esphome/components/sm300d2/sensor.py
index 29e0cfe9b1..e0f2b7b280 100644
--- a/esphome/components/sm300d2/sensor.py
+++ b/esphome/components/sm300d2/sensor.py
@@ -26,6 +26,7 @@ from esphome.const import (
     UNIT_PARTS_PER_MILLION,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -93,7 +94,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/smt100/sensor.py b/esphome/components/smt100/sensor.py
index f877ce2af0..632a1e7547 100644
--- a/esphome/components/smt100/sensor.py
+++ b/esphome/components/smt100/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     UNIT_PERCENT,
     UNIT_VOLT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
 
@@ -71,7 +72,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/sntp/time.py b/esphome/components/sntp/time.py
index 7d592f8ef8..9d849f9fe9 100644
--- a/esphome/components/sntp/time.py
+++ b/esphome/components/sntp/time.py
@@ -109,7 +109,7 @@ CONFIG_SCHEMA = cv.All(
 FINAL_VALIDATE_SCHEMA = _sntp_final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     servers = config[CONF_SERVERS]
 
     # Define server count at compile time
diff --git a/esphome/components/socket/__init__.py b/esphome/components/socket/__init__.py
index 895fc8d03a..edebed5d40 100644
--- a/esphome/components/socket/__init__.py
+++ b/esphome/components/socket/__init__.py
@@ -7,6 +7,7 @@ import esphome.codegen as cg
 from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.core import CORE
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -162,7 +163,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     impl = config[CONF_IMPLEMENTATION]
     if impl == IMPLEMENTATION_LWIP_TCP:
         cg.add_define("USE_SOCKET_IMPL_LWIP_TCP")
diff --git a/esphome/components/sonoff_d1/light.py b/esphome/components/sonoff_d1/light.py
index 06cde45cd6..ae2c65595a 100644
--- a/esphome/components/sonoff_d1/light.py
+++ b/esphome/components/sonoff_d1/light.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import light, uart
 import esphome.config_validation as cv
 from esphome.const import CONF_MAX_VALUE, CONF_MIN_VALUE, CONF_OUTPUT_ID
+from esphome.types import ConfigType
 
 CONF_USE_RM433_REMOTE = "use_rm433_remote"
 
@@ -29,7 +30,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
diff --git a/esphome/components/spa06_i2c/sensor.py b/esphome/components/spa06_i2c/sensor.py
index b48a5bca50..bffb4a4b4f 100644
--- a/esphome/components/spa06_i2c/sensor.py
+++ b/esphome/components/spa06_i2c/sensor.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from ..spa06_base import CONFIG_SCHEMA_BASE, to_code_base
 
@@ -18,6 +19,6 @@ CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
 ).extend({cv.GenerateID(): cv.declare_id(SPA06I2CComponent)})
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/spa06_spi/sensor.py b/esphome/components/spa06_spi/sensor.py
index b82186ec21..19cb99a831 100644
--- a/esphome/components/spa06_spi/sensor.py
+++ b/esphome/components/spa06_spi/sensor.py
@@ -4,6 +4,7 @@ import esphome.codegen as cg
 from esphome.components import spi
 from esphome.components.spi import CONF_SPI_MODE
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 from ..spa06_base import CONFIG_SCHEMA_BASE, to_code_base
 
@@ -21,7 +22,7 @@ _LOGGER = logging.getLogger(__name__)
 VALID_SPI_MODES = {3: "MODE3", "3": "MODE3", "MODE3": "MODE3"}
 
 
-def check_spi_mode(config):
+def check_spi_mode(config: ConfigType) -> ConfigType:
     spi_mode = config.get(CONF_SPI_MODE)
     if spi_mode not in VALID_SPI_MODES:
         raise cv.Invalid("SPA06 only supports SPI mode 3")
@@ -36,6 +37,6 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await to_code_base(config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/speed/fan/__init__.py b/esphome/components/speed/fan/__init__.py
index 3c495f3160..9a9290e78e 100644
--- a/esphome/components/speed/fan/__init__.py
+++ b/esphome/components/speed/fan/__init__.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_SPEED,
     CONF_SPEED_COUNT,
 )
+from esphome.types import ConfigType
 
 from .. import speed_ns
 
@@ -33,7 +34,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await fan.new_fan(config, config[CONF_SPEED_COUNT])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/spi_device/__init__.py b/esphome/components/spi_device/__init__.py
index 2f23d8a011..bd2bfe6452 100644
--- a/esphome/components/spi_device/__init__.py
+++ b/esphome/components/spi_device/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import spi
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MODE
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
 CODEOWNERS = ["@clydebarrow"]
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(spi.spi_device_schema(False, "1MHz"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     cg.add(var.set_bit_order(config[CONF_BIT_ORDER]))
diff --git a/esphome/components/spi_led_strip/light.py b/esphome/components/spi_led_strip/light.py
index ca320265a9..9139cc1ae3 100644
--- a/esphome/components/spi_led_strip/light.py
+++ b/esphome/components/spi_led_strip/light.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import light, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_NUM_LEDS, CONF_OUTPUT_ID
+from esphome.types import ConfigType
 
 spi_led_strip_ns = cg.esphome_ns.namespace("spi_led_strip")
 SpiLedStrip = spi_led_strip_ns.class_(
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = light.ADDRESSABLE_LIGHT_SCHEMA.extend(
 ).extend(spi.spi_device_schema(False, "1MHz"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID], config[CONF_NUM_LEDS])
     await light.register_light(var, config)
     await spi.register_spi_device(var, config)
diff --git a/esphome/components/ssd1306_base/__init__.py b/esphome/components/ssd1306_base/__init__.py
index 9d397e396b..26eda3b4ea 100644
--- a/esphome/components/ssd1306_base/__init__.py
+++ b/esphome/components/ssd1306_base/__init__.py
@@ -15,6 +15,8 @@ from esphome.const import (
     CONF_OFFSET_Y,
     CONF_RESET_PIN,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 ssd1306_base_ns = cg.esphome_ns.namespace("ssd1306_base")
 SSD1306 = ssd1306_base_ns.class_("SSD1306", cg.PollingComponent, display.DisplayBuffer)
@@ -40,7 +42,7 @@ MODELS = {
 SSD1306_MODEL = cv.enum(MODELS, upper=True, space="_")
 
 
-def _validate(value):
+def _validate(value: ConfigType) -> ConfigType:
     model = value[CONF_MODEL]
     if (
         model not in ("SSD1305_128X32", "SSD1305_128X64")
@@ -73,7 +75,7 @@ SSD1306_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def setup_ssd1306(var, config):
+async def setup_ssd1306(var: MockObj, config: ConfigType) -> None:
     await display.register_display(var, config)
 
     cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/esphome/components/ssd1306_i2c/display.py b/esphome/components/ssd1306_i2c/display.py
index 2ac0093ef1..ec271039ae 100644
--- a/esphome/components/ssd1306_i2c/display.py
+++ b/esphome/components/ssd1306_i2c/display.py
@@ -3,6 +3,7 @@ from esphome.components import i2c, ssd1306_base
 from esphome.components.ssd1306_base import _validate
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_LAMBDA, CONF_PAGES
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ssd1306_base"]
 DEPENDENCIES = ["i2c"]
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ssd1306_base.setup_ssd1306(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ssd1306_spi/display.py b/esphome/components/ssd1306_spi/display.py
index 26953b4f39..9a415ccfdb 100644
--- a/esphome/components/ssd1306_spi/display.py
+++ b/esphome/components/ssd1306_spi/display.py
@@ -4,6 +4,7 @@ from esphome.components import spi, ssd1306_base
 from esphome.components.ssd1306_base import _validate
 import esphome.config_validation as cv
 from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ssd1306_base"]
 DEPENDENCIES = ["spi"]
@@ -29,7 +30,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ssd1306_base.setup_ssd1306(var, config)
     await spi.register_spi_device(var, config, write_only=True)
diff --git a/esphome/components/ssd1322_base/__init__.py b/esphome/components/ssd1322_base/__init__.py
index 3569bbe957..daa0345857 100644
--- a/esphome/components/ssd1322_base/__init__.py
+++ b/esphome/components/ssd1322_base/__init__.py
@@ -9,6 +9,8 @@ from esphome.const import (
     CONF_MODEL,
     CONF_RESET_PIN,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -32,7 +34,7 @@ SSD1322_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def setup_ssd1322(var, config):
+async def setup_ssd1322(var: MockObj, config: ConfigType) -> None:
     await display.register_display(var, config)
 
     cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/esphome/components/ssd1322_spi/display.py b/esphome/components/ssd1322_spi/display.py
index 3d01caf874..63e0816ae7 100644
--- a/esphome/components/ssd1322_spi/display.py
+++ b/esphome/components/ssd1322_spi/display.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import spi, ssd1322_base
 import esphome.config_validation as cv
 from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -29,7 +30,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ssd1322_base.setup_ssd1322(var, config)
     await spi.register_spi_device(var, config, write_only=True)
diff --git a/esphome/components/ssd1325_base/__init__.py b/esphome/components/ssd1325_base/__init__.py
index 12cbd883a0..e48a821825 100644
--- a/esphome/components/ssd1325_base/__init__.py
+++ b/esphome/components/ssd1325_base/__init__.py
@@ -9,6 +9,8 @@ from esphome.const import (
     CONF_MODEL,
     CONF_RESET_PIN,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -36,7 +38,7 @@ SSD1325_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def setup_ssd1325(var, config):
+async def setup_ssd1325(var: MockObj, config: ConfigType) -> None:
     await display.register_display(var, config)
 
     cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/esphome/components/ssd1325_spi/display.py b/esphome/components/ssd1325_spi/display.py
index dbb9a14ac2..cca9a3cf8e 100644
--- a/esphome/components/ssd1325_spi/display.py
+++ b/esphome/components/ssd1325_spi/display.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import spi, ssd1325_base
 import esphome.config_validation as cv
 from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -29,7 +30,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ssd1325_base.setup_ssd1325(var, config)
     await spi.register_spi_device(var, config, write_only=True)
diff --git a/esphome/components/ssd1327_base/__init__.py b/esphome/components/ssd1327_base/__init__.py
index d0ec2410e6..462f197696 100644
--- a/esphome/components/ssd1327_base/__init__.py
+++ b/esphome/components/ssd1327_base/__init__.py
@@ -3,6 +3,8 @@ import esphome.codegen as cg
 from esphome.components import display
 import esphome.config_validation as cv
 from esphome.const import CONF_BRIGHTNESS, CONF_LAMBDA, CONF_MODEL, CONF_RESET_PIN
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -25,7 +27,7 @@ SSD1327_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def setup_ssd1327(var, config):
+async def setup_ssd1327(var: MockObj, config: ConfigType) -> None:
     await display.register_display(var, config)
 
     cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/esphome/components/ssd1327_i2c/display.py b/esphome/components/ssd1327_i2c/display.py
index 95de1c2979..e079a8698f 100644
--- a/esphome/components/ssd1327_i2c/display.py
+++ b/esphome/components/ssd1327_i2c/display.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, ssd1327_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_LAMBDA, CONF_PAGES
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ssd1327_base.setup_ssd1327(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ssd1327_spi/display.py b/esphome/components/ssd1327_spi/display.py
index f052764a91..8a5ea40efa 100644
--- a/esphome/components/ssd1327_spi/display.py
+++ b/esphome/components/ssd1327_spi/display.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import spi, ssd1327_base
 import esphome.config_validation as cv
 from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -29,7 +30,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ssd1327_base.setup_ssd1327(var, config)
     await spi.register_spi_device(var, config, write_only=True)
diff --git a/esphome/components/ssd1331_base/__init__.py b/esphome/components/ssd1331_base/__init__.py
index 144a95a29f..d1c0b585f8 100644
--- a/esphome/components/ssd1331_base/__init__.py
+++ b/esphome/components/ssd1331_base/__init__.py
@@ -3,6 +3,8 @@ import esphome.codegen as cg
 from esphome.components import display
 import esphome.config_validation as cv
 from esphome.const import CONF_BRIGHTNESS, CONF_LAMBDA, CONF_RESET_PIN
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -17,7 +19,7 @@ SSD1331_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def setup_ssd1331(var, config):
+async def setup_ssd1331(var: MockObj, config: ConfigType) -> None:
     await display.register_display(var, config)
 
     if CONF_RESET_PIN in config:
diff --git a/esphome/components/ssd1331_spi/display.py b/esphome/components/ssd1331_spi/display.py
index c16780302f..eeebb48ac6 100644
--- a/esphome/components/ssd1331_spi/display.py
+++ b/esphome/components/ssd1331_spi/display.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import spi, ssd1331_base
 import esphome.config_validation as cv
 from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -29,7 +30,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ssd1331_base.setup_ssd1331(var, config)
     await spi.register_spi_device(var, config, write_only=True)
diff --git a/esphome/components/ssd1351_base/__init__.py b/esphome/components/ssd1351_base/__init__.py
index fc03083ad0..a516b4d951 100644
--- a/esphome/components/ssd1351_base/__init__.py
+++ b/esphome/components/ssd1351_base/__init__.py
@@ -3,6 +3,8 @@ import esphome.codegen as cg
 from esphome.components import display
 import esphome.config_validation as cv
 from esphome.const import CONF_BRIGHTNESS, CONF_LAMBDA, CONF_MODEL, CONF_RESET_PIN
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -26,7 +28,7 @@ SSD1351_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def setup_ssd1351(var, config):
+async def setup_ssd1351(var: MockObj, config: ConfigType) -> None:
     await display.register_display(var, config)
 
     cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/esphome/components/ssd1351_spi/display.py b/esphome/components/ssd1351_spi/display.py
index 2a6e984029..10991b8338 100644
--- a/esphome/components/ssd1351_spi/display.py
+++ b/esphome/components/ssd1351_spi/display.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import spi, ssd1351_base
 import esphome.config_validation as cv
 from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 
@@ -29,7 +30,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ssd1351_base.setup_ssd1351(var, config)
     await spi.register_spi_device(var, config, write_only=True)
diff --git a/esphome/components/st7123/touchscreen/__init__.py b/esphome/components/st7123/touchscreen/__init__.py
index 5ebd08066f..55ea43ca6a 100644
--- a/esphome/components/st7123/touchscreen/__init__.py
+++ b/esphome/components/st7123/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+from esphome.types import ConfigType
 
 from .. import st7123_ns
 
@@ -21,7 +22,7 @@ CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
 ).extend(i2c.i2c_device_schema(0x55))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/st7567_base/__init__.py b/esphome/components/st7567_base/__init__.py
index 6f93172a1a..51225c5023 100644
--- a/esphome/components/st7567_base/__init__.py
+++ b/esphome/components/st7567_base/__init__.py
@@ -10,6 +10,8 @@ from esphome.const import (
     CONF_RESET_PIN,
     CONF_TRANSFORM,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@latonita"]
 
@@ -34,7 +36,7 @@ ST7567_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def setup_st7567(var, config):
+async def setup_st7567(var: MockObj, config: ConfigType) -> None:
     await display.register_display(var, config)
 
     if CONF_RESET_PIN in config:
diff --git a/esphome/components/st7567_i2c/display.py b/esphome/components/st7567_i2c/display.py
index bd62b3b382..1a7da33a8e 100644
--- a/esphome/components/st7567_i2c/display.py
+++ b/esphome/components/st7567_i2c/display.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, st7567_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_LAMBDA, CONF_PAGES
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@latonita"]
 
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await st7567_base.setup_st7567(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/st7567_spi/display.py b/esphome/components/st7567_spi/display.py
index 02cd2c105c..ad04b9f212 100644
--- a/esphome/components/st7567_spi/display.py
+++ b/esphome/components/st7567_spi/display.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import spi, st7567_base
 import esphome.config_validation as cv
 from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@latonita"]
 
@@ -29,7 +30,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await st7567_base.setup_st7567(var, config)
     await spi.register_spi_device(var, config, write_only=True)
diff --git a/esphome/components/st7735/display.py b/esphome/components/st7735/display.py
index 766370c21f..5cbcee12ab 100644
--- a/esphome/components/st7735/display.py
+++ b/esphome/components/st7735/display.py
@@ -13,6 +13,8 @@ from esphome.const import (
     CONF_PAGES,
     CONF_RESET_PIN,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 from . import st7735_ns
 
@@ -76,7 +78,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def setup_st7735(var, config):
+async def setup_st7735(var: MockObj, config: ConfigType) -> None:
     await display.register_display(var, config)
 
     if CONF_RESET_PIN in config:
@@ -89,7 +91,7 @@ async def setup_st7735(var, config):
         cg.add(var.set_writer(lambda_))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     LOGGER.warning(
         "The 'st7735' component is deprecated, it is recommended to use 'mipi_spi' instead."
     )
diff --git a/esphome/components/st7920/display.py b/esphome/components/st7920/display.py
index ef33fac6c6..853e38a279 100644
--- a/esphome/components/st7920/display.py
+++ b/esphome/components/st7920/display.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import display, spi
 import esphome.config_validation as cv
 from esphome.const import CONF_HEIGHT, CONF_ID, CONF_LAMBDA, CONF_WIDTH
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["display"]
 CODEOWNERS = ["@marsjan155"]
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await spi.register_spi_device(var, config, write_only=True)
 
diff --git a/esphome/components/statsd/__init__.py b/esphome/components/statsd/__init__.py
index 39188c6b81..b5a0586e31 100644
--- a/esphome/components/statsd/__init__.py
+++ b/esphome/components/statsd/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_PORT,
     CONF_SENSORS,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["socket"]
 CODEOWNERS = ["@Links2004"]
@@ -45,7 +46,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("10s"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     cg.add(
diff --git a/esphome/components/status/binary_sensor.py b/esphome/components/status/binary_sensor.py
index f0c7c87e17..452ae9398f 100644
--- a/esphome/components/status/binary_sensor.py
+++ b/esphome/components/status/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_CONNECTIVITY, ENTITY_CATEGORY_DIAGNOSTIC
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["network"]
 
@@ -17,6 +18,6 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
diff --git a/esphome/components/status_led/__init__.py b/esphome/components/status_led/__init__.py
index b0fce37126..700296c0df 100644
--- a/esphome/components/status_led/__init__.py
+++ b/esphome/components/status_led/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PIN
 from esphome.core import CoroPriority, coroutine_with_priority
+from esphome.types import ConfigType
 
 status_led_ns = cg.esphome_ns.namespace("status_led")
 StatusLED = status_led_ns.class_("StatusLED", cg.Component)
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = cv.Schema(
 
 
 @coroutine_with_priority(CoroPriority.STATUS)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     rhs = StatusLED.new(pin)
     var = cg.Pvariable(config[CONF_ID], rhs)
diff --git a/esphome/components/status_led/light/__init__.py b/esphome/components/status_led/light/__init__.py
index f8d03a3b4f..f63cf14178 100644
--- a/esphome/components/status_led/light/__init__.py
+++ b/esphome/components/status_led/light/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import light, output
 import esphome.config_validation as cv
 from esphome.const import CONF_OUTPUT, CONF_OUTPUT_ID, CONF_PIN
+from esphome.types import ConfigType
 
 from .. import status_led_ns
 
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     if CONF_PIN in config:
         pin = await cg.gpio_pin_expression(config[CONF_PIN])
diff --git a/esphome/components/sts3x/sensor.py b/esphome/components/sts3x/sensor.py
index 7b04bd58bb..d4fd431d13 100644
--- a/esphome/components/sts3x/sensor.py
+++ b/esphome/components/sts3x/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["sensirion_common"]
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/stts22h/sensor.py b/esphome/components/stts22h/sensor.py
index 094c233361..7b86f90860 100644
--- a/esphome/components/stts22h/sensor.py
+++ b/esphome/components/stts22h/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -27,7 +28,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/sx126x/packet_transport/__init__.py b/esphome/components/sx126x/packet_transport/__init__.py
index 4d79b23ac1..fc3bbf6df2 100644
--- a/esphome/components/sx126x/packet_transport/__init__.py
+++ b/esphome/components/sx126x/packet_transport/__init__.py
@@ -6,6 +6,7 @@ from esphome.components.packet_transport import (
 )
 import esphome.config_validation as cv
 from esphome.cpp_types import PollingComponent
+from esphome.types import ConfigType
 
 from .. import CONF_SX126X_ID, SX126x, SX126xListener, sx126x_ns
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = transport_schema(SX126xTransport).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var, _ = await new_packet_transport(config)
     sx126x = await cg.get_variable(config[CONF_SX126X_ID])
     cg.add(var.set_parent(sx126x))
diff --git a/esphome/components/syslog/__init__.py b/esphome/components/syslog/__init__.py
index 08626404f7..bf7fe9a307 100644
--- a/esphome/components/syslog/__init__.py
+++ b/esphome/components/syslog/__init__.py
@@ -6,6 +6,7 @@ from esphome.components.udp import CONF_UDP_ID
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_LEVEL, CONF_PORT, CONF_TIME_ID
 from esphome.cpp_types import Component, Parented
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@clydebarrow"]
 
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = udp.UDP_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     parent = await cg.get_variable(config[CONF_UDP_ID])
     time = await cg.get_variable(config[CONF_TIME_ID])
     cg.add(parent.set_broadcast_port(config[CONF_PORT]))
diff --git a/esphome/components/t6615/sensor.py b/esphome/components/t6615/sensor.py
index 9315e4a669..6f3ef372bc 100644
--- a/esphome/components/t6615/sensor.py
+++ b/esphome/components/t6615/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_PARTS_PER_MILLION,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@tylermenezes"]
 DEPENDENCIES = ["uart"]
@@ -36,7 +37,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/tc74/sensor.py b/esphome/components/tc74/sensor.py
index 18a94016fb..3d26dc2377 100644
--- a/esphome/components/tc74/sensor.py
+++ b/esphome/components/tc74/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@sethgirvan"]
 DEPENDENCIES = ["i2c"]
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tca9548a/__init__.py b/esphome/components/tca9548a/__init__.py
index 72973a54ad..381b84cad6 100644
--- a/esphome/components/tca9548a/__init__.py
+++ b/esphome/components/tca9548a/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_CHANNELS, CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@andreashergert1984"]
 
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tca9555/__init__.py b/esphome/components/tca9555/__init__.py
index 1c643fe1c9..3033cc65e0 100644
--- a/esphome/components/tca9555/__init__.py
+++ b/esphome/components/tca9555/__init__.py
@@ -11,6 +11,8 @@ from esphome.const import (
     CONF_NUMBER,
     CONF_OUTPUT,
 )
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@mobrembski"]
 
@@ -36,7 +38,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
@@ -44,7 +46,7 @@ async def to_code(config):
         cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin)))
 
 
-def validate_mode(value):
+def validate_mode(value: ConfigType) -> ConfigType:
     if not (value[CONF_INPUT] or value[CONF_OUTPUT]):
         raise cv.Invalid("Mode must be either input or output")
     if value[CONF_INPUT] and value[CONF_OUTPUT]:
@@ -66,7 +68,7 @@ TCA9555_PIN_SCHEMA = pins.gpio_base_schema(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_TCA9555, TCA9555_PIN_SCHEMA)
-async def tca9555_pin_to_code(config):
+async def tca9555_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_TCA9555])
 
diff --git a/esphome/components/tcl112/climate.py b/esphome/components/tcl112/climate.py
index 58ed7ee529..c175b1ea80 100644
--- a/esphome/components/tcl112/climate.py
+++ b/esphome/components/tcl112/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 CODEOWNERS = ["@glmnet"]
@@ -10,5 +11,5 @@ Tcl112Climate = tcl112_ns.class_("Tcl112Climate", climate_ir.ClimateIR)
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(Tcl112Climate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/tcs34725/sensor.py b/esphome/components/tcs34725/sensor.py
index 34b6c579b6..da6edfd62a 100644
--- a/esphome/components/tcs34725/sensor.py
+++ b/esphome/components/tcs34725/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_LUX,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -103,7 +104,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tee501/sensor.py b/esphome/components/tee501/sensor.py
index db8e8d9268..2d8853394c 100644
--- a/esphome/components/tee501/sensor.py
+++ b/esphome/components/tee501/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@Stock-M"]
 
@@ -30,7 +31,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tem3200/sensor.py b/esphome/components/tem3200/sensor.py
index 508dc1bcd4..289641f951 100644
--- a/esphome/components/tem3200/sensor.py
+++ b/esphome/components/tem3200/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@bakerkj"]
 DEPENDENCIES = ["i2c"]
@@ -40,7 +41,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/thermopro_ble/sensor.py b/esphome/components/thermopro_ble/sensor.py
index d0d6cdacb7..c660e5fcef 100644
--- a/esphome/components/thermopro_ble/sensor.py
+++ b/esphome/components/thermopro_ble/sensor.py
@@ -19,6 +19,7 @@ from esphome.const import (
     UNIT_DECIBEL_MILLIWATT,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@sittner"]
 
@@ -74,7 +75,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/time_based/cover/__init__.py b/esphome/components/time_based/cover/__init__.py
index 022b48d249..895743f400 100644
--- a/esphome/components/time_based/cover/__init__.py
+++ b/esphome/components/time_based/cover/__init__.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_OPEN_DURATION,
     CONF_STOP_ACTION,
 )
+from esphome.types import ConfigType
 
 from .. import time_based_ns
 
@@ -36,7 +37,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await cover.new_cover(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/tinyusb/__init__.py b/esphome/components/tinyusb/__init__.py
index 4c6f4db85b..53c4ab0073 100644
--- a/esphome/components/tinyusb/__init__.py
+++ b/esphome/components/tinyusb/__init__.py
@@ -12,6 +12,7 @@ from esphome.components.esp32 import (
 )
 import esphome.config_validation as cv
 from esphome.const import CONF_HARDWARE_UART, CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 CONFLICTS_WITH = ["usb_host"]
@@ -57,7 +58,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate(config) -> None:
+def _final_validate(config: ConfigType) -> None:
     full_config = fv.full_config.get()
     if not any(name in full_config for name in _USB_CLASS_COMPONENTS):
         raise cv.Invalid(
@@ -80,7 +81,7 @@ def _final_validate(config) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/tlc59208f/__init__.py b/esphome/components/tlc59208f/__init__.py
index b685423787..1af9f66b95 100644
--- a/esphome/components/tlc59208f/__init__.py
+++ b/esphome/components/tlc59208f/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 MULTI_CONF = True
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tlc59208f/output.py b/esphome/components/tlc59208f/output.py
index a2f4f16554..81d864ccce 100644
--- a/esphome/components/tlc59208f/output.py
+++ b/esphome/components/tlc59208f/output.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from . import TLC59208FOutput, tlc59208f_ns
 
@@ -19,7 +20,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     paren = await cg.get_variable(config[CONF_TLC59208F_ID])
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_channel(config[CONF_CHANNEL]))
diff --git a/esphome/components/tlc5947/__init__.py b/esphome/components/tlc5947/__init__.py
index 20e53893aa..05e2ef037d 100644
--- a/esphome/components/tlc5947/__init__.py
+++ b/esphome/components/tlc5947/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_NUM_CHIPS,
     CONF_OE_PIN,
 )
+from esphome.types import ConfigType
 
 CONF_LAT_PIN = "lat_pin"
 
@@ -32,7 +33,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/tlc5947/output/__init__.py b/esphome/components/tlc5947/output/__init__.py
index 6bea1546d3..cb285dc6ab 100644
--- a/esphome/components/tlc5947/output/__init__.py
+++ b/esphome/components/tlc5947/output/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from .. import TLC5947, tlc5947_ns
 
@@ -21,7 +22,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
     await cg.register_parented(var, config[CONF_TLC5947_ID])
diff --git a/esphome/components/tlc5971/__init__.py b/esphome/components/tlc5971/__init__.py
index b09924c3d3..5b9027e61a 100644
--- a/esphome/components/tlc5971/__init__.py
+++ b/esphome/components/tlc5971/__init__.py
@@ -5,6 +5,7 @@ from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_CLOCK_PIN, CONF_DATA_PIN, CONF_ID, CONF_NUM_CHIPS
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@IJIJI"]
 
@@ -22,7 +23,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/tlc5971/output/__init__.py b/esphome/components/tlc5971/output/__init__.py
index 854fbbd810..8fc19aad3b 100644
--- a/esphome/components/tlc5971/output/__init__.py
+++ b/esphome/components/tlc5971/output/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import output
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.types import ConfigType
 
 from .. import TLC5971, tlc5971_ns
 
@@ -21,7 +22,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await output.register_output(var, config)
     await cg.register_parented(var, config[CONF_TLC5971_ID])
diff --git a/esphome/components/tm1621/display.py b/esphome/components/tm1621/display.py
index f521af2842..e8a40507d8 100644
--- a/esphome/components/tm1621/display.py
+++ b/esphome/components/tm1621/display.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_READ_PIN,
     CONF_WRITE_PIN,
 )
+from esphome.types import ConfigType
 
 tm1621_ns = cg.esphome_ns.namespace("tm1621")
 TM1621Display = tm1621_ns.class_("TM1621Display", cg.PollingComponent)
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await display.register_display(var, config)
 
diff --git a/esphome/components/tm1637/binary_sensor.py b/esphome/components/tm1637/binary_sensor.py
index 817231627a..3dff02bbe8 100644
--- a/esphome/components/tm1637/binary_sensor.py
+++ b/esphome/components/tm1637/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_KEY
+from esphome.types import ConfigType
 
 CONF_TM1637_ID = "tm1637_id"
 
@@ -17,7 +18,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(TM1637Key).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await binary_sensor.register_binary_sensor(var, config)
     cg.add(var.set_keycode(config[CONF_KEY]))
diff --git a/esphome/components/tm1637/display.py b/esphome/components/tm1637/display.py
index 141ee5a39f..ec4d32561b 100644
--- a/esphome/components/tm1637/display.py
+++ b/esphome/components/tm1637/display.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_LAMBDA,
     CONF_LENGTH,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@glmnet"]
 
@@ -32,7 +33,7 @@ CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend(
 ).extend(cv.polling_component_schema("1s"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await display.register_display(var, config)
 
diff --git a/esphome/components/tmp102/sensor.py b/esphome/components/tmp102/sensor.py
index 862d526ccf..eba0d3c026 100644
--- a/esphome/components/tmp102/sensor.py
+++ b/esphome/components/tmp102/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@timsavage"]
 DEPENDENCIES = ["i2c"]
@@ -38,7 +39,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tmp1075/sensor.py b/esphome/components/tmp1075/sensor.py
index bedeef8e3c..3cbda4a57a 100644
--- a/esphome/components/tmp1075/sensor.py
+++ b/esphome/components/tmp1075/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -71,7 +72,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tmp117/sensor.py b/esphome/components/tmp117/sensor.py
index e906fe0aee..8a3073bef6 100644
--- a/esphome/components/tmp117/sensor.py
+++ b/esphome/components/tmp117/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@Azimath"]
@@ -29,7 +30,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def determine_config_register(polling_period):
+def determine_config_register(polling_period: int) -> int:
     if polling_period >= 16000:
         # 64 averaged conversions, max conversion time
         # 0000 00 111 11 00000
@@ -71,7 +72,7 @@ def determine_config_register(polling_period):
     return 0x0000
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tof10120/sensor.py b/esphome/components/tof10120/sensor.py
index d3aeaa814f..2475cf6bd5 100644
--- a/esphome/components/tof10120/sensor.py
+++ b/esphome/components/tof10120/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_METER,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@wstrzalka"]
 DEPENDENCIES = ["i2c"]
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tormatic/cover.py b/esphome/components/tormatic/cover.py
index 447920326b..f4d4c2a6d4 100644
--- a/esphome/components/tormatic/cover.py
+++ b/esphome/components/tormatic/cover.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import cover, uart
 import esphome.config_validation as cv
 from esphome.const import CONF_CLOSE_DURATION, CONF_OPEN_DURATION
+from esphome.types import ConfigType
 
 tormatic_ns = cg.esphome_ns.namespace("tormatic")
 Tormatic = tormatic_ns.class_("Tormatic", cover.Cover, cg.PollingComponent)
@@ -33,7 +34,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await cover.new_cover(config)
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
diff --git a/esphome/components/toshiba/climate.py b/esphome/components/toshiba/climate.py
index bdb17923fa..3b1e7352f9 100644
--- a/esphome/components/toshiba/climate.py
+++ b/esphome/components/toshiba/climate.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import climate_ir
 import esphome.config_validation as cv
 from esphome.const import CONF_MODEL
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 CODEOWNERS = ["@kbx81"]
@@ -24,6 +25,6 @@ CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(ToshibaClimate).exten
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate_ir.new_climate_ir(config)
     cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/esphome/components/total_daily_energy/sensor.py b/esphome/components/total_daily_energy/sensor.py
index f026dc9530..343fe917de 100644
--- a/esphome/components/total_daily_energy/sensor.py
+++ b/esphome/components/total_daily_energy/sensor.py
@@ -13,6 +13,7 @@ from esphome.const import (
     STATE_CLASS_TOTAL_INCREASING,
 )
 from esphome.core.entity_helpers import inherit_property_from
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["time"]
 
@@ -29,11 +30,11 @@ TotalDailyEnergy = total_daily_energy_ns.class_(
 )
 
 
-def inherit_unit_of_measurement(uom, config):
+def inherit_unit_of_measurement(uom: str, config: ConfigType) -> str:
     return uom + "h"
 
 
-def inherit_accuracy_decimals(decimals, config):
+def inherit_accuracy_decimals(decimals: int, config: ConfigType) -> int:
     return decimals + 2
 
 
@@ -80,7 +81,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/tsl2561/sensor.py b/esphome/components/tsl2561/sensor.py
index cd4b88e740..79ee2587d3 100644
--- a/esphome/components/tsl2561/sensor.py
+++ b/esphome/components/tsl2561/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
@@ -8,6 +10,8 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_LUX,
 )
+from esphome.core import EnumValue
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -28,7 +32,7 @@ GAINS = {
 CONF_IS_CS_PACKAGE = "is_cs_package"
 
 
-def validate_integration_time(value):
+def validate_integration_time(value: Any) -> EnumValue:
     value = cv.positive_time_period_milliseconds(value).total_milliseconds
     return cv.enum(INTEGRATION_TIMES, int=True)(value)
 
@@ -59,7 +63,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tsl2591/sensor.py b/esphome/components/tsl2591/sensor.py
index 0df3fa6687..fa202b0cea 100644
--- a/esphome/components/tsl2591/sensor.py
+++ b/esphome/components/tsl2591/sensor.py
@@ -19,6 +19,8 @@
 # Here is the project that started me down the TSL2591 device trail in the first
 # place: https://hackaday.io/project/176690-the-water-watcher
 
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
@@ -40,6 +42,8 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_LUX,
 )
+from esphome.core import EnumValue
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -71,7 +75,7 @@ GAINS = {
 }
 
 
-def validate_integration_time(value):
+def validate_integration_time(value: Any) -> EnumValue:
     value = cv.positive_time_period_milliseconds(value).total_milliseconds
     return cv.enum(INTEGRATION_TIMES, int=True)(value)
 
@@ -131,7 +135,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/tt21100/binary_sensor/__init__.py b/esphome/components/tt21100/binary_sensor/__init__.py
index 081bd17c20..cc3226089d 100644
--- a/esphome/components/tt21100/binary_sensor/__init__.py
+++ b/esphome/components/tt21100/binary_sensor/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_INDEX
+from esphome.types import ConfigType
 
 from .. import tt21100_ns
 from ..touchscreen import TT21100ButtonListener, TT21100Touchscreen
@@ -28,7 +29,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await cg.register_parented(var, config[CONF_TT21100_ID])
diff --git a/esphome/components/tt21100/touchscreen/__init__.py b/esphome/components/tt21100/touchscreen/__init__.py
index 9466dcdaa5..22489df379 100644
--- a/esphome/components/tt21100/touchscreen/__init__.py
+++ b/esphome/components/tt21100/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+from esphome.types import ConfigType
 
 from .. import tt21100_ns
 
@@ -26,7 +27,7 @@ CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await touchscreen.register_touchscreen(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ttp229_bsf/__init__.py b/esphome/components/ttp229_bsf/__init__.py
index fa1938723d..9e2a4ad114 100644
--- a/esphome/components/ttp229_bsf/__init__.py
+++ b/esphome/components/ttp229_bsf/__init__.py
@@ -2,6 +2,7 @@ from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_SCL_PIN, CONF_SDO_PIN
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["binary_sensor"]
 
@@ -20,7 +21,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/ttp229_bsf/binary_sensor.py b/esphome/components/ttp229_bsf/binary_sensor.py
index 178ad4f037..99280c82da 100644
--- a/esphome/components/ttp229_bsf/binary_sensor.py
+++ b/esphome/components/ttp229_bsf/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL
+from esphome.types import ConfigType
 
 from . import CONF_TTP229_ID, TTP229BSFComponent, ttp229_bsf_ns
 
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(TTP229BSFChannel).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
 
     cg.add(var.set_channel(config[CONF_CHANNEL]))
diff --git a/esphome/components/ttp229_lsf/__init__.py b/esphome/components/ttp229_lsf/__init__.py
index 412233a6bd..d32f72fcce 100644
--- a/esphome/components/ttp229_lsf/__init__.py
+++ b/esphome/components/ttp229_lsf/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 AUTO_LOAD = ["binary_sensor"]
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/ttp229_lsf/binary_sensor.py b/esphome/components/ttp229_lsf/binary_sensor.py
index 07f00df4b4..7d11dfcbff 100644
--- a/esphome/components/ttp229_lsf/binary_sensor.py
+++ b/esphome/components/ttp229_lsf/binary_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_CHANNEL
+from esphome.types import ConfigType
 
 from . import CONF_TTP229_ID, TTP229LSFComponent, ttp229_lsf_ns
 
@@ -16,7 +17,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(TTP229Channel).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
 
     cg.add(var.set_channel(config[CONF_CHANNEL]))
diff --git a/esphome/components/tx20/sensor.py b/esphome/components/tx20/sensor.py
index 1bb5ab0706..3a24b8dc0b 100644
--- a/esphome/components/tx20/sensor.py
+++ b/esphome/components/tx20/sensor.py
@@ -14,6 +14,7 @@ from esphome.const import (
     UNIT_DEGREES,
     UNIT_KILOMETER_PER_HOUR,
 )
+from esphome.types import ConfigType
 
 tx20_ns = cg.esphome_ns.namespace("tx20")
 Tx20Component = tx20_ns.class_("Tx20Component", cg.Component)
@@ -39,7 +40,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
diff --git a/esphome/components/uln2003/stepper.py b/esphome/components/uln2003/stepper.py
index b57d7ffb92..03fd254d17 100644
--- a/esphome/components/uln2003/stepper.py
+++ b/esphome/components/uln2003/stepper.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_SLEEP_WHEN_DONE,
     CONF_STEP_MODE,
 )
+from esphome.types import ConfigType
 
 uln2003_ns = cg.esphome_ns.namespace("uln2003")
 ULN2003StepMode = uln2003_ns.enum("ULN2003StepMode")
@@ -38,7 +39,7 @@ CONFIG_SCHEMA = stepper.STEPPER_SCHEMA.extend(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await stepper.register_stepper(var, config)
diff --git a/esphome/components/ultrasonic/sensor.py b/esphome/components/ultrasonic/sensor.py
index fad4e6b11d..25973447f6 100644
--- a/esphome/components/ultrasonic/sensor.py
+++ b/esphome/components/ultrasonic/sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_METER,
 )
+from esphome.types import ConfigType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/uptime/sensor/__init__.py b/esphome/components/uptime/sensor/__init__.py
index dd76bb5a87..4b611ffff3 100644
--- a/esphome/components/uptime/sensor/__init__.py
+++ b/esphome/components/uptime/sensor/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     STATE_CLASS_TOTAL_INCREASING,
     UNIT_SECOND,
 )
+from esphome.types import ConfigType
 
 uptime_ns = cg.esphome_ns.namespace("uptime")
 UptimeSecondsSensor = uptime_ns.class_(
@@ -54,7 +55,7 @@ CONFIG_SCHEMA = cv.typed_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     if time_id_config := config.get(CONF_TIME_ID):
diff --git a/esphome/components/uptime/text_sensor/__init__.py b/esphome/components/uptime/text_sensor/__init__.py
index 6b91b526c0..ed6a99c405 100644
--- a/esphome/components/uptime/text_sensor/__init__.py
+++ b/esphome/components/uptime/text_sensor/__init__.py
@@ -10,6 +10,7 @@ from esphome.const import (
     ENTITY_CATEGORY_DIAGNOSTIC,
     ICON_TIMER,
 )
+from esphome.types import ConfigType
 
 uptime_ns = cg.esphome_ns.namespace("uptime")
 UptimeTextSensor = uptime_ns.class_(
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     format = config[CONF_FORMAT]
     var = cg.new_Pvariable(
         config[CONF_ID],
diff --git a/esphome/components/usb_host/__init__.py b/esphome/components/usb_host/__init__.py
index 70425c27ca..4abcc3a449 100644
--- a/esphome/components/usb_host/__init__.py
+++ b/esphome/components/usb_host/__init__.py
@@ -13,6 +13,7 @@ from esphome.components.esp32 import (
 import esphome.config_validation as cv
 from esphome.const import CONF_DEVICES, CONF_ID
 from esphome.core import CORE
+from esphome.cpp_generator import MockObj
 from esphome.cpp_types import Component
 from esphome.types import ConfigType
 
@@ -30,7 +31,9 @@ CONF_MAX_TRANSFER_REQUESTS = "max_transfer_requests"
 CONF_MAX_PACKET_SIZE = "max_packet_size"
 
 
-def usb_device_schema(cls=USBClient, vid: int = None, pid: int = None) -> cv.Schema:
+def usb_device_schema(
+    cls=USBClient, vid: int | None = None, pid: int | None = None
+) -> cv.Schema:
     schema = cv.COMPONENT_SCHEMA.extend(
         {
             cv.GenerateID(): cv.declare_id(cls),
@@ -85,7 +88,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def register_usb_client(config):
+async def register_usb_client(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID], config[CONF_VID], config[CONF_PID])
     await cg.register_component(var, config)
     return var
diff --git a/esphome/components/veml3235/sensor.py b/esphome/components/veml3235/sensor.py
index 08d3685d1f..afff598869 100644
--- a/esphome/components/veml3235/sensor.py
+++ b/esphome/components/veml3235/sensor.py
@@ -8,6 +8,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_LUX,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 DEPENDENCIES = ["i2c"]
@@ -43,7 +44,7 @@ GAINS = {
 }
 
 
-def _validate_auto_gain_thresholds(config):
+def _validate_auto_gain_thresholds(config: ConfigType) -> ConfigType:
     if config[CONF_AUTO_GAIN_THRESHOLD_LOW] >= config[CONF_AUTO_GAIN_THRESHOLD_HIGH]:
         raise cv.Invalid(
             f"'{CONF_AUTO_GAIN_THRESHOLD_LOW}' must be less than '{CONF_AUTO_GAIN_THRESHOLD_HIGH}'"
@@ -80,7 +81,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/veml7700/sensor.py b/esphome/components/veml7700/sensor.py
index d0d3584dc2..4afca4b868 100644
--- a/esphome/components/veml7700/sensor.py
+++ b/esphome/components/veml7700/sensor.py
@@ -1,3 +1,5 @@
+from typing import Any
+
 import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
@@ -23,6 +25,8 @@ from esphome.const import (
     UNIT_LUX,
     UNIT_MILLISECOND,
 )
+from esphome.core import EnumValue
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@latonita"]
 DEPENDENCIES = ["i2c"]
@@ -59,7 +63,7 @@ INTEGRATION_TIMES = {
 }
 
 
-def validate_integration_time(value):
+def validate_integration_time(value: Any) -> EnumValue:
     value = cv.positive_time_period_milliseconds(value).total_milliseconds
     return cv.enum(INTEGRATION_TIMES, int=True)(value)
 
@@ -151,7 +155,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/version/text_sensor.py b/esphome/components/version/text_sensor.py
index a55e18a5a7..cad239dc41 100644
--- a/esphome/components/version/text_sensor.py
+++ b/esphome/components/version/text_sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     ENTITY_CATEGORY_DIAGNOSTIC,
     ICON_NEW_BOX,
 )
+from esphome.types import ConfigType
 
 version_ns = cg.esphome_ns.namespace("version")
 VersionTextSensor = version_ns.class_(
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await text_sensor.new_text_sensor(config)
     await cg.register_component(var, config)
     cg.add(var.set_hide_hash(config[CONF_HIDE_HASH]))
diff --git a/esphome/components/wake_on_lan/button.py b/esphome/components/wake_on_lan/button.py
index e1a4e4f4b0..5e756d0057 100644
--- a/esphome/components/wake_on_lan/button.py
+++ b/esphome/components/wake_on_lan/button.py
@@ -3,11 +3,12 @@ from esphome.components import button
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
 from esphome.core import CORE
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["network"]
 
 
-def AUTO_LOAD():
+def AUTO_LOAD() -> list[str]:
     if CORE.is_esp8266 or CORE.is_rp2:
         return []
     return ["socket"]
@@ -30,7 +31,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_macaddr(*config[CONF_TARGET_MAC_ADDRESS].parts))
     await cg.register_component(var, config)
diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index 7ecc3b4a87..be87c62377 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -13,6 +13,7 @@ from esphome.const import (
     CONF_RESET_DURATION,
     CONF_RESET_PIN,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
 
@@ -177,7 +178,7 @@ MODELS = {
 RESET_PIN_REQUIRED_MODELS = ("2.13inv2", "2.13in-ttgo-b74")
 
 
-def validate_full_update_every_only_types_ac(value):
+def validate_full_update_every_only_types_ac(value: ConfigType) -> ConfigType:
     if CONF_FULL_UPDATE_EVERY not in value:
         return value
     if MODELS[value[CONF_MODEL]][0] == "b":
@@ -192,7 +193,7 @@ def validate_full_update_every_only_types_ac(value):
     return value
 
 
-def validate_reset_pin_required(config):
+def validate_reset_pin_required(config: ConfigType) -> ConfigType:
     if config[CONF_MODEL] in RESET_PIN_REQUIRED_MODELS and CONF_RESET_PIN not in config:
         raise cv.Invalid(
             f"'{CONF_RESET_PIN}' is required for model {config[CONF_MODEL]}"
@@ -227,7 +228,7 @@ FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     model_type, model = MODELS[config[CONF_MODEL]]
     if model_type == "a":
         rhs = WaveshareEPaperTypeA.new(model)
diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index fc575d1c06..546e10ff5e 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -6,12 +6,13 @@ from esphome.const import CONF_ID
 from esphome.core import CORE, coroutine_with_priority
 from esphome.coroutine import CoroPriority
 from esphome.helpers import copy_file_if_changed
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
 DEPENDENCIES = ["network"]
 
 
-def AUTO_LOAD():
+def AUTO_LOAD() -> list[str]:
     if CORE.is_esp32:
         return ["web_server_idf"]
     if CORE.using_arduino:
@@ -25,7 +26,7 @@ WebServerBase = web_server_base_ns.class_("WebServerBase")
 CONF_WEB_SERVER_BASE_ID = "web_server_base_id"
 
 
-def _consume_web_server_base_sockets(config):
+def _consume_web_server_base_sockets(config: ConfigType) -> ConfigType:
     """Register the shared listening socket for the HTTP server.
 
     web_server_base is the shared HTTP server used by web_server and captive_portal.
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = cv.All(
 
 
 @coroutine_with_priority(CoroPriority.WEB_SERVER_BASE)
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(cg.RawExpression(f"{web_server_base_ns}::global_web_server_base = {var}"))
 
diff --git a/esphome/components/web_server_idf/__init__.py b/esphome/components/web_server_idf/__init__.py
index 1f195425f5..c16b0a2833 100644
--- a/esphome/components/web_server_idf/__init__.py
+++ b/esphome/components/web_server_idf/__init__.py
@@ -4,6 +4,7 @@ from esphome.components.esp32 import (
 )
 from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@dentra"]
 
@@ -13,7 +14,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # Increase the maximum supported size of headers section in HTTP request packet to be processed by the server
     add_idf_sdkconfig_option("CONFIG_HTTPD_MAX_REQ_HDR_LEN", 1024)
     # Re-enable esp-tls (excluded by default to save compile time);
diff --git a/esphome/components/whirlpool/climate.py b/esphome/components/whirlpool/climate.py
index f969a505fb..3435a6c0bf 100644
--- a/esphome/components/whirlpool/climate.py
+++ b/esphome/components/whirlpool/climate.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import climate_ir
 import esphome.config_validation as cv
 from esphome.const import CONF_MODEL
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 CODEOWNERS = ["@glmnet"]
@@ -22,6 +23,6 @@ CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(WhirlpoolClimate).ext
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate_ir.new_climate_ir(config)
     cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/esphome/components/whynter/climate.py b/esphome/components/whynter/climate.py
index bf33890d9c..36f0942281 100644
--- a/esphome/components/whynter/climate.py
+++ b/esphome/components/whynter/climate.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import climate_ir
 import esphome.config_validation as cv
 from esphome.const import CONF_USE_FAHRENHEIT
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 
@@ -16,6 +17,6 @@ CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(Whynter).extend(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate_ir.new_climate_ir(config)
     cg.add(var.set_fahrenheit(config[CONF_USE_FAHRENHEIT]))
diff --git a/esphome/components/wiegand/__init__.py b/esphome/components/wiegand/__init__.py
index 36ec7bd43f..dd6e84ac25 100644
--- a/esphome/components/wiegand/__init__.py
+++ b/esphome/components/wiegand/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import key_provider
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_ON_KEY, CONF_ON_TAG, CONF_TRIGGER_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ssieb"]
 
@@ -51,7 +52,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     pin = await cg.gpio_pin_expression(config[CONF_D0])
diff --git a/esphome/components/wifi_info/text_sensor.py b/esphome/components/wifi_info/text_sensor.py
index 5f72d0aa74..d14dcde46e 100644
--- a/esphome/components/wifi_info/text_sensor.py
+++ b/esphome/components/wifi_info/text_sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_SSID,
     ENTITY_CATEGORY_DIAGNOSTIC,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["wifi"]
 
@@ -70,14 +71,14 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-async def setup_conf(config, key):
+async def setup_conf(config: ConfigType, key: str) -> None:
     if key in config:
         conf = config[key]
         var = await text_sensor.new_text_sensor(conf)
         await cg.register_component(var, conf)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     # Request specific WiFi listeners based on which sensors are configured
     # Each sensor needs its own listener slot - call request for EACH sensor
 
diff --git a/esphome/components/wifi_signal/sensor.py b/esphome/components/wifi_signal/sensor.py
index 075cfd96c6..41205f71ce 100644
--- a/esphome/components/wifi_signal/sensor.py
+++ b/esphome/components/wifi_signal/sensor.py
@@ -7,6 +7,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_DECIBEL_MILLIWATT,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["wifi"]
 wifi_signal_ns = cg.esphome_ns.namespace("wifi_signal")
@@ -24,7 +25,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     wifi.request_wifi_connect_state_listener()
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
diff --git a/esphome/components/wk2132_i2c/__init__.py b/esphome/components/wk2132_i2c/__init__.py
index 903fe8fe4f..ecb7a5da09 100644
--- a/esphome/components/wk2132_i2c/__init__.py
+++ b/esphome/components/wk2132_i2c/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, weikai
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@DrCoolZic"]
 DEPENDENCIES = ["i2c"]
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_name(str(config[CONF_ID])))
     await weikai.register_weikai(var, config)
diff --git a/esphome/components/wk2132_spi/__init__.py b/esphome/components/wk2132_spi/__init__.py
index debc84f6d8..94b692f170 100644
--- a/esphome/components/wk2132_spi/__init__.py
+++ b/esphome/components/wk2132_spi/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import spi, weikai
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@DrCoolZic"]
 DEPENDENCIES = ["spi"]
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_name(str(config[CONF_ID])))
     await weikai.register_weikai(var, config)
diff --git a/esphome/components/wk2168_i2c/__init__.py b/esphome/components/wk2168_i2c/__init__.py
index 32fd4882db..d4aacaf97d 100644
--- a/esphome/components/wk2168_i2c/__init__.py
+++ b/esphome/components/wk2168_i2c/__init__.py
@@ -3,6 +3,8 @@ import esphome.codegen as cg
 from esphome.components import i2c, weikai
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INVERTED, CONF_MODE, CONF_NUMBER
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@DrCoolZic"]
 DEPENDENCIES = ["i2c"]
@@ -29,7 +31,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_name(str(config[CONF_ID])))
     await weikai.register_weikai(var, config)
@@ -48,7 +50,7 @@ WK2168_PIN_SCHEMA = cv.All(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_WK2168_I2C, WK2168_PIN_SCHEMA)
-async def sc16is75x_pin_to_code(config):
+async def sc16is75x_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_WK2168_I2C])
     cg.add(var.set_parent(parent))
diff --git a/esphome/components/wk2168_spi/__init__.py b/esphome/components/wk2168_spi/__init__.py
index 123ce0bb8b..b4efaf65ac 100644
--- a/esphome/components/wk2168_spi/__init__.py
+++ b/esphome/components/wk2168_spi/__init__.py
@@ -3,6 +3,8 @@ import esphome.codegen as cg
 from esphome.components import spi, weikai
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INVERTED, CONF_MODE, CONF_NUMBER
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@DrCoolZic"]
 DEPENDENCIES = ["spi"]
@@ -27,7 +29,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_name(str(config[CONF_ID])))
     await weikai.register_weikai(var, config)
@@ -46,7 +48,7 @@ WK2168_PIN_SCHEMA = cv.All(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_WK2168_SPI, WK2168_PIN_SCHEMA)
-async def sc16is75x_pin_to_code(config):
+async def sc16is75x_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_WK2168_SPI])
     cg.add(var.set_parent(parent))
diff --git a/esphome/components/wk2204_i2c/__init__.py b/esphome/components/wk2204_i2c/__init__.py
index a52aa30cc9..1502cc6cdb 100644
--- a/esphome/components/wk2204_i2c/__init__.py
+++ b/esphome/components/wk2204_i2c/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, weikai
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@DrCoolZic"]
 DEPENDENCIES = ["i2c"]
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_name(str(config[CONF_ID])))
     await weikai.register_weikai(var, config)
diff --git a/esphome/components/wk2204_spi/__init__.py b/esphome/components/wk2204_spi/__init__.py
index 616ba75c59..930f534bb0 100644
--- a/esphome/components/wk2204_spi/__init__.py
+++ b/esphome/components/wk2204_spi/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import spi, weikai
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@DrCoolZic"]
 DEPENDENCIES = ["spi"]
@@ -23,7 +24,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_name(str(config[CONF_ID])))
     await weikai.register_weikai(var, config)
diff --git a/esphome/components/wk2212_i2c/__init__.py b/esphome/components/wk2212_i2c/__init__.py
index 0ef32cbc96..00018dd735 100644
--- a/esphome/components/wk2212_i2c/__init__.py
+++ b/esphome/components/wk2212_i2c/__init__.py
@@ -3,6 +3,8 @@ import esphome.codegen as cg
 from esphome.components import i2c, weikai
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INVERTED, CONF_MODE, CONF_NUMBER
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@DrCoolZic"]
 DEPENDENCIES = ["i2c"]
@@ -29,7 +31,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_name(str(config[CONF_ID])))
     await weikai.register_weikai(var, config)
@@ -48,7 +50,7 @@ WK2212_PIN_SCHEMA = cv.All(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_WK2212_I2C, WK2212_PIN_SCHEMA)
-async def sc16is75x_pin_to_code(config):
+async def sc16is75x_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_WK2212_I2C])
     cg.add(var.set_parent(parent))
diff --git a/esphome/components/wk2212_spi/__init__.py b/esphome/components/wk2212_spi/__init__.py
index 8c9bea5416..c1a050e8ca 100644
--- a/esphome/components/wk2212_spi/__init__.py
+++ b/esphome/components/wk2212_spi/__init__.py
@@ -3,6 +3,8 @@ import esphome.codegen as cg
 from esphome.components import spi, weikai
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INVERTED, CONF_MODE, CONF_NUMBER
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@DrCoolZic"]
 DEPENDENCIES = ["spi"]
@@ -27,7 +29,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_name(str(config[CONF_ID])))
     await weikai.register_weikai(var, config)
@@ -46,7 +48,7 @@ WK2212_PIN_SCHEMA = cv.All(
 
 
 @pins.PIN_SCHEMA_REGISTRY.register(CONF_WK2212_SPI, WK2212_PIN_SCHEMA)
-async def sc16is75x_pin_to_code(config):
+async def sc16is75x_pin_to_code(config: ConfigType) -> MockObj:
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_WK2212_SPI])
     cg.add(var.set_parent(parent))
diff --git a/esphome/components/wl_134/text_sensor.py b/esphome/components/wl_134/text_sensor.py
index 1a10396bc6..af5e705786 100644
--- a/esphome/components/wl_134/text_sensor.py
+++ b/esphome/components/wl_134/text_sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import text_sensor, uart
 import esphome.config_validation as cv
 from esphome.const import CONF_RESET, ICON_FINGERPRINT
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@hobbypunk90"]
 DEPENDENCIES = ["uart"]
@@ -21,7 +22,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await text_sensor.new_text_sensor(config)
     await cg.register_component(var, config)
     cg.add(var.set_do_reset(config[CONF_RESET]))
diff --git a/esphome/components/wled/__init__.py b/esphome/components/wled/__init__.py
index 49eb15dad6..a7135975f0 100644
--- a/esphome/components/wled/__init__.py
+++ b/esphome/components/wled/__init__.py
@@ -3,7 +3,8 @@ from esphome.components.light.effects import register_addressable_effect
 from esphome.components.light.types import AddressableLightEffect
 import esphome.config_validation as cv
 from esphome.const import CONF_NAME, CONF_PORT
-from esphome.core import CORE
+from esphome.core import CORE, ID
+from esphome.types import ConfigType
 
 wled_ns = cg.esphome_ns.namespace("wled")
 WLEDLightEffect = wled_ns.class_("WLEDLightEffect", AddressableLightEffect)
@@ -23,7 +24,7 @@ CONF_BLANK_ON_START = "blank_on_start"
         cv.Optional(CONF_BLANK_ON_START, default=True): cv.boolean,
     },
 )
-async def wled_light_effect_to_code(config, effect_id):
+async def wled_light_effect_to_code(config: ConfigType, effect_id: ID) -> cg.MockObj:
     effect = cg.new_Pvariable(effect_id, config[CONF_NAME])
     cg.add(effect.set_port(config[CONF_PORT]))
     cg.add(effect.set_sync_group_mask(config[CONF_SYNC_GROUP_MASK]))
diff --git a/esphome/components/wts01/sensor.py b/esphome/components/wts01/sensor.py
index bf4f0262ad..84032512f6 100644
--- a/esphome/components/wts01/sensor.py
+++ b/esphome/components/wts01/sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
 )
+from esphome.types import ConfigType
 
 CONF_WTS01_ID = "wts01_id"
 CODEOWNERS = ["@alepee"]
@@ -35,7 +36,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
diff --git a/esphome/components/x9c/output.py b/esphome/components/x9c/output.py
index 0cc850b856..ff3f26e2ab 100644
--- a/esphome/components/x9c/output.py
+++ b/esphome/components/x9c/output.py
@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_STEP_DELAY,
     CONF_UD_PIN,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@EtienneMD"]
 
@@ -39,7 +40,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await output.register_output(var, config)
diff --git a/esphome/components/xdb401/sensor.py b/esphome/components/xdb401/sensor.py
index 7545343f02..c629e46650 100644
--- a/esphome/components/xdb401/sensor.py
+++ b/esphome/components/xdb401/sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PASCAL,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/xgzp68xx/sensor.py b/esphome/components/xgzp68xx/sensor.py
index 6b83012eb4..83c20dfbd8 100644
--- a/esphome/components/xgzp68xx/sensor.py
+++ b/esphome/components/xgzp68xx/sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PASCAL,
 )
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@gcormier"]
@@ -64,7 +65,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/xiaomi_ble/__init__.py b/esphome/components/xiaomi_ble/__init__.py
index 7f5045f1ce..16da83934e 100644
--- a/esphome/components/xiaomi_ble/__init__.py
+++ b/esphome/components/xiaomi_ble/__init__.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import ble_device_base
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base"]
 
@@ -20,6 +21,6 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_cgd1/sensor.py b/esphome/components/xiaomi_cgd1/sensor.py
index 7206f023d7..09337df5ca 100644
--- a/esphome/components/xiaomi_cgd1/sensor.py
+++ b/esphome/components/xiaomi_cgd1/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -57,7 +58,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_cgdk2/sensor.py b/esphome/components/xiaomi_cgdk2/sensor.py
index 0e7535cd76..83de32f411 100644
--- a/esphome/components/xiaomi_cgdk2/sensor.py
+++ b/esphome/components/xiaomi_cgdk2/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -57,7 +58,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_cgg1/sensor.py b/esphome/components/xiaomi_cgg1/sensor.py
index 6273d8549b..3f0df9eafe 100644
--- a/esphome/components/xiaomi_cgg1/sensor.py
+++ b/esphome/components/xiaomi_cgg1/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -57,7 +58,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_cgpr1/binary_sensor.py b/esphome/components/xiaomi_cgpr1/binary_sensor.py
index 3fdcd983b0..219432c1fc 100644
--- a/esphome/components/xiaomi_cgpr1/binary_sensor.py
+++ b/esphome/components/xiaomi_cgpr1/binary_sensor.py
@@ -17,6 +17,7 @@ from esphome.const import (
     UNIT_MINUTE,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble", "sensor"]
 
@@ -62,7 +63,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_gcls002/sensor.py b/esphome/components/xiaomi_gcls002/sensor.py
index f430cbdd10..63ba5da597 100644
--- a/esphome/components/xiaomi_gcls002/sensor.py
+++ b/esphome/components/xiaomi_gcls002/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     UNIT_MICROSIEMENS_PER_CENTIMETER,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -63,7 +64,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_hhccjcy01/sensor.py b/esphome/components/xiaomi_hhccjcy01/sensor.py
index 2c2e88b75f..13e8e509c3 100644
--- a/esphome/components/xiaomi_hhccjcy01/sensor.py
+++ b/esphome/components/xiaomi_hhccjcy01/sensor.py
@@ -21,6 +21,7 @@ from esphome.const import (
     UNIT_MICROSIEMENS_PER_CENTIMETER,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -73,7 +74,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_hhccjcy10/sensor.py b/esphome/components/xiaomi_hhccjcy10/sensor.py
index 56eeda484e..d1ce8dfcf7 100644
--- a/esphome/components/xiaomi_hhccjcy10/sensor.py
+++ b/esphome/components/xiaomi_hhccjcy10/sensor.py
@@ -21,6 +21,7 @@ from esphome.const import (
     UNIT_MICROSIEMENS_PER_CENTIMETER,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base"]
 
@@ -73,7 +74,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_hhccpot002/sensor.py b/esphome/components/xiaomi_hhccpot002/sensor.py
index 50b10777bb..061753c44c 100644
--- a/esphome/components/xiaomi_hhccpot002/sensor.py
+++ b/esphome/components/xiaomi_hhccpot002/sensor.py
@@ -12,6 +12,7 @@ from esphome.const import (
     UNIT_MICROSIEMENS_PER_CENTIMETER,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -45,7 +46,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_jqjcy01ym/sensor.py b/esphome/components/xiaomi_jqjcy01ym/sensor.py
index 7467f08785..b791c40dca 100644
--- a/esphome/components/xiaomi_jqjcy01ym/sensor.py
+++ b/esphome/components/xiaomi_jqjcy01ym/sensor.py
@@ -18,6 +18,7 @@ from esphome.const import (
     UNIT_MILLIGRAMS_PER_CUBIC_METER,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -64,7 +65,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_lywsd02/sensor.py b/esphome/components/xiaomi_lywsd02/sensor.py
index c455961e7e..f79b81dce2 100644
--- a/esphome/components/xiaomi_lywsd02/sensor.py
+++ b/esphome/components/xiaomi_lywsd02/sensor.py
@@ -15,6 +15,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -55,7 +56,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_lywsd02mmc/sensor.py b/esphome/components/xiaomi_lywsd02mmc/sensor.py
index 000460b333..05e0204def 100644
--- a/esphome/components/xiaomi_lywsd02mmc/sensor.py
+++ b/esphome/components/xiaomi_lywsd02mmc/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 CODEOWNERS = ["@juanluss31"]
@@ -58,7 +59,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_lywsd03mmc/sensor.py b/esphome/components/xiaomi_lywsd03mmc/sensor.py
index 6362f26524..f4e24a97d0 100644
--- a/esphome/components/xiaomi_lywsd03mmc/sensor.py
+++ b/esphome/components/xiaomi_lywsd03mmc/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@ahpohl"]
 
@@ -59,7 +60,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_lywsdcgq/sensor.py b/esphome/components/xiaomi_lywsdcgq/sensor.py
index 0fbe4fcda9..8f0b93a22e 100644
--- a/esphome/components/xiaomi_lywsdcgq/sensor.py
+++ b/esphome/components/xiaomi_lywsdcgq/sensor.py
@@ -15,6 +15,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -55,7 +56,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_mhoc303/sensor.py b/esphome/components/xiaomi_mhoc303/sensor.py
index de1b3ea4b8..9ce544fc59 100644
--- a/esphome/components/xiaomi_mhoc303/sensor.py
+++ b/esphome/components/xiaomi_mhoc303/sensor.py
@@ -15,6 +15,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -55,7 +56,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_mhoc401/sensor.py b/esphome/components/xiaomi_mhoc401/sensor.py
index 4604af218e..52cae36fcd 100644
--- a/esphome/components/xiaomi_mhoc401/sensor.py
+++ b/esphome/components/xiaomi_mhoc401/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@vevsvevs"]
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
@@ -58,7 +59,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_miscale/sensor.py b/esphome/components/xiaomi_miscale/sensor.py
index 8a2ac6bbb3..fa4296d7a9 100644
--- a/esphome/components/xiaomi_miscale/sensor.py
+++ b/esphome/components/xiaomi_miscale/sensor.py
@@ -14,6 +14,7 @@ from esphome.const import (
     UNIT_KILOGRAM,
     UNIT_OHM,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base"]
 
@@ -49,7 +50,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_mjyd02yla/binary_sensor.py b/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
index 4cfc82d2c6..5d562a2ca9 100644
--- a/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
+++ b/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
@@ -19,6 +19,7 @@ from esphome.const import (
     UNIT_MINUTE,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble", "sensor"]
 
@@ -68,7 +69,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_mue4094rt/binary_sensor.py b/esphome/components/xiaomi_mue4094rt/binary_sensor.py
index 6df8dcb8ea..34678eeac7 100644
--- a/esphome/components/xiaomi_mue4094rt/binary_sensor.py
+++ b/esphome/components/xiaomi_mue4094rt/binary_sensor.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor, ble_device_base
 import esphome.config_validation as cv
 from esphome.const import CONF_MAC_ADDRESS, CONF_TIMEOUT, DEVICE_CLASS_MOTION
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 
@@ -33,7 +34,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_wx08zm/binary_sensor.py b/esphome/components/xiaomi_wx08zm/binary_sensor.py
index 6aaf94f48f..4a6267f8b9 100644
--- a/esphome/components/xiaomi_wx08zm/binary_sensor.py
+++ b/esphome/components/xiaomi_wx08zm/binary_sensor.py
@@ -11,6 +11,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble", "sensor"]
 
@@ -48,7 +49,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await binary_sensor.new_binary_sensor(config)
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xiaomi_xmwsdj04mmc/sensor.py b/esphome/components/xiaomi_xmwsdj04mmc/sensor.py
index 758fa53d9e..8282523129 100644
--- a/esphome/components/xiaomi_xmwsdj04mmc/sensor.py
+++ b/esphome/components/xiaomi_xmwsdj04mmc/sensor.py
@@ -16,6 +16,7 @@ from esphome.const import (
     UNIT_CELSIUS,
     UNIT_PERCENT,
 )
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base", "xiaomi_ble"]
 CODEOWNERS = ["@medusalix"]
@@ -58,7 +59,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await ble_device_base.register_ble_device(var, config)
diff --git a/esphome/components/xpt2046/touchscreen/__init__.py b/esphome/components/xpt2046/touchscreen/__init__.py
index d91ae44789..e38bc23da3 100644
--- a/esphome/components/xpt2046/touchscreen/__init__.py
+++ b/esphome/components/xpt2046/touchscreen/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.components import spi, touchscreen
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_THRESHOLD
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@numo68", "@nielsnl68"]
 DEPENDENCIES = ["spi"]
@@ -31,7 +32,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await spi.register_spi_device(var, config)
     await touchscreen.register_touchscreen(var, config)
diff --git a/esphome/components/yashima/climate.py b/esphome/components/yashima/climate.py
index d7386eb6a3..cfc4744d82 100644
--- a/esphome/components/yashima/climate.py
+++ b/esphome/components/yashima/climate.py
@@ -3,6 +3,7 @@ from esphome.components import climate, remote_transmitter, sensor
 from esphome.components.remote_base import CONF_TRANSMITTER_ID
 import esphome.config_validation as cv
 from esphome.const import CONF_SENSOR, CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["sensor"]
 
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await climate.new_climate(config)
     await cg.register_component(var, config)
 
diff --git a/esphome/components/zephyr/__init__.py b/esphome/components/zephyr/__init__.py
index 338d1986ea..29ba0b9ed2 100644
--- a/esphome/components/zephyr/__init__.py
+++ b/esphome/components/zephyr/__init__.py
@@ -50,14 +50,14 @@ PrjConfValueType = bool | str | int | HexValue
 
 
 class Section:
-    def __init__(self, name, address, size, region):
+    def __init__(self, name: str, address: int, size: int, region: str) -> None:
         self.name = name
         self.address = address
         self.size = size
         self.region = region
         self.end_address = self.address + self.size
 
-    def __str__(self):
+    def __str__(self) -> str:
         return (
             f"{self.name}:\n"
             f"  address: 0x{self.address:X}\n"
@@ -181,7 +181,7 @@ async def _cdc_acm_to_code(config: ConfigType) -> None:
         await cg.register_component(var, {})
 
 
-def zephyr_setup_preferences():
+def zephyr_setup_preferences() -> None:
     cg.add(zephyr_ns.setup_preferences())
     zephyr_add_prj_conf("SETTINGS", True)
     zephyr_add_prj_conf("NVS", True)
diff --git a/esphome/components/zephyr_mcumgr/ota/__init__.py b/esphome/components/zephyr_mcumgr/ota/__init__.py
index 1503c94274..ad89c1ac79 100644
--- a/esphome/components/zephyr_mcumgr/ota/__init__.py
+++ b/esphome/components/zephyr_mcumgr/ota/__init__.py
@@ -177,7 +177,7 @@ async def to_code(config: ConfigType) -> None:
         slot1_start = slot0_start + slot_size
 
         def _mcuboot_partition_overlay() -> str:
-            def part(name, start, size):
+            def part(name: str, start: int, size: int) -> str:
                 return f"""
                 {name}: partition@{start:x} {{
                     reg = <0x{start:x} 0x{size:x}>;
diff --git a/esphome/components/zephyr_pwm/output.py b/esphome/components/zephyr_pwm/output.py
index b7ee27f63c..2cb62b85b5 100644
--- a/esphome/components/zephyr_pwm/output.py
+++ b/esphome/components/zephyr_pwm/output.py
@@ -1,4 +1,5 @@
 from dataclasses import dataclass, field
+from typing import Any
 
 from esphome import pins
 import esphome.codegen as cg
@@ -29,7 +30,7 @@ ZephyrPWMChannel = zephyr_pwm_ns.class_(
 validate_frequency = cv.All(cv.frequency, cv.float_range(min=3.815, max=1e7))
 
 
-def _pin_schema(value):
+def _pin_schema(value: Any) -> ConfigType:
     value = pins.internal_gpio_output_pin_schema(value)
     if value.get(CONF_ALLOW_OTHER_USES, False):
         raise cv.Invalid("allow_other_uses is not supported for zephyr_pwm pins")
@@ -109,7 +110,7 @@ def _final_validate(config: ConfigType) -> None:
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-def _overlay_pwm():
+def _overlay_pwm() -> str:
     pwm_blocks: list[PWMBlock] = _get_data().pwm_blocks
 
     assert CORE.is_nrf52
@@ -153,7 +154,7 @@ def _overlay_pwm():
     return "\n".join(overlay_parts)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     zephyr_add_prj_conf("PWM", True)
     pin = config[CONF_PIN]
     pwm_blocks: list[PWMBlock] = _get_data().pwm_blocks
diff --git a/esphome/components/zhlt01/climate.py b/esphome/components/zhlt01/climate.py
index 8d0c50308b..9e9933229f 100644
--- a/esphome/components/zhlt01/climate.py
+++ b/esphome/components/zhlt01/climate.py
@@ -1,5 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import climate_ir
+from esphome.types import ConfigType
 
 AUTO_LOAD = ["climate_ir"]
 CODEOWNERS = ["@cfeenstra1024"]
@@ -10,5 +11,5 @@ ZHLT01Climate = zhlt01_ns.class_("ZHLT01Climate", climate_ir.ClimateIR)
 CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(ZHLT01Climate)
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     await climate_ir.new_climate_ir(config)
diff --git a/esphome/components/zio_ultrasonic/sensor.py b/esphome/components/zio_ultrasonic/sensor.py
index 533bc5cc57..c4134cc40e 100644
--- a/esphome/components/zio_ultrasonic/sensor.py
+++ b/esphome/components/zio_ultrasonic/sensor.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_DISTANCE, STATE_CLASS_MEASUREMENT
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
 CODEOWNERS = ["@kahrendt"]
@@ -25,7 +26,7 @@ CONFIG_SCHEMA = (
 )
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = await sensor.new_sensor(config)
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
diff --git a/esphome/components/zwave_proxy/__init__.py b/esphome/components/zwave_proxy/__init__.py
index 14b8474045..660e3f49a0 100644
--- a/esphome/components/zwave_proxy/__init__.py
+++ b/esphome/components/zwave_proxy/__init__.py
@@ -3,6 +3,7 @@ from esphome.components import uart
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_POWER_SAVE_MODE, CONF_WIFI
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 CODEOWNERS = ["@kbx81"]
 DEPENDENCIES = ["api", "uart"]
@@ -11,7 +12,7 @@ zwave_proxy_ns = cg.esphome_ns.namespace("zwave_proxy")
 ZWaveProxy = zwave_proxy_ns.class_("ZWaveProxy", cg.Component, uart.UARTDevice)
 
 
-def final_validate(config) -> None:
+def final_validate(config: ConfigType) -> None:
     full_config = fv.full_config.get()
     if (wifi_conf := full_config.get(CONF_WIFI)) and (
         wifi_conf.get(CONF_POWER_SAVE_MODE).lower() != "none"
@@ -34,7 +35,7 @@ CONFIG_SCHEMA = (
 FINAL_VALIDATE_SCHEMA = final_validate
 
 
-async def to_code(config):
+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)
diff --git a/esphome/components/zyaura/sensor.py b/esphome/components/zyaura/sensor.py
index 58de519283..0508f456e4 100644
--- a/esphome/components/zyaura/sensor.py
+++ b/esphome/components/zyaura/sensor.py
@@ -19,6 +19,7 @@ from esphome.const import (
     UNIT_PERCENT,
 )
 from esphome.cpp_helpers import gpio_pin_expression
+from esphome.types import ConfigType
 
 zyaura_ns = cg.esphome_ns.namespace("zyaura")
 ZyAuraSensor = zyaura_ns.class_("ZyAuraSensor", cg.PollingComponent)
@@ -51,7 +52,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.polling_component_schema("60s"))
 
 
-async def to_code(config):
+async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 

From c8ebe461d13491ca3406d680c85b8cb31dc261dc Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 24 Aug 2026 14:11:35 +1200
Subject: [PATCH 139/155] [ci] Skip CodSpeed benchmarks on beta and release
 pull requests (#18703)

---
 .github/workflows/ci.yml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 35148de0c0..9da0937555 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -112,6 +112,12 @@ jobs:
       component-test-batches: ${{ steps.determine.outputs.component-test-batches }}
       validate-only-components: ${{ steps.determine.outputs.validate-only-components }}
       benchmarks: ${{ steps.determine.outputs.benchmarks }}
+      # "true" when this run is a pull request into one of the release
+      # branches. Those pull requests are batches of changes already tested on
+      # their original dev pull requests, so several jobs below trade coverage
+      # for turnaround time on them. Matched exactly, not by prefix, so an
+      # ordinary branch named e.g. "release-notes" is not caught by it.
+      release-pr: ${{ github.base_ref == 'beta' || github.base_ref == 'release' }}
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -230,7 +236,7 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - determine-jobs
-    if: github.event_name == 'pull_request' && !startsWith(github.base_ref, 'beta') && !startsWith(github.base_ref, 'release') && needs.determine-jobs.outputs.core-ci == 'true'
+    if: github.event_name == 'pull_request' && needs.determine-jobs.outputs.release-pr == 'false' && needs.determine-jobs.outputs.core-ci == 'true'
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -449,10 +455,21 @@ jobs:
     if: >-
       github.repository == 'esphome/esphome' && (
         (github.event_name == 'push' && github.ref_name == 'dev') ||
-        (github.event_name == 'pull_request' && needs.determine-jobs.outputs.benchmarks == 'true')
+        (
+          github.event_name == 'pull_request' &&
+          needs.determine-jobs.outputs.release-pr == 'false' &&
+          needs.determine-jobs.outputs.benchmarks == 'true'
+        )
       )
     # CodSpeed benchmarks require a CodSpeed account linked to the repository to run
     # (https://codspeed.io) -- disabled on forks that aren't esphome/esphome itself.
+    #
+    # Pull requests into beta and release are skipped as well. CodSpeed compares a
+    # pull request against the newest commit of its base branch that has a benchmark
+    # run of its own, and only dev is benchmarked. A release pull request therefore
+    # falls back to dev's latest run, so every speed-up merged into dev since the
+    # release branched is reported as a regression in the release. The changes there
+    # have already been benchmarked on their original dev pull requests.
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -929,7 +946,7 @@ jobs:
       ESPHOME_SDK_NRF_PREFIX: ~/.esphome-sdk-nrf
     strategy:
       fail-fast: false
-      max-parallel: ${{ (startsWith(github.base_ref, 'beta') || startsWith(github.base_ref, 'release')) && 32 || 16 }}
+      max-parallel: ${{ needs.determine-jobs.outputs.release-pr == 'true' && 32 || 16 }}
       matrix:
         batch: ${{ fromJson(needs.determine-jobs.outputs.component-test-batches) }}
     steps:
@@ -1016,7 +1033,7 @@ jobs:
           # - This catches pin conflicts and other issues in directly changed code
           # - Grouped tests use --testing-mode to allow config merging (disables some checks)
           # - Dependencies are safe to group since they weren't modified in this PR
-          if [[ "${{ github.base_ref }}" == beta* ]] || [[ "${{ github.base_ref }}" == release* ]]; then
+          if [[ "${{ needs.determine-jobs.outputs.release-pr }}" == "true" ]]; then
             directly_changed_csv=""
             echo "Testing components: $components_csv"
             echo "Target branch: ${{ github.base_ref }} - grouping all components"

From 9974ad97fa13a8b0c61b21837db8ef3ca14abecd Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 21:59:19 -0500
Subject: [PATCH 140/155] [core] Extract the shared idedata and size-summary
 helpers into build_helpers (#18661)

---
 esphome/__main__.py                           |  15 +-
 esphome/build_helpers/__init__.py             |   1 +
 esphome/{espidf => build_helpers}/idedata.py  | 201 +++++-
 esphome/build_helpers/size_summary.py         |  24 +
 esphome/espidf/clang_tidy.py                  |  13 +-
 esphome/espidf/size_summary.py                |  18 +-
 esphome/espidf/toolchain.py                   |  33 +-
 script/determine-jobs.py                      |  15 +-
 tests/script/test_determine_jobs.py           |  18 +-
 tests/unit_tests/__init__.py                  |   0
 .../analyze_memory/test_build_artifacts.py    |   2 +-
 tests/unit_tests/build_gen/__init__.py        |   0
 tests/unit_tests/build_helpers/__init__.py    |   0
 .../unit_tests/build_helpers/test_idedata.py  | 678 ++++++++++++++++++
 .../build_helpers/test_size_summary.py        |  22 +
 tests/unit_tests/test_core.py                 |   2 +-
 tests/unit_tests/test_espidf_clang_tidy.py    |  35 +
 tests/unit_tests/test_espidf_idedata.py       | 264 -------
 tests/unit_tests/test_espidf_toolchain.py     | 112 +--
 tests/unit_tests/test_main.py                 | 104 ++-
 tests/unit_tests/test_size_summary.py         |  17 +
 21 files changed, 1091 insertions(+), 483 deletions(-)
 create mode 100644 esphome/build_helpers/__init__.py
 rename esphome/{espidf => build_helpers}/idedata.py (51%)
 create mode 100644 esphome/build_helpers/size_summary.py
 create mode 100644 tests/unit_tests/__init__.py
 create mode 100644 tests/unit_tests/build_gen/__init__.py
 create mode 100644 tests/unit_tests/build_helpers/__init__.py
 create mode 100644 tests/unit_tests/build_helpers/test_idedata.py
 create mode 100644 tests/unit_tests/build_helpers/test_size_summary.py
 delete mode 100644 tests/unit_tests/test_espidf_idedata.py

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 769b66ecc8..0da86b3ec0 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -857,7 +857,20 @@ def compile_program(args: ArgsProtocol, config: ConfigType) -> int:
         toolchain.create_factory_bin()
         toolchain.create_ota_bin()
         toolchain.create_elf_copy()
-        toolchain.get_idedata()
+        from esphome.build_helpers.idedata import IDEDATA_BEST_EFFORT_ERRORS
+
+        try:
+            if toolchain.get_idedata() is None:
+                _LOGGER.warning("No idedata was generated for this build")
+        except IDEDATA_BEST_EFFORT_ERRORS as err:
+            # The firmware already built; an idedata failure must not fail
+            # a successful build.
+            _LOGGER.warning(
+                "Could not generate idedata: %s (IDE, clang-tidy, and "
+                "memory-analysis data will be unavailable for this build)",
+                err,
+            )
+            _LOGGER.debug("Idedata failure detail", exc_info=True)
     else:
         from esphome.platformio import toolchain
 
diff --git a/esphome/build_helpers/__init__.py b/esphome/build_helpers/__init__.py
new file mode 100644
index 0000000000..df956a2509
--- /dev/null
+++ b/esphome/build_helpers/__init__.py
@@ -0,0 +1 @@
+"""Build helpers shared by the native (non-PlatformIO) toolchains."""
diff --git a/esphome/espidf/idedata.py b/esphome/build_helpers/idedata.py
similarity index 51%
rename from esphome/espidf/idedata.py
rename to esphome/build_helpers/idedata.py
index 0047d568e2..038fe64970 100644
--- a/esphome/espidf/idedata.py
+++ b/esphome/build_helpers/idedata.py
@@ -1,10 +1,10 @@
-"""Derive idedata from an ESP-IDF native-toolchain ``compile_commands.json``.
+"""Derive idedata from a native (non-PlatformIO) build's ``compile_commands.json``.
 
-PlatformIO exposes a curated ``pio run -t idedata`` JSON; the native ESP-IDF
-toolchain has no such command, but its CMake build emits
-``build/compile_commands.json`` (CMAKE_EXPORT_COMPILE_COMMANDS). This module
-turns that file into the same fields consumers (IDE integration, clang-tidy)
-expect:
+PlatformIO exposes a curated ``pio run -t idedata`` JSON; the native
+toolchains have no such command, but each build produces a
+``compile_commands.json`` (CMAKE_EXPORT_COMPILE_COMMANDS for ESP-IDF, ninja's
+compdb tool otherwise). This module turns that file into the same fields
+consumers (IDE integration, clang-tidy) expect:
 
     {cc_path, cxx_path, cxx_flags, defines, includes: {build, toolchain}}
 """
@@ -18,6 +18,19 @@ from pathlib import Path
 import shlex
 import subprocess
 
+from esphome.core import EsphomeError
+from esphome.helpers import write_file
+
+# Everything idedata generation may raise after a successful link; idedata
+# is a bonus artifact, so consumers warn instead of failing the build
+IDEDATA_BEST_EFFORT_ERRORS = (
+    EsphomeError,
+    LookupError,
+    OSError,
+    RuntimeError,
+    ValueError,
+)
+
 _LOGGER = logging.getLogger(__name__)
 
 # C++ translation-unit suffixes used to identify ESPHome source files.
@@ -30,12 +43,8 @@ _ESPHOME_SRC_MARKER = "/src/esphome/"
 
 
 def _is_esphome_src(file: str) -> bool:
-    """Whether ``file`` is an ESPHome C++ translation unit.
-
-    ``compile_commands.json`` ``file`` paths use the OS-native separator, so on
-    Windows they contain backslashes; normalize to ``/`` before testing the
-    marker, otherwise no source matches and the build-include union is empty.
-    """
+    """Whether ``file`` is an ESPHome C++ translation unit; normalized to
+    ``/`` first since Windows compile DBs use backslashes."""
     return _ESPHOME_SRC_MARKER in file.replace("\\", "/") and file.endswith(
         _CXX_SUFFIXES
     )
@@ -106,11 +115,8 @@ def _expand_response_files(tokens: list[str], directory: Path) -> list[str]:
 
 
 def _pick_entry(entries: list[dict]) -> dict:
-    """Pick a representative ESPHome C++ translation unit.
-
-    All ESPHome sources share the same component flags/defines, so any one of
-    them yields the cxx_path / cxx_flags / defines we need.
-    """
+    """Pick a representative ESPHome C++ TU; all share the same component
+    flags/defines."""
     for entry in entries:
         if _is_esphome_src(entry["file"]):
             return entry
@@ -120,25 +126,46 @@ def _pick_entry(entries: list[dict]) -> dict:
     raise ValueError("no C++ translation unit found in compile_commands.json")
 
 
-def _parse_entry(entry: dict) -> tuple[str, list[str], list[str], list[str]]:
+# Compiler launchers that may prefix a compile command; a closed launcher
+# denylist beats enumerating compiler names, an open set.
+_LAUNCHER_STEMS = frozenset({"ccache", "sccache", "distcc", "icecc", "buildcache"})
+
+
+def _is_launcher(token: str) -> bool:
+    return Path(token).stem.lower() in _LAUNCHER_STEMS
+
+
+def parse_entry(
+    entry: dict, launcher: str | None = None
+) -> tuple[str, list[str], list[str], list[str]]:
     """Parse one compile_commands entry -> (cxx_path, defines, includes, cxx_flags)."""
     directory = Path(entry["directory"])
     tokens = _expand_response_files(_split_command(entry["command"]), directory)
 
     def _include(raw: str) -> str:
-        # Include paths in compile_commands are interpreted relative to the
-        # entry's ``directory`` (e.g. build-local ``-Iconfig``); resolve them
-        # so the cached idedata is usable regardless of the consumer's cwd.
-        # Emit forward slashes (``normpath`` yields ``\`` on Windows) so the
-        # paths match the absolute, already-forward-slash entries in the JSON.
+        # Resolve against the entry's ``directory`` so cached idedata works
+        # from any cwd; emit forward slashes to match the JSON's own entries
         raw = raw.strip()
         if raw and not Path(raw).is_absolute():
             raw = os.path.normpath(directory / raw)
         return raw.replace("\\", "/")
 
+    # A launcher-wrapped command ("ccache g++ ...") names the compiler second
+    if launcher is not None and tokens[:1] == [launcher]:
+        tokens = tokens[1:]
+    if not tokens:
+        # An empty command, or one that was only the launcher; fail by name
+        raise ValueError(f"empty compile command for {entry.get('file')}")
+    if _is_launcher(tokens[0]) and len(tokens) > 1 and not tokens[1].startswith("-"):
+        # Stale DB built with a launcher this run no longer configures; the
+        # real compiler is the next token
+        _LOGGER.warning("Stripping unconfigured launcher %s", tokens[0])
+        tokens = tokens[1:]
     # token0 is the compiler path; the rest of the command already uses forward
     # slashes on Windows, so normalize it too for a consistent idedata file.
     cxx_path = tokens[0].replace("\\", "/")
+    # Enforced here so no caller can record ccache as the compiler
+    reject_launcher_compiler(cxx_path)
     defines: list[str] = []
     includes: list[str] = []
     cxx_flags: list[str] = []
@@ -168,7 +195,7 @@ def _parse_entry(entry: dict) -> tuple[str, list[str], list[str], list[str]]:
     return cxx_path, defines, includes, cxx_flags
 
 
-def _get_toolchain_includes(cxx_path: str) -> list[str]:
+def get_toolchain_includes(cxx_path: str) -> list[str]:
     """Query the compiler for its builtin ``#include <...>`` search dirs."""
     result = subprocess.run(
         [cxx_path, "-E", "-x", "c++", "-", "-v"],
@@ -219,26 +246,128 @@ def _cc_path_from_cxx(cxx_path: str) -> str:
     return f"{stem}{suffix}"
 
 
-def idedata_from_build(compile_commands: Path) -> dict:
+def _cache_usable(cached: object) -> bool:
+    """Check a cached idedata dict against the guarantees of the write path.
+
+    Caches written by older versions predate the launcher rejection and the
+    include-union shape; serving one would bypass both. The dict check also
+    keeps "in" from substring-matching a bare JSON string.
+    """
+    if not isinstance(cached, dict) or "cc_path" not in cached:
+        return False
+    cxx_path = cached.get("cxx_path")
+    if not isinstance(cxx_path, str) or _is_launcher(cxx_path):
+        return False
+    includes = cached.get("includes")
+    return isinstance(includes, dict) and isinstance(includes.get("build"), list)
+
+
+def load_or_build_idedata(
+    compile_commands: Path,
+    elf_path: Path,
+    cache: Path,
+    launcher: str | None = None,
+) -> dict | None:
+    """Return idedata for a compile_commands.json build, cached on mtime.
+
+    Shared by the native ESP-IDF and ESP8266 Arduino toolchains. Returns None
+    when the compile DB doesn't exist yet (nothing was built). ``launcher``
+    is the compiler-launcher path (ccache) the build was generated with, if
+    any; commands in the compile DB are prefixed with it.
+    """
+    if not compile_commands.is_file():
+        _LOGGER.debug("No %s yet; skipping idedata generation", compile_commands)
+        return None
+
+    if cache.is_file() and cache.stat().st_mtime >= compile_commands.stat().st_mtime:
+        try:
+            cached = json.loads(cache.read_text(encoding="utf-8"))
+        except (ValueError, OSError) as err:
+            # A recurring cause (interrupted write, disk full) would otherwise
+            # look like unexplained slow builds
+            _LOGGER.warning("Discarding unreadable idedata cache %s: %s", cache, err)
+        else:
+            if _cache_usable(cached):
+                # Re-stamp so a relocated build dir cannot serve a stale ELF path
+                cached["prog_path"] = str(elf_path)
+                return cached
+            _LOGGER.debug("Regenerating idedata: cache %s fails validation", cache)
+
+    data = idedata_from_build(compile_commands, launcher)
+    data["prog_path"] = str(elf_path)
+    cache.parent.mkdir(parents=True, exist_ok=True)
+    # Atomic so a crash mid-write cannot leave a truncated cache
+    write_file(cache, json.dumps(data, indent=2) + "\n")
+    return data
+
+
+def reject_launcher_compiler(cxx_path: str) -> None:
+    """Reject a compile DB naming a launcher (ccache) as the compiler; it
+    must never be probed, cached, or consumed."""
+    if _is_launcher(cxx_path):
+        raise EsphomeError(
+            f"compile_commands.json names the launcher {cxx_path} as the "
+            "compiler; the compile database is unusable"
+        )
+
+
+def idedata_from_build(compile_commands: Path, launcher: str | None = None) -> dict:
     """Parse compile_commands.json into the idedata fields consumers expect.
 
-    A single ESP-IDF compile entry only carries its own component's REQUIRES
-    include set, but consumers (clang-tidy) analyze ESPHome headers that
-    transitively pull in other components. So take cxx_path / cxx_flags /
-    defines from a representative ESPHome TU, but union the include dirs across
-    all ESPHome TUs to get a project-wide superset (as PlatformIO's idedata
-    provides).
+    A single compile entry only carries the include set its own translation
+    unit was built with (per-component under ESP-IDF), but consumers
+    (clang-tidy) analyze ESPHome headers that transitively pull in other
+    components. So take cxx_path / cxx_flags / defines from a representative
+    ESPHome TU, but union the include dirs across all ESPHome TUs to get a
+    project-wide superset (as PlatformIO's idedata provides).
     """
     entries = json.loads(Path(compile_commands).read_text(encoding="utf-8"))
-    cxx_path, defines, _, cxx_flags = _parse_entry(_pick_entry(entries))
+    if not isinstance(entries, list) or not all(isinstance(e, dict) for e in entries):
+        # A TypeError here would escape IDEDATA_BEST_EFFORT_ERRORS
+        raise EsphomeError(f"{compile_commands} is not a compile-command list")
 
-    build_includes: dict[str, None] = {}
+    representative = _pick_entry(entries)
+    cxx_path, defines, rep_includes, cxx_flags = parse_entry(representative, launcher)
+
+    # Seed with the representative's includes so it is not parsed twice
+    has_esphome_tu = _is_esphome_src(representative["file"])
+    build_includes: dict[str, None] = dict.fromkeys(
+        rep_includes if has_esphome_tu else ()
+    )
+
+    def _shape(entry: dict) -> str:
+        # directory + command minus TU-specific paths: same shape means the
+        # same include set, so tokenize once per shape. Response-file
+        # commands never dedupe (the .rsp contents differ per object)
+        command = entry["command"]
+        directory = entry.get("directory", "")
+        if "@" in command:
+            return f"unique:{directory}|{entry.get('output') or command}"
+        stripped = command.replace(entry.get("file", ""), "").replace(
+            entry.get("output", ""), ""
+        )
+        return f"{directory}|{stripped}"
+
+    seen_shapes = {_shape(representative)}
     for entry in entries:
-        if not _is_esphome_src(entry["file"]):
+        if entry is representative or not _is_esphome_src(entry["file"]):
             continue
-        for inc in _parse_entry(entry)[2]:
+        has_esphome_tu = True
+        if (shape := _shape(entry)) in seen_shapes:
+            _LOGGER.debug("Include union: %s shares a command shape", entry["file"])
+            continue
+        seen_shapes.add(shape)
+        for inc in parse_entry(entry, launcher)[2]:
             build_includes.setdefault(inc, None)
 
+    if not has_esphome_tu:
+        # An arbitrary fallback TU breaks clang-tidy/IDE consumers, and a
+        # warning would be cached into permanence; call sites downgrade this
+        raise EsphomeError(
+            f"No ESPHome translation unit found in {compile_commands}; "
+            "refusing to cache unusable idedata"
+        )
+
     return {
         "cc_path": _cc_path_from_cxx(cxx_path),
         "cxx_path": cxx_path,
@@ -246,6 +375,6 @@ def idedata_from_build(compile_commands: Path) -> dict:
         "defines": defines,
         "includes": {
             "build": list(build_includes),
-            "toolchain": _get_toolchain_includes(cxx_path),
+            "toolchain": get_toolchain_includes(cxx_path),
         },
     }
diff --git a/esphome/build_helpers/size_summary.py b/esphome/build_helpers/size_summary.py
new file mode 100644
index 0000000000..b888111044
--- /dev/null
+++ b/esphome/build_helpers/size_summary.py
@@ -0,0 +1,24 @@
+"""The PlatformIO-format size bar shared by the native toolchains."""
+
+from __future__ import annotations
+
+
+def format_bar(used: int, total: int) -> str:
+    """Match PlatformIO's ``_format_availale_bytes`` (sic, pioupload.py) exactly."""
+    pct_raw = used / total if total else 0
+    blocks = 10
+    filled = min(int(round(blocks * pct_raw)), blocks)
+    progress = "=" * filled
+    return (
+        f"[{progress:<{blocks}}] {pct_raw: 6.1%} "
+        f"(used {used:d} bytes from {total:d} bytes)"
+    )
+
+
+def print_size_line(label: str, used: int, total: int) -> None:
+    """One PlatformIO-format summary line (``RAM``/``Flash``).
+
+    The label padding is part of the format: ``script/ci_memory_impact_extract.py``
+    matches these lines verbatim.
+    """
+    print(f"{label + ':':<7}{format_bar(used, total)}")
diff --git a/esphome/espidf/clang_tidy.py b/esphome/espidf/clang_tidy.py
index c91db775a3..9a70f1a99a 100644
--- a/esphome/espidf/clang_tidy.py
+++ b/esphome/espidf/clang_tidy.py
@@ -23,6 +23,12 @@ from dataclasses import dataclass
 import os
 from pathlib import Path
 
+from esphome.build_helpers.idedata import (
+    get_toolchain_includes,
+    parse_entry,
+    reject_launcher_compiler,
+)
+
 TIDY_PROJECT_NAME = "esphome_tidy"
 
 # A do-nothing C++ app: just enough for IDF to configure a valid project. It's
@@ -415,13 +421,12 @@ def _idedata_from_tidy_project(compile_commands: Path) -> dict:
     """
     import json
 
-    from esphome.espidf.idedata import _get_toolchain_includes, _parse_entry
-
     entries = json.loads(Path(compile_commands).read_text(encoding="utf-8"))
     entry = next((e for e in entries if e["file"].endswith("tidy.cpp")), None)
     if entry is None:
         raise RuntimeError(f"tidy.cpp not found in {compile_commands}")
-    cxx_path, defines, includes, cxx_flags = _parse_entry(entry)
+    cxx_path, defines, includes, cxx_flags = parse_entry(entry)
+    reject_launcher_compiler(cxx_path)
 
     return {
         "cxx_path": cxx_path,
@@ -429,7 +434,7 @@ def _idedata_from_tidy_project(compile_commands: Path) -> dict:
         "defines": defines,
         "includes": {
             "build": includes,
-            "toolchain": _get_toolchain_includes(cxx_path),
+            "toolchain": get_toolchain_includes(cxx_path),
         },
     }
 
diff --git a/esphome/espidf/size_summary.py b/esphome/espidf/size_summary.py
index 7a5305ff0c..2be3634c69 100644
--- a/esphome/espidf/size_summary.py
+++ b/esphome/espidf/size_summary.py
@@ -28,6 +28,8 @@ import json
 import logging
 from pathlib import Path
 
+from esphome.build_helpers.size_summary import print_size_line
+
 _LOGGER = logging.getLogger(__name__)
 _SIZE_SUFFIXES = {"K": 1024, "M": 1024 * 1024}
 
@@ -67,18 +69,6 @@ def _find_app_partition_size(partitions_csv: Path) -> int:
     raise ValueError(f"No app+factory or app+ota_0 partition in {partitions_csv}")
 
 
-def _format_bar(used: int, total: int) -> str:
-    """Match PlatformIO's ``_format_availale_bytes`` (pioupload.py) exactly."""
-    pct_raw = used / total if total else 0
-    blocks = 10
-    filled = min(int(round(blocks * pct_raw)), blocks)
-    progress = "=" * filled
-    return (
-        f"[{progress:<{blocks}}] {pct_raw: 6.1%} "
-        f"(used {used:d} bytes from {total:d} bytes)"
-    )
-
-
 def print_summary(size_json: Path, partitions_csv: Path | None) -> None:
     """Print PlatformIO-shaped RAM and Flash one-liners.
 
@@ -99,7 +89,7 @@ def print_summary(size_json: Path, partitions_csv: Path | None) -> None:
     ram_used = ram_region.get("used")
     ram_total = ram_region.get("size")
     if ram_total and ram_used is not None:
-        print(f"RAM:   {_format_bar(ram_used, ram_total)}")
+        print_size_line("RAM", ram_used, ram_total)
 
     image_size = data.get("image_size")
     if image_size is None or partitions_csv is None:
@@ -109,4 +99,4 @@ def print_summary(size_json: Path, partitions_csv: Path | None) -> None:
     except ValueError as e:
         _LOGGER.debug("Skipping Flash summary: %s", e)
         return
-    print(f"Flash: {_format_bar(image_size, app_size)}")
+    print_size_line("Flash", image_size, app_size)
diff --git a/esphome/espidf/toolchain.py b/esphome/espidf/toolchain.py
index 07ba03e2cf..3c5c4803c2 100644
--- a/esphome/espidf/toolchain.py
+++ b/esphome/espidf/toolchain.py
@@ -526,32 +526,15 @@ def get_idedata() -> dict | None:
     idedata fields IDE integrations and clang-tidy expect, cached alongside the
     PlatformIO idedata path. Returns None if the compile DB doesn't exist yet.
     """
-    from esphome.espidf.idedata import idedata_from_build
+    from esphome.build_helpers.idedata import load_or_build_idedata
 
-    compile_commands = CORE.relative_build_path("build", "compile_commands.json")
-    if not compile_commands.is_file():
-        _LOGGER.debug("No %s yet; skipping idedata generation", compile_commands)
-        return None
-
-    cache = CORE.relative_internal_path("idedata", f"{CORE.name}.json")
-    if cache.is_file() and cache.stat().st_mtime >= compile_commands.stat().st_mtime:
-        try:
-            cached = json.loads(cache.read_text(encoding="utf-8"))
-        except ValueError:
-            pass
-        else:
-            # Caches written before cc_path was emitted stay newer than
-            # compile_commands.json forever, so rebuild them on the field rather
-            # than on the timestamp. Check the type too: a corrupted cache can
-            # still be valid JSON, and "in" would match a substring of a string.
-            if isinstance(cached, dict) and "cc_path" in cached:
-                return cached
-
-    data = idedata_from_build(compile_commands)
-    data["prog_path"] = str(get_elf_path())
-    cache.parent.mkdir(parents=True, exist_ok=True)
-    cache.write_text(json.dumps(data, indent=2) + "\n", encoding="utf-8")
-    return data
+    # No launcher: CMake excludes CMAKE_<LANG>_COMPILER_LAUNCHER (ccache)
+    # from the exported compile database, unlike ninja's compdb dump.
+    return load_or_build_idedata(
+        CORE.relative_build_path("build", "compile_commands.json"),
+        get_elf_path(),
+        CORE.relative_internal_path("idedata", f"{CORE.name}.json"),
+    )
 
 
 def create_factory_bin() -> bool:
diff --git a/script/determine-jobs.py b/script/determine-jobs.py
index e4d002975c..722e2370fe 100755
--- a/script/determine-jobs.py
+++ b/script/determine-jobs.py
@@ -525,13 +525,20 @@ def _esp32_platformio_path_or_file_trigger(files: list[str]) -> bool:
     return False
 
 
-# ESP-IDF infra: changes under esphome/espidf/ or to the IDF build generator
-# affect every esp32 IDF build (now the default toolchain) but aren't
+# Native-build infra: changes under esphome/espidf/, the shared
+# esphome/build_helpers/ package, or the modules the native ESP-IDF build
+# imports affect every esp32 IDF build (now the default toolchain) but aren't
 # components, so the component matrix wouldn't otherwise force any esp32
 # compile. When they change we fold the `esp32` component into the matrix so
 # the default native-IDF build path is still compiled on an infra-only PR.
-ESP_IDF_INFRA_TRIGGER_PATH_PREFIXES = ("esphome/espidf/",)
-ESP_IDF_INFRA_TRIGGER_FILES = frozenset({"esphome/build_gen/espidf.py"})
+ESP_IDF_INFRA_TRIGGER_PATH_PREFIXES = ("esphome/espidf/", "esphome/build_helpers/")
+ESP_IDF_INFRA_TRIGGER_FILES = frozenset(
+    {
+        "esphome/build_gen/espidf.py",
+        "esphome/framework_helpers.py",
+        "esphome/platformio/library.py",
+    }
+)
 
 
 def _esp_idf_infra_changed(files: list[str]) -> bool:
diff --git a/tests/script/test_determine_jobs.py b/tests/script/test_determine_jobs.py
index 80f572d9fe..1a568ca6c6 100644
--- a/tests/script/test_determine_jobs.py
+++ b/tests/script/test_determine_jobs.py
@@ -1120,7 +1120,13 @@ def test_should_run_esp32_platformio_with_branch() -> None:
         (["esphome/espidf/runner.py"], True),
         (["esphome/espidf/framework.py"], True),
         (["esphome/build_gen/espidf.py"], True),
-        # PlatformIO build gen and esp32 component are NOT IDF-infra triggers
+        # Shared native-build modules the IDF build imports -> trigger
+        (["esphome/build_helpers/idedata.py"], True),
+        (["esphome/platformio/library.py"], True),
+        (["esphome/framework_helpers.py"], True),
+        # PlatformIO build gen, its toolchain, and the esp32 component are
+        # NOT IDF-infra triggers
+        (["esphome/platformio/toolchain.py"], False),
         (["esphome/build_gen/platformio.py"], False),
         (["esphome/components/esp32/__init__.py"], False),
         (["README.md"], False),
@@ -1132,6 +1138,16 @@ def test_esp_idf_infra_changed(changed_files: list[str], expected: bool) -> None
     assert determine_jobs._esp_idf_infra_changed(changed_files) is expected
 
 
+def test_esp_idf_infra_trigger_paths_exist() -> None:
+    """A renamed or moved trigger module must fail here, not silently stop
+    forcing the esp32 IDF compile."""
+    repo_root = Path(__file__).resolve().parents[2]
+    for file in determine_jobs.ESP_IDF_INFRA_TRIGGER_FILES:
+        assert (repo_root / file).is_file(), f"trigger file {file} moved or renamed"
+    for prefix in determine_jobs.ESP_IDF_INFRA_TRIGGER_PATH_PREFIXES:
+        assert (repo_root / prefix).is_dir(), f"trigger dir {prefix} moved or renamed"
+
+
 @pytest.mark.parametrize(
     ("changed_files", "expected_result"),
     [
diff --git a/tests/unit_tests/__init__.py b/tests/unit_tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit_tests/analyze_memory/test_build_artifacts.py b/tests/unit_tests/analyze_memory/test_build_artifacts.py
index d97ee94e1c..ed37858b86 100644
--- a/tests/unit_tests/analyze_memory/test_build_artifacts.py
+++ b/tests/unit_tests/analyze_memory/test_build_artifacts.py
@@ -9,7 +9,7 @@ from esphome.analyze_memory.toolchain import (
     find_idedata_path,
     idedata_candidates,
 )
-from esphome.espidf.idedata import _cc_path_from_cxx
+from esphome.build_helpers.idedata import _cc_path_from_cxx
 from esphome.platformio.toolchain import IDEData
 
 
diff --git a/tests/unit_tests/build_gen/__init__.py b/tests/unit_tests/build_gen/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit_tests/build_helpers/__init__.py b/tests/unit_tests/build_helpers/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/unit_tests/build_helpers/test_idedata.py b/tests/unit_tests/build_helpers/test_idedata.py
new file mode 100644
index 0000000000..fcf9c67086
--- /dev/null
+++ b/tests/unit_tests/build_helpers/test_idedata.py
@@ -0,0 +1,678 @@
+"""Tests for esphome.build_helpers.idedata (compile_commands.json -> idedata)."""
+
+# pylint: disable=protected-access
+
+import json
+import logging
+import os
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from esphome.build_helpers import idedata
+from esphome.core import EsphomeError
+
+# An absolute, forward-slash (shlex-safe) path prefix valid on the host OS, so
+# tests exercise the same is-absolute / normalize behavior as a real compile DB
+# (a drive-qualified path on Windows, a leading slash elsewhere).
+ABS = "C:/" if os.name == "nt" else "/"
+
+
+def _entry(directory: str, file: str, command: str) -> dict:
+    return {"directory": directory, "file": file, "command": command}
+
+
+def test_parse_entry_extracts_fields() -> None:
+    """cxx_path, defines, includes and remaining flags are split apart."""
+    entry = _entry(
+        f"{ABS}build",
+        f"{ABS}build/src/esphome/core/application.cpp",
+        f"/tools/xtensa-esp32-elf-g++ -DUSE_ESP32 -DESPHOME_LOG_LEVEL=5 "
+        f"-I{ABS}inc/a -isystem {ABS}sys/b -std=gnu++20 -c app.cpp -o app.cpp.o",
+    )
+
+    cxx_path, defines, includes, cxx_flags = idedata.parse_entry(entry)
+
+    assert cxx_path == "/tools/xtensa-esp32-elf-g++"
+    assert "USE_ESP32" in defines
+    assert "ESPHOME_LOG_LEVEL=5" in defines
+    assert f"{ABS}inc/a" in includes
+    assert f"{ABS}sys/b" in includes
+    assert "-std=gnu++20" in cxx_flags
+    # input/output files and their flags are not treated as flags
+    assert "-c" not in cxx_flags
+    assert "-o" not in cxx_flags
+    assert "app.cpp" not in cxx_flags
+    assert "app.cpp.o" not in cxx_flags
+
+
+def test_parse_entry_space_separated_args() -> None:
+    """``-D X`` / ``-I path`` (separate arg) and ``-isystem<path>`` (joined)."""
+    entry = _entry(
+        f"{ABS}build",
+        f"{ABS}build/src/esphome/x.cpp",
+        f"g++ -D FOO=1 -I {ABS}inc/sep -isystem{ABS}sys/joined -c x.cpp",
+    )
+
+    _, defines, includes, _ = idedata.parse_entry(entry)
+
+    assert "FOO=1" in defines
+    assert f"{ABS}inc/sep" in includes
+    assert f"{ABS}sys/joined" in includes
+
+
+def test_parse_entry_resolves_relative_includes() -> None:
+    """Relative includes are resolved against the entry's ``directory``."""
+    directory = f"{ABS}build/proj"
+    entry = _entry(
+        directory,
+        f"{directory}/src/esphome/x.cpp",
+        "g++ -Iconfig -I../shared -isystem rel/sys -c x.cpp",
+    )
+
+    _, _, includes, _ = idedata.parse_entry(entry)
+
+    def resolved(rel: str) -> str:
+        # parse_entry emits forward slashes for consistency (normpath would
+        # yield backslashes on Windows).
+        return os.path.normpath(Path(directory) / rel).replace("\\", "/")
+
+    assert resolved("config") in includes
+    assert resolved("../shared") in includes  # ../ normalized away
+    assert resolved("rel/sys") in includes
+    # nothing is left relative
+    assert all(Path(inc).is_absolute() for inc in includes)
+
+
+def test_parse_entry_skips_dependency_flags() -> None:
+    """Dependency-generation flags (and their args) are dropped."""
+    entry = _entry(
+        "/build",
+        "/build/src/esphome/x.cpp",
+        "g++ -MD -MT x.cpp.o -MF x.cpp.o.d -c x.cpp -o x.cpp.o",
+    )
+
+    _, _, _, cxx_flags = idedata.parse_entry(entry)
+
+    for tok in ("-MD", "-MT", "x.cpp.o", "-MF", "x.cpp.o.d", "-c", "-o", "x.cpp"):
+        assert tok not in cxx_flags
+
+
+def test_expand_response_files(tmp_path: Path) -> None:
+    """``@file`` arguments are inlined relative to the directory."""
+    rsp = tmp_path / "flags.rsp"
+    rsp.write_text("-DFROM_RSP -I/rsp/inc")
+
+    tokens = idedata._expand_response_files(
+        ["g++", f"@{rsp.name}", "-c", "x.cpp"], tmp_path
+    )
+
+    assert "-DFROM_RSP" in tokens
+    assert "-I/rsp/inc" in tokens
+    assert not any(t.startswith("@") for t in tokens)
+
+
+def test_expand_response_files_keeps_literal_when_missing(tmp_path: Path) -> None:
+    """An unreadable ``@file`` token is kept verbatim rather than dropped."""
+    tokens = idedata._expand_response_files(["g++", "@nope.rsp"], tmp_path)
+    assert "@nope.rsp" in tokens
+
+
+def test_pick_entry_prefers_esphome_tu() -> None:
+    """A ``/src/esphome/`` C++ TU is picked over other compile entries."""
+    entries = [
+        _entry("/b", "/b/managed_components/foo/foo.c", "gcc -c foo.c"),
+        _entry("/b", "/b/src/esphome/core/app.cpp", "g++ -c app.cpp"),
+    ]
+    assert idedata._pick_entry(entries)["file"].endswith("app.cpp")
+
+
+def test_pick_entry_falls_back_to_any_cxx_tu() -> None:
+    """With no ``/src/esphome/`` TU present, the first C++ entry is the fallback."""
+    entries = [
+        _entry("/b", "/b/managed_components/foo/foo.c", "gcc -c foo.c"),
+        _entry("/b", "/b/components/x/x.cpp", "g++ -c x.cpp"),
+    ]
+    assert idedata._pick_entry(entries)["file"].endswith("x.cpp")
+
+
+def test_is_esphome_src_handles_backslash_paths() -> None:
+    r"""The src marker must match Windows ``\src\esphome\`` paths too.
+
+    compile_commands ``file`` entries use the OS-native separator; if the
+    marker only matched forward slashes no source would match on Windows and
+    the build-include union would be silently empty.
+    """
+    assert idedata._is_esphome_src(r"C:\b\src\esphome\core\app.cpp")
+    assert idedata._is_esphome_src("/b/src/esphome/core/app.cpp")
+    # non-esphome and non-C++ still rejected regardless of separator
+    assert not idedata._is_esphome_src(r"C:\b\managed_components\x\x.cpp")
+    assert not idedata._is_esphome_src(r"C:\b\src\esphome\core\app.h")
+
+
+@pytest.mark.parametrize(
+    ("command", "launcher"),
+    [
+        ("", None),
+        # A command that is only the launcher strips to nothing
+        ("/usr/bin/ccache", "/usr/bin/ccache"),
+    ],
+)
+def test_parse_entry_empty_command_raises(command: str, launcher: str | None) -> None:
+    """A blank (or launcher-only) command fails with a named ValueError,
+    not an IndexError."""
+    entry = {"directory": "/b", "file": "/b/src/x.cpp", "command": command}
+    with pytest.raises(ValueError, match="empty compile command"):
+        idedata.parse_entry(entry, launcher)
+
+
+def test_idedata_from_build_empty_includes_raises(tmp_path: Path) -> None:
+    """A compile DB with no ESPHome TU is never usable idedata and must
+    not be cached (call sites downgrade the raise to a build warning)."""
+    compile_commands = tmp_path / "compile_commands.json"
+    compile_commands.write_text(
+        json.dumps(
+            [
+                _entry(
+                    f"{ABS}build",
+                    f"{ABS}build/other/lib.cpp",
+                    "/tools/g++ -c other/lib.cpp -o lib.o",
+                )
+            ]
+        )
+    )
+    with (
+        patch.object(idedata, "get_toolchain_includes", return_value=[]),
+        pytest.raises(EsphomeError, match="No ESPHome translation unit found"),
+    ):
+        idedata.idedata_from_build(compile_commands)
+
+
+def test_idedata_from_build_rsp_commands_never_dedupe(tmp_path: Path) -> None:
+    """Per-object response files strip to one shape while holding different
+    include sets; @-commands must tokenize per TU."""
+    entries = []
+    for name in ("a", "b"):
+        rsp = tmp_path / f"{name}.cpp.o.rsp"
+        rsp.write_text(f"-I{ABS}inc/{name}")
+        file = f"{ABS}build/src/esphome/core/{name}.cpp"
+        entries.append(
+            {
+                "directory": str(tmp_path),
+                "file": file,
+                "command": f"/tools/g++ @{rsp.name} -c {file} -o {name}.o",
+                "output": f"{name}.o",
+            }
+        )
+    compile_commands = tmp_path / "compile_commands.json"
+    compile_commands.write_text(json.dumps(entries))
+    with patch.object(idedata, "get_toolchain_includes", return_value=[]):
+        data = idedata.idedata_from_build(compile_commands)
+    joined = " ".join(data["includes"]["build"])
+    assert "inc/a" in joined and "inc/b" in joined
+
+
+def test_idedata_from_build_dedupes_identical_command_shapes(
+    tmp_path: Path,
+) -> None:
+    """Translation units sharing one ninja rule (same command modulo
+    file/output) carry
+    identical includes, so only one per shape is tokenized; a differing
+    shape still contributes its includes."""
+
+    def _tu(name: str, inc: str) -> dict:
+        # ninja's compdb embeds the file and output strings verbatim
+        file = f"{ABS}build/src/esphome/core/{name}.cpp"
+        return _entry(
+            f"{ABS}build", file, f"/tools/g++ -I{ABS}inc/{inc} -c {file} -o {name}.o"
+        ) | {"output": f"{name}.o"}
+
+    entries = [_tu(name, "shared") for name in ("application", "component", "helpers")]
+    entries.append(_tu("extra", "extra"))
+    compile_commands = tmp_path / "compile_commands.json"
+    compile_commands.write_text(json.dumps(entries))
+    with (
+        patch.object(idedata, "get_toolchain_includes", return_value=[]),
+        patch.object(idedata, "parse_entry", wraps=idedata.parse_entry) as spy,
+    ):
+        data = idedata.idedata_from_build(compile_commands)
+    includes = set(data["includes"]["build"])
+    assert f"{ABS}inc/shared".replace("\\", "/") in {
+        i.replace("\\", "/") for i in includes
+    }
+    assert any("inc/extra" in i for i in includes)
+    # Representative + one distinct shape; the two same-shape duplicates
+    # are never tokenized
+    assert spy.call_count == 2
+
+
+def test_idedata_from_build(tmp_path: Path) -> None:
+    """Full transform: representative entry + include union + toolchain dirs."""
+    compile_commands = tmp_path / "compile_commands.json"
+    entries = [
+        _entry(
+            f"{ABS}b",
+            f"{ABS}b/src/esphome/core/app.cpp",
+            f"g++ -DUSE_ESP32 -I{ABS}inc/core -std=gnu++20 -c app.cpp -o app.cpp.o",
+        ),
+        _entry(
+            f"{ABS}b",
+            f"{ABS}b/src/esphome/sensor/s.cpp",
+            f"g++ -DUSE_ESP32 -I{ABS}inc/sensor -c s.cpp -o s.cpp.o",
+        ),
+        # non-esphome TU: its includes must not leak into the union
+        _entry(
+            f"{ABS}b",
+            f"{ABS}b/managed_components/x/x.c",
+            f"gcc -I{ABS}inc/managed -c x.c",
+        ),
+    ]
+    compile_commands.write_text(json.dumps(entries))
+
+    fake_proc = MagicMock(
+        returncode=0,
+        stderr=(
+            "ignored\n"
+            "#include <...> search starts here:\n"
+            " /tc/inc/c++\n"
+            " /tc/inc\n"
+            "End of search list.\n"
+            "more ignored\n"
+        ),
+    )
+    with patch.object(idedata.subprocess, "run", return_value=fake_proc):
+        data = idedata.idedata_from_build(compile_commands)
+
+    assert data["cxx_path"] == "g++"
+    assert "USE_ESP32" in data["defines"]
+    assert "-std=gnu++20" in data["cxx_flags"]
+    # include dirs unioned across all esphome TUs
+    assert f"{ABS}inc/core" in data["includes"]["build"]
+    assert f"{ABS}inc/sensor" in data["includes"]["build"]
+    # the non-esphome TU is excluded from the union
+    assert f"{ABS}inc/managed" not in data["includes"]["build"]
+    # toolchain search dirs parsed from the compiler's -v output
+    assert data["includes"]["toolchain"] == ["/tc/inc/c++", "/tc/inc"]
+
+
+def test_get_toolchain_includes_raises_on_probe_failure() -> None:
+    """A failed compiler probe is a hard error, not a silent empty list."""
+    fake_proc = MagicMock(returncode=1, stderr="xtensa-esp32-elf-g++: not found")
+    with (
+        patch.object(idedata.subprocess, "run", return_value=fake_proc),
+        pytest.raises(RuntimeError, match="builtin include dirs"),
+    ):
+        idedata.get_toolchain_includes("/bad/compiler")
+
+
+def test_get_toolchain_includes_raises_when_no_dirs_found() -> None:
+    """Markers present but no dirs (anomalous output) also raises."""
+    fake_proc = MagicMock(
+        returncode=0,
+        stderr="#include <...> search starts here:\nEnd of search list.\n",
+    )
+    with (
+        patch.object(idedata.subprocess, "run", return_value=fake_proc),
+        pytest.raises(RuntimeError, match="builtin include dirs"),
+    ):
+        idedata.get_toolchain_includes("/some/compiler")
+
+
+# ESP-IDF's compile_commands.json on Windows mixes literal backslash path
+# separators in the compiler path with shell ``\"`` quote-escaping in defines,
+# which only the real Windows argv parser handles. These exercise that path.
+@pytest.mark.skipif(os.name != "nt", reason="Windows argv tokenization")
+def test_split_command_preserves_paths_and_unescapes_quotes() -> None:
+    r"""Backslash paths survive while ``\"`` define-quoting is unescaped."""
+    command = r"C:\esp\bin\riscv32-esp-elf-g++.exe -DVER=\"1.2.3\" -IC:/inc/a -c x.cpp"
+
+    tokens = idedata._split_command(command)
+
+    assert tokens[0] == r"C:\esp\bin\riscv32-esp-elf-g++.exe"
+    assert '-DVER="1.2.3"' in tokens
+    assert "-IC:/inc/a" in tokens
+
+
+@pytest.mark.skipif(os.name != "nt", reason="Windows argv tokenization")
+def test_split_command_empty_returns_empty() -> None:
+    """An empty or blank command tokenizes to ``[]`` (e.g. an empty response file).
+
+    Guards against ``CommandLineToArgvW("")`` returning the current process name
+    instead of an empty list.
+    """
+    assert idedata._split_command("") == []
+    assert idedata._split_command("   ") == []
+
+
+@pytest.mark.skipif(os.name != "nt", reason="Windows argv tokenization")
+def test_parse_entry_normalizes_windows_cxx_path() -> None:
+    """A backslash compiler path is emitted forward-slashed; define unescaped."""
+    entry = _entry(
+        r"C:\b",
+        r"C:\b\src\esphome\x.cpp",
+        r"C:\esp\bin\g++.exe -DVER=\"1.2.3\" -IC:/inc/a -c x.cpp",
+    )
+
+    cxx_path, defines, includes, _ = idedata.parse_entry(entry)
+
+    assert cxx_path == "C:/esp/bin/g++.exe"
+    assert "\\" not in cxx_path
+    assert 'VER="1.2.3"' in defines
+    assert "C:/inc/a" in includes
+
+
+def test_parse_entry_strips_launcher_prefix() -> None:
+    """A launcher-wrapped compile names the compiler second; the exact
+    configured launcher is stripped, not anything ccache-shaped."""
+    entry = _entry(
+        f"{ABS}build",
+        f"{ABS}build/src/esphome/core/application.cpp",
+        "/opt/homebrew/bin/ccache /tools/xtensa-lx106-elf-g++ -DUSE_ESP8266 "
+        "-c app.cpp -o app.cpp.o",
+    )
+    cxx_path, defines, _, _ = idedata.parse_entry(
+        entry, launcher="/opt/homebrew/bin/ccache"
+    )
+    assert cxx_path == "/tools/xtensa-lx106-elf-g++"
+    assert defines == ["USE_ESP8266"]
+
+
+def test_parse_entry_recovers_from_unconfigured_launcher(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """A stale compile DB built with a launcher this run no longer configures
+    still yields the real compiler (the next token), not the launcher."""
+    entry = _entry(
+        f"{ABS}build",
+        f"{ABS}build/src/esphome/core/application.cpp",
+        "/opt/homebrew/bin/ccache /tools/xtensa-lx106-elf-g++ -c a.cpp -o a.o",
+    )
+    caplog.set_level(logging.DEBUG)
+    cxx_path, _, _, _ = idedata.parse_entry(entry)
+    assert cxx_path == "/tools/xtensa-lx106-elf-g++"
+    assert "Stripping unconfigured launcher" in caplog.text
+
+
+def test_parse_entry_rejects_launcher_without_program() -> None:
+    """A launcher followed only by flags is rejected in the parser itself,
+    so no caller can record ccache as the compiler."""
+    entry = _entry(
+        f"{ABS}build",
+        f"{ABS}build/src/esphome/core/application.cpp",
+        "/opt/homebrew/bin/ccache -c a.cpp -o a.o",
+    )
+    with pytest.raises(EsphomeError, match="compile database is unusable"):
+        idedata.parse_entry(entry)
+
+
+def _write_compile_commands(tmp_path: Path) -> Path:
+    compile_commands = tmp_path / "compile_commands.json"
+    compile_commands.write_text(
+        json.dumps(
+            [
+                _entry(
+                    f"{ABS}build",
+                    f"{ABS}build/src/esphome/core/application.cpp",
+                    "/tools/g++ -DUSE_ESP8266 -c app.cpp -o app.cpp.o",
+                )
+            ]
+        )
+    )
+    return compile_commands
+
+
+def test_load_or_build_idedata_missing_compile_db(tmp_path: Path) -> None:
+    assert (
+        idedata.load_or_build_idedata(
+            tmp_path / "compile_commands.json", tmp_path / "f.elf", tmp_path / "c.json"
+        )
+        is None
+    )
+
+
+def test_load_or_build_idedata_builds_and_caches(tmp_path: Path) -> None:
+    compile_commands = _write_compile_commands(tmp_path)
+    cache = tmp_path / "cache" / "test.json"
+    with patch.object(
+        idedata, "get_toolchain_includes", return_value=["/toolchain/include"]
+    ):
+        data = idedata.load_or_build_idedata(
+            compile_commands, tmp_path / "firmware.elf", cache
+        )
+    assert data["cc_path"] == "/tools/gcc"
+    assert data["prog_path"] == str(tmp_path / "firmware.elf")
+    assert json.loads(cache.read_text()) == data
+
+    # A fresh cache is served without re-parsing the compile DB
+    os.utime(cache, (compile_commands.stat().st_mtime + 10,) * 2)
+    with patch.object(idedata, "idedata_from_build") as mock_build:
+        assert (
+            idedata.load_or_build_idedata(
+                compile_commands, tmp_path / "firmware.elf", cache
+            )
+            == data
+        )
+    mock_build.assert_not_called()
+
+
+def test_load_or_build_idedata_rebuilds_bad_cache(tmp_path: Path) -> None:
+    compile_commands = _write_compile_commands(tmp_path)
+    cache = tmp_path / "cache.json"
+    for bad in ("not json", json.dumps({"no_cc_path": True})):
+        cache.write_text(bad)
+        os.utime(cache, (compile_commands.stat().st_mtime + 10,) * 2)
+        with patch.object(idedata, "get_toolchain_includes", return_value=[]):
+            data = idedata.load_or_build_idedata(
+                compile_commands, tmp_path / "f.elf", cache
+            )
+        assert "cc_path" in data
+
+
+def test_load_or_build_idedata_rebuilds_when_compile_db_newer(tmp_path: Path) -> None:
+    """A compile DB newer than the cache forces regeneration."""
+    compile_commands = _write_compile_commands(tmp_path)
+    cache = tmp_path / "cache.json"
+    cache.write_text(json.dumps({"cc_path": "stale"}))
+    os.utime(compile_commands, (cache.stat().st_mtime + 10,) * 2)
+    with patch.object(idedata, "get_toolchain_includes", return_value=[]):
+        data = idedata.load_or_build_idedata(
+            compile_commands, tmp_path / "f.elf", cache
+        )
+    assert data["cc_path"] != "stale"
+
+
+def test_load_or_build_idedata_rebuilds_non_dict_cache(tmp_path: Path) -> None:
+    """Valid JSON that is not an object is regenerated, never handed out.
+
+    A bare string would otherwise pass the cc_path check by substring.
+    """
+    compile_commands = _write_compile_commands(tmp_path)
+    cache = tmp_path / "cache.json"
+    for bad in ('"cc_path is a string"', "[]", "42"):
+        cache.write_text(bad)
+        os.utime(cache, (compile_commands.stat().st_mtime + 10,) * 2)
+        with patch.object(idedata, "get_toolchain_includes", return_value=[]):
+            data = idedata.load_or_build_idedata(
+                compile_commands, tmp_path / "f.elf", cache
+            )
+        assert isinstance(data, dict)
+        assert "cc_path" in data
+
+
+def test_is_launcher_matches_only_known_launchers() -> None:
+    """Compilers of any shape pass; only the closed launcher set matches."""
+    for token in ("/t/g++-13", "gcc-8.4.0", "clang++-17", "armcc", "icx", "cc"):
+        assert not idedata._is_launcher(token)
+    for token in ("/opt/homebrew/bin/ccache", "CCACHE.EXE", "distcc", "sccache"):
+        assert idedata._is_launcher(token)
+
+
+def test_load_or_build_idedata_corrupted_cache_is_logged(
+    tmp_path: Path, caplog: pytest.LogCaptureFixture
+) -> None:
+    """A truncated cache is diagnosable, not a silent slow-build cause."""
+    compile_commands = _write_compile_commands(tmp_path)
+    cache = tmp_path / "c.json"
+    cache.write_text('{"cc_path": trunc')
+    os.utime(cache, (compile_commands.stat().st_mtime + 5,) * 2)
+    with patch.object(idedata, "get_toolchain_includes", return_value=[]):
+        data = idedata.load_or_build_idedata(
+            compile_commands, tmp_path / "f.elf", cache
+        )
+    assert data["cxx_path"] == "/tools/g++"
+    assert "Discarding unreadable idedata cache" in caplog.text
+
+
+def test_load_or_build_idedata_discards_unreadable_cache_file(
+    tmp_path: Path, caplog: pytest.LogCaptureFixture
+) -> None:
+    """An OSError on the cache read (permissions, I/O) regenerates like a
+    parse failure instead of aborting the consumer."""
+    compile_commands = _write_compile_commands(tmp_path)
+    cache = tmp_path / "c.json"
+    cache.write_text("{}")
+    os.utime(cache, (compile_commands.stat().st_mtime + 5,) * 2)
+    real_read_text = Path.read_text
+
+    def fail_cache_read(self: Path, *args: object, **kwargs: object) -> str:
+        # chmod(0) cannot revoke read access on Windows, so fault the read
+        # itself for a platform-independent OSError
+        if self == cache:
+            raise OSError("permission denied")
+        return real_read_text(self, *args, **kwargs)
+
+    with (
+        patch.object(idedata, "get_toolchain_includes", return_value=[]),
+        patch.object(Path, "read_text", fail_cache_read),
+    ):
+        data = idedata.load_or_build_idedata(
+            compile_commands, tmp_path / "f.elf", cache
+        )
+    assert data["cxx_path"] == "/tools/g++"
+    assert "Discarding unreadable idedata cache" in caplog.text
+
+
+def test_load_or_build_idedata_never_caches_a_launcher(tmp_path: Path) -> None:
+    """A compile DB naming a launcher as the compiler is rejected, never cached."""
+    compile_commands = tmp_path / "compile_commands.json"
+    compile_commands.write_text(
+        json.dumps(
+            [
+                _entry(
+                    f"{ABS}build",
+                    f"{ABS}build/src/esphome/core/application.cpp",
+                    "/opt/homebrew/bin/ccache -c app.cpp -o app.cpp.o",
+                )
+            ]
+        )
+    )
+    cache = tmp_path / "c.json"
+    # No probe patch needed: the launcher is rejected before the probe runs
+    with pytest.raises(EsphomeError, match="compile database is unusable"):
+        idedata.load_or_build_idedata(compile_commands, tmp_path / "f.elf", cache)
+    assert not cache.exists()
+
+
+@pytest.mark.parametrize(
+    "cached",
+    (
+        {"cc_path": "/x/gcc", "cxx_path": "/opt/homebrew/bin/ccache"},
+        {"cc_path": "/x/gcc", "cxx_path": "/tools/g++"},
+        {"cc_path": "/x/gcc", "cxx_path": "/tools/g++", "includes": {}},
+    ),
+    ids=("launcher-cxx", "no-includes", "no-build-list"),
+)
+def test_load_or_build_idedata_regenerates_invalid_cache(
+    tmp_path: Path, cached: dict
+) -> None:
+    """A cache written by an older version fails validation and regenerates."""
+    compile_commands = _write_compile_commands(tmp_path)
+    cache = tmp_path / "c.json"
+    cache.write_text(json.dumps(cached))
+    os.utime(cache, (compile_commands.stat().st_mtime + 5,) * 2)
+    with patch.object(idedata, "get_toolchain_includes", return_value=[]):
+        data = idedata.load_or_build_idedata(
+            compile_commands, tmp_path / "f.elf", cache
+        )
+    assert data["cxx_path"] == "/tools/g++"
+    assert "includes" in data
+
+
+def test_load_or_build_idedata_cache_hit_restamps_prog_path(tmp_path: Path) -> None:
+    """A served cache carries the current ELF path, not the one it was written with."""
+    compile_commands = _write_compile_commands(tmp_path)
+    cache = tmp_path / "c.json"
+    cache.write_text(
+        json.dumps(
+            {
+                "cc_path": "/tools/gcc",
+                "cxx_path": "/tools/g++",
+                "includes": {"build": [], "toolchain": []},
+                "prog_path": "/old/location/firmware.elf",
+            }
+        )
+    )
+    os.utime(cache, (compile_commands.stat().st_mtime + 5,) * 2)
+    data = idedata.load_or_build_idedata(
+        compile_commands, tmp_path / "firmware.elf", cache
+    )
+    assert data["prog_path"] == str(tmp_path / "firmware.elf")
+
+
+def test_idedata_from_build_non_list_compile_db_raises(tmp_path: Path) -> None:
+    """Valid JSON that is not a list raises by name, inside the best-effort tuple."""
+    compile_commands = tmp_path / "compile_commands.json"
+    for bad in ("{}", "null", '"text"', '["a", "b"]', "[1, 2]"):
+        compile_commands.write_text(bad)
+        with pytest.raises(EsphomeError, match="not a compile-command list"):
+            idedata.idedata_from_build(compile_commands)
+
+
+def test_idedata_from_build_same_file_rsp_commands_never_dedupe(
+    tmp_path: Path,
+) -> None:
+    """Two objects built from one source with different .rsp files keep both
+    include sets; the rsp sentinel keys on the output, not the source."""
+    file = f"{ABS}build/src/esphome/core/shared.cpp"
+    entries = []
+    for name in ("a", "b"):
+        rsp = tmp_path / f"{name}.o.rsp"
+        rsp.write_text(f"-I{ABS}inc/{name}")
+        entries.append(
+            {
+                "directory": str(tmp_path),
+                "file": file,
+                "command": f"/tools/g++ @{rsp.name} -c {file} -o {name}.o",
+                "output": f"{name}.o",
+            }
+        )
+    compile_commands = tmp_path / "compile_commands.json"
+    compile_commands.write_text(json.dumps(entries))
+    with patch.object(idedata, "get_toolchain_includes", return_value=[]):
+        data = idedata.idedata_from_build(compile_commands)
+    joined = " ".join(data["includes"]["build"])
+    assert "inc/a" in joined and "inc/b" in joined
+
+
+def test_load_or_build_idedata_cache_hit_skips_rebuild(tmp_path: Path) -> None:
+    """A valid cache newer than the compile DB is served without re-parsing."""
+    compile_commands = _write_compile_commands(tmp_path)
+    cache = tmp_path / "c.json"
+    cache.write_text(
+        json.dumps(
+            {
+                "cc_path": "/tools/gcc",
+                "cxx_path": "/tools/g++",
+                "includes": {"build": ["/inc"], "toolchain": []},
+                "cached": True,
+            }
+        )
+    )
+    os.utime(cache, (compile_commands.stat().st_mtime + 5,) * 2)
+    with patch.object(idedata, "idedata_from_build") as mock_build:
+        data = idedata.load_or_build_idedata(
+            compile_commands, tmp_path / "f.elf", cache
+        )
+    mock_build.assert_not_called()
+    assert data["cached"] is True
diff --git a/tests/unit_tests/build_helpers/test_size_summary.py b/tests/unit_tests/build_helpers/test_size_summary.py
new file mode 100644
index 0000000000..231ae271b2
--- /dev/null
+++ b/tests/unit_tests/build_helpers/test_size_summary.py
@@ -0,0 +1,22 @@
+"""Tests for the shared PlatformIO-format size bar."""
+
+from __future__ import annotations
+
+import pytest
+
+from esphome.build_helpers.size_summary import format_bar, print_size_line
+
+
+def test_format_bar_zero_total() -> None:
+    """A zero total must not divide by zero."""
+    assert format_bar(0, 0) == "[          ]   0.0% (used 0 bytes from 0 bytes)"
+
+
+def test_print_size_line_label_padding(capsys: pytest.CaptureFixture[str]) -> None:
+    """The label column is exactly what ci_memory_impact_extract.py greps."""
+    print_size_line("RAM", 47932, 180736)
+    print_size_line("Flash", 888511, 1835008)
+    out = capsys.readouterr().out.splitlines()
+    assert out[0].startswith("RAM:   [")
+    assert out[1].startswith("Flash: [")
+    assert "26.5% (used 47932 bytes from 180736 bytes)" in out[0]
diff --git a/tests/unit_tests/test_core.py b/tests/unit_tests/test_core.py
index c373116106..7adf955217 100644
--- a/tests/unit_tests/test_core.py
+++ b/tests/unit_tests/test_core.py
@@ -6,9 +6,9 @@ from unittest.mock import patch
 
 from hypothesis import given
 import pytest
-from strategies import mac_addr_strings
 
 from esphome import const, core
+from tests.unit_tests.strategies import mac_addr_strings
 
 
 class TestHexInt:
diff --git a/tests/unit_tests/test_espidf_clang_tidy.py b/tests/unit_tests/test_espidf_clang_tidy.py
index cb25535d8d..4cc445e29b 100644
--- a/tests/unit_tests/test_espidf_clang_tidy.py
+++ b/tests/unit_tests/test_espidf_clang_tidy.py
@@ -1,10 +1,13 @@
 """Tests for esphome.espidf.clang_tidy tidy-project generation."""
 
+import json
 import os
 from pathlib import Path
+from unittest.mock import patch
 
 import pytest
 
+from esphome.espidf import clang_tidy
 from esphome.espidf.clang_tidy import _Settings, _setup_core, _write_tidy_project
 
 REPO_ROOT = Path(__file__).resolve().parents[2]
@@ -64,3 +67,35 @@ def test_setup_core_sets_arduino_env(
     _setup_core(tmp_path / "proj", _settings(target_framework=target_framework))
 
     assert os.environ["ESPHOME_ARDUINO_COMPONENT"] == expected
+
+
+def test_idedata_from_tidy_project(tmp_path) -> None:
+    """The tidy TU's compile entry is assembled into consumer-shaped idedata."""
+    compile_commands = tmp_path / "compile_commands.json"
+    compile_commands.write_text(
+        json.dumps(
+            [
+                {
+                    "directory": str(tmp_path),
+                    "file": str(tmp_path / "main" / "tidy.cpp"),
+                    "command": "/tc/xtensa-esp32-elf-g++ -DUSE_ESP32 "
+                    f"-I{tmp_path}/inc -c main/tidy.cpp -o tidy.o",
+                }
+            ]
+        )
+    )
+    with patch(
+        "esphome.espidf.clang_tidy.get_toolchain_includes", return_value=["/tc/inc"]
+    ):
+        data = clang_tidy._idedata_from_tidy_project(compile_commands)
+    assert data["cxx_path"] == "/tc/xtensa-esp32-elf-g++"
+    assert data["defines"] == ["USE_ESP32"]
+    assert data["includes"]["toolchain"] == ["/tc/inc"]
+    assert any(inc.endswith("/inc") for inc in data["includes"]["build"])
+
+
+def test_idedata_from_tidy_project_missing_tu_raises(tmp_path) -> None:
+    compile_commands = tmp_path / "compile_commands.json"
+    compile_commands.write_text(json.dumps([]))
+    with pytest.raises(RuntimeError, match="tidy.cpp not found"):
+        clang_tidy._idedata_from_tidy_project(compile_commands)
diff --git a/tests/unit_tests/test_espidf_idedata.py b/tests/unit_tests/test_espidf_idedata.py
deleted file mode 100644
index 1088517ed1..0000000000
--- a/tests/unit_tests/test_espidf_idedata.py
+++ /dev/null
@@ -1,264 +0,0 @@
-"""Tests for esphome.espidf.idedata (compile_commands.json -> idedata)."""
-
-# pylint: disable=protected-access
-
-import json
-import os
-from pathlib import Path
-from unittest.mock import MagicMock, patch
-
-import pytest
-
-from esphome.espidf import idedata
-
-# An absolute, forward-slash (shlex-safe) path prefix valid on the host OS, so
-# tests exercise the same is-absolute / normalize behavior as a real compile DB
-# (a drive-qualified path on Windows, a leading slash elsewhere).
-ABS = "C:/" if os.name == "nt" else "/"
-
-
-def _entry(directory: str, file: str, command: str) -> dict:
-    return {"directory": directory, "file": file, "command": command}
-
-
-def test_parse_entry_extracts_fields() -> None:
-    """cxx_path, defines, includes and remaining flags are split apart."""
-    entry = _entry(
-        f"{ABS}build",
-        f"{ABS}build/src/esphome/core/application.cpp",
-        f"/tools/xtensa-esp32-elf-g++ -DUSE_ESP32 -DESPHOME_LOG_LEVEL=5 "
-        f"-I{ABS}inc/a -isystem {ABS}sys/b -std=gnu++20 -c app.cpp -o app.cpp.o",
-    )
-
-    cxx_path, defines, includes, cxx_flags = idedata._parse_entry(entry)
-
-    assert cxx_path == "/tools/xtensa-esp32-elf-g++"
-    assert "USE_ESP32" in defines
-    assert "ESPHOME_LOG_LEVEL=5" in defines
-    assert f"{ABS}inc/a" in includes
-    assert f"{ABS}sys/b" in includes
-    assert "-std=gnu++20" in cxx_flags
-    # input/output files and their flags are not treated as flags
-    assert "-c" not in cxx_flags
-    assert "-o" not in cxx_flags
-    assert "app.cpp" not in cxx_flags
-    assert "app.cpp.o" not in cxx_flags
-
-
-def test_parse_entry_space_separated_args() -> None:
-    """``-D X`` / ``-I path`` (separate arg) and ``-isystem<path>`` (joined)."""
-    entry = _entry(
-        f"{ABS}build",
-        f"{ABS}build/src/esphome/x.cpp",
-        f"g++ -D FOO=1 -I {ABS}inc/sep -isystem{ABS}sys/joined -c x.cpp",
-    )
-
-    _, defines, includes, _ = idedata._parse_entry(entry)
-
-    assert "FOO=1" in defines
-    assert f"{ABS}inc/sep" in includes
-    assert f"{ABS}sys/joined" in includes
-
-
-def test_parse_entry_resolves_relative_includes() -> None:
-    """Relative includes are resolved against the entry's ``directory``."""
-    directory = f"{ABS}build/proj"
-    entry = _entry(
-        directory,
-        f"{directory}/src/esphome/x.cpp",
-        "g++ -Iconfig -I../shared -isystem rel/sys -c x.cpp",
-    )
-
-    _, _, includes, _ = idedata._parse_entry(entry)
-
-    def resolved(rel: str) -> str:
-        # _parse_entry emits forward slashes for consistency (normpath would
-        # yield backslashes on Windows).
-        return os.path.normpath(Path(directory) / rel).replace("\\", "/")
-
-    assert resolved("config") in includes
-    assert resolved("../shared") in includes  # ../ normalized away
-    assert resolved("rel/sys") in includes
-    # nothing is left relative
-    assert all(Path(inc).is_absolute() for inc in includes)
-
-
-def test_parse_entry_skips_dependency_flags() -> None:
-    """Dependency-generation flags (and their args) are dropped."""
-    entry = _entry(
-        "/build",
-        "/build/src/esphome/x.cpp",
-        "g++ -MD -MT x.cpp.o -MF x.cpp.o.d -c x.cpp -o x.cpp.o",
-    )
-
-    _, _, _, cxx_flags = idedata._parse_entry(entry)
-
-    for tok in ("-MD", "-MT", "x.cpp.o", "-MF", "x.cpp.o.d", "-c", "-o", "x.cpp"):
-        assert tok not in cxx_flags
-
-
-def test_expand_response_files(tmp_path: Path) -> None:
-    """``@file`` arguments are inlined relative to the directory."""
-    rsp = tmp_path / "flags.rsp"
-    rsp.write_text("-DFROM_RSP -I/rsp/inc")
-
-    tokens = idedata._expand_response_files(
-        ["g++", f"@{rsp.name}", "-c", "x.cpp"], tmp_path
-    )
-
-    assert "-DFROM_RSP" in tokens
-    assert "-I/rsp/inc" in tokens
-    assert not any(t.startswith("@") for t in tokens)
-
-
-def test_expand_response_files_keeps_literal_when_missing(tmp_path: Path) -> None:
-    """An unreadable ``@file`` token is kept verbatim rather than dropped."""
-    tokens = idedata._expand_response_files(["g++", "@nope.rsp"], tmp_path)
-    assert "@nope.rsp" in tokens
-
-
-def test_pick_entry_prefers_esphome_tu() -> None:
-    """A ``/src/esphome/`` C++ TU is picked over other compile entries."""
-    entries = [
-        _entry("/b", "/b/managed_components/foo/foo.c", "gcc -c foo.c"),
-        _entry("/b", "/b/src/esphome/core/app.cpp", "g++ -c app.cpp"),
-    ]
-    assert idedata._pick_entry(entries)["file"].endswith("app.cpp")
-
-
-def test_pick_entry_falls_back_to_any_cxx_tu() -> None:
-    """With no ``/src/esphome/`` TU present, the first C++ entry is the fallback."""
-    entries = [
-        _entry("/b", "/b/managed_components/foo/foo.c", "gcc -c foo.c"),
-        _entry("/b", "/b/components/x/x.cpp", "g++ -c x.cpp"),
-    ]
-    assert idedata._pick_entry(entries)["file"].endswith("x.cpp")
-
-
-def test_is_esphome_src_handles_backslash_paths() -> None:
-    r"""The src marker must match Windows ``\src\esphome\`` paths too.
-
-    compile_commands ``file`` entries use the OS-native separator; if the
-    marker only matched forward slashes no source would match on Windows and
-    the build-include union would be silently empty.
-    """
-    assert idedata._is_esphome_src(r"C:\b\src\esphome\core\app.cpp")
-    assert idedata._is_esphome_src("/b/src/esphome/core/app.cpp")
-    # non-esphome and non-C++ still rejected regardless of separator
-    assert not idedata._is_esphome_src(r"C:\b\managed_components\x\x.cpp")
-    assert not idedata._is_esphome_src(r"C:\b\src\esphome\core\app.h")
-
-
-def test_idedata_from_build(tmp_path: Path) -> None:
-    """Full transform: representative entry + include union + toolchain dirs."""
-    compile_commands = tmp_path / "compile_commands.json"
-    entries = [
-        _entry(
-            f"{ABS}b",
-            f"{ABS}b/src/esphome/core/app.cpp",
-            f"g++ -DUSE_ESP32 -I{ABS}inc/core -std=gnu++20 -c app.cpp -o app.cpp.o",
-        ),
-        _entry(
-            f"{ABS}b",
-            f"{ABS}b/src/esphome/sensor/s.cpp",
-            f"g++ -DUSE_ESP32 -I{ABS}inc/sensor -c s.cpp -o s.cpp.o",
-        ),
-        # non-esphome TU: its includes must not leak into the union
-        _entry(
-            f"{ABS}b",
-            f"{ABS}b/managed_components/x/x.c",
-            f"gcc -I{ABS}inc/managed -c x.c",
-        ),
-    ]
-    compile_commands.write_text(json.dumps(entries))
-
-    fake_proc = MagicMock(
-        returncode=0,
-        stderr=(
-            "ignored\n"
-            "#include <...> search starts here:\n"
-            " /tc/inc/c++\n"
-            " /tc/inc\n"
-            "End of search list.\n"
-            "more ignored\n"
-        ),
-    )
-    with patch.object(idedata.subprocess, "run", return_value=fake_proc):
-        data = idedata.idedata_from_build(compile_commands)
-
-    assert data["cxx_path"] == "g++"
-    assert "USE_ESP32" in data["defines"]
-    assert "-std=gnu++20" in data["cxx_flags"]
-    # include dirs unioned across all esphome TUs
-    assert f"{ABS}inc/core" in data["includes"]["build"]
-    assert f"{ABS}inc/sensor" in data["includes"]["build"]
-    # the non-esphome TU is excluded from the union
-    assert f"{ABS}inc/managed" not in data["includes"]["build"]
-    # toolchain search dirs parsed from the compiler's -v output
-    assert data["includes"]["toolchain"] == ["/tc/inc/c++", "/tc/inc"]
-
-
-def test_get_toolchain_includes_raises_on_probe_failure() -> None:
-    """A failed compiler probe is a hard error, not a silent empty list."""
-    fake_proc = MagicMock(returncode=1, stderr="xtensa-esp32-elf-g++: not found")
-    with (
-        patch.object(idedata.subprocess, "run", return_value=fake_proc),
-        pytest.raises(RuntimeError, match="builtin include dirs"),
-    ):
-        idedata._get_toolchain_includes("/bad/compiler")
-
-
-def test_get_toolchain_includes_raises_when_no_dirs_found() -> None:
-    """Markers present but no dirs (anomalous output) also raises."""
-    fake_proc = MagicMock(
-        returncode=0,
-        stderr="#include <...> search starts here:\nEnd of search list.\n",
-    )
-    with (
-        patch.object(idedata.subprocess, "run", return_value=fake_proc),
-        pytest.raises(RuntimeError, match="builtin include dirs"),
-    ):
-        idedata._get_toolchain_includes("/some/compiler")
-
-
-# ESP-IDF's compile_commands.json on Windows mixes literal backslash path
-# separators in the compiler path with shell ``\"`` quote-escaping in defines,
-# which only the real Windows argv parser handles. These exercise that path.
-@pytest.mark.skipif(os.name != "nt", reason="Windows argv tokenization")
-def test_split_command_preserves_paths_and_unescapes_quotes() -> None:
-    r"""Backslash paths survive while ``\"`` define-quoting is unescaped."""
-    command = r"C:\esp\bin\riscv32-esp-elf-g++.exe -DVER=\"1.2.3\" -IC:/inc/a -c x.cpp"
-
-    tokens = idedata._split_command(command)
-
-    assert tokens[0] == r"C:\esp\bin\riscv32-esp-elf-g++.exe"
-    assert '-DVER="1.2.3"' in tokens
-    assert "-IC:/inc/a" in tokens
-
-
-@pytest.mark.skipif(os.name != "nt", reason="Windows argv tokenization")
-def test_split_command_empty_returns_empty() -> None:
-    """An empty or blank command tokenizes to ``[]`` (e.g. an empty response file).
-
-    Guards against ``CommandLineToArgvW("")`` returning the current process name
-    instead of an empty list.
-    """
-    assert idedata._split_command("") == []
-    assert idedata._split_command("   ") == []
-
-
-@pytest.mark.skipif(os.name != "nt", reason="Windows argv tokenization")
-def test_parse_entry_normalizes_windows_cxx_path() -> None:
-    """A backslash compiler path is emitted forward-slashed; define unescaped."""
-    entry = _entry(
-        r"C:\b",
-        r"C:\b\src\esphome\x.cpp",
-        r"C:\esp\bin\g++.exe -DVER=\"1.2.3\" -IC:/inc/a -c x.cpp",
-    )
-
-    cxx_path, defines, includes, _ = idedata._parse_entry(entry)
-
-    assert cxx_path == "C:/esp/bin/g++.exe"
-    assert "\\" not in cxx_path
-    assert 'VER="1.2.3"' in defines
-    assert "C:/inc/a" in includes
diff --git a/tests/unit_tests/test_espidf_toolchain.py b/tests/unit_tests/test_espidf_toolchain.py
index 2556397aef..6c11a74d48 100644
--- a/tests/unit_tests/test_espidf_toolchain.py
+++ b/tests/unit_tests/test_espidf_toolchain.py
@@ -140,7 +140,7 @@ def test_get_idedata_generates_and_caches(setup_core: Path) -> None:
     compile_commands.write_text("[]")
 
     with patch(
-        "esphome.espidf.idedata.idedata_from_build",
+        "esphome.build_helpers.idedata.idedata_from_build",
         return_value={"cxx_path": "g++"},
     ) as mock_transform:
         result = toolchain.get_idedata()
@@ -151,114 +151,6 @@ def test_get_idedata_generates_and_caches(setup_core: Path) -> None:
     assert json.loads(cache.read_text()) == {"cxx_path": "g++", "prog_path": prog_path}
 
 
-def test_get_idedata_uses_cache_when_valid(setup_core: Path) -> None:
-    """A cache at least as new as the compile DB is reused without regenerating."""
-    compile_commands, cache = _setup_build(setup_core)
-    compile_commands.parent.mkdir(parents=True, exist_ok=True)
-    compile_commands.write_text("[]")
-    cache.parent.mkdir(parents=True, exist_ok=True)
-    cache.write_text('{"cc_path": "cached-gcc", "cxx_path": "cached"}')
-    cc_mtime = compile_commands.stat().st_mtime
-    os.utime(cache, (cc_mtime + 1, cc_mtime + 1))
-
-    with patch("esphome.espidf.idedata.idedata_from_build") as mock_transform:
-        result = toolchain.get_idedata()
-
-    mock_transform.assert_not_called()
-    assert result == {"cc_path": "cached-gcc", "cxx_path": "cached"}
-
-
-def test_get_idedata_regenerates_cache_without_cc_path(setup_core: Path) -> None:
-    """A cache predating cc_path is rebuilt even though it is newer.
-
-    Such a cache stays newer than the compile DB forever, so consumers that
-    derive the binutils paths from cc_path would keep failing on it.
-    """
-    compile_commands, cache = _setup_build(setup_core)
-    compile_commands.parent.mkdir(parents=True, exist_ok=True)
-    compile_commands.write_text("[]")
-    cache.parent.mkdir(parents=True, exist_ok=True)
-    cache.write_text('{"cxx_path": "cached"}')
-    cc_mtime = compile_commands.stat().st_mtime
-    os.utime(cache, (cc_mtime + 1, cc_mtime + 1))
-
-    with patch(
-        "esphome.espidf.idedata.idedata_from_build",
-        return_value={"cc_path": "gcc", "cxx_path": "g++"},
-    ) as mock_transform:
-        result = toolchain.get_idedata()
-
-    mock_transform.assert_called_once()
-    assert result["cc_path"] == "gcc"
-
-
-def test_get_idedata_regenerates_when_compile_commands_newer(setup_core: Path) -> None:
-    """A compile DB newer than the cache forces regeneration."""
-    compile_commands, cache = _setup_build(setup_core)
-    cache.parent.mkdir(parents=True, exist_ok=True)
-    cache.write_text('{"cxx_path": "stale"}')
-    compile_commands.parent.mkdir(parents=True, exist_ok=True)
-    compile_commands.write_text("[]")
-    cache_mtime = cache.stat().st_mtime
-    os.utime(compile_commands, (cache_mtime + 1, cache_mtime + 1))
-
-    with patch(
-        "esphome.espidf.idedata.idedata_from_build",
-        return_value={"cxx_path": "fresh"},
-    ) as mock_transform:
-        result = toolchain.get_idedata()
-
-    mock_transform.assert_called_once()
-    assert result == {"cxx_path": "fresh", "prog_path": str(toolchain.get_elf_path())}
-
-
-@pytest.mark.parametrize("cached", ['"cc_path is a string"', "[]", "42"])
-def test_get_idedata_regenerates_on_non_dict_cache(
-    setup_core: Path, cached: str
-) -> None:
-    """A newer cache holding valid JSON that is not an object is regenerated.
-
-    A bare string would otherwise pass the cc_path check by substring and be
-    handed to consumers expecting a dict.
-    """
-    compile_commands, cache = _setup_build(setup_core)
-    compile_commands.parent.mkdir(parents=True, exist_ok=True)
-    compile_commands.write_text("[]")
-    cache.parent.mkdir(parents=True, exist_ok=True)
-    cache.write_text(cached)
-    cc_mtime = compile_commands.stat().st_mtime
-    os.utime(cache, (cc_mtime + 1, cc_mtime + 1))
-
-    with patch(
-        "esphome.espidf.idedata.idedata_from_build",
-        return_value={"cc_path": "gcc", "cxx_path": "g++"},
-    ) as mock_transform:
-        result = toolchain.get_idedata()
-
-    mock_transform.assert_called_once()
-    assert isinstance(result, dict)
-
-
-def test_get_idedata_regenerates_on_corrupted_cache(setup_core: Path) -> None:
-    """An unparseable (but newer) cache falls back to regeneration."""
-    compile_commands, cache = _setup_build(setup_core)
-    compile_commands.parent.mkdir(parents=True, exist_ok=True)
-    compile_commands.write_text("[]")
-    cache.parent.mkdir(parents=True, exist_ok=True)
-    cache.write_text("{not json")
-    cc_mtime = compile_commands.stat().st_mtime
-    os.utime(cache, (cc_mtime + 1, cc_mtime + 1))
-
-    with patch(
-        "esphome.espidf.idedata.idedata_from_build",
-        return_value={"cxx_path": "regen"},
-    ) as mock_transform:
-        result = toolchain.get_idedata()
-
-    mock_transform.assert_called_once()
-    assert result == {"cxx_path": "regen", "prog_path": str(toolchain.get_elf_path())}
-
-
 def test_get_idedata_prog_path_points_at_firmware_elf(setup_core: Path) -> None:
     """The idedata exposes prog_path (the ELF) so consumers like build-action
     can locate firmware.factory.bin / firmware.ota.bin as its siblings."""
@@ -267,7 +159,7 @@ def test_get_idedata_prog_path_points_at_firmware_elf(setup_core: Path) -> None:
     compile_commands.write_text("[]")
 
     with patch(
-        "esphome.espidf.idedata.idedata_from_build",
+        "esphome.build_helpers.idedata.idedata_from_build",
         return_value={"cxx_path": "g++"},
     ):
         result = toolchain.get_idedata()
diff --git a/tests/unit_tests/test_main.py b/tests/unit_tests/test_main.py
index 1cb710ca58..c7a5c85638 100644
--- a/tests/unit_tests/test_main.py
+++ b/tests/unit_tests/test_main.py
@@ -17,6 +17,7 @@ from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
 import pytest
 from pytest import CaptureFixture
+import serial
 from zeroconf import ServiceStateChange
 
 from esphome import __main__ as main, yaml_util
@@ -26,6 +27,7 @@ from esphome.__main__ import (
     _make_crystal_freq_callback,
     _redact_with_legacy_fallback,
     _resolve_network_devices,
+    _should_subscribe_states,
     _split_network_devices,
     _unresolved_default_error,
     _validate_bootloader_binary,
@@ -69,19 +71,21 @@ from esphome.__main__ import (
 )
 from esphome.address_cache import AddressCache
 from esphome.bundle import BUNDLE_EXTENSION, BundleFile, BundleResult
-from esphome.components import esp32, esp8266
+from esphome.components import esp32, esp8266, mqtt
 from esphome.components.esp32 import (
     KEY_ESP32,
     KEY_VARIANT,
     VARIANT_ESP32,
     get_esp32_variant,
 )
+from esphome.config import Config
 from esphome.const import (
     CONF_API,
     CONF_AUTH,
     CONF_BAUD_RATE,
     CONF_BROKER,
     CONF_DISABLED,
+    CONF_DISCOVER_IP,
     CONF_ESPHOME,
     CONF_LEVEL,
     CONF_LOG,
@@ -103,6 +107,7 @@ from esphome.const import (
     CONF_WEB_SERVER,
     CONF_WIFI,
     KEY_CORE,
+    KEY_TARGET_FRAMEWORK,
     KEY_TARGET_PLATFORM,
     PLATFORM_BK72XX,
     PLATFORM_ESP32,
@@ -567,8 +572,6 @@ def test_command_config__no_defaults_dumps_user_snapshot(
 ) -> None:
     """``--no-defaults`` dumps ``config.user_config`` instead of the
     validated config, so schema defaults don't leak into the output."""
-    from esphome.config import Config
-
     setup_core(tmp_path=tmp_path, config={"esphome": {"name": "test"}})
     args = MockArgs()
     args.show_secrets = True
@@ -621,8 +624,6 @@ def test_command_config__no_defaults_skips_strip_default_ids(
 ) -> None:
     """When ``--no-defaults`` is set, ``strip_default_ids`` isn't run --
     the user snapshot is already free of schema-injected IDs."""
-    from esphome.config import Config
-
     setup_core(tmp_path=tmp_path, config={"esphome": {"name": "test"}})
     args = MockArgs()
     args.show_secrets = True
@@ -3440,9 +3441,6 @@ def test_get_port_type() -> None:
 
 def test_mqtt_reexports_discover_ip() -> None:
     """The old import path must keep working for external code."""
-    from esphome.components import mqtt
-    from esphome.const import CONF_DISCOVER_IP
-
     assert mqtt.CONF_DISCOVER_IP is CONF_DISCOVER_IP
 
 
@@ -5909,8 +5907,6 @@ class MockSerial:
             chunk = self.chunks[self.chunk_index]
             if chunk is MOCK_SERIAL_END:
                 # Sentinel means we're done - simulate port closed
-                import serial
-
                 raise serial.SerialException("Port closed")
             # Respect the requested size and keep any remaining bytes
             if size <= 0:
@@ -5924,8 +5920,6 @@ class MockSerial:
                 # Entire chunk consumed; advance to the next one
                 self.chunk_index += 1
             return data  # type: ignore[return-value]
-        import serial
-
         raise serial.SerialException("Port closed")
 
 
@@ -6784,8 +6778,6 @@ def test_parse_args_argcomplete_only_runs_when_completing() -> None:
 
 def test_should_subscribe_states_default() -> None:
     """Test that states are shown by default when nothing is set."""
-    from esphome.__main__ import _should_subscribe_states
-
     args = parse_args(["esphome", "logs", "device.yaml"])
     with patch.dict(os.environ, {}, clear=False):
         os.environ.pop("ESPHOME_LOG_STATES", None)
@@ -6794,8 +6786,6 @@ def test_should_subscribe_states_default() -> None:
 
 def test_should_subscribe_states_env_suppresses() -> None:
     """Test that ESPHOME_LOG_STATES=false suppresses states by default."""
-    from esphome.__main__ import _should_subscribe_states
-
     args = parse_args(["esphome", "logs", "device.yaml"])
     with patch.dict(os.environ, {"ESPHOME_LOG_STATES": "false"}):
         assert _should_subscribe_states(args) is False
@@ -6803,8 +6793,6 @@ def test_should_subscribe_states_env_suppresses() -> None:
 
 def test_should_subscribe_states_env_enables() -> None:
     """Test that ESPHOME_LOG_STATES=true enables states by default."""
-    from esphome.__main__ import _should_subscribe_states
-
     args = parse_args(["esphome", "logs", "device.yaml"])
     with patch.dict(os.environ, {"ESPHOME_LOG_STATES": "true"}):
         assert _should_subscribe_states(args) is True
@@ -6812,8 +6800,6 @@ def test_should_subscribe_states_env_enables() -> None:
 
 def test_should_subscribe_states_flag_overrides_env() -> None:
     """Test that --states overrides ESPHOME_LOG_STATES=false."""
-    from esphome.__main__ import _should_subscribe_states
-
     args = parse_args(["esphome", "logs", "--states", "device.yaml"])
     with patch.dict(os.environ, {"ESPHOME_LOG_STATES": "false"}):
         assert _should_subscribe_states(args) is True
@@ -6821,8 +6807,6 @@ def test_should_subscribe_states_flag_overrides_env() -> None:
 
 def test_should_subscribe_states_no_flag_overrides_env() -> None:
     """Test that --no-states overrides ESPHOME_LOG_STATES=true."""
-    from esphome.__main__ import _should_subscribe_states
-
     args = parse_args(["esphome", "logs", "--no-states", "device.yaml"])
     with patch.dict(os.environ, {"ESPHOME_LOG_STATES": "true"}):
         assert _should_subscribe_states(args) is False
@@ -7135,6 +7119,82 @@ def test_warn_source_tree_mismatch_falls_back_when_stat_fails(
     assert not caplog.text
 
 
+@pytest.mark.parametrize(
+    "error",
+    [
+        FileNotFoundError("no such compiler"),
+        RuntimeError("Could not query builtin include dirs"),
+        ValueError("no C++ translation unit found"),
+        KeyError("command"),
+        None,  # replaced with EsphomeError inside
+    ],
+)
+def test_compile_program_espidf_idedata_failure_does_not_fail_build(
+    error: Exception,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """A post-compile idedata error is a warning: the firmware already built."""
+    if error is None:
+        error = EsphomeError("compile database is unusable")
+    CORE.toolchain = Toolchain.ESP_IDF
+    CORE.data[KEY_CORE] = {
+        KEY_TARGET_PLATFORM: "esp32",
+        KEY_TARGET_FRAMEWORK: "esp-idf",
+    }
+    with (
+        patch("esphome.espidf.toolchain.run_compile", return_value=0),
+        patch("esphome.espidf.toolchain.create_factory_bin"),
+        patch("esphome.espidf.toolchain.create_ota_bin"),
+        patch("esphome.espidf.toolchain.create_elf_copy"),
+        patch("esphome.espidf.toolchain.get_idedata", side_effect=error),
+        patch("esphome.__main__._check_and_emit_build_info"),
+    ):
+        assert compile_program(MagicMock(), {}) == 0
+    assert "Could not generate idedata" in caplog.text
+
+
+def test_compile_program_espidf_idedata_success_is_silent(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """The healthy path: idedata generated, nothing to warn about."""
+    CORE.toolchain = Toolchain.ESP_IDF
+    CORE.data[KEY_CORE] = {
+        KEY_TARGET_PLATFORM: "esp32",
+        KEY_TARGET_FRAMEWORK: "esp-idf",
+    }
+    with (
+        patch("esphome.espidf.toolchain.run_compile", return_value=0),
+        patch("esphome.espidf.toolchain.create_factory_bin"),
+        patch("esphome.espidf.toolchain.create_ota_bin"),
+        patch("esphome.espidf.toolchain.create_elf_copy"),
+        patch("esphome.espidf.toolchain.get_idedata", return_value={"cc_path": "x"}),
+        patch("esphome.__main__._check_and_emit_build_info"),
+    ):
+        assert compile_program(MagicMock(), {}) == 0
+    assert "idedata" not in caplog.text
+
+
+def test_compile_program_espidf_idedata_none_warns(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """A silent None from the post-compile idedata refresh is made visible."""
+    CORE.toolchain = Toolchain.ESP_IDF
+    CORE.data[KEY_CORE] = {
+        KEY_TARGET_PLATFORM: "esp32",
+        KEY_TARGET_FRAMEWORK: "esp-idf",
+    }
+    with (
+        patch("esphome.espidf.toolchain.run_compile", return_value=0),
+        patch("esphome.espidf.toolchain.create_factory_bin"),
+        patch("esphome.espidf.toolchain.create_ota_bin"),
+        patch("esphome.espidf.toolchain.create_elf_copy"),
+        patch("esphome.espidf.toolchain.get_idedata", return_value=None),
+        patch("esphome.__main__._check_and_emit_build_info"),
+    ):
+        assert compile_program(MagicMock(), {}) == 0
+    assert "No idedata was generated" in caplog.text
+
+
 @pytest.mark.asyncio
 async def test_wrap_to_code_comment_is_insertion_order_independent() -> None:
     """The config comment dumps with sorted keys: voluptuous fills schema
diff --git a/tests/unit_tests/test_size_summary.py b/tests/unit_tests/test_size_summary.py
index 933be88476..0c0852a191 100644
--- a/tests/unit_tests/test_size_summary.py
+++ b/tests/unit_tests/test_size_summary.py
@@ -126,3 +126,20 @@ def test_print_summary_handles_no_memory_types(
     size_json = _write_size_json(tmp_path, {"image_size": 0})
     print_summary(size_json, partitions_csv=None)
     assert capsys.readouterr().out == ""
+
+
+def test_print_summary_flash_line(
+    tmp_path: Path, capsys: pytest.CaptureFixture[str]
+) -> None:
+    """A partition table with an app row yields the Flash line in the exact
+    padded shape script/ci_memory_impact_extract.py greps."""
+    size_json = _write_size_json(tmp_path, _esp32_size_data())
+    partitions = tmp_path / "partitions.csv"
+    partitions.write_text(
+        "# name, type, subtype, offset, size, flags\n"
+        "app0, app, ota_0, 0x10000, 0x1C0000,\n"
+    )
+    print_summary(size_json, partitions)
+    out = capsys.readouterr().out
+    assert "Flash: " in out
+    assert "(used 827455 bytes from 1835008 bytes)" in out

From 5f6a910e2d6e41d3716668a66e5dff8cca25f2ea Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sun, 23 Aug 2026 22:24:12 -0500
Subject: [PATCH 141/155] [core] Harden the shared library converter (#18685)

---
 esphome/components/zephyr/library.py          |  19 +-
 esphome/espidf/component.py                   |  97 ++-
 esphome/espidf/extra_script.py                | 161 -----
 esphome/platformio/extra_script.py            | 365 ++++++++++++
 esphome/platformio/library.py                 | 324 ++++++++--
 esphome/platformio/toolchain.py               |   3 +
 script/determine-jobs.py                      |   1 +
 tests/script/test_determine_jobs.py           |   1 +
 tests/unit_tests/test_espidf_component.py     | 219 +++----
 .../test_platformio_extra_script.py           | 563 ++++++++++++++++++
 tests/unit_tests/test_platformio_library.py   | 219 ++++++-
 tests/unit_tests/test_platformio_toolchain.py |   7 +
 tests/unit_tests/test_zephyr_library.py       |  28 +
 13 files changed, 1581 insertions(+), 426 deletions(-)
 delete mode 100644 esphome/espidf/extra_script.py
 create mode 100644 esphome/platformio/extra_script.py
 create mode 100644 tests/unit_tests/test_platformio_extra_script.py

diff --git a/esphome/components/zephyr/library.py b/esphome/components/zephyr/library.py
index 0e6551ccf1..d09f0afedb 100644
--- a/esphome/components/zephyr/library.py
+++ b/esphome/components/zephyr/library.py
@@ -28,6 +28,7 @@ from esphome.platformio.library import (
     collect_filtered_files,
     convert_libraries,
     ensure_list,
+    lex_build_flags,
     split_list_by_condition,
 )
 
@@ -38,11 +39,13 @@ ZEPHYR_FRAMEWORK = "zephyr"
 
 
 def _escape(p: PathType) -> str:
-    # In CMakeLists.txt, backslashes need to be escaped (mirrors the ESP-IDF
-    # backend's escape_entry). Doubling -- rather than rewriting '\' -> '/' --
-    # preserves content, so it's safe for arbitrary build flags (e.g. a -D value
-    # containing a backslash) as well as Windows paths.
-    return f'"{str(p)}"'.replace("\\", "\\\\")
+    # In CMakeLists.txt, backslashes and embedded quotes need escaping
+    # (mirrors the ESP-IDF backend's escape_entry; the lex round-trip makes
+    # a literal quote in a -D value reachable). Doubling backslashes --
+    # rather than rewriting '\' -> '/' -- preserves content, so it's safe
+    # for arbitrary build flags as well as Windows paths.
+    escaped = str(p).replace("\\", "\\\\").replace('"', '\\"')
+    return f'"{escaped}"'
 
 
 def generate_module_yml(component: ConvertedLibrary) -> str:
@@ -80,7 +83,11 @@ def generate_cmakelists_txt(component: ConvertedLibrary) -> str:
 
     build_include_dir = build.get("includeDir", DEFAULT_BUILD_INCLUDE_DIR)
     build_src_filter = ensure_list(build.get("srcFilter", DEFAULT_BUILD_SRC_FILTER))
-    build_flags = ensure_list(build.get("flags", DEFAULT_BUILD_FLAGS))
+    # The shared lexer re-glues spaced entries and drops bare/empty
+    # arguments, same as the espidf emitter
+    build_flags = lex_build_flags(
+        build.get("flags", DEFAULT_BUILD_FLAGS), component.name
+    )
 
     src_files = collect_filtered_files(
         read_path / Path(build_src_dir), build_src_filter
diff --git a/esphome/espidf/component.py b/esphome/espidf/component.py
index aa6f10c261..bed999656b 100644
--- a/esphome/espidf/component.py
+++ b/esphome/espidf/component.py
@@ -20,6 +20,7 @@ from esphome.platformio.library import (
     DEFAULT_BUILD_SRC_FILTER,
     ESPHOME_DATA_EXTRA_CMAKE_KEY,
     ESPHOME_DATA_KEY,
+    ESPHOME_DATA_LINK_FLAGS_KEY,
     SRC_FILE_EXTENSIONS,
     ConvertedLibrary as IDFComponent,
     LibraryBackend,
@@ -27,6 +28,7 @@ from esphome.platformio.library import (
     collect_filtered_files,
     convert_libraries,
     ensure_list,
+    lex_build_flags,
     split_list_by_condition,
 )
 
@@ -40,37 +42,6 @@ def _idf_framework() -> str:
     return "arduino" if CORE.using_arduino else "espidf"
 
 
-def _apply_extra_script(component: IDFComponent) -> None:
-    """Run a PIO ``extraScript`` and fold its captured env vars into
-    ``component.data["build"]["flags"]`` so the existing -L/-l/-D
-    extraction in ``generate_cmakelists_txt`` picks them up."""
-    extra_script = component.data.get("build", {}).get("extraScript")
-    if not extra_script:
-        return
-    # Resolve and confine to the library's source dir so a malicious
-    # library.json can't escape (e.g. ``"extraScript": "../../etc/passwd"``).
-    source_path = component.source_dir
-    library_root = source_path.resolve()
-    script_path = (source_path / extra_script).resolve()
-    if not script_path.is_relative_to(library_root) or not script_path.is_file():
-        return
-    from esphome.components.esp32 import get_esp32_variant
-    from esphome.espidf.extra_script import captured_as_build_flags, run_extra_script
-
-    idf_target = variant_to_idf_target(get_esp32_variant())
-    result = run_extra_script(
-        script_path, library_dir=source_path, idf_target=idf_target
-    )
-    extra_flags = captured_as_build_flags(result, library_dir=source_path)
-    if not extra_flags:
-        return
-    flags = component.data.setdefault("build", {}).setdefault("flags", [])
-    if isinstance(flags, str):
-        flags = [flags]
-    flags.extend(extra_flags)
-    component.data["build"]["flags"] = flags
-
-
 def generate_cmakelists_txt(component: IDFComponent) -> str:
     """
     Generate a CMakeLists.txt file for an ESP-IDF component.
@@ -85,14 +56,12 @@ def generate_cmakelists_txt(component: IDFComponent) -> str:
     Returns:
         str: The complete CMakeLists.txt content as a string
     """
-    # Late import: this module loads with the esp32 platform on every
-    # validate/compile, but shlex is only needed when generating component
-    # CMakeLists.
-    import shlex
 
     def escape_entry(p: PathType) -> str:
-        # In CMakeLists.txt, backslashes need to be escaped
-        return f'"{str(p)}"'.replace("\\", "\\\\")
+        # In CMakeLists.txt, backslashes and embedded quotes need escaping
+        # (a quoted define value reaches here via the shlex round-trip)
+        escaped = str(p).replace("\\", "\\\\").replace('"', '\\"')
+        return f'"{escaped}"'
 
     def escape_path(p: PathType) -> str:
         # CMake uses forward slashes for paths on every platform and treats
@@ -122,26 +91,12 @@ def generate_cmakelists_txt(component: IDFComponent) -> str:
     build_src_filter = ensure_list(
         component.data.get("build", {}).get("srcFilter", DEFAULT_BUILD_SRC_FILTER)
     )
-    build_flags = ensure_list(
-        component.data.get("build", {}).get("flags", DEFAULT_BUILD_FLAGS)
+    # PlatformIO shell-lexes each build.flags entry; bare -I/-L/-l/-D tokens
+    # re-glue to their argument so the prefix classifiers below route them.
+    build_flags = lex_build_flags(
+        component.data.get("build", {}).get("flags", DEFAULT_BUILD_FLAGS),
+        f"library {component.name}",
     )
-    # PlatformIO shell-lexes each build.flags entry, so one entry can carry a
-    # flag and its argument (e.g. "-include cp_custom_alloc.h"). Split the
-    # same way; emitting such an entry as a single quoted compile option
-    # hands the compiler one argv with an embedded space.
-    build_flags = [token for entry in build_flags for token in shlex.split(entry)]
-    # Re-glue bare -I/-L/-l tokens to their argument ("-I foo" -> "-Ifoo") so
-    # the prefix classifiers below still route them to INCLUDE_DIRS and the
-    # link handling.
-    tokens, build_flags = build_flags, []
-    i = 0
-    while i < len(tokens):
-        if tokens[i] in ("-I", "-L", "-l") and i + 1 < len(tokens):
-            build_flags.append(tokens[i] + tokens[i + 1])
-            i += 2
-        else:
-            build_flags.append(tokens[i])
-            i += 1
 
     # List all sources files
     build_src_files = collect_filtered_files(
@@ -253,6 +208,16 @@ def generate_cmakelists_txt(component: IDFComponent) -> str:
             content += f"  {str_build_flag}\n"
         content += ")\n"
 
+    # Extra-script LINKFLAGS: routed to the link line; in
+    # target_compile_options they would be silently ineffective
+    if link_flags := component.data.get(ESPHOME_DATA_KEY, {}).get(
+        ESPHOME_DATA_LINK_FLAGS_KEY, []
+    ):
+        content += "target_link_options(${COMPONENT_LIB} INTERFACE\n"
+        for link_flag in link_flags:
+            content += f"  {escape_entry(link_flag)}\n"
+        content += ")\n"
+
     # Add custom CMake scripts
     content += "\n".join(
         component.data.get(ESPHOME_DATA_KEY, {}).get(ESPHOME_DATA_EXTRA_CMAKE_KEY, [])
@@ -275,12 +240,17 @@ def generate_idf_component_yml(component: IDFComponent) -> str:
 
     data = {}
 
+    # Metadata only: tolerate malformed shapes instead of crashing on a
+    # third-party manifest (repository may legally be {"url": ...} or a
+    # plain URL string)
     description = component.data.get("description")
-    if description:
+    if isinstance(description, str) and description:
         data["description"] = description
 
-    repository = component.data.get("repository", {}).get("url", None)
-    if repository:
+    repository = component.data.get("repository")
+    if isinstance(repository, dict):
+        repository = repository.get("url")
+    if isinstance(repository, str) and repository:
         data["repository"] = repository
 
     for dependency in component.dependencies:
@@ -299,7 +269,14 @@ def generate_idf_component_yml(component: IDFComponent) -> str:
 
 def _emit_idf_component(component: IDFComponent) -> None:
     """Write the ESP-IDF build files for a resolved library into its cache dir."""
-    _apply_extra_script(component)
+    from esphome.components.esp32 import get_esp32_variant
+    from esphome.platformio.extra_script import apply_extra_script
+
+    apply_extra_script(
+        component,
+        board_mcu=lambda: variant_to_idf_target(get_esp32_variant()),
+        pio_platform="espressif32",
+    )
     write_file_if_changed(
         component.path / "CMakeLists.txt",
         generate_cmakelists_txt(component),
diff --git a/esphome/espidf/extra_script.py b/esphome/espidf/extra_script.py
deleted file mode 100644
index 487fef7cc1..0000000000
--- a/esphome/espidf/extra_script.py
+++ /dev/null
@@ -1,161 +0,0 @@
-"""Run a PlatformIO ``extraScript`` against a captured SCons-env stand-in.
-
-PlatformIO libraries occasionally configure per-target link/build state
-via a Python ``extraScript`` declared in ``library.json``'s ``build``
-section instead of static fields. The script runs under SCons during
-PIO's build and mutates the active ``Environment`` (``env.Append``,
-``env.Replace``, …) — chiefly to set ``LIBPATH``/``LIBS`` per chip MCU.
-
-ESPHome's PIO→IDF converter doesn't run SCons, so these scripts were
-previously ignored and any library
-relying on them failed to link under ``toolchain: esp-idf``. This
-module provides a small shim that ``exec``s an extra-script with a
-fake ``env`` object, captures the common ``env.Append(...)`` calls,
-and returns the captured vars so the caller can fold them back into
-the library's generated CMakeLists.
-
-Caveats
--------
-* Only the ``env.Append`` API is captured. ``env.Replace``,
-  ``env.Prepend``, ``env.AddPreAction``, SCons file generators, and any
-  arbitrary I/O are silently no-ops. Scripts that depend on those will
-  produce incomplete output.
-* Running arbitrary Python from third-party libraries is a non-trivial
-  trust decision. The shim does no sandboxing — anything in the
-  script's process can run. Use only with libraries whose source you
-  trust.
-"""
-
-from __future__ import annotations
-
-from dataclasses import dataclass, field
-import logging
-import os
-from pathlib import Path
-
-_LOGGER = logging.getLogger(__name__)
-
-# Keys we know how to translate back into ESPHome's build-flag pipeline.
-# Other env.Append kwargs are recorded but ignored downstream.
-_CAPTURED_KEYS = frozenset({"LIBPATH", "LIBS", "CPPDEFINES", "LINKFLAGS", "CPPFLAGS"})
-
-
-@dataclass
-class ExtraScriptResult:
-    """Build-var deltas captured from a PIO extra-script ``env.Append`` call."""
-
-    libpath: list[str] = field(default_factory=list)
-    libs: list[str] = field(default_factory=list)
-    cppdefines: list[str | tuple[str, str]] = field(default_factory=list)
-    linkflags: list[str] = field(default_factory=list)
-    cppflags: list[str] = field(default_factory=list)
-
-
-class _FakeSConsEnv:
-    """Minimal stand-in for SCons ``Environment`` exposed to extra-scripts.
-
-    Implements just enough surface area to let scripts query ``BOARD_MCU``
-    / ``PIOENV`` and call ``env.Append(LIBPATH=…, LIBS=…, …)``. Every
-    other env method swallows silently so unrelated calls don't raise
-    ``AttributeError`` and abort the script.
-    """
-
-    def __init__(self, *, board_mcu: str, pio_env: str) -> None:
-        self._vars: dict[str, str] = {
-            "BOARD_MCU": board_mcu,
-            "PIOPLATFORM": "espressif32",
-            "PIOENV": pio_env,
-        }
-        self.result = ExtraScriptResult()
-
-    # ----- SCons env API the common scripts use -----
-
-    def get(self, key: str, default: str | None = None) -> str | None:
-        return self._vars.get(key, default)
-
-    def Append(self, **kwargs) -> None:  # noqa: N802 (SCons API name)
-        for key, value in kwargs.items():
-            if key not in _CAPTURED_KEYS:
-                continue
-            items = list(value) if isinstance(value, (list, tuple)) else [value]
-            bucket = getattr(self.result, key.lower())
-            bucket.extend(items)
-
-    # ----- Everything else is a no-op so unsupported scripts don't crash -----
-
-    def __getattr__(self, name: str):
-        def _noop(*args, **kwargs):
-            return None
-
-        return _noop
-
-
-def run_extra_script(
-    script_path: Path, *, library_dir: Path, idf_target: str
-) -> ExtraScriptResult:
-    """Execute ``script_path`` with a fake SCons env and return captured vars.
-
-    ``idf_target`` is the active ESP-IDF target name (e.g. ``esp32``,
-    ``esp32s3``); it's exposed to the script as PlatformIO's
-    ``BOARD_MCU`` so chip-conditional logic resolves the same way it
-    would under PIO. The script runs with ``library_dir`` as the
-    process CWD so relative-path lookups (``join``, ``realpath``,
-    ``open``) resolve against the library tree.
-
-    On any exception inside the script we log at debug level and return
-    an empty result — extra-scripts are best-effort, and an unsupported
-    script shouldn't block the build.
-    """
-    env = _FakeSConsEnv(board_mcu=idf_target, pio_env=f"esphome_{idf_target}")
-    code = compile(script_path.read_text(encoding="utf-8"), str(script_path), "exec")
-    old_cwd = Path.cwd()
-    try:
-        os.chdir(library_dir)
-        exec(  # noqa: S102 pylint: disable=exec-used
-            code,
-            {
-                "Import": lambda *_args: None,  # SCons-side import; harmless here
-                "env": env,
-                "__file__": str(script_path),
-                "__name__": "__pio_extra_script__",
-            },
-        )
-    except Exception as e:  # noqa: BLE001  # pylint: disable=broad-exception-caught
-        _LOGGER.warning("PIO extra-script %s raised %s; skipping", script_path, e)
-        return ExtraScriptResult()
-    finally:
-        os.chdir(old_cwd)
-    return env.result
-
-
-def captured_as_build_flags(
-    result: ExtraScriptResult, *, library_dir: Path
-) -> list[str]:
-    """Translate captured env vars into the ``-L`` / ``-l`` / ``-D`` /
-    raw-flag form ``_generate_cmakelists_txt`` already knows how to consume.
-
-    ``LIBPATH`` entries are made relative to ``library_dir`` so the
-    generated CMakeLists is portable; absolute paths outside the library
-    tree are kept as-is (CMake handles absolute paths in
-    ``target_link_directories`` fine).
-    """
-    flags: list[str] = []
-    library_root = library_dir.resolve()
-    for path in result.libpath:
-        # Anchor relative paths to library_dir (not the current CWD, which
-        # has been restored by the time we get here). Joining an absolute
-        # path against library_dir returns the absolute path unchanged.
-        resolved = (library_dir / path).resolve()
-        try:
-            flags.append(f"-L{resolved.relative_to(library_root)}")
-        except ValueError:
-            flags.append(f"-L{resolved}")
-    flags.extend(f"-l{lib}" for lib in result.libs)
-    for define in result.cppdefines:
-        if isinstance(define, tuple) and len(define) == 2:
-            flags.append(f"-D{define[0]}={define[1]}")
-        else:
-            flags.append(f"-D{define}")
-    flags.extend(result.linkflags)
-    flags.extend(result.cppflags)
-    return flags
diff --git a/esphome/platformio/extra_script.py b/esphome/platformio/extra_script.py
new file mode 100644
index 0000000000..e04ccd1f55
--- /dev/null
+++ b/esphome/platformio/extra_script.py
@@ -0,0 +1,365 @@
+"""Run a PlatformIO library ``extraScript`` against a fake SCons env.
+
+The shim execs the script with a stand-in ``env``, captures ``env.Append``
+calls (everything else is a logged no-op), and folds the result into the
+library's build flags. No sandboxing: the script runs with full process
+access, so it carries the same trust as the library's own source.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass, field
+import logging
+import os
+from pathlib import Path
+import shlex
+from typing import TYPE_CHECKING, Any, NamedTuple
+
+from esphome.core import EsphomeError
+from esphome.platformio.library import ESPHOME_DATA_KEY, ESPHOME_DATA_LINK_FLAGS_KEY
+
+if TYPE_CHECKING:
+    from esphome.platformio.library import ConvertedLibrary
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def apply_extra_script(
+    component: ConvertedLibrary,
+    board_mcu: Callable[[], str],
+    pio_platform: str,
+) -> None:
+    """Run a library's ``extraScript`` and fold its captured env vars into
+    ``build.flags``; ``board_mcu`` is a callable so it resolves lazily."""
+    extra_script = component.data.get("build", {}).get("extraScript")
+    if extra_script is None or extra_script == "":
+        return
+    if not isinstance(extra_script, str):
+        # A list/dict value would raise an opaque TypeError on the join below
+        raise EsphomeError(
+            f"extraScript of library {component.name} must be a string, "
+            f"got {type(extra_script).__name__}"
+        )
+    # Resolve and confine to the library's source dir so a malicious
+    # library.json can't escape (e.g. ``"extraScript": "../../etc/passwd"``).
+    source_path = component.source_dir
+    library_root = source_path.resolve()
+    script_path = (source_path / extra_script).resolve()
+    if not script_path.is_relative_to(library_root):
+        # More hostile than a missing script; must not be quieter than it
+        raise EsphomeError(
+            f"extraScript {extra_script} of library {component.name} escapes "
+            "the library directory"
+        )
+    if not script_path.is_file():
+        # A declared-but-absent script is a broken or half-downloaded
+        # package, not an unsupported script; PlatformIO fails on it too
+        raise EsphomeError(
+            f"extraScript {extra_script} of library {component.name} not found"
+        )
+    result = run_extra_script(
+        script_path,
+        library_dir=source_path,
+        board_mcu=board_mcu(),
+        pio_platform=pio_platform,
+    )
+    if link_flags := _str_entries(result.linkflags, "LINKFLAGS"):
+        # Kept apart from build.flags: the CMake emitters route those to
+        # target_compile_options, where a link flag is silently ineffective
+        esphome_data = component.data.setdefault(ESPHOME_DATA_KEY, {})
+        esphome_data.setdefault(ESPHOME_DATA_LINK_FLAGS_KEY, []).extend(link_flags)
+    extra_flags = captured_as_build_flags(result, library_dir=source_path)
+    if not extra_flags:
+        return
+    flags = component.data.setdefault("build", {}).setdefault("flags", [])
+    if isinstance(flags, str):
+        flags = [flags]
+    elif not isinstance(flags, list):
+        # A null/dict value coerced through a list wrapper would inject a
+        # non-string into the compiler command line; fail naming the library
+        raise EsphomeError(
+            f"Library {component.name} has a malformed build.flags "
+            f"({type(flags).__name__}); expected a string or list"
+        )
+    component.data["build"]["flags"] = [*flags, *extra_flags]
+
+
+# Keys we know how to translate back into ESPHome's build-flag pipeline.
+# Other env.Append kwargs are recorded but ignored downstream.
+_CAPTURED_KEYS = frozenset(
+    {"CPPPATH", "LIBPATH", "LIBS", "CPPDEFINES", "LINKFLAGS", "CPPFLAGS"}
+)
+
+
+@dataclass
+class ExtraScriptResult:
+    """Build-var deltas captured from a PIO extra-script ``env.Append`` call."""
+
+    cpppath: list[str] = field(default_factory=list)
+    libpath: list[str] = field(default_factory=list)
+    libs: list[str] = field(default_factory=list)
+    cppdefines: list[CppDefine] = field(default_factory=list)
+    linkflags: list[str] = field(default_factory=list)
+    cppflags: list[str] = field(default_factory=list)
+
+
+class CppDefine(NamedTuple):
+    """One normalized CPPDEFINES entry; a ``value`` of None is a bare -DNAME."""
+
+    name: str
+    value: str | None = None
+
+
+def _cppdefine(entry: Any) -> CppDefine | None:
+    """Normalize one CPPDEFINES element, or warn and drop an unsupported
+    shape; formatting those blind would hand the compiler garbage like
+    ``-D{'FOO': '1'}``."""
+    if isinstance(entry, str):
+        return CppDefine(entry)
+    if (
+        isinstance(entry, (tuple, list))
+        and len(entry) == 2
+        and isinstance(entry[0], (str, int))
+        and isinstance(entry[1], (str, int, type(None)))
+    ):
+        value = entry[1]
+        return CppDefine(str(entry[0]), None if value is None else str(value))
+    _LOGGER.warning("Ignoring unsupported CPPDEFINES entry %r", entry)
+    return None
+
+
+def _cppdefines_items(value: Any) -> list[CppDefine]:
+    """Normalize SCons ``processDefines`` spellings into ``CppDefine``s: a
+    bare 2-tuple is one ``name=value`` pair, a dict maps names to values, a
+    list is element-wise."""
+    if isinstance(value, tuple) and len(value) == 2:
+        elements: list[Any] = [value]
+    elif isinstance(value, dict):
+        elements = list(value.items())
+    else:
+        elements = list(value) if isinstance(value, (list, tuple)) else [value]
+    return [d for e in elements if (d := _cppdefine(e)) is not None]
+
+
+class _FakeSConsEnv:
+    """Minimal SCons ``Environment`` stand-in: ``get`` and ``Append`` work;
+    every other method is a swallowed no-op so scripts don't abort."""
+
+    def __init__(self, *, board_mcu: str, pio_env: str, pio_platform: str) -> None:
+        self._vars: dict[str, str] = {
+            "BOARD_MCU": board_mcu,
+            "PIOPLATFORM": pio_platform,
+            "PIOENV": pio_env,
+        }
+        self.result = ExtraScriptResult()
+        self._warned_methods: set[str] = set()
+        self._warned_keys: set[str] = set()
+        self._warned_gets: set[str] = set()
+
+    # ----- SCons env API the common scripts use -----
+
+    def get(self, key: str, default: str | None = None) -> str | None:
+        if key not in self._vars and key not in self._warned_gets:
+            # A script branching on an unmodelled var silently takes the
+            # default branch; make that diagnosable from a normal build log
+            self._warned_gets.add(key)
+            _LOGGER.warning(
+                "PIO extra-script env.get(%r) is not modelled; returning the default",
+                key,
+            )
+        return self._vars.get(key, default)
+
+    def __contains__(self, key: object) -> bool:
+        # Without this, "KEY" in env falls back to the legacy sequence
+        # protocol: __getitem__(0), (1), ... never raises, so it loops
+        # forever flooding the log
+        return key in self._vars
+
+    def __iter__(self):
+        return iter(self._vars)
+
+    def __getitem__(self, key: str) -> str:
+        # Scripts also read env["BOARD_MCU"]; an unmodelled subscript
+        # degrades one branch instead of discarding the whole capture
+        if key not in self._vars and key not in self._warned_gets:
+            self._warned_gets.add(key)
+            _LOGGER.warning(
+                "PIO extra-script env[%r] is not modelled; returning ''", key
+            )
+        return self._vars.get(key, "")
+
+    def Append(self, **kwargs) -> None:  # noqa: N802 (SCons API name)
+        self._add(kwargs, prepend=False)
+
+    def Prepend(self, **kwargs) -> None:  # noqa: N802 (SCons API name)
+        self._add(kwargs, prepend=True)
+
+    def _add(self, kwargs: dict[str, Any], *, prepend: bool) -> None:
+        for key, value in kwargs.items():
+            if key not in _CAPTURED_KEYS:
+                # Warn once per key so a loop of Appends cannot spam
+                if key not in self._warned_keys:
+                    self._warned_keys.add(key)
+                    _LOGGER.warning(
+                        "PIO extra-script env.Append(%s=...) is not captured; ignoring",
+                        key,
+                    )
+                continue
+            if key == "CPPDEFINES":
+                items = _cppdefines_items(value)
+            else:
+                items = list(value) if isinstance(value, (list, tuple)) else [value]
+            bucket = getattr(self.result, key.lower())
+            if prepend:
+                # SCons order: new values ahead of what is already there
+                # (scripts prepend LIBS for static-link symbol resolution)
+                bucket[:0] = items
+            else:
+                bucket.extend(items)
+
+    # Dedup is not modelled; a repeated flag is harmless on the command line
+    AppendUnique = Append
+    PrependUnique = Prepend
+
+    # ----- Everything else is a no-op so unsupported scripts don't crash -----
+
+    def __getattr__(self, name: str):
+        if name.startswith("__") and name.endswith("__"):
+            # Protocol probes (copy, pickle, iteration) are not script calls
+            raise AttributeError(name)
+        if name not in self._warned_methods:
+            # Warn on access, not call: hasattr()/truthiness branches would
+            # otherwise silently take the wrong path; a script whose whole
+            # effect is env.Replace() stays diagnosable either way
+            self._warned_methods.add(name)
+            _LOGGER.warning("PIO extra-script env.%s is not supported; ignoring", name)
+
+        def _noop(*args, **kwargs):
+            return None
+
+        return _noop
+
+
+def run_extra_script(
+    script_path: Path,
+    *,
+    library_dir: Path,
+    board_mcu: str,
+    pio_platform: str,
+) -> ExtraScriptResult:
+    """Execute ``script_path`` with a fake SCons env, ``library_dir`` as CWD.
+
+    A crashed script warns and returns an empty result, never a partial
+    capture."""
+    env = _FakeSConsEnv(
+        board_mcu=board_mcu,
+        pio_env=f"esphome_{board_mcu}",
+        pio_platform=pio_platform,
+    )
+    try:
+        source = script_path.read_text(encoding="utf-8")
+    except OSError as err:
+        # An unreadable declared script is a broken package, exactly like a
+        # missing one; must not be quieter than that case
+        raise EsphomeError(f"extraScript {script_path} is unreadable: {err}") from err
+    except UnicodeDecodeError as e:
+        # A content problem, best-effort like a SyntaxError below
+        _LOGGER.warning(
+            "PIO extra-script %s (in %s) is not UTF-8 (%r); ignoring its output",
+            script_path,
+            library_dir.name,
+            e,
+        )
+        return ExtraScriptResult()
+    old_cwd = Path.cwd()
+    try:
+        # Inside the try: a SyntaxError in a vendored script is just as
+        # best-effort as a runtime failure
+        code = compile(source, str(script_path), "exec")
+        os.chdir(library_dir)
+        exec(  # noqa: S102 pylint: disable=exec-used
+            code,
+            {
+                "Import": lambda *_args: None,  # SCons-side import; harmless here
+                "env": env,
+                "__file__": str(script_path),
+                "__name__": "__pio_extra_script__",
+            },
+        )
+    except SystemExit as e:
+        if not e.code:
+            # sys.exit() / sys.exit(0) is a normal PlatformIO script ending;
+            # the capture is complete
+            return env.result
+        _LOGGER.warning(
+            "PIO extra-script %s (in %s) exited with status %r; ignoring its output",
+            script_path,
+            library_dir.name,
+            e.code,
+        )
+        return ExtraScriptResult()
+    except Exception as e:  # noqa: BLE001  # pylint: disable=broad-exception-caught
+        # Discard any partial capture: half-applied flags could build wrong
+        # firmware that links cleanly.
+        _LOGGER.warning(
+            "PIO extra-script %s (in %s) raised %r; ignoring its output",
+            script_path,
+            library_dir.name,
+            e,
+        )
+        return ExtraScriptResult()
+    finally:
+        os.chdir(old_cwd)
+    return env.result
+
+
+def _str_entries(bucket: list, kind: str) -> list[str]:
+    # Third-party scripts legally append SCons nodes, ints, or dicts;
+    # stringifying those into flags would hand the compiler garbage
+    good = [entry for entry in bucket if isinstance(entry, str)]
+    for entry in bucket:
+        if not isinstance(entry, str):
+            _LOGGER.warning("Ignoring unsupported %s entry %r", kind, entry)
+    return good
+
+
+def captured_as_build_flags(
+    result: ExtraScriptResult, *, library_dir: Path
+) -> list[str]:
+    """Translate captured env vars into -L/-l/-D/raw build flags; path
+    entries anchor to ``library_dir`` so the build files stay portable."""
+    flags: list[str] = []
+    library_root = library_dir.resolve()
+
+    def _anchored(path: str) -> str:
+        # Anchor relative paths to library_dir; the script's CWD has been
+        # restored by now
+        resolved = (library_dir / path).resolve()
+        try:
+            return str(resolved.relative_to(library_root))
+        except ValueError:
+            return str(resolved)
+
+    # shlex.quote so a spaced path survives lex_build_flags as one token
+    flags.extend(
+        f"-I{shlex.quote(_anchored(path))}"
+        for path in _str_entries(result.cpppath, "CPPPATH")
+    )
+    flags.extend(
+        f"-L{shlex.quote(_anchored(path))}"
+        for path in _str_entries(result.libpath, "LIBPATH")
+    )
+    flags.extend(f"-l{shlex.quote(lib)}" for lib in _str_entries(result.libs, "LIBS"))
+    for define in result.cppdefines:
+        if define.value is None:
+            # {"FOO": None} / ("FOO", None) is a bare -DFOO in SCons
+            flags.append(shlex.quote(f"-D{define.name}"))
+        else:
+            flags.append(shlex.quote(f"-D{define.name}={define.value}"))
+    # Each captured entry is one argv token in SCons; quote so the
+    # lex_build_flags round-trip cannot split a spaced value into two.
+    # LINKFLAGS are deliberately absent: they travel via
+    # ESPHOME_DATA_LINK_FLAGS_KEY straight to the link line.
+    flags.extend(shlex.quote(f) for f in _str_entries(result.cppflags, "CPPFLAGS"))
+    return flags
diff --git a/esphome/platformio/library.py b/esphome/platformio/library.py
index ee0a758a31..a3899fa860 100644
--- a/esphome/platformio/library.py
+++ b/esphome/platformio/library.py
@@ -13,7 +13,7 @@ regardless of which toolchain consumes the result.
 """
 
 from collections import deque
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
 from dataclasses import dataclass, field
 import glob
 import hashlib
@@ -47,25 +47,34 @@ DEFAULT_BUILD_SRC_FILTER = (
 DEFAULT_BUILD_SRC_DIRS = "src"
 DEFAULT_BUILD_INCLUDE_DIR = "include"
 DEFAULT_BUILD_FLAGS = []
-SRC_FILE_EXTENSIONS = [
-    ".c",
-    ".cpp",
-    ".cc",
-    ".cxx",
-    ".c++",
-    ".S",
-    ".spp",
-    ".SPP",
-    ".sx",
-    ".s",
-    ".asm",
-    ".ASM",
-]
+# Suffix -> compiler kind (PlatformIO's CSUFFIXES/CXXSUFFIXES/ASSUFFIXES);
+# "asm" merges SCons's AS and ASPP sets. Per CXXSUFFIXES .C/.C++ are C++
+# here, even where SCons demotes .C on case-insensitive filesystems.
+SOURCE_KIND_FOR_SUFFIX: dict[str, str] = {
+    ".c": "c",
+    ".cpp": "cxx",
+    ".cc": "cxx",
+    ".cxx": "cxx",
+    ".c++": "cxx",
+    ".C": "cxx",
+    ".C++": "cxx",
+    ".S": "asm",
+    ".spp": "asm",
+    ".SPP": "asm",
+    ".sx": "asm",
+    ".s": "asm",
+    ".asm": "asm",
+    ".ASM": "asm",
+}
+SRC_FILE_EXTENSIONS = list(SOURCE_KIND_FOR_SUFFIX)
 
 DOMAIN = "pio_components"
 
 ESPHOME_DATA_KEY = "ESPHOME"
 ESPHOME_DATA_EXTRA_CMAKE_KEY = "EXTRA_CMAKE"
+# Captured extra-script LINKFLAGS; kept apart from build.flags so they reach
+# the link line (target_link_options), not target_compile_options
+ESPHOME_DATA_LINK_FLAGS_KEY = "LINK_FLAGS"
 
 
 class Source:
@@ -203,6 +212,11 @@ class InvalidLibrary(Exception):
     pass
 
 
+class IncompatiblePlatform(InvalidLibrary):
+    """The routine cross-platform skip, typed so callers need not match
+    message text."""
+
+
 class ConvertedLibrary:
     """A resolved PlatformIO library plus its parsed manifest and on-disk path.
 
@@ -427,17 +441,22 @@ def check_library_data(data: dict, platform: str | None, framework: str):
     if isinstance(platforms, str):
         platforms = [a.strip() for a in platforms.split(",")]
     platforms = ensure_list(platforms)
+    if not all(isinstance(pf, str) for pf in platforms):
+        # A real (non-platform) manifest problem; callers warn, not skip
+        raise InvalidLibrary(f"Malformed platforms value: {platforms!r}")
 
     # Check if library supports the target platform
     valid_platforms = platform is None or "*" in platforms or platform in platforms
 
     if not valid_platforms:
-        raise InvalidLibrary(f"Unsupported library platforms: {platforms}")
+        raise IncompatiblePlatform(f"Unsupported library platforms: {platforms}")
 
     frameworks = data.get("frameworks", "*")
     if isinstance(frameworks, str):
         frameworks = [a.strip() for a in frameworks.split(",")]
     frameworks = ensure_list(frameworks)
+    if not all(isinstance(fw, str) for fw in frameworks):
+        raise InvalidLibrary(f"Malformed frameworks value: {frameworks!r}")
 
     # Check if library declares the active framework. PIO library manifests
     # often list only "arduino" even when the library actually compiles fine
@@ -455,7 +474,7 @@ def check_library_data(data: dict, platform: str | None, framework: str):
         )
 
 
-def _parse_library_json(library_json_path: PathType):
+def parse_library_json(library_json_path: PathType):
     """
     Load and parse a JSON file describing a library.
 
@@ -469,7 +488,7 @@ def _parse_library_json(library_json_path: PathType):
         return json.load(fp)
 
 
-def _parse_library_properties(library_properties_path: PathType):
+def parse_library_properties(library_properties_path: PathType):
     """
     Parse a key-value platformio .properties style file into a dictionary.
 
@@ -553,19 +572,131 @@ def _resolve_registry_version(
     return owner, name, best["name"], pkgfile["download_url"]
 
 
-def _normalize_dependencies(dependencies: Any) -> list[dict]:
+def split_flag_entry(entry: Any, owner: str) -> list[str]:
+    """``shlex.split`` with a clean error naming the offending flags entry."""
+    # Late import: shlex is only needed when actually lexing flags
+    import shlex
+
+    try:
+        return shlex.split(entry)
+    except (ValueError, AttributeError, TypeError) as err:
+        # AttributeError/TypeError: a dict or number from a third-party
+        # manifest; name the entry instead of an opaque shlex traceback
+        raise EsphomeError(f"Malformed build flag {entry!r} in {owner}: {err}") from err
+
+
+def lex_build_flags(entries: str | list[str], owner: str) -> list[str]:
+    """Shell-lex ``build.flags`` entries the way PlatformIO's ParseFlags
+    does; bare -I/-L/-l/-D tokens re-glue to their argument."""
+    # Lex per entry as ParseFlags does: a dangling -I must warn, not absorb
+    # the next entry's first token
+    return [
+        token
+        for entry in ensure_list(entries)
+        for token in join_flag_args(split_flag_entry(entry, owner), owner)
+    ]
+
+
+# Flags whose argument may follow as a separate token; ParseFlags glues them
+BARE_ARG_FLAGS = frozenset({"-I", "-L", "-l", "-D"})
+
+
+def join_flag_args(tokens: Iterable[str], owner: str) -> list[str]:
+    """Join a bare ``-I``/``-L``/``-l``/``-D`` with its following token, as
+    PlatformIO's ParseFlags does. A trailing or empty argument is warned and
+    dropped: the bare flag would make gcc eat the next flag."""
+    out: list[str] = []
+    it = iter(tokens)
+    for tok in it:
+        if tok in BARE_ARG_FLAGS:
+            arg = next(it, None)
+            if arg is None:
+                _LOGGER.warning("Ignoring trailing '%s' in %s build flags", tok, owner)
+                break
+            if not arg:
+                _LOGGER.warning(
+                    "Ignoring '%s' with empty argument in %s build flags", tok, owner
+                )
+                continue
+            tok += arg
+        out.append(tok)
+    return out
+
+
+def warn_properties_depends(name: str, data: object) -> None:
+    """Warn for ``depends=``-only manifests; the walk reads only the JSON
+    ``dependencies`` key, so they would otherwise drop silently."""
+    if isinstance(data, dict) and not data.get("dependencies") and data.get("depends"):
+        # INFO: common and unactionable for transitive libraries; a WARNING
+        # on every build would train users to ignore the stream
+        _LOGGER.info(
+            "Library %s declares dependencies via library.properties "
+            "depends=, which are not resolved automatically; add them with "
+            "add_library() if needed",
+            name,
+        )
+
+
+def dependency_is_usable(
+    dep: dict, platform: str | None, framework: str, requester: str
+) -> bool:
+    """Compatibility filter for a manifest dependency: platform mismatches
+    skip at debug, any other ``InvalidLibrary`` warns naming the requester."""
+    try:
+        check_library_data(dep, platform, framework)
+    except IncompatiblePlatform as e:
+        _LOGGER.debug("Skip dependency %s of %s: %s", dep.get("name"), requester, e)
+        return False
+    except InvalidLibrary as e:
+        _LOGGER.warning(
+            "Skipping dependency %s of %s: %s", dep.get("name"), requester, e
+        )
+        return False
+    return True
+
+
+def _valid_dependency_entry(entry: dict, manifest_name: str) -> bool:
+    """Whether a normalized entry carries a usable name (non-empty string),
+    version (string, if present), and owner (string, if present); invalid
+    entries warn naming the manifest."""
+    name = entry.get("name")
+    owner = entry.get("owner")
+    name_ok = isinstance(name, str) and name
+    version_ok = "version" not in entry or isinstance(entry["version"], str)
+    owner_ok = owner is None or isinstance(owner, str)
+    if name_ok and version_ok and owner_ok:
+        return True
+    _LOGGER.warning(
+        "Ignoring unrecognized dependency entry %r of %s", entry, manifest_name
+    )
+    return False
+
+
+def normalize_dependencies(
+    dependencies: Any, manifest_name: str = "manifest"
+) -> list[dict]:
     """Normalize a library manifest's ``dependencies`` to a list of dicts.
 
-    PIO's library.json accepts both the list-of-dicts form and the shorthand
-    dict form (``{"owner/Name": "version_spec"}``); normalize the latter so
-    callers see a uniform list.
+    PIO's library.json accepts the list-of-dicts form, the shorthand dict
+    form (``{"owner/Name": "version_spec"}``), bare name strings inside the
+    list, and a plain (possibly comma-separated) string; normalize them all
+    so callers see a uniform list. ``manifest_name`` names the manifest in the
+    warning for entries that cannot be normalized.
+
+    Bare-name spellings carry no version; the dependency walk later drops
+    version-less entries at DEBUG, since they are usually names of bundled
+    framework libraries (Wire, SPI) that need no registry install.
     """
-    if not dependencies:
+    if dependencies is None:
         return []
+    if isinstance(dependencies, str):
+        # A plain string is one or more comma-separated names; iterating it
+        # as a list would shred it into one-character "libraries"
+        return [{"name": n.strip()} for n in dependencies.split(",") if n.strip()]
     if isinstance(dependencies, dict):
         normalized = []
         for raw_name, spec in dependencies.items():
-            if "/" in raw_name:
+            if isinstance(raw_name, str) and "/" in raw_name:
                 owner, pkgname = raw_name.split("/", 1)
             else:
                 owner, pkgname = None, raw_name
@@ -574,9 +705,31 @@ def _normalize_dependencies(dependencies: Any) -> list[dict]:
                 entry.update(spec)
             else:
                 entry["version"] = spec
-            normalized.append(entry)
+            if _valid_dependency_entry(entry, manifest_name):
+                normalized.append(entry)
         return normalized
-    return [d for d in dependencies if isinstance(d, dict)]
+    if not isinstance(dependencies, (list, tuple)):
+        _LOGGER.warning(
+            "Ignoring unrecognized dependencies %r of %s",
+            dependencies,
+            manifest_name,
+        )
+        return []
+    normalized = []
+    for entry in dependencies:
+        if isinstance(entry, dict):
+            if _valid_dependency_entry(entry, manifest_name):
+                normalized.append(entry)
+        elif isinstance(entry, str) and entry:
+            # PIO also accepts a bare list of names ("dependencies": ["Wire"])
+            normalized.append({"name": entry})
+        else:
+            _LOGGER.warning(
+                "Ignoring unrecognized dependency entry %r of %s",
+                entry,
+                manifest_name,
+            )
+    return normalized
 
 
 @dataclass
@@ -688,6 +841,24 @@ def _node_key(
     return name, "registry", (owner, pkgname)
 
 
+def lib_ignore_set() -> set[str]:
+    """The ``lib_ignore`` names from ``esphome->platformio_options``,
+    normalized to lowercase short names (the part after the ``/``)."""
+    return {
+        name.split("/")[-1].lower()
+        for name in CORE.platformio_options.get("lib_ignore", [])
+    }
+
+
+def is_lib_ignored(name: str | None, lib_ignore: set[str]) -> bool:
+    """Whether ``name`` matches the normalized ``lib_ignore`` set."""
+    return (
+        bool(lib_ignore)
+        and name is not None
+        and (name.split("/")[-1].lower() in lib_ignore)
+    )
+
+
 def convert_libraries(
     libraries: list[Library], backend: LibraryBackend
 ) -> list[ConvertedLibrary]:
@@ -713,10 +884,7 @@ def convert_libraries(
     """
     nodes: dict[str, _LibNode] = {}
 
-    lib_ignore = {
-        name.split("/")[-1].lower()
-        for name in CORE.platformio_options.get("lib_ignore", [])
-    }
+    lib_ignore = lib_ignore_set()
 
     # The generated build files inside the shared cache bake in the dependency
     # wiring, which lib_ignore changes; salt the cache path so configs with
@@ -728,11 +896,6 @@ def convert_libraries(
         else ""
     )
 
-    def is_ignored(name: str | None) -> bool:
-        if not lib_ignore or name is None:
-            return False
-        return name.split("/")[-1].lower() in lib_ignore
-
     def add_spec(name: str | None, version: str | None, repository: str | None) -> str:
         key, kind, locator = _node_key(name, version, repository)
         node = nodes.get(key) or _LibNode(key=key, is_git=kind == "git")
@@ -781,7 +944,7 @@ def convert_libraries(
     top_level = [
         add_spec(library.name, library.version, library.repository)
         for library in libraries
-        if not is_ignored(library.name)
+        if not is_lib_ignored(library.name, lib_ignore)
     ]
 
     # Collect + resolve to a fixpoint: a node is (re)resolved whenever its
@@ -795,10 +958,8 @@ def convert_libraries(
         key = worklist.popleft()
         node = nodes[key]
 
-        # A node is queued once per referring edge; skip the (uncached) registry
-        # lookup + download + dependency walk unless its requirement set grew
-        # since the last resolve. Requirements only ever grow, so this still
-        # converges the fixpoint and terminates dependency cycles.
+        # Re-resolve only when the requirement set grew; requirements
+        # only ever grow, so the fixpoint converges and cycles terminate
         requirements = frozenset(node.requirements)
         if resolved_requirements.get(key) == requirements:
             continue
@@ -823,11 +984,8 @@ def convert_libraries(
         has_json = library_json_path.is_file()
         has_properties = library_properties_path.is_file()
         if not has_json and not has_properties and not node.is_local:
-            # The shared cache can hold a broken copy (e.g. a clone or an
-            # extraction interrupted by a killed process). Force one
-            # re-download so a bad cache entry self-heals instead of failing
-            # every build until the user runs a full clean. A local source is
-            # read in place, so there is nothing to re-download.
+            # An interrupted clone/extraction self-heals with one forced
+            # re-download; a local source has nothing to re-download
             _LOGGER.warning(
                 "Library %s at %s is missing library.json and library.properties; "
                 "re-downloading",
@@ -838,49 +996,85 @@ def convert_libraries(
             has_json = library_json_path.is_file()
             has_properties = library_properties_path.is_file()
         if has_json:
-            component.data = _parse_library_json(library_json_path)
+            component.data = parse_library_json(library_json_path)
         elif has_properties:
-            component.data = _parse_library_properties(library_properties_path)
+            component.data = parse_library_properties(library_properties_path)
         else:
-            # For a local library a missing manifest is user input, so raise
-            # EsphomeError (clean CLI message) like the missing-directory case;
-            # for registry/git a missing manifest means a corrupt cache, which
-            # is not user error, so keep RuntimeError.
+            # Local sources are user input (EsphomeError); a registry/git
+            # miss means a corrupt cache (RuntimeError)
             error_cls = EsphomeError if node.is_local else RuntimeError
             raise error_cls(
                 f"Invalid PIO library {key}: missing library.json and "
                 f"library.properties in {source_dir}"
             )
 
+        # A bare json.load imposes no shape; every backend dereferences
+        # these fields, so validate once here and name the library
+        malformed = not isinstance(component.data, dict)
+        if not malformed:
+            build = component.data.get("build", {})
+            esphome_data = component.data.get(ESPHOME_DATA_KEY, {})
+            malformed = (
+                not isinstance(build, dict)
+                or not isinstance(esphome_data, dict)
+                or not isinstance(
+                    esphome_data.get(ESPHOME_DATA_LINK_FLAGS_KEY, []), list
+                )
+                or not isinstance(build.get("srcDir", ""), str)
+                or not isinstance(build.get("includeDir", ""), str)
+                or not isinstance(build.get("srcFilter", ""), (str, list))
+            )
+        if malformed:
+            # Fail fast only for a library the user asked for; a defect in
+            # an unrequested corner of the graph must not block the build
+            if key in top_level_keys:
+                raise EsphomeError(f"Library {key} has a malformed manifest")
+            _LOGGER.warning("Skipping dependency %s: malformed manifest", key)
+            continue
+        warn_properties_depends(component.name, component.data)
+
         try:
             check_library_data(component.data, backend.platform, backend.framework)
         except InvalidLibrary as e:
-            # Skip an incompatible transitive dependency, but fail fast if a
-            # top-level library the build explicitly requested is incompatible.
+            # An explicitly requested library fails fast; the routine
+            # cross-platform skip stays at debug, other causes warn
             if key in top_level_keys:
-                raise RuntimeError(
-                    f"Requested library {key} is not compatible with "
-                    f"{backend.framework}: {e}"
-                ) from e
-            _LOGGER.debug("Skip incompatible dependency %s: %s", key, str(e))
+                reason = (
+                    f"is not compatible with {backend.framework}"
+                    if isinstance(e, IncompatiblePlatform)
+                    else "has a malformed manifest"
+                )
+                raise RuntimeError(f"Requested library {key} {reason}: {e}") from e
+            if isinstance(e, IncompatiblePlatform):
+                _LOGGER.debug("Skip incompatible dependency %s: %s", key, str(e))
+            else:
+                _LOGGER.warning("Skipping dependency %s: %s", key, str(e))
             continue
         components[key] = component
 
         # Requirements changed (we got past the short-circuit above), so
         # (re)walk this component's dependencies.
         node.edges = set()
-        for dependency in _normalize_dependencies(component.data.get("dependencies")):
-            if "name" not in dependency or "version" not in dependency:
+        for dependency in normalize_dependencies(
+            component.data.get("dependencies"), component.name
+        ):
+            if "version" not in dependency:
+                # Cannot resolve from the registry; common for bundled
+                # names (Wire, SPI) -- unactionable noise above debug
+                _LOGGER.debug(
+                    "Skip version-less dependency %r of %s",
+                    dependency.get("name"),
+                    component.name,
+                )
                 continue
-            try:
-                check_library_data(dependency, backend.platform, backend.framework)
-            except InvalidLibrary as e:
-                _LOGGER.debug("Skip dependency %s: %s", dependency.get("name"), str(e))
+            if not dependency_is_usable(
+                dependency, backend.platform, backend.framework, component.name
+            ):
                 continue
             dep_name = _owner_pkgname_to_name(
                 dependency.get("owner"), dependency.get("name")
             )
-            if is_ignored(dep_name):
+            if is_lib_ignored(dep_name, lib_ignore):
                 _LOGGER.debug("Skip ignored dependency %s", dep_name)
                 continue
             # The version field may actually be a URL (git/archive dependency).
diff --git a/esphome/platformio/toolchain.py b/esphome/platformio/toolchain.py
index d76581d032..a98ef3e9fe 100644
--- a/esphome/platformio/toolchain.py
+++ b/esphome/platformio/toolchain.py
@@ -254,6 +254,9 @@ def _ccache_runs(ccache: str) -> bool:
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
             timeout=15,
+            # Repo-wide convention (posix_spawn fast path); see the
+            # close_fds=False call sites across esphome/ and script/helpers.py
+            close_fds=False,
         )
     except (OSError, subprocess.SubprocessError):
         _LOGGER.warning(
diff --git a/script/determine-jobs.py b/script/determine-jobs.py
index 722e2370fe..3e11deeb9a 100755
--- a/script/determine-jobs.py
+++ b/script/determine-jobs.py
@@ -537,6 +537,7 @@ ESP_IDF_INFRA_TRIGGER_FILES = frozenset(
         "esphome/build_gen/espidf.py",
         "esphome/framework_helpers.py",
         "esphome/platformio/library.py",
+        "esphome/platformio/extra_script.py",
     }
 )
 
diff --git a/tests/script/test_determine_jobs.py b/tests/script/test_determine_jobs.py
index 1a568ca6c6..b42c33de96 100644
--- a/tests/script/test_determine_jobs.py
+++ b/tests/script/test_determine_jobs.py
@@ -1124,6 +1124,7 @@ def test_should_run_esp32_platformio_with_branch() -> None:
         (["esphome/build_helpers/idedata.py"], True),
         (["esphome/platformio/library.py"], True),
         (["esphome/framework_helpers.py"], True),
+        (["esphome/platformio/extra_script.py"], True),
         # PlatformIO build gen, its toolchain, and the esp32 component are
         # NOT IDF-infra triggers
         (["esphome/platformio/toolchain.py"], False),
diff --git a/tests/unit_tests/test_espidf_component.py b/tests/unit_tests/test_espidf_component.py
index f9e048f6f4..7b4f848979 100644
--- a/tests/unit_tests/test_espidf_component.py
+++ b/tests/unit_tests/test_espidf_component.py
@@ -1,12 +1,12 @@
 import glob
 import hashlib
 import json
-import os
 from pathlib import Path
 from unittest.mock import MagicMock
 
 import pytest
 
+from esphome.components import esp32 as esp32_module
 from esphome.const import (
     KEY_CORE,
     KEY_TARGET_FRAMEWORK,
@@ -16,21 +16,24 @@ from esphome.const import (
 )
 from esphome.core import CORE, Library
 from esphome.espidf.component import (
+    _emit_idf_component,
     generate_cmakelists_txt,
     generate_idf_component_yml,
     generate_idf_components,
 )
 import esphome.platformio.library
 from esphome.platformio.library import (
+    ESPHOME_DATA_KEY,
+    ESPHOME_DATA_LINK_FLAGS_KEY,
     ConvertedLibrary as IDFComponent,
     GitSource,
     URLSource,
     _node_key,
-    _normalize_dependencies,
-    _parse_library_json,
-    _parse_library_properties,
     _resolve_registry_version,
     collect_filtered_files,
+    normalize_dependencies,
+    parse_library_json,
+    parse_library_properties,
     split_list_by_condition,
 )
 
@@ -291,6 +294,38 @@ def test_generate_cmakelists_txt_multi_token_flag(tmp_component):
     assert '  "-include"\n  "cp_custom_alloc.h"\n' in content
 
 
+def test_generate_cmakelists_txt_escapes_embedded_quotes(tmp_component):
+    """A define value carrying a literal quote survives into CMake as an
+    escaped quote, not a prematurely-terminated string."""
+    src_dir = tmp_component.path / "src"
+    src_dir.mkdir()
+    (src_dir / "main.c").write_text("int main() {}")
+    # shlex keeps the backslash-escaped quotes as literal characters
+    tmp_component.data = {"build": {"flags": ['-DMSG=\\"hi\\"']}}
+
+    content = generate_cmakelists_txt(tmp_component)
+    assert '"-DMSG=\\"hi\\""' in content
+
+
+def test_generate_cmakelists_txt_extra_script_link_flags(tmp_component):
+    """Captured extra-script LINKFLAGS come out as target_link_options, not
+    compile options where they would be silently ineffective."""
+    src_dir = tmp_component.path / "src"
+    src_dir.mkdir()
+    (src_dir / "main.c").write_text("int main() {}")
+
+    tmp_component.data = {
+        ESPHOME_DATA_KEY: {ESPHOME_DATA_LINK_FLAGS_KEY: ["-Wl,--gc-sections"]}
+    }
+
+    content = generate_cmakelists_txt(tmp_component)
+    assert (
+        'target_link_options(${COMPONENT_LIB} INTERFACE\n  "-Wl,--gc-sections"\n)'
+        in content
+    )
+    assert "target_compile_options" not in content
+
+
 def test_generate_cmakelists_txt_space_separated_classified_flags(tmp_component):
     # Space-separated -I/-L/-l entries routed to INCLUDE_DIRS and the link
     # handling before the shlex split was added; splitting must not leak
@@ -339,6 +374,18 @@ def test_generate_idf_component_yml_basic(tmp_component):
     assert result == "description: test\nrepository: http://aaa\n"
 
 
+def test_generate_idf_component_yml_tolerates_malformed_metadata(tmp_component):
+    """A string repository is the URL itself; junk shapes drop instead of
+    crashing on a third-party manifest."""
+    tmp_component.data = {"description": "test", "repository": "http://aaa"}
+    assert (
+        generate_idf_component_yml(tmp_component)
+        == "description: test\nrepository: http://aaa\n"
+    )
+    tmp_component.data = {"description": {"en": "x"}, "repository": 123}
+    assert generate_idf_component_yml(tmp_component) == "{}\n"
+
+
 def test_generate_idf_component_yml_with_dependencies(tmp_component, tmp_path):
     dep = IDFComponent("dep", "1.0", source=URLSource("http://dummy.com"))
     dep.path = tmp_path / "dep"
@@ -369,133 +416,11 @@ def test_generate_idf_component_yml_missing_path_raises(tmp_component):
         generate_idf_component_yml(tmp_component)
 
 
-def test_extra_script_captures_libpath_libs_and_defines(tmp_path):
-    from esphome.espidf.extra_script import captured_as_build_flags, run_extra_script
-
-    (tmp_path / "src" / "esp32").mkdir(parents=True)
-    script = tmp_path / "extra_script.py"
-    script.write_text(
-        "Import('env')\n"
-        "mcu = env.get('BOARD_MCU')\n"
-        "env.Append(\n"
-        "    LIBPATH=[join('src', mcu)],\n"
-        "    LIBS=['algobsec'],\n"
-        "    CPPDEFINES=['FOO', ('BAR', '1')],\n"
-        "    LINKFLAGS=['-Wl,--gc-sections'],\n"
-        ")\n"
-    )
-    # The script uses bare ``join`` (PIO's extra-scripts run inside SCons
-    # where this is in scope). Inject it via the script header so the
-    # shim's exec namespace can resolve it.
-    script.write_text("from os.path import join\n" + script.read_text())
-
-    result = run_extra_script(script, library_dir=tmp_path, idf_target="esp32")
-
-    assert result.libpath == [str(Path("src") / "esp32")]
-    assert result.libs == ["algobsec"]
-    assert ("BAR", "1") in result.cppdefines
-    assert "FOO" in result.cppdefines
-    assert result.linkflags == ["-Wl,--gc-sections"]
-
-    flags = captured_as_build_flags(result, library_dir=tmp_path)
-    sep = os.sep
-    assert f"-Lsrc{sep}esp32" in flags
-    assert "-lalgobsec" in flags
-    assert "-DFOO" in flags
-    assert "-DBAR=1" in flags
-    assert "-Wl,--gc-sections" in flags
-
-
-def test_extra_script_libpath_relative_resolves_against_library_dir(
-    tmp_path, monkeypatch
-):
-    """Relative LIBPATH entries must resolve against ``library_dir``, not the
-    caller's CWD (the shim restores CWD before ``captured_as_build_flags``
-    runs)."""
-    from esphome.espidf.extra_script import ExtraScriptResult, captured_as_build_flags
-
-    (tmp_path / "lib" / "esp32").mkdir(parents=True)
-    elsewhere = tmp_path.parent / "not_the_library_dir"
-    elsewhere.mkdir(exist_ok=True)
-    monkeypatch.chdir(elsewhere)
-
-    result = ExtraScriptResult(libpath=["lib/esp32"])
-    flags = captured_as_build_flags(result, library_dir=tmp_path)
-
-    sep = os.sep
-    assert flags == [f"-Llib{sep}esp32"]
-
-
-def test_extra_script_libpath_absolute_outside_library_dir(tmp_path):
-    from esphome.espidf.extra_script import ExtraScriptResult, captured_as_build_flags
-
-    outside = tmp_path.parent / "system_lib"
-    outside.mkdir(exist_ok=True)
-    result = ExtraScriptResult(libpath=[str(outside)])
-
-    flags = captured_as_build_flags(result, library_dir=tmp_path)
-    assert flags == [f"-L{outside.resolve()}"]
-
-
-def test_extra_script_failure_returns_empty_result(tmp_path, caplog):
-    from esphome.espidf.extra_script import run_extra_script
-
-    script = tmp_path / "broken.py"
-    script.write_text("raise RuntimeError('boom')\n")
-
-    with caplog.at_level("WARNING"):
-        result = run_extra_script(script, library_dir=tmp_path, idf_target="esp32")
-
-    assert result.libpath == []
-    assert result.libs == []
-    assert "broken.py" in caplog.text
-
-
-def test_apply_extra_script_path_traversal_is_rejected(tmp_path):
-    from esphome.espidf.component import _apply_extra_script
-
-    library_dir = tmp_path / "lib"
-    library_dir.mkdir()
-    outside = tmp_path / "evil.py"
-    outside.write_text("env.Append(LIBS=['pwned'])\n")
-
-    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
-    c.path = library_dir
-    c.data = {"build": {"extraScript": "../evil.py"}}
-
-    _apply_extra_script(c)
-
-    # Nothing was folded into flags: the traversal was rejected before
-    # the script could run.
-    assert "flags" not in c.data["build"]
-
-
-def test_apply_extra_script_merges_into_existing_flags(tmp_path, monkeypatch):
-    from esphome.components import esp32 as esp32_module
-
-    monkeypatch.setattr(esp32_module, "get_esp32_variant", lambda: "ESP32")
-
-    from esphome.espidf.component import _apply_extra_script
-
-    (tmp_path / "src").mkdir()
-    script = tmp_path / "extra.py"
-    script.write_text("env.Append(LIBS=['algobsec'])\n")
-
-    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
-    c.path = tmp_path
-    c.data = {"build": {"extraScript": "extra.py", "flags": ["-DEXISTING"]}}
-
-    _apply_extra_script(c)
-
-    assert "-DEXISTING" in c.data["build"]["flags"]
-    assert "-lalgobsec" in c.data["build"]["flags"]
-
-
 def test_parse_library_json(tmp_path):
     f = tmp_path / "library.json"
     f.write_text(json.dumps({"name": "test"}))
 
-    result = _parse_library_json(f)
+    result = parse_library_json(f)
     assert result["name"] == "test"
 
 
@@ -510,7 +435,7 @@ empty=
 """
     )
 
-    result = _parse_library_properties(f)
+    result = parse_library_properties(f)
 
     assert result["name"] == "Test"
     assert result["version"] == "1.0"
@@ -680,22 +605,22 @@ def test_node_key_registry_bare_name():
 
 
 def test_normalize_dependencies_none():
-    assert _normalize_dependencies(None) == []
+    assert normalize_dependencies(None) == []
 
 
 def test_normalize_dependencies_list_form():
     deps = [{"name": "foo", "version": "1.0"}]
-    assert _normalize_dependencies(deps) == [{"name": "foo", "version": "1.0"}]
+    assert normalize_dependencies(deps) == [{"name": "foo", "version": "1.0"}]
 
 
 def test_normalize_dependencies_dict_form():
-    out = _normalize_dependencies({"nanopb/Nanopb": "^0.4.91", "BareName": "1.2.3"})
+    out = normalize_dependencies({"nanopb/Nanopb": "^0.4.91", "BareName": "1.2.3"})
     assert {"name": "Nanopb", "owner": "nanopb", "version": "^0.4.91"} in out
     assert {"name": "BareName", "owner": None, "version": "1.2.3"} in out
 
 
 def test_normalize_dependencies_dict_form_nested_spec():
-    out = _normalize_dependencies(
+    out = normalize_dependencies(
         {"nanopb/Nanopb": {"version": "^0.4.91", "platforms": "espidf"}}
     )
     assert out == [
@@ -1190,3 +1115,33 @@ def test_idf_component_download_passes_salt() -> None:
         "owner/name", force=True, salt="abcd1234", namespace="idf"
     )
     assert c.path == Path("/converted/owner/name")
+
+
+def test_emit_idf_component_wires_esp32_target(tmp_path, monkeypatch):
+    """Emitting a component resolves the esp32 variant into the shared
+    extraScript helper."""
+
+    monkeypatch.setattr(esp32_module, "get_esp32_variant", lambda: "ESP32")
+    (tmp_path / "src").mkdir()
+    script = tmp_path / "extra.py"
+    script.write_text("env.Append(LIBS=[env.get('BOARD_MCU')])\n")
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "extra.py"}}
+    _emit_idf_component(c)
+    assert c.data["build"]["flags"] == ["-lesp32"]
+
+
+def test_build_flags_dangling_flag_does_not_cross_entries(
+    tmp_path, caplog: pytest.LogCaptureFixture
+) -> None:
+    """Each entry is lexed independently, as ParseFlags does: a dangling -I ending one
+    entry warns instead of absorbing the next entry's first token."""
+    (tmp_path / "src").mkdir()
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"flags": ["-Wall -I", "-DFOO=1"]}}
+    content = generate_cmakelists_txt(c)
+    assert "FOO=1" in content
+    assert "-I-DFOO" not in content
+    assert "Ignoring trailing '-I'" in caplog.text
diff --git a/tests/unit_tests/test_platformio_extra_script.py b/tests/unit_tests/test_platformio_extra_script.py
new file mode 100644
index 0000000000..07f0e78500
--- /dev/null
+++ b/tests/unit_tests/test_platformio_extra_script.py
@@ -0,0 +1,563 @@
+"""Tests for the shared extraScript machinery (platformio.extra_script)."""
+
+from __future__ import annotations
+
+import logging
+import os
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+from esphome.core import EsphomeError
+from esphome.platformio.extra_script import (
+    CppDefine,
+    ExtraScriptResult,
+    _FakeSConsEnv,
+    apply_extra_script,
+    captured_as_build_flags,
+    run_extra_script,
+)
+from esphome.platformio.library import (
+    ESPHOME_DATA_KEY,
+    ESPHOME_DATA_LINK_FLAGS_KEY,
+    ConvertedLibrary as IDFComponent,
+    URLSource,
+    lex_build_flags,
+)
+
+
+def test_extra_script_captures_libpath_libs_and_defines(tmp_path):
+
+    (tmp_path / "src" / "esp32").mkdir(parents=True)
+    script = tmp_path / "extra_script.py"
+    script.write_text(
+        "Import('env')\n"
+        "mcu = env.get('BOARD_MCU')\n"
+        "env.Append(\n"
+        "    LIBPATH=[join('src', mcu)],\n"
+        "    LIBS=['algobsec'],\n"
+        "    CPPDEFINES=['FOO', ('BAR', '1')],\n"
+        "    LINKFLAGS=['-Wl,--gc-sections'],\n"
+        ")\n"
+    )
+    # The script uses bare ``join`` (PIO's extra-scripts run inside SCons
+    # where this is in scope). Inject it via the script header so the
+    # shim's exec namespace can resolve it.
+    script.write_text("from os.path import join\n" + script.read_text())
+
+    result = run_extra_script(
+        script, library_dir=tmp_path, board_mcu="esp32", pio_platform="espressif32"
+    )
+
+    assert result.libpath == [str(Path("src") / "esp32")]
+    assert result.libs == ["algobsec"]
+    assert CppDefine("BAR", "1") in result.cppdefines
+    assert CppDefine("FOO") in result.cppdefines
+    assert result.linkflags == ["-Wl,--gc-sections"]
+
+    # Lex like the consumer does: quoting makes raw strings platform-varying
+    tokens = lex_build_flags(
+        captured_as_build_flags(result, library_dir=tmp_path), "test"
+    )
+    sep = os.sep
+    assert f"-Lsrc{sep}esp32" in tokens
+    assert "-lalgobsec" in tokens
+    assert "-DFOO" in tokens
+    assert "-DBAR=1" in tokens
+    # LINKFLAGS travel via the link-flags channel, never the compile flags
+    assert "-Wl,--gc-sections" not in tokens
+
+
+def test_extra_script_libpath_relative_resolves_against_library_dir(
+    tmp_path, monkeypatch
+):
+    """Relative LIBPATH entries must resolve against ``library_dir``, not the
+    caller's CWD (the shim restores CWD before ``captured_as_build_flags``
+    runs)."""
+
+    (tmp_path / "lib" / "esp32").mkdir(parents=True)
+    elsewhere = tmp_path.parent / "not_the_library_dir"
+    elsewhere.mkdir(exist_ok=True)
+    monkeypatch.chdir(elsewhere)
+
+    result = ExtraScriptResult(libpath=["lib/esp32"])
+    flags = captured_as_build_flags(result, library_dir=tmp_path)
+
+    sep = os.sep
+    assert lex_build_flags(flags, "test") == [f"-Llib{sep}esp32"]
+
+
+def test_extra_script_libpath_absolute_outside_library_dir(tmp_path):
+
+    outside = tmp_path.parent / "system_lib"
+    outside.mkdir(exist_ok=True)
+    result = ExtraScriptResult(libpath=[str(outside)])
+
+    flags = captured_as_build_flags(result, library_dir=tmp_path)
+    assert lex_build_flags(flags, "test") == [f"-L{outside.resolve()}"]
+
+
+def test_extra_script_failure_returns_empty_result(tmp_path, caplog):
+
+    script = tmp_path / "broken.py"
+    script.write_text("raise RuntimeError('boom')\n")
+
+    with caplog.at_level("WARNING"):
+        result = run_extra_script(
+            script, library_dir=tmp_path, board_mcu="esp32", pio_platform="espressif32"
+        )
+
+    assert result.libpath == []
+    assert result.libs == []
+    assert "broken.py" in caplog.text
+
+
+def test_apply_extra_script_path_traversal_is_rejected(tmp_path):
+
+    library_dir = tmp_path / "lib"
+    library_dir.mkdir()
+    outside = tmp_path / "evil.py"
+    outside.write_text("env.Append(LIBS=['pwned'])\n")
+
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = library_dir
+    c.data = {"build": {"extraScript": "../evil.py"}}
+
+    with pytest.raises(EsphomeError, match="escapes the library directory"):
+        apply_extra_script(c, board_mcu=lambda: "esp32", pio_platform="espressif32")
+    # Nothing was folded into flags: the traversal was rejected before
+    # the script could run.
+    assert "flags" not in c.data["build"]
+
+
+def test_apply_extra_script_merges_into_existing_flags(tmp_path):
+
+    (tmp_path / "src").mkdir()
+    script = tmp_path / "extra.py"
+    script.write_text("env.Append(LIBS=['algobsec'])\n")
+
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "extra.py", "flags": ["-DEXISTING"]}}
+
+    apply_extra_script(c, board_mcu=lambda: "esp32", pio_platform="espressif32")
+
+    assert "-DEXISTING" in c.data["build"]["flags"]
+    assert "-lalgobsec" in c.data["build"]["flags"]
+
+
+def test_apply_extra_script_malformed_flags_raises(tmp_path) -> None:
+    """A null/dict build.flags fails naming the library instead of injecting
+    a non-string into the compiler command line."""
+
+    (tmp_path / "src").mkdir()
+    script = tmp_path / "extra.py"
+    script.write_text("env.Append(LIBS=['algobsec'])\n")
+
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "extra.py", "flags": None}}
+
+    with pytest.raises(EsphomeError, match="malformed build.flags"):
+        apply_extra_script(c, board_mcu=lambda: "esp32", pio_platform="espressif32")
+
+
+def test_apply_extra_script_callable_target_and_str_flags(tmp_path) -> None:
+    """The shared helper resolves the board_mcu callable lazily and normalizes
+    a string ``build.flags`` value into a list before extending it."""
+
+    (tmp_path / "src").mkdir()
+    script = tmp_path / "extra.py"
+    script.write_text("env.Append(LIBS=[env.get('BOARD_MCU')])\n")
+
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "extra.py", "flags": "-DBASE=1"}}
+
+    apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+
+    assert c.data["build"]["flags"] == ["-DBASE=1", "-lesp8266"]
+
+
+def test_captured_nonstring_buckets_warn_and_skip(tmp_path, caplog) -> None:
+    """Non-string LIBS/LINKFLAGS/CPPFLAGS/LIBPATH entries (legal SCons
+    nodes) are skipped by name instead of stringified into garbage flags."""
+    (tmp_path / "src").mkdir()
+    script = tmp_path / "extra.py"
+    script.write_text(
+        "env.Append(LIBS=['m', 42], LINKFLAGS=['-Wl,-x', {'no': 1}], "
+        "CPPFLAGS=['-Os', 3.5], LIBPATH=['libs', 7])\n"
+    )
+    (tmp_path / "libs").mkdir()
+
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "extra.py"}}
+
+    apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+
+    flags = c.data["build"]["flags"]
+    assert "-lm" in flags and "-Os" in flags
+    assert c.data[ESPHOME_DATA_KEY][ESPHOME_DATA_LINK_FLAGS_KEY] == ["-Wl,-x"]
+    assert not any("42" in f or "no" in f or "3.5" in f for f in flags)
+    assert "Ignoring unsupported LIBS entry 42" in caplog.text
+    assert "Ignoring unsupported LINKFLAGS entry {'no': 1}" in caplog.text
+    assert "Ignoring unsupported LIBPATH entry 7" in caplog.text
+
+
+def test_captured_dict_cppdefines_warn_and_skip(tmp_path, caplog) -> None:
+    """A dict CPPDEFINES entry (legal SCons) must warn and skip; formatting
+    it blind would hand the compiler -D{'FOO': '1'} garbage."""
+    (tmp_path / "src").mkdir()
+    script = tmp_path / "extra.py"
+    script.write_text(
+        "env.Append(CPPDEFINES=[{'FOO': '1'}, ('BAR', 2), ['BAZ', 3], 'PLAIN'])\n"
+    )
+
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "extra.py"}}
+
+    apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+
+    assert c.data["build"]["flags"] == ["-DBAR=2", "-DBAZ=3", "-DPLAIN"]
+    assert "Ignoring unsupported CPPDEFINES entry" in caplog.text
+
+
+def test_apply_extra_script_subscript_env_read(tmp_path) -> None:
+    """Scripts also read env["BOARD_MCU"]; the subscript form must work or
+    the broad handler discards every flag the script captured."""
+    (tmp_path / "src").mkdir()
+    script = tmp_path / "extra.py"
+    script.write_text("env.Append(LIBS=[env['BOARD_MCU']])\n")
+
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "extra.py"}}
+
+    apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+
+    assert c.data["build"]["flags"] == ["-lesp8266"]
+
+
+def test_apply_extra_script_no_script_and_no_flags(tmp_path) -> None:
+
+    # No extraScript declared: nothing happens, the target is never resolved
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {}}
+    apply_extra_script(
+        c,
+        board_mcu=lambda: pytest.fail("target resolved without a script"),
+        pio_platform="espressif8266",
+    )
+
+    # A script that captures nothing leaves the flags untouched
+    script = tmp_path / "noop.py"
+    script.write_text("pass\n")
+    c.data = {"build": {"extraScript": "noop.py"}}
+    apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+    assert "flags" not in c.data["build"]
+
+
+def test_apply_extra_script_ignores_uncaptured_env_calls(tmp_path, caplog) -> None:
+    """Un-captured env vars and unsupported env methods are skipped but
+    diagnosable from the build log."""
+
+    caplog.set_level(logging.DEBUG)
+    script = tmp_path / "extra.py"
+    script.write_text(
+        "env.Replace(CC='clang')\nenv.Append(UNCAPTURED=['x'], LIBS='single')\n"
+    )
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "extra.py"}}
+    apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+    assert c.data["build"]["flags"] == ["-lsingle"]
+    assert "env.Append(UNCAPTURED=...) is not captured" in caplog.text
+    assert "env.Replace is not supported" in caplog.text
+
+
+def test_apply_extra_script_swallows_script_errors(tmp_path, caplog) -> None:
+    """A raising extra-script is best-effort: logged and skipped."""
+
+    script = tmp_path / "extra.py"
+    script.write_text("raise RuntimeError('boom')\n")
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "extra.py"}}
+    apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+    assert "flags" not in c.data["build"]
+    assert "ignoring its output" in caplog.text
+
+
+def test_apply_extra_script_pio_platform(tmp_path) -> None:
+    """The backend's platform token is exposed to the script as PIOPLATFORM."""
+
+    script = tmp_path / "extra.py"
+    script.write_text("env.Append(LIBS=[env.get('PIOPLATFORM')])\n")
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "extra.py"}}
+    apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+    assert c.data["build"]["flags"] == ["-lespressif8266"]
+
+
+def test_apply_extra_script_missing_script_raises(tmp_path) -> None:
+    """A declared but absent extraScript is a broken package and fails by
+    name, as it would under PlatformIO."""
+
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": "nope.py"}}
+    with pytest.raises(EsphomeError, match="nope.py of library owner/name not found"):
+        apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+
+
+@pytest.mark.parametrize("bad", (["a.py"], {"esp32": "a.py"}), ids=("list", "dict"))
+def test_apply_extra_script_non_string_raises(tmp_path, bad) -> None:
+    """A non-string extraScript fails naming the library, not with a TypeError."""
+
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": bad}}
+    with pytest.raises(EsphomeError, match="of library owner/name must be a string"):
+        apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+
+
+def test_extra_script_cpppath_captured_as_include_flags(tmp_path, monkeypatch):
+    """CPPPATH entries translate to -I flags anchored like LIBPATH."""
+
+    (tmp_path / "include").mkdir()
+    outside = tmp_path.parent / "system_inc"
+    outside.mkdir(exist_ok=True)
+    elsewhere = tmp_path.parent / "not_the_library_dir"
+    elsewhere.mkdir(exist_ok=True)
+    monkeypatch.chdir(elsewhere)
+
+    result = ExtraScriptResult(cpppath=["include", str(outside), 7])
+    flags = captured_as_build_flags(result, library_dir=tmp_path)
+
+    assert lex_build_flags(flags, "test") == ["-Iinclude", f"-I{outside.resolve()}"]
+
+
+def test_extra_script_spaced_paths_survive_relexing(tmp_path):
+    """-I/-L paths with spaces round-trip through lex_build_flags as one token."""
+    (tmp_path / "my libs").mkdir()
+    result = ExtraScriptResult(cpppath=["my libs"], libpath=["my libs"])
+    flags = captured_as_build_flags(result, library_dir=tmp_path)
+    assert lex_build_flags(flags, "test") == ["-Imy libs", "-Lmy libs"]
+
+
+def test_run_extra_script_failure_discards_partial_capture(tmp_path, caplog) -> None:
+    """A crashed script yields an empty result: half-applied flags could
+    build wrong-output firmware that links cleanly."""
+
+    script = tmp_path / "extra.py"
+    script.write_text("env.Append(LIBS=['algobsec'])\nraise RuntimeError('boom')\n")
+    result = run_extra_script(
+        script, library_dir=tmp_path, board_mcu="esp32", pio_platform="espressif32"
+    )
+    assert result.libs == []
+    assert "ignoring its output" in caplog.text
+
+
+def test_run_extra_script_syntax_error_is_best_effort(tmp_path, caplog) -> None:
+    """A vendored script that does not even compile warns and skips instead
+    of aborting the build."""
+
+    script = tmp_path / "extra.py"
+    script.write_text("def broken(:\n")
+    result = run_extra_script(
+        script, library_dir=tmp_path, board_mcu="esp32", pio_platform="espressif32"
+    )
+    assert result.libs == []
+    assert "ignoring its output" in caplog.text
+
+
+def test_unsupported_env_method_warns_once(caplog) -> None:
+    """Repeated calls to the same unsupported method warn only once."""
+
+    env = _FakeSConsEnv(
+        board_mcu="esp8266", pio_env="esphome_esp8266", pio_platform="espressif8266"
+    )
+    env.Replace(CC="clang")
+    env.Replace(CC="gcc")
+    assert caplog.text.count("env.Replace is not supported") == 1
+
+
+def test_run_extra_script_sys_exit_is_best_effort(tmp_path, caplog) -> None:
+    """A nonzero sys.exit() in a vendored script must not kill the esphome
+    run, and its output is discarded."""
+
+    script = tmp_path / "extra.py"
+    script.write_text("import sys\nenv.Append(LIBS=['x'])\nsys.exit(3)\n")
+    result = run_extra_script(
+        script, library_dir=tmp_path, board_mcu="esp32", pio_platform="espressif32"
+    )
+    assert result.libs == []
+    assert "exited with status 3" in caplog.text
+
+
+def test_run_extra_script_sys_exit_zero_is_success(tmp_path, caplog) -> None:
+    """sys.exit(0) is a normal PlatformIO script ending: the capture is kept."""
+
+    script = tmp_path / "extra.py"
+    script.write_text("import sys\nenv.Append(LIBS=['algobsec'])\nsys.exit(0)\n")
+    result = run_extra_script(
+        script, library_dir=tmp_path, board_mcu="esp32", pio_platform="espressif32"
+    )
+    assert result.libs == ["algobsec"]
+    assert "ignoring its output" not in caplog.text
+
+
+def test_run_extra_script_unreadable_raises(tmp_path) -> None:
+    """An unreadable declared script is a broken package, like a missing one."""
+
+    script = tmp_path / "extra.py"
+    script.write_text("")
+    with (
+        patch("pathlib.Path.read_text", side_effect=OSError("denied")),
+        pytest.raises(EsphomeError, match="is unreadable"),
+    ):
+        run_extra_script(
+            script, library_dir=tmp_path, board_mcu="esp32", pio_platform="espressif32"
+        )
+
+
+def test_run_extra_script_bad_encoding_is_best_effort(tmp_path, caplog) -> None:
+    """Undecodable content warns and skips, like a SyntaxError."""
+
+    script = tmp_path / "extra.py"
+    script.write_bytes(b"\xff\xfe\x00bad")
+    result = run_extra_script(
+        script, library_dir=tmp_path, board_mcu="esp32", pio_platform="espressif32"
+    )
+    assert result.libs == []
+    assert "is not UTF-8" in caplog.text
+
+
+@pytest.mark.parametrize("method", ("Prepend", "AppendUnique", "PrependUnique"))
+def test_append_variants_capture_like_append(method: str) -> None:
+    """Prepend/AppendUnique/PrependUnique write the captured keys too."""
+    env = _FakeSConsEnv(
+        board_mcu="esp8266", pio_env="esphome_esp8266", pio_platform="espressif8266"
+    )
+    getattr(env, method)(LIBS=["algobsec"], LIBPATH=["lib"])
+    assert env.result.libs == ["algobsec"]
+    assert env.result.libpath == ["lib"]
+
+
+@pytest.mark.parametrize("method", ("Prepend", "PrependUnique"))
+def test_prepend_inserts_ahead_of_existing(method: str) -> None:
+    """Prepend keeps SCons order: new values land ahead of what is already
+    captured (scripts prepend LIBS for static-link symbol resolution)."""
+    env = _FakeSConsEnv(
+        board_mcu="esp8266", pio_env="esphome_esp8266", pio_platform="espressif8266"
+    )
+    env.Append(LIBS=["m"])
+    getattr(env, method)(LIBS=["algobsec", "bsec"])
+    assert env.result.libs == ["algobsec", "bsec", "m"]
+
+
+def test_env_membership_and_iteration(tmp_path) -> None:
+    """Membership tests and for-loops must use the mapping protocol; the
+    legacy sequence fallback through __getitem__ would loop forever."""
+    env = _FakeSConsEnv(
+        board_mcu="esp8266", pio_env="esphome_esp8266", pio_platform="espressif8266"
+    )
+    assert "BOARD_MCU" in env
+    assert "NOPE" not in env
+    assert sorted(env) == ["BOARD_MCU", "PIOENV", "PIOPLATFORM"]
+
+
+def test_apply_extra_script_non_string_falsey_raises(tmp_path) -> None:
+    """A falsey non-string extraScript (false, 0, []) is a malformed
+    manifest, not an absent script."""
+    c = IDFComponent("owner/name", "1.0", source=URLSource("http://dummy"))
+    c.path = tmp_path
+    c.data = {"build": {"extraScript": False}}
+    with pytest.raises(EsphomeError, match="must be a string"):
+        apply_extra_script(c, board_mcu=lambda: "esp8266", pio_platform="espressif8266")
+
+
+def test_env_get_unknown_key_warns_once(caplog) -> None:
+    """A script branching on an unmodelled env var is diagnosable."""
+    env = _FakeSConsEnv(
+        board_mcu="esp8266", pio_env="esphome_esp8266", pio_platform="espressif8266"
+    )
+    assert env.get("BOARD") is None
+    assert env.get("BOARD", "d1") == "d1"
+    assert env.get("BOARD_MCU") == "esp8266"
+    assert caplog.text.count("env.get('BOARD') is not modelled") == 1
+    assert "BOARD_MCU" not in caplog.text
+
+
+def test_spaced_cppflag_survives_relexing(tmp_path) -> None:
+    """A captured argv token with a space stays one token after lexing."""
+    result = ExtraScriptResult(
+        cppflags=["-include my hdr.h"],
+        cppdefines=[CppDefine("MSG", '"hello world"'), CppDefine("PLAIN")],
+    )
+    flags = captured_as_build_flags(result, library_dir=tmp_path)
+    assert lex_build_flags(flags, "test") == [
+        '-DMSG="hello world"',
+        "-DPLAIN",
+        "-include my hdr.h",
+    ]
+
+
+def test_env_attribute_access_warns_without_call(caplog) -> None:
+    """hasattr()/truthiness on an unsupported method is diagnosable; dunder
+    protocol probes stay silent."""
+    env = _FakeSConsEnv(
+        board_mcu="esp8266", pio_env="esphome_esp8266", pio_platform="espressif8266"
+    )
+    assert env.GetProjectOption
+    assert caplog.text.count("env.GetProjectOption is not supported") == 1
+    assert not hasattr(env, "__deepcopy__")
+    assert "__deepcopy__" not in caplog.text
+
+
+def test_env_unmodelled_subscript_degrades_one_branch(caplog) -> None:
+    """env[...] on an unmodelled var returns '' instead of KeyError
+    discarding the whole capture."""
+    env = _FakeSConsEnv(
+        board_mcu="esp8266", pio_env="esphome_esp8266", pio_platform="espressif8266"
+    )
+    assert env["PIOFRAMEWORK"] == ""
+    assert env["PIOFRAMEWORK"] == ""
+    assert caplog.text.count("env['PIOFRAMEWORK'] is not modelled") == 1
+    assert env["BOARD_MCU"] == "esp8266"
+    env.Append(LIBS=["still_captured"])
+    assert env.result.libs == ["still_captured"]
+
+
+def test_cppdefines_scons_spellings(tmp_path) -> None:
+    """A bare 2-tuple is one name=value pair, a dict maps names to values,
+    and a None value is a bare define (SCons processDefines)."""
+    env = _FakeSConsEnv(
+        board_mcu="esp8266", pio_env="esphome_esp8266", pio_platform="espressif8266"
+    )
+    env.Append(CPPDEFINES=("FOO", "1"))
+    env.Append(CPPDEFINES={"BAR": "2", "BAZ": None})
+    env.Append(CPPDEFINES=["PLAIN"])
+    flags = captured_as_build_flags(env.result, library_dir=tmp_path)
+    assert lex_build_flags(flags, "test") == [
+        "-DFOO=1",
+        "-DBAR=2",
+        "-DBAZ",
+        "-DPLAIN",
+    ]
+
+
+def test_uncaptured_append_key_warns_once(caplog) -> None:
+    """A loop of Appends to the same uncaptured key warns once."""
+
+    env = _FakeSConsEnv(
+        board_mcu="esp8266", pio_env="esphome_esp8266", pio_platform="espressif8266"
+    )
+    env.Append(RANLIBFLAGS=["a"])
+    env.Append(RANLIBFLAGS=["b"])
+    assert caplog.text.count("env.Append(RANLIBFLAGS=...) is not captured") == 1
diff --git a/tests/unit_tests/test_platformio_library.py b/tests/unit_tests/test_platformio_library.py
index 0eede78656..bf8340cea0 100644
--- a/tests/unit_tests/test_platformio_library.py
+++ b/tests/unit_tests/test_platformio_library.py
@@ -13,6 +13,7 @@ import pytest
 from esphome.core import EsphomeError, Library
 import esphome.platformio.library as lib
 from esphome.platformio.library import (
+    SOURCE_KIND_FOR_SUFFIX,
     ConvertedLibrary,
     GitSource,
     InvalidLibrary,
@@ -23,6 +24,8 @@ from esphome.platformio.library import (
     _resolve_registry_version,
     check_library_data,
     convert_libraries,
+    join_flag_args,
+    split_flag_entry,
 )
 
 
@@ -154,7 +157,9 @@ def test_urlsource_download_extracts_then_reuses_marker(setup_core, monkeypatch)
     monkeypatch.setattr(lib, "rmdir", lambda path, msg="": None)
     dl_calls: list[list[str]] = []
     monkeypatch.setattr(
-        lib, "download_from_mirrors", lambda urls, headers, f: dl_calls.append(urls)
+        lib,
+        "download_from_mirrors",
+        lambda urls, headers, f: dl_calls.append(urls),
     )
 
     def fake_extract(fileobj, path):
@@ -292,7 +297,10 @@ def _patch_download_without_manifest(
     calls: list[bool] = []
 
     def fake_download(
-        self: ConvertedLibrary, force: bool = False, salt: str = "", namespace: str = ""
+        self: ConvertedLibrary,
+        force: bool = False,
+        salt: str = "",
+        namespace: str = "",
     ) -> None:
         calls.append(force)
         self.path = tmp_path / self.get_require_name()
@@ -531,3 +539,210 @@ def test_convert_libraries_skips_incompatible_dependency(tmp_path, monkeypatch):
     top = convert_libraries([Library("esphome/A", "1.0.0", None)], _backend())
 
     assert top[0].dependencies == []
+
+
+def test_split_flag_entry_unbalanced_quote_is_clean() -> None:
+    """A malformed flags entry raises EsphomeError, not a raw ValueError."""
+
+    assert split_flag_entry('-DX="a b"', "library x") == ["-DX=a b"]
+    with pytest.raises(EsphomeError, match=r"Malformed build flag.*library x"):
+        split_flag_entry('-DX="unclosed', "library x")
+
+
+def test_join_flag_args_reglues_spaced_define() -> None:
+    """A spaced -D re-glues to its argument, as ParseFlags does."""
+
+    assert join_flag_args(["-D", "FOO=1", "-Os"], "x") == ["-DFOO=1", "-Os"]
+
+
+def test_join_flag_args_trailing_bare_flag_warns(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+
+    assert join_flag_args(["-Os", "-l"], "library x") == ["-Os"]
+    assert "Ignoring trailing '-l'" in caplog.text
+
+
+def test_lex_build_flags_dangling_flag_does_not_cross_entries(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Each entry is lexed independently, as ParseFlags does: a dangling -I
+    ending one entry warns instead of absorbing the next entry's first token."""
+    from esphome.platformio.library import lex_build_flags
+
+    assert lex_build_flags(["-Wall -I", "-DFOO=1"], "lib x") == ["-Wall", "-DFOO=1"]
+    assert "Ignoring trailing '-I'" in caplog.text
+
+
+def test_join_flag_args_empty_argument_warns_and_drops(
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """An empty glued argument is dropped: a bare -D would eat the next flag."""
+    assert lib.lex_build_flags('-D "" -DFOO', "build_flags") == ["-DFOO"]
+    assert "Ignoring '-D' with empty argument in build_flags" in caplog.text
+
+
+def test_normalize_dependencies_forms(caplog) -> None:
+    """Every PIO-legal spelling normalizes; unrecognizable entries warn."""
+    from esphome.platformio.library import normalize_dependencies
+
+    assert normalize_dependencies(
+        ["Wire", {"name": "SPI"}, 5, "", {"version": "1.0"}], "libx"
+    ) == [
+        {"name": "Wire"},
+        {"name": "SPI"},
+    ]
+    # The int, the empty string, and the nameless dict all warn
+    assert caplog.text.count("unrecognized dependency entry") == 3
+    # A plain string is names, never iterated into characters
+    assert normalize_dependencies("Wire, SPI") == [
+        {"name": "Wire"},
+        {"name": "SPI"},
+    ]
+    assert normalize_dependencies("Wire") == [{"name": "Wire"}]
+    # A non-iterable value fails by manifest name, never a bare TypeError
+    assert normalize_dependencies(5, "libx") == []
+    assert "Ignoring unrecognized dependencies 5 of libx" in caplog.text
+    # The dict-shorthand form validates names like the list form: an empty
+    # key and a spec overriding name with a non-string both warn and drop
+    assert normalize_dependencies(
+        {"": "1.0", "Wire": {"name": 123, "version": "1.0"}, "SPI": "*"}, "libx"
+    ) == [{"name": "SPI", "owner": None, "version": "*"}]
+    assert caplog.text.count("unrecognized dependency entry") == 5
+    # A container or numeric version would raise from set.add() or fail
+    # opaquely in the registry; both spellings warn and drop
+    assert normalize_dependencies({"Foo": ["1.0", "2.0"]}, "libx") == []
+    assert normalize_dependencies([{"name": "Foo", "version": 1}], "libx") == []
+    assert caplog.text.count("unrecognized dependency entry") == 7
+    # A non-string owner would stringify into a malformed registry name
+    assert (
+        normalize_dependencies(
+            [{"name": "Foo", "owner": {"bad": 1}, "version": "1.0"}], "libx"
+        )
+        == []
+    )
+    # A falsey scalar (0, false) is malformed, not an empty list
+    assert normalize_dependencies(0, "libx") == []
+    assert "Ignoring unrecognized dependencies 0 of libx" in caplog.text
+
+
+@pytest.mark.parametrize(
+    "manifest",
+    [
+        ["not", "a", "manifest"],
+        {"name": "A", "build": "src"},
+        {"name": "A", "ESPHOME": "yes"},
+        {"name": "A", "build": {"srcDir": 123}},
+        {"name": "A", "build": {"includeDir": ["inc"]}},
+        {"name": "A", "build": {"srcFilter": {"+": "src"}}},
+        {"name": "A", "ESPHOME": {"LINK_FLAGS": "-Wl,-x"}},
+    ],
+)
+def test_convert_libraries_malformed_manifest_raises(
+    tmp_path, monkeypatch, manifest
+) -> None:
+    """A manifest without the expected dict shape fails by library name
+    before any backend dereferences data/build."""
+    _patch_download_with_manifests(monkeypatch, tmp_path, {"esphome/A": manifest})
+    with pytest.raises(EsphomeError, match="has a malformed manifest"):
+        convert_libraries([Library("esphome/A", None, None)], _backend())
+
+
+def test_convert_libraries_malformed_transitive_dep_skips(
+    tmp_path, monkeypatch, caplog: pytest.LogCaptureFixture
+) -> None:
+    """A malformed manifest on a dependency the user never asked for warns
+    and skips; only a top-level library fails the build."""
+    _patch_download_with_manifests(
+        monkeypatch,
+        tmp_path,
+        {
+            "esphome/A": {
+                "name": "A",
+                "dependencies": [{"name": "B", "owner": "esphome", "version": "1.0"}],
+            },
+            "esphome/B": {"name": "B", "build": {"srcDir": 123}},
+        },
+    )
+    components = convert_libraries([Library("esphome/A", None, None)], _backend())
+    names = [c.name for c in components]
+    assert "esphome/A" in names
+    assert "esphome/B" not in names
+    assert "Skipping dependency esphome/B: malformed manifest" in caplog.text
+
+
+def test_walk_warns_for_properties_only_depends(
+    tmp_path, monkeypatch, caplog: pytest.LogCaptureFixture
+) -> None:
+    """A manifest declaring dependencies only as library.properties depends=
+    warns in the shared walk, so every backend reports the drop."""
+    _patch_download_with_manifests(
+        monkeypatch,
+        tmp_path,
+        {"esphome/A": "name=A\nversion=1.0\ndepends=Wire, SPI\n"},
+        properties=("esphome/A",),
+    )
+    caplog.set_level("INFO")
+    convert_libraries([Library("esphome/A", "1.0.0", None)], _backend())
+    assert "declares dependencies via library.properties" in caplog.text
+
+
+def test_walk_warns_for_nonplatform_invalid_library(
+    tmp_path, monkeypatch, caplog: pytest.LogCaptureFixture
+) -> None:
+    """A dependency dropped for any cause other than the routine platform
+    filter is visible in every backend."""
+    _patch_download_with_manifests(
+        monkeypatch,
+        tmp_path,
+        {
+            "esphome/A": {
+                "name": "A",
+                "dependencies": [{"name": "B", "version": "1.0", "platforms": [123]}],
+            }
+        },
+    )
+    convert_libraries([Library("esphome/A", None, None)], _backend())
+    assert "Skipping dependency B of esphome/A: Malformed platforms" in caplog.text
+
+
+def test_convert_libraries_warns_for_nonplatform_invalid_dependency_component(
+    tmp_path, monkeypatch, caplog: pytest.LogCaptureFixture
+) -> None:
+    """A dependency component dropped for any cause other than the platform
+    filter warns; only the routine cross-platform skip stays at debug."""
+    _patch_download_with_manifests(
+        monkeypatch,
+        tmp_path,
+        {
+            "esphome/A": {
+                "name": "A",
+                "dependencies": [{"name": "C", "owner": "esphome", "version": "1.0"}],
+            },
+            "esphome/C": {"name": "C", "frameworks": [None]},
+        },
+    )
+    convert_libraries([Library("esphome/A", "1.0.0", None)], _backend())
+    assert "Malformed frameworks" in caplog.text
+    assert "Skipping dependency" in caplog.text
+
+
+def test_split_flag_entry_non_string_is_clean() -> None:
+    """A dict or number from a third-party manifest fails naming the entry,
+    not with an opaque shlex traceback."""
+
+    with pytest.raises(EsphomeError, match="Malformed build flag"):
+        split_flag_entry({"esp32": ["-DX"]}, "lib x")
+    with pytest.raises(EsphomeError, match="Malformed build flag 5"):
+        split_flag_entry(5, "lib x")
+
+
+def test_source_kind_map_shape() -> None:
+    """The kind values the native compile rules key on, and the deliberate
+    AS/ASPP merge (.s and .S both map to asm)."""
+
+    assert set(SOURCE_KIND_FOR_SUFFIX.values()) == {"c", "cxx", "asm"}
+    assert SOURCE_KIND_FOR_SUFFIX[".s"] == "asm"
+    assert SOURCE_KIND_FOR_SUFFIX[".S"] == "asm"
+    assert SOURCE_KIND_FOR_SUFFIX[".c"] == "c"
+    assert SOURCE_KIND_FOR_SUFFIX[".cpp"] == "cxx"
diff --git a/tests/unit_tests/test_platformio_toolchain.py b/tests/unit_tests/test_platformio_toolchain.py
index 172b288c25..28304270a4 100644
--- a/tests/unit_tests/test_platformio_toolchain.py
+++ b/tests/unit_tests/test_platformio_toolchain.py
@@ -1977,3 +1977,10 @@ def test_run_platformio_cli_invokes_heal(
     with patch.object(toolchain, "heal_platformio_python_env") as mock_heal:
         toolchain.run_platformio_cli("test")
     mock_heal.assert_called_once()
+
+
+def test_ccache_probe_spawns_with_close_fds_false() -> None:
+    """The probe follows the repo-wide posix_spawn convention."""
+    with patch("subprocess.run") as mock_run:
+        assert toolchain._ccache_runs("/usr/bin/ccache") is True
+    assert mock_run.call_args.kwargs["close_fds"] is False
diff --git a/tests/unit_tests/test_zephyr_library.py b/tests/unit_tests/test_zephyr_library.py
index b370fe0c47..765e505c38 100644
--- a/tests/unit_tests/test_zephyr_library.py
+++ b/tests/unit_tests/test_zephyr_library.py
@@ -66,6 +66,34 @@ def test_generate_cmakelists_txt_flags_and_includes(tmp_path):
     assert "-lm" in out
 
 
+def test_generate_cmakelists_txt_escapes_embedded_quotes(tmp_path):
+    """A define value carrying a literal quote (reachable via the lex
+    round-trip) survives as an escaped quote, not a broken CMake string."""
+    c = _make_component(tmp_path)
+    (tmp_path / "src").mkdir()
+    (tmp_path / "src" / "a.c").write_text("")
+    c.data = {"build": {"flags": ['-DMSG=\\"hi\\"']}}
+
+    out = generate_cmakelists_txt(c)
+    assert '"-DMSG=\\"hi\\""' in out
+
+
+def test_generate_cmakelists_txt_lexes_spaced_flags(tmp_path):
+    """A spaced -I entry routes to include dirs instead of landing verbatim
+    in compile options; same shared lexer as the espidf emitter."""
+    c = _make_component(tmp_path)
+    (tmp_path / "src").mkdir()
+    (tmp_path / "src" / "a.c").write_text("")
+    (tmp_path / "include").mkdir()
+    c.data = {"build": {"flags": "-I include -DBAR=1"}}
+
+    out = generate_cmakelists_txt(c)
+
+    assert str((tmp_path / "include").resolve()).replace("\\", "\\\\") in out
+    assert "-DBAR=1" in out
+    assert "-I include" not in out
+
+
 def test_generate_zephyr_modules_collects_all_dirs_and_writes(tmp_path, monkeypatch):
     # Two converted libraries: one top-level, one transitive dependency. The
     # converter calls backend.emit for both; generate_zephyr_modules must return

From 2b11fbe1646055feb49e275bb3021ffcc9bf0464 Mon Sep 17 00:00:00 2001
From: rwrozelle <rwrozelle@gmail.com>
Date: Sun, 23 Aug 2026 23:50:19 -0400
Subject: [PATCH 142/155] [preferences] modify IntervalSyncer to be a
 PollingComponent (#14370)

Co-authored-by: J. Nick Koston <nick@home-assistant.io>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 esphome/components/preferences/__init__.py    |   7 +-
 esphome/components/preferences/syncer.h       |  21 +--
 esphome/core/defines.h                        |   1 -
 .../preferences/test.esp32-idf.yaml           |   7 +
 .../host_preferences_suspend_resume.yaml      |  41 ++++++
 .../test_host_preferences_suspend_resume.py   | 137 ++++++++++++++++++
 6 files changed, 194 insertions(+), 20 deletions(-)
 create mode 100644 tests/integration/fixtures/host_preferences_suspend_resume.yaml
 create mode 100644 tests/integration/test_host_preferences_suspend_resume.py

diff --git a/esphome/components/preferences/__init__.py b/esphome/components/preferences/__init__.py
index c92903ec2e..abd050ec3b 100644
--- a/esphome/components/preferences/__init__.py
+++ b/esphome/components/preferences/__init__.py
@@ -9,7 +9,7 @@ from esphome.types import ConfigType
 CODEOWNERS = ["@esphome/core"]
 
 preferences_ns = cg.esphome_ns.namespace("preferences")
-IntervalSyncer = preferences_ns.class_("IntervalSyncer", cg.Component)
+IntervalSyncer = preferences_ns.class_("IntervalSyncer", cg.PollingComponent)
 
 CONF_FLASH_WRITE_INTERVAL = "flash_write_interval"
 CONF_RTC_STORAGE = "rtc_storage"
@@ -31,10 +31,7 @@ CONFIG_SCHEMA = cv.Schema(
 async def to_code(config: ConfigType) -> None:
     var = cg.new_Pvariable(config[CONF_ID])
     write_interval = config[CONF_FLASH_WRITE_INTERVAL]
-    if write_interval.total_milliseconds == 0:
-        cg.add_define("USE_PREFERENCES_SYNC_EVERY_LOOP")
-    else:
-        cg.add(var.set_write_interval(write_interval))
+    cg.add(var.set_update_interval(write_interval))
     if config.get(CONF_RTC_STORAGE):
         preferences.request_rtc_storage()
     await cg.register_component(var, config)
diff --git a/esphome/components/preferences/syncer.h b/esphome/components/preferences/syncer.h
index cee02394b4..8a809672db 100644
--- a/esphome/components/preferences/syncer.h
+++ b/esphome/components/preferences/syncer.h
@@ -2,26 +2,19 @@
 
 #include "esphome/core/preferences.h"
 #include "esphome/core/component.h"
+// Include for ESPDEPRECATED, Remove before 2027.3.0
+#include "esphome/core/helpers.h"
 
 namespace esphome::preferences {
 
-class IntervalSyncer final : public Component {
+class IntervalSyncer final : public PollingComponent {
  public:
-#ifdef USE_PREFERENCES_SYNC_EVERY_LOOP
-  void loop() override { global_preferences->sync(); }
-#else
-  void set_write_interval(uint32_t write_interval) { this->write_interval_ = write_interval; }
-  void setup() override {
-    this->set_interval(this->write_interval_, []() { global_preferences->sync(); });
-  }
-#endif
+  // Remove before 2027.3.0
+  ESPDEPRECATED("Use set_update_interval() instead. Removed in 2027.3.0", "2026.9.0")
+  void set_write_interval(uint32_t write_interval) { this->set_update_interval(write_interval); }
+  void update() override { global_preferences->sync(); }
   void on_shutdown() override { global_preferences->sync(); }
   float get_setup_priority() const override { return setup_priority::BUS; }
-
-#ifndef USE_PREFERENCES_SYNC_EVERY_LOOP
- protected:
-  uint32_t write_interval_{60000};
-#endif
 };
 
 }  // namespace esphome::preferences
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 42da0191ed..a8aab65d4a 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -160,7 +160,6 @@
 #define USE_OUTPUT
 #define USE_OUTPUT_FLOAT_POWER_SCALING
 #define USE_POWER_SUPPLY
-#define USE_PREFERENCES_SYNC_EVERY_LOOP
 // Only defined by key-lookup preference backends; the slot-based platforms
 // (esp8266, rp2040) never set it in generated builds, and their preferences
 // managers do not provide load_from_key(), so the PreferencesKeyLookupContract
diff --git a/tests/components/preferences/test.esp32-idf.yaml b/tests/components/preferences/test.esp32-idf.yaml
index 4c7c176fdc..f0ea0f5898 100644
--- a/tests/components/preferences/test.esp32-idf.yaml
+++ b/tests/components/preferences/test.esp32-idf.yaml
@@ -1,2 +1,9 @@
 preferences:
+  id: prefs_syncer
   flash_write_interval: 20s
+
+esphome:
+  on_boot:
+    then:
+      - component.suspend: prefs_syncer
+      - component.resume: prefs_syncer
diff --git a/tests/integration/fixtures/host_preferences_suspend_resume.yaml b/tests/integration/fixtures/host_preferences_suspend_resume.yaml
new file mode 100644
index 0000000000..b32b9a1571
--- /dev/null
+++ b/tests/integration/fixtures/host_preferences_suspend_resume.yaml
@@ -0,0 +1,41 @@
+esphome:
+  name: test_suspend_resume_device
+
+host:
+
+logger:
+  level: DEBUG
+
+api:
+
+preferences:
+  id: prefs_syncer
+  flash_write_interval: 1s
+
+button:
+  - platform: template
+    name: "Save Preference"
+    on_press:
+      - lambda: |-
+          // save() only updates the in-memory map; only sync() persists it to disk.
+          ESPPreferenceObject pref = global_preferences->make_preference<uint32_t>(0xBEEF);
+          uint32_t value = 123;
+          if (pref.save(&value)) {
+            ESP_LOGI("test", "Preference saved in memory");
+          } else {
+            ESP_LOGE("test", "Preference save failed");
+          }
+
+  - platform: template
+    name: "Suspend Syncer"
+    on_press:
+      - component.suspend: prefs_syncer
+      - lambda: |-
+          ESP_LOGI("test", "Syncer suspended");
+
+  - platform: template
+    name: "Resume Syncer"
+    on_press:
+      - component.resume: prefs_syncer
+      - lambda: |-
+          ESP_LOGI("test", "Syncer resumed");
diff --git a/tests/integration/test_host_preferences_suspend_resume.py b/tests/integration/test_host_preferences_suspend_resume.py
new file mode 100644
index 0000000000..ab08d5c440
--- /dev/null
+++ b/tests/integration/test_host_preferences_suspend_resume.py
@@ -0,0 +1,137 @@
+"""Test that suspending/resuming the preferences IntervalSyncer actually stops/starts flash writes."""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Awaitable
+from pathlib import Path
+import re
+from typing import Any
+
+from aioesphomeapi import ButtonInfo, EntityInfo
+import pytest
+
+from .types import APIClientConnectedFactory, RunCompiledFunction
+
+DEVICE_NAME = "test_suspend_resume_device"
+
+
+def find_entity_by_name(
+    entities: list[EntityInfo], entity_type: type, name: str
+) -> Any:
+    """Helper to find an entity by type and name."""
+    return next(
+        (e for e in entities if isinstance(e, entity_type) and e.name == name), None
+    )
+
+
+async def _wait_for(
+    awaitable: Awaitable[Any], message: str, timeout: float = 5.0
+) -> None:
+    """Await a future or coroutine, failing the test with a clear message on timeout."""
+    try:
+        await asyncio.wait_for(awaitable, timeout=timeout)
+    except TimeoutError:
+        pytest.fail(message)
+
+
+async def _poll_until_exists(path: Path) -> None:
+    """Poll for a file to appear, rather than guessing a sleep duration."""
+    while not path.exists():
+        await asyncio.sleep(0.05)
+
+
+@pytest.fixture(autouse=True)
+def isolated_preferences(monkeypatch: pytest.MonkeyPatch, tmp_path) -> Path:
+    """Keep host preferences per-test so this test never touches the real
+    ~/.esphome/prefs and never races other tests over ESPHOME_PREFDIR."""
+    prefdir = tmp_path / "prefs"
+    monkeypatch.setenv("ESPHOME_PREFDIR", str(prefdir))
+    return prefdir / f"{DEVICE_NAME}.prefs"
+
+
+@pytest.mark.asyncio
+async def test_host_preferences_suspend_resume(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+    isolated_preferences: Path,
+) -> None:
+    """Test that a running syncer flushes, a suspended one doesn't, and resume restores flushing."""
+    pref_file = isolated_preferences
+
+    loop = asyncio.get_running_loop()
+    saved_in_memory = loop.create_future()
+    syncer_suspended = loop.create_future()
+    syncer_resumed = loop.create_future()
+
+    save_pattern = re.compile(r"Preference saved in memory")
+    suspend_pattern = re.compile(r"Syncer suspended")
+    resume_pattern = re.compile(r"Syncer resumed")
+
+    def check_output(line: str) -> None:
+        if save_pattern.search(line) and not saved_in_memory.done():
+            saved_in_memory.set_result(True)
+        if suspend_pattern.search(line) and not syncer_suspended.done():
+            syncer_suspended.set_result(True)
+        if resume_pattern.search(line) and not syncer_resumed.done():
+            syncer_resumed.set_result(True)
+
+    async with (
+        run_compiled(yaml_config, line_callback=check_output),
+        api_client_connected() as client,
+    ):
+        entities, _ = await client.list_entities_services()
+
+        save_button = find_entity_by_name(entities, ButtonInfo, "Save Preference")
+        suspend_button = find_entity_by_name(entities, ButtonInfo, "Suspend Syncer")
+        resume_button = find_entity_by_name(entities, ButtonInfo, "Resume Syncer")
+        assert save_button is not None, "Save Preference button not found"
+        assert suspend_button is not None, "Suspend Syncer button not found"
+        assert resume_button is not None, "Resume Syncer button not found"
+
+        # --- Positive control: a running syncer flushes to disk. Without this,
+        # the suspend assertion below could pass for the wrong reason (e.g. wrong prefs path). ---
+        client.button_command(save_button.key)
+        await _wait_for(
+            saved_in_memory, "Preference was not saved to memory within timeout"
+        )
+        await _wait_for(
+            _poll_until_exists(pref_file),
+            "Running syncer never flushed to disk; positive control failed",
+            timeout=10.0,
+        )
+        saved_in_memory = loop.create_future()
+
+        # --- Suspend: a suspended syncer must not flush. ---
+        client.button_command(suspend_button.key)
+        await _wait_for(
+            syncer_suspended, "Syncer suspend command was not processed within timeout"
+        )
+        # Delete only after suspend is confirmed: the poller is now stopped, so
+        # nothing can recreate the file before the negative assertion below.
+        pref_file.unlink()
+
+        client.button_command(save_button.key)
+        await _wait_for(
+            saved_in_memory, "Preference was not saved to memory within timeout"
+        )
+
+        # Wait well past flash_write_interval (1s): a running syncer would
+        # have flushed to disk by now, a suspended one must not have. This is a
+        # negative assertion (proving absence), so a fixed sleep is unavoidable here.
+        await asyncio.sleep(1.5)
+        assert not pref_file.exists(), (
+            "Suspended syncer flushed to disk; component.suspend did not stop the poller"
+        )
+
+        # --- Resume: flushing must restart. ---
+        client.button_command(resume_button.key)
+        await _wait_for(
+            syncer_resumed, "Syncer resume command was not processed within timeout"
+        )
+        await _wait_for(
+            _poll_until_exists(pref_file),
+            "Resumed syncer never flushed to disk; component.resume did not restart the poller",
+            timeout=10.0,
+        )

From 7674477dd0585c7a0cb471ff3b20bac475dda155 Mon Sep 17 00:00:00 2001
From: Bonne Eggleston <bonne@exciton.com.au>
Date: Mon, 24 Aug 2026 07:05:00 -0700
Subject: [PATCH 143/155] [modbus_controller] Brace poll-refused log to fix
 -Wempty-body warning (#18724)

---
 esphome/components/modbus_controller/modbus_controller.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/modbus_controller/modbus_controller.cpp b/esphome/components/modbus_controller/modbus_controller.cpp
index fb7010cb4e..21fe4ef45f 100644
--- a/esphome/components/modbus_controller/modbus_controller.cpp
+++ b/esphome/components/modbus_controller/modbus_controller.cpp
@@ -218,8 +218,9 @@ void ModbusController::update() {
     for (auto &cmd : this->polling_command_items_) {
       ESP_LOGVV(TAG, "Updating range 0x%X", cmd.register_address());
       // A refusal is already logged by the hub; note the affected range for controller-level diagnostics.
-      if (!cmd.send())
+      if (!cmd.send()) {
         ESP_LOGD(TAG, "Poll refused by hub for range 0x%X", cmd.register_address());
+      }
     }
   }
   this->update_counter_++;

From 5ed20805ced8d67e3b27117ab0ba231c8571b9ab Mon Sep 17 00:00:00 2001
From: n-IA-hane <49248235+n-IA-hane@users.noreply.github.com>
Date: Mon, 24 Aug 2026 17:35:59 +0200
Subject: [PATCH 144/155] [audio_http] Add persistent ring buffer option
 (#18708)

Co-authored-by: n-IA-hane <n-IA-hane@users.noreply.github.com>
---
 esphome/components/audio_http/audio_http_media_source.cpp | 4 +++-
 esphome/components/audio_http/audio_http_media_source.h   | 2 ++
 esphome/components/audio_http/media_source.py             | 4 ++++
 tests/components/audio_http/common.yaml                   | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/esphome/components/audio_http/audio_http_media_source.cpp b/esphome/components/audio_http/audio_http_media_source.cpp
index 04b7d046e6..fb8620f7d9 100644
--- a/esphome/components/audio_http/audio_http_media_source.cpp
+++ b/esphome/components/audio_http/audio_http_media_source.cpp
@@ -30,8 +30,9 @@ void AudioHTTPMediaSource::dump_config() {
   ESP_LOGCONFIG(TAG,
                 "Audio HTTP Media Source:\n"
                 "  Buffer Size: %zu bytes\n"
+                "  Persistent Ring Buffer: %s\n"
                 "  Decoder Task Stack in PSRAM: %s",
-                this->buffer_size_, YESNO(this->decoder_task_stack_in_psram_));
+                this->buffer_size_, YESNO(this->persistent_ring_buffer_), YESNO(this->decoder_task_stack_in_psram_));
 }
 
 void AudioHTTPMediaSource::setup() {
@@ -39,6 +40,7 @@ void AudioHTTPMediaSource::setup() {
 
   micro_decoder::DecoderConfig config;
   config.ring_buffer_size = this->buffer_size_;
+  config.persistent_ring_buffer = this->persistent_ring_buffer_;
   // Keep the transfer buffer smaller than the ring buffer so the reader can top up the ring
   // while the decoder is still draining it, instead of oscillating between empty and full.
   config.transfer_buffer_size = std::min(DEFAULT_TRANSFER_BUFFER_SIZE, this->buffer_size_ / 2);
diff --git a/esphome/components/audio_http/audio_http_media_source.h b/esphome/components/audio_http/audio_http_media_source.h
index f794aa1f02..a97025e53e 100644
--- a/esphome/components/audio_http/audio_http_media_source.h
+++ b/esphome/components/audio_http/audio_http_media_source.h
@@ -33,6 +33,7 @@ class AudioHTTPMediaSource final : public Component,
 
   void set_buffer_size(size_t buffer_size) { this->buffer_size_ = buffer_size; }
   void set_task_stack_in_psram(bool task_stack_in_psram) { this->decoder_task_stack_in_psram_ = task_stack_in_psram; }
+  void set_persistent_ring_buffer(bool persistent) { this->persistent_ring_buffer_ = persistent; }
 
   // MediaSource interface implementation
   bool play_uri(const std::string &uri) override;
@@ -54,6 +55,7 @@ class AudioHTTPMediaSource final : public Component,
   // on_audio_write(). Must be atomic to avoid a data race.
   std::atomic<bool> pause_{false};
   bool decoder_task_stack_in_psram_{false};
+  bool persistent_ring_buffer_{false};
 };
 
 }  // namespace esphome::audio_http
diff --git a/esphome/components/audio_http/media_source.py b/esphome/components/audio_http/media_source.py
index e8acbc81af..14543957e9 100644
--- a/esphome/components/audio_http/media_source.py
+++ b/esphome/components/audio_http/media_source.py
@@ -7,6 +7,8 @@ from esphome.types import ConfigType
 CODEOWNERS = ["@kahrendt"]
 AUTO_LOAD = ["audio"]
 
+CONF_PERSISTENT_RING_BUFFER = "persistent_ring_buffer"
+
 audio_http_ns = cg.esphome_ns.namespace("audio_http")
 AudioHTTPMediaSource = audio_http_ns.class_(
     "AudioHTTPMediaSource", cg.Component, media_source.MediaSource
@@ -28,6 +30,7 @@ CONFIG_SCHEMA = cv.All(
                 min=5000, max=1000000
             ),
             cv.Optional(CONF_TASK_STACK_IN_PSRAM): psram.validate_task_stack_in_psram,
+            cv.Optional(CONF_PERSISTENT_RING_BUFFER, default=False): cv.boolean,
         }
     )
     .extend(cv.COMPONENT_SCHEMA),
@@ -45,3 +48,4 @@ async def to_code(config: ConfigType) -> None:
         cg.add(var.set_task_stack_in_psram(True))
         psram.request_external_task_stack()
     cg.add(var.set_buffer_size(config[CONF_BUFFER_SIZE]))
+    cg.add(var.set_persistent_ring_buffer(config[CONF_PERSISTENT_RING_BUFFER]))
diff --git a/tests/components/audio_http/common.yaml b/tests/components/audio_http/common.yaml
index b7457165a5..7bee370c90 100644
--- a/tests/components/audio_http/common.yaml
+++ b/tests/components/audio_http/common.yaml
@@ -4,4 +4,5 @@ media_source:
   - platform: audio_http
     id: audio_http_source
     buffer_size: 100000
+    persistent_ring_buffer: true
     task_stack_in_psram: true

From b11a34af5cf81c0ca227b2be71908773a9433e0a Mon Sep 17 00:00:00 2001
From: Boris Krivonog <boris.krivonog@inova.si>
Date: Mon, 24 Aug 2026 17:51:09 +0200
Subject: [PATCH 145/155] [mitsubishi_cn105] Defer status requests after
 responses (#18227)

---
 .../mitsubishi_cn105/mitsubishi_cn105.cpp     | 37 ++++++++----
 .../mitsubishi_cn105/mitsubishi_cn105.h       |  1 +
 .../mitsubishi_cn105_climate_tests.cpp        | 11 ++--
 .../climate/mitsubishi_cn105_tests.cpp        | 60 +++++++++++++++++--
 4 files changed, 88 insertions(+), 21 deletions(-)

diff --git a/esphome/components/mitsubishi_cn105/mitsubishi_cn105.cpp b/esphome/components/mitsubishi_cn105/mitsubishi_cn105.cpp
index 6683a9a25b..3d30d1a25f 100644
--- a/esphome/components/mitsubishi_cn105/mitsubishi_cn105.cpp
+++ b/esphome/components/mitsubishi_cn105/mitsubishi_cn105.cpp
@@ -49,6 +49,13 @@ void MitsubishiCN105::initialize() { this->set_state_(State::CONNECTING); }
 
 bool MitsubishiCN105::update() {
   switch (this->state_) {
+    case State::DEFERRED_STATUS_REQUEST:
+      // Defer the next request to a later loop iteration; some units might not respond if a request is sent
+      // immediately after a response. See https://github.com/esphome/esphome/issues/18099. No minimum RX-to-TX delay
+      // is enforced.
+      this->set_state_(State::UPDATING_STATUS);
+      return false;
+
     case State::WAITING_FOR_SCHEDULED_STATUS_UPDATE:
       if (this->pending_updates_.any()) {
         this->status_update_wait_credit_ms_ =
@@ -101,12 +108,14 @@ bool MitsubishiCN105::should_transition(State from, State to) {
       return from == State::CONNECTING;
 
     case State::UPDATING_STATUS:
-      return from == State::CONNECTED || from == State::STATUS_UPDATED ||
-             from == State::WAITING_FOR_SCHEDULED_STATUS_UPDATE;
+      return from == State::DEFERRED_STATUS_REQUEST || from == State::WAITING_FOR_SCHEDULED_STATUS_UPDATE;
 
     case State::STATUS_UPDATED:
       return from == State::UPDATING_STATUS;
 
+    case State::DEFERRED_STATUS_REQUEST:
+      return from == State::CONNECTED || from == State::STATUS_UPDATED;
+
     case State::SCHEDULE_NEXT_STATUS_UPDATE:
       return from == State::STATUS_UPDATED || from == State::SETTINGS_APPLIED;
 
@@ -114,7 +123,7 @@ bool MitsubishiCN105::should_transition(State from, State to) {
       return from == State::SCHEDULE_NEXT_STATUS_UPDATE;
 
     case State::APPLYING_SETTINGS:
-      return from == State::WAITING_FOR_SCHEDULED_STATUS_UPDATE || from == State::STATUS_UPDATED;
+      return from == State::WAITING_FOR_SCHEDULED_STATUS_UPDATE;
 
     case State::SETTINGS_APPLIED:
       return from == State::APPLYING_SETTINGS;
@@ -122,9 +131,10 @@ bool MitsubishiCN105::should_transition(State from, State to) {
     case State::READ_TIMEOUT:
       return from == State::UPDATING_STATUS || from == State::APPLYING_SETTINGS || from == State::CONNECTING;
 
-    default:
+    case State::NOT_CONNECTED:
       return false;
   }
+  return false;
 }
 
 void MitsubishiCN105::did_transition_(State to) {
@@ -135,7 +145,7 @@ void MitsubishiCN105::did_transition_(State to) {
 
     case State::CONNECTED:
       this->current_status_msg_type_ = STATUS_MSG_SETTINGS;
-      this->set_state_(State::UPDATING_STATUS);
+      this->set_state_(State::DEFERRED_STATUS_REQUEST);
       break;
 
     case State::UPDATING_STATUS:
@@ -143,11 +153,14 @@ void MitsubishiCN105::did_transition_(State to) {
       break;
 
     case State::STATUS_UPDATED: {
-      if (this->pending_updates_.any() && this->is_status_initialized()) {
-        this->set_state_(State::APPLYING_SETTINGS);
-      } else if (this->current_status_msg_type_ == STATUS_MSG_SETTINGS && this->should_request_telemetry_()) {
+      // When present, pending settings are applied from WAITING_FOR_SCHEDULED_STATUS_UPDATE during the next update(),
+      // deferring transmission to a later loop iteration; some units might not respond if a request is sent
+      // immediately after a response, causing the request to time out.
+      const bool should_apply_pending_settings = this->pending_updates_.any() && this->is_status_initialized();
+      if (!should_apply_pending_settings && this->current_status_msg_type_ == STATUS_MSG_SETTINGS &&
+          this->should_request_telemetry_()) {
         this->current_status_msg_type_ = STATUS_MSG_TELEMETRY;
-        this->set_state_(State::UPDATING_STATUS);
+        this->set_state_(State::DEFERRED_STATUS_REQUEST);
       } else {
         this->set_state_(State::SCHEDULE_NEXT_STATUS_UPDATE);
       }
@@ -175,7 +188,9 @@ void MitsubishiCN105::did_transition_(State to) {
       this->set_state_(State::CONNECTING);
       break;
 
-    default:
+    case State::NOT_CONNECTED:
+    case State::DEFERRED_STATUS_REQUEST:
+    case State::WAITING_FOR_SCHEDULED_STATUS_UPDATE:
       break;
   }
 }
@@ -359,6 +374,8 @@ const LogString *MitsubishiCN105::state_to_string(State state) {
       return LOG_STR("UpdatingStatus");
     case State::STATUS_UPDATED:
       return LOG_STR("StatusUpdated");
+    case State::DEFERRED_STATUS_REQUEST:
+      return LOG_STR("DeferredStatusRequest");
     case State::SCHEDULE_NEXT_STATUS_UPDATE:
       return LOG_STR("ScheduleNextStatusUpdate");
     case State::WAITING_FOR_SCHEDULED_STATUS_UPDATE:
diff --git a/esphome/components/mitsubishi_cn105/mitsubishi_cn105.h b/esphome/components/mitsubishi_cn105/mitsubishi_cn105.h
index 4d3f899dee..0fee90dfc1 100644
--- a/esphome/components/mitsubishi_cn105/mitsubishi_cn105.h
+++ b/esphome/components/mitsubishi_cn105/mitsubishi_cn105.h
@@ -101,6 +101,7 @@ class MitsubishiCN105 {
     CONNECTED,
     UPDATING_STATUS,
     STATUS_UPDATED,
+    DEFERRED_STATUS_REQUEST,
     SCHEDULE_NEXT_STATUS_UPDATE,
     WAITING_FOR_SCHEDULED_STATUS_UPDATE,
     APPLYING_SETTINGS,
diff --git a/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp b/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp
index 669345f576..10d935a775 100644
--- a/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp
+++ b/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_climate_tests.cpp
@@ -15,11 +15,10 @@ struct MitsubishiCN105ClimateTestContext {
 
 TEST(MitsubishiCN105ClimateTests, CelsiusTemperatureMappingAndTraitsMatchExpectedValues) {
   MitsubishiCN105ClimateTestContext context;
-  const auto mapping = TemperatureMapping();
 
   for (int temperature = 16; temperature <= 31; ++temperature) {
-    EXPECT_EQ(mapping.to_mitsubishi(temperature), temperature);
-    EXPECT_EQ(mapping.from_mitsubishi(temperature), temperature);
+    EXPECT_EQ(context.component.get_temperature_mapping().to_mitsubishi(temperature), temperature);
+    EXPECT_EQ(context.component.get_temperature_mapping().from_mitsubishi(temperature), temperature);
   }
 
   const auto traits = context.sut.traits();
@@ -32,8 +31,6 @@ TEST(MitsubishiCN105ClimateTests, CelsiusTemperatureMappingAndTraitsMatchExpecte
 
 TEST(MitsubishiCN105ClimateTests, FahrenheitTemperatureMappingAndTraitsMatchExpectedValues) {
   MitsubishiCN105ClimateTestContext context;
-  auto mapping = TemperatureMapping();
-  mapping.set_use_fahrenheit(true);
   context.component.set_use_fahrenheit(true);
 
   const std::array cases{
@@ -46,8 +43,8 @@ TEST(MitsubishiCN105ClimateTests, FahrenheitTemperatureMappingAndTraitsMatchExpe
   };
 
   for (const auto &[fahrenheit, mitsubishi_celsius] : cases) {
-    EXPECT_FLOAT_EQ(mapping.to_mitsubishi(fahrenheit), mitsubishi_celsius);
-    EXPECT_FLOAT_EQ(mapping.from_mitsubishi(mitsubishi_celsius), fahrenheit);
+    EXPECT_FLOAT_EQ(context.component.get_temperature_mapping().to_mitsubishi(fahrenheit), mitsubishi_celsius);
+    EXPECT_FLOAT_EQ(context.component.get_temperature_mapping().from_mitsubishi(mitsubishi_celsius), fahrenheit);
   }
   const auto traits = context.sut.traits();
   EXPECT_EQ(traits.get_temperature_unit(), TemperatureUnit::FAHRENHEIT);
diff --git a/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_tests.cpp b/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_tests.cpp
index 3bc6d5b2b8..fcd09bb18e 100644
--- a/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_tests.cpp
+++ b/tests/components/mitsubishi_cn105/climate/mitsubishi_cn105_tests.cpp
@@ -42,11 +42,17 @@ TEST(MitsubishiCN105Tests, ConnectAndUpdateStatus) {
 
   // All bytes from UART should be consumed
   EXPECT_TRUE(ctx.uart.rx.empty());
-  // After successful connect we request status, first settings (0x02)
+  // Defer the first settings request (0x02) until the next update.
+  EXPECT_EQ(ctx.sut.state_, TestableMitsubishiCN105::State::DEFERRED_STATUS_REQUEST);
+  EXPECT_TRUE(ctx.uart.tx.empty());
+
+  ctx.sut.set_current_time(201);
+  ASSERT_FALSE(ctx.sut.update());
+
   EXPECT_EQ(ctx.sut.state_, TestableMitsubishiCN105::State::UPDATING_STATUS);
   EXPECT_THAT(ctx.uart.tx, ::testing::ElementsAre(0xFC, 0x42, 0x01, 0x30, 0x10, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7B));
-  EXPECT_EQ(ctx.sut.operation_start_ms_, 200);
+  EXPECT_EQ(ctx.sut.operation_start_ms_, 201);
 
   // Clear TX bytes.
   ctx.uart.tx.clear();
@@ -75,15 +81,24 @@ TEST(MitsubishiCN105Tests, ConnectAndUpdateStatus) {
   EXPECT_EQ(ctx.sut.status().vane_mode, MitsubishiCN105::VaneMode::POSITION_4);
   EXPECT_EQ(ctx.sut.status().wide_vane_mode, MitsubishiCN105::WideVaneMode::SWING);
 
-  // Now fetch telemetry (0x03)
+  // Defer the telemetry request (0x03) until the next update.
+  EXPECT_EQ(ctx.sut.state_, TestableMitsubishiCN105::State::DEFERRED_STATUS_REQUEST);
+  EXPECT_TRUE(ctx.uart.tx.empty());
+
+  ctx.sut.set_current_time(301);
+  ASSERT_FALSE(ctx.sut.update());
+
   EXPECT_EQ(ctx.sut.state_, TestableMitsubishiCN105::State::UPDATING_STATUS);
   EXPECT_THAT(ctx.uart.tx, ::testing::ElementsAre(0xFC, 0x42, 0x01, 0x30, 0x10, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7A));
-  EXPECT_EQ(ctx.sut.operation_start_ms_, 300);
+  EXPECT_EQ(ctx.sut.operation_start_ms_, 301);
 
   // Clear TX bytes.
   ctx.uart.tx.clear();
 
+  // Queue a setting while waiting for telemetry.
+  ctx.sut.set_power(true);
+
   // Telemetry response
   ctx.uart.push_rx({0xFC, 0x62, 0x01, 0x30, 0x10, 0x03, 0x00, 0x00, 0x0B, 0x00, 0x00,
                     0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5});
@@ -103,6 +118,13 @@ TEST(MitsubishiCN105Tests, ConnectAndUpdateStatus) {
   EXPECT_TRUE(ctx.uart.tx.empty());
   EXPECT_EQ(ctx.sut.state_, TestableMitsubishiCN105::State::WAITING_FOR_SCHEDULED_STATUS_UPDATE);
   EXPECT_EQ(ctx.sut.operation_start_ms_, 400);
+
+  // Apply the pending setting on the next update, outside RX processing.
+  ctx.sut.set_current_time(401);
+  ASSERT_FALSE(ctx.sut.update());
+  EXPECT_EQ(ctx.sut.state_, TestableMitsubishiCN105::State::APPLYING_SETTINGS);
+  EXPECT_FALSE(ctx.uart.tx.empty());
+  EXPECT_EQ(ctx.sut.operation_start_ms_, 401);
 }
 
 TEST(MitsubishiCN105Tests, NoResponseTriggersReconnect) {
@@ -469,6 +491,36 @@ TEST(MitsubishiCN105Tests, WriteInterruptsWaitingForNextStatusUpdate) {
   EXPECT_EQ(ctx.sut.status_update_wait_credit_ms_, 0);
 }
 
+TEST(MitsubishiCN105Tests, PendingSettingsTakePriorityOverDueTelemetry) {
+  MitsubishiCN105TestsContext ctx;
+
+  ctx.sut.status_.target_temperature = 24.0f;
+  ctx.sut.status_.room_temperature = 21.0f;
+  ASSERT_TRUE(ctx.sut.is_status_initialized());
+
+  ctx.sut.state_ = TestableMitsubishiCN105::State::STATUS_UPDATED;
+  ctx.sut.set_state(TestableMitsubishiCN105::State::SCHEDULE_NEXT_STATUS_UPDATE);
+  ctx.sut.set_current_time(1000);
+  ASSERT_FALSE(ctx.sut.update());
+  ASSERT_EQ(ctx.sut.state_, TestableMitsubishiCN105::State::UPDATING_STATUS);
+  ctx.uart.tx.clear();
+
+  ctx.sut.set_power(true);
+  ctx.uart.push_rx({0xFC, 0x62, 0x01, 0x30, 0x10, 0x02, 0x00, 0x00, 0x00, 0x08, 0x07,
+                    0x00, 0x04, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C});
+
+  ctx.sut.set_current_time(1001);
+  ASSERT_TRUE(ctx.sut.update());
+  EXPECT_TRUE(ctx.uart.tx.empty());
+  EXPECT_EQ(ctx.sut.state_, TestableMitsubishiCN105::State::WAITING_FOR_SCHEDULED_STATUS_UPDATE);
+
+  ctx.sut.set_current_time(1002);
+  ASSERT_FALSE(ctx.sut.update());
+  EXPECT_EQ(ctx.sut.state_, TestableMitsubishiCN105::State::APPLYING_SETTINGS);
+  EXPECT_THAT(ctx.uart.tx, ::testing::ElementsAre(0xFC, 0x41, 0x01, 0x30, 0x10, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00,
+                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7B));
+}
+
 TEST(MitsubishiCN105Tests, SetAndClearRemoteRoomTemp) {
   MitsubishiCN105TestsContext ctx;
 

From b8408e14b9c5bdd90e167d6b1a3bf129ac502798 Mon Sep 17 00:00:00 2001
From: Gafielt <57099610+Gafielt@users.noreply.github.com>
Date: Mon, 24 Aug 2026 18:36:23 +0200
Subject: [PATCH 146/155] [uart] Delete ESP32 UART driver on shutdown to keep
 ROM output off the bus (#18684)

Co-authored-by: J. Nick Koston <nick@home-assistant.io>
---
 esphome/components/uart/uart_component_esp_idf.cpp | 11 +++++++++++
 esphome/components/uart/uart_component_esp_idf.h   |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/esphome/components/uart/uart_component_esp_idf.cpp b/esphome/components/uart/uart_component_esp_idf.cpp
index a61339feb4..bbeb86bcdb 100644
--- a/esphome/components/uart/uart_component_esp_idf.cpp
+++ b/esphome/components/uart/uart_component_esp_idf.cpp
@@ -393,5 +393,16 @@ void IRAM_ATTR IDFUARTComponent::uart_rx_isr_callback(uart_port_t uart_num, uart
 }
 #endif  // USE_UART_WAKE_LOOP_ON_RX
 
+void IDFUARTComponent::on_shutdown() {
+  if (this->uart_num_ == UART_NUM_MAX || !uart_is_driver_installed(this->uart_num_))
+    return;
+  uart_wait_tx_done(this->uart_num_, pdMS_TO_TICKS(100));
+  // Keep the peripheral quiet across a soft reset so ROM output does not reach the attached device (#15472)
+  esp_err_t err = uart_driver_delete(this->uart_num_);
+  if (err != ESP_OK) {
+    ESP_LOGW(TAG, "uart_driver_delete failed: %s", esp_err_to_name(err));
+  }
+}
+
 }  // namespace esphome::uart
 #endif  // USE_ESP32
diff --git a/esphome/components/uart/uart_component_esp_idf.h b/esphome/components/uart/uart_component_esp_idf.h
index 649dd3aa46..a761d80f04 100644
--- a/esphome/components/uart/uart_component_esp_idf.h
+++ b/esphome/components/uart/uart_component_esp_idf.h
@@ -52,9 +52,11 @@ class IDFUARTComponent final : public UARTComponent, public Component {
   void load_settings(bool dump_config) override;
   using UARTComponent::load_settings;  // also bring in the no-arg overload for convenience
 
+  void on_shutdown() override;
+
  protected:
   void check_logger_conflict() override;
-  uart_port_t uart_num_;
+  uart_port_t uart_num_{UART_NUM_MAX};
   uart_config_t get_config_();
 
   bool has_peek_{false};

From 49fc4be861cf4fdbf946489c5e96fd1373b891ad Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 24 Aug 2026 12:18:17 -0500
Subject: [PATCH 147/155] [ci] Run C++ unit tests when a component's Python or
 test override changes (#18706)

---
 script/build_helpers.py             |  9 +--
 script/determine-jobs.py            | 14 +++--
 script/helpers.py                   | 70 +++++++++++++++--------
 script/list-components.py           | 13 ++---
 tests/script/test_determine_jobs.py | 50 ++++++++++++++++
 tests/script/test_helpers.py        | 89 +++++++++++++++++++++++++++++
 6 files changed, 202 insertions(+), 43 deletions(-)

diff --git a/script/build_helpers.py b/script/build_helpers.py
index 50830c221e..b4b25924c3 100644
--- a/script/build_helpers.py
+++ b/script/build_helpers.py
@@ -10,7 +10,7 @@ from pathlib import Path
 import subprocess
 import sys
 
-from helpers import get_all_dependencies, root_path as _root_path
+from helpers import get_all_dependencies, has_cpp_unit_tests, root_path as _root_path
 import yaml
 
 # Ensure the repo root is on sys.path so that ``tests.testing_helpers`` and
@@ -131,14 +131,11 @@ def filter_components_with_files(components: list[str], tests_dir: Path) -> list
     """
     filtered_components: list[str] = []
     for component in components:
-        test_dir = tests_dir / component
-        if test_dir.is_dir() and (
-            any(test_dir.glob("*.cpp")) or any(test_dir.glob("*.h"))
-        ):
+        if has_cpp_unit_tests(component, tests_dir):
             filtered_components.append(component)
         else:
             print(
-                f"WARNING: No files found for component '{component}' in {test_dir}, skipping.",
+                f"WARNING: No files found for component '{component}' in {tests_dir / component}, skipping.",
                 file=sys.stderr,
             )
     return filtered_components
diff --git a/script/determine-jobs.py b/script/determine-jobs.py
index 3e11deeb9a..2bdf7807a9 100755
--- a/script/determine-jobs.py
+++ b/script/determine-jobs.py
@@ -66,7 +66,6 @@ from helpers import (
     base_python_changed,
     changed_files,
     core_changed,
-    filter_component_and_test_cpp_files,
     filter_component_and_test_files,
     get_changed_components,
     get_component_from_path,
@@ -628,12 +627,17 @@ def determine_cpp_unit_tests(
 
     C++ unit tests will run when any of the following conditions are met:
 
-    1. Any C++ core source files changed (esphome/core/*), in which case
+    1. Any core C++ or Python files changed (esphome/core/*), in which case
        all cpp unit tests run.
     2. A test file for a component changed, which triggers tests for that
        component.
     3. The code for a component changed, which triggers tests for that
-       component and all components that depend on it.
+       component and all components that depend on it. Python files count
+       too: a component's Python decides which sources and defines go into
+       the host test build, so a Python-only change can break the link.
+
+    Components without C++ test sources are dropped from the list, so the
+    job is only scheduled when there is something to build.
 
     Args:
         branch: Branch to compare against. If None, uses default.
@@ -647,9 +651,7 @@ def determine_cpp_unit_tests(
     if core_changed(files):
         return (True, [])
 
-    # Filter to only C++ files
-    cpp_files = list(filter(filter_component_and_test_cpp_files, files))
-    return (False, get_cpp_changed_components(cpp_files))
+    return (False, get_cpp_changed_components(files))
 
 
 # Paths within tests/benchmarks/ that contain component benchmark files
diff --git a/script/helpers.py b/script/helpers.py
index 8132ee49e5..9e3969e5ce 100644
--- a/script/helpers.py
+++ b/script/helpers.py
@@ -1150,17 +1150,41 @@ def filter_component_and_test_files(file_path: str) -> bool:
     )
 
 
-def filter_component_and_test_cpp_files(file_path: str) -> bool:
-    """Check if a file is a C++ source file in component or test directories.
+def filter_cpp_unit_test_files(file_path: str) -> bool:
+    """Check if a file can affect a component's C++ unit test build.
+
+    Besides C++ sources, a component's Python code (defines, source file
+    filters, libraries) and the ``__init__.py`` manifest overrides under
+    ``tests/components/<component>/`` decide what the host test binary
+    compiles and links. Other Python files under ``tests/components/``
+    (pytest conftest.py, fixtures) do not.
 
     Args:
         file_path: Path to check
 
     Returns:
-        True if the file is a C++ source/header file in component or test directories
+        True if the file is a C++ or Python file in a component directory, or
+        a C++ file or ``__init__.py`` in a component test directory
     """
-    return file_path.endswith(CPP_FILE_EXTENSIONS) and file_path.startswith(
-        COMPONENT_AND_TESTS_PATHS
+    if file_path.startswith(ESPHOME_COMPONENTS_PATH):
+        return file_path.endswith(CPP_AND_PYTHON_FILE_EXTENSIONS)
+    if file_path.startswith(ESPHOME_TESTS_COMPONENTS_PATH):
+        return file_path.endswith(CPP_FILE_EXTENSIONS) or file_path.endswith(
+            "/__init__.py"
+        )
+    return False
+
+
+def has_cpp_unit_tests(component: str, tests_dir: Path) -> bool:
+    """Check if a component has C++ test or benchmark sources in ``tests_dir``.
+
+    Shared by CI job selection and the build itself
+    (``build_helpers.filter_components_with_files``) so both agree on
+    which components have something to build.
+    """
+    component_dir = tests_dir / component
+    return component_dir.is_dir() and (
+        any(component_dir.glob("*.cpp")) or any(component_dir.glob("*.h"))
     )
 
 
@@ -1486,41 +1510,41 @@ def base_python_changed(files: list[str]) -> bool:
 
 
 def get_cpp_changed_components(files: list[str]) -> list[str]:
-    """Get components that have changed C++ files or tests.
+    """Get components whose C++ unit tests are affected by changed files.
 
     This function analyzes a list of changed files and determines which components
     are affected. It handles two scenarios:
 
-    1. Test files changed (tests/components/<component>/*.cpp):
+    1. Test files changed (tests/components/<component>/*.cpp or __init__.py):
        - Adds the component to the affected list
        - Only that component needs to be tested
 
-    2. Component C++ files changed (esphome/components/<component>/*):
+    2. Component files changed (esphome/components/<component>/*.cpp or *.py):
        - Adds the component to the affected list
        - Also adds all components that depend on this component (recursively)
        - This ensures that changes propagate to dependent components
 
+    Python files count because a component's Python code decides which
+    sources and defines end up in the host test build. Components without
+    C++ test sources are dropped so CI does not schedule the job for nothing.
+
     Args:
-        files: List of file paths to analyze (should be C++ files)
+        files: List of changed file paths; irrelevant ones are ignored
 
     Returns:
         Sorted list of component names that need C++ unit tests run
     """
     components_graph = create_components_graph()
+    tests_dir = Path(root_path) / ESPHOME_TESTS_COMPONENTS_PATH
     affected: set[str] = set()
     for file in files:
-        if not file.endswith(CPP_FILE_EXTENSIONS):
+        if not filter_cpp_unit_test_files(file):
             continue
-        if file.startswith(ESPHOME_TESTS_COMPONENTS_PATH):
-            parts = file.split("/")
-            if len(parts) >= 4:
-                component_dir = Path(ESPHOME_TESTS_COMPONENTS_PATH) / parts[2]
-                if component_dir.is_dir():
-                    affected.add(parts[2])
-        elif file.startswith(ESPHOME_COMPONENTS_PATH):
-            parts = file.split("/")
-            if len(parts) >= 4:
-                component = parts[2]
-                affected.update(find_children_of_component(components_graph, component))
-                affected.add(component)
-    return sorted(affected)
+        parts = file.split("/")
+        if len(parts) < 4:
+            continue
+        component = parts[2]
+        affected.add(component)
+        if file.startswith(ESPHOME_COMPONENTS_PATH):
+            affected.update(find_children_of_component(components_graph, component))
+    return sorted(c for c in affected if has_cpp_unit_tests(c, tests_dir))
diff --git a/script/list-components.py b/script/list-components.py
index 31a1609f88..45efccb133 100755
--- a/script/list-components.py
+++ b/script/list-components.py
@@ -3,7 +3,6 @@ import argparse
 
 from helpers import (
     changed_files,
-    filter_component_and_test_cpp_files,
     filter_component_and_test_files,
     get_all_component_files,
     get_components_with_dependencies,
@@ -38,7 +37,7 @@ def main():
     parser.add_argument(
         "--cpp-changed",
         action="store_true",
-        help="List components with changed C++ files",
+        help="List components whose C++ unit tests are affected by changed files",
     )
     args = parser.parse_args()
 
@@ -78,9 +77,9 @@ def main():
         #   Returns: Components with code changes + their dependencies (not infrastructure)
         #   Reason: CI needs to test changed components and their dependents
         #
-        # - --cpp-changed: Used by CI to determine if any C++ files changed (script/determine-jobs.py)
-        #   Returns: Only components with changed C++ files
-        #   Reason: Only components with C++ changes need C++ testing
+        # - --cpp-changed: Mirrors the C++ unit test selection in script/determine-jobs.py
+        #   Returns: Components with changed C++ or Python files (plus dependents)
+        #   Reason: Python decides which sources and defines go into the host test build
 
         base_test_changed = any(
             "tests/test_build_components" in file for file in changed
@@ -115,9 +114,7 @@ def main():
         for c in get_components_with_dependencies(files, False):
             print(c)
     elif args.cpp_changed:
-        # Only look at changed cpp files
-        files = list(filter(filter_component_and_test_cpp_files, changed))
-        for c in get_cpp_changed_components(files):
+        for c in get_cpp_changed_components(changed):
             print(c)
     else:
         # Return all changed components (with dependencies) - default behavior
diff --git a/tests/script/test_determine_jobs.py b/tests/script/test_determine_jobs.py
index b42c33de96..565f8c563f 100644
--- a/tests/script/test_determine_jobs.py
+++ b/tests/script/test_determine_jobs.py
@@ -1214,6 +1214,56 @@ def test_count_changed_cpp_files_with_branch() -> None:
         mock_changed.assert_called_once_with("release")
 
 
+@pytest.mark.parametrize(
+    ("changed_files", "expected"),
+    [
+        # Core C++ change runs everything
+        (["esphome/core/helpers.cpp"], (True, [])),
+        # Core Python change runs everything too
+        (["esphome/core/config.py"], (True, [])),
+        # Component C++ change: component plus dependents with C++ tests
+        (["esphome/components/time/posix_tz.cpp"], (False, ["sntp", "time"])),
+        # Component Python change shapes the host build (defines, source
+        # filters), so it must trigger the same tests as a C++ change
+        (["esphome/components/time/__init__.py"], (False, ["sntp", "time"])),
+        # Nothing to build when no selected component has C++ tests
+        (["esphome/components/homeassistant/__init__.py"], (False, [])),
+        # Test manifest override changes only that component
+        (["tests/components/time/__init__.py"], (False, ["time"])),
+        # Test source change only that component
+        (["tests/components/time/posix_tz.cpp"], (False, ["time"])),
+        # pytest files and YAML build tests do not affect the test binary
+        (["tests/components/socket/conftest.py"], (False, [])),
+        (["tests/components/time/test.esp32-idf.yaml"], (False, [])),
+        (["README.md", "script/helpers.py"], (False, [])),
+        ([], (False, [])),
+    ],
+)
+def test_determine_cpp_unit_tests(
+    changed_files: list[str],
+    expected: tuple[bool, list[str]],
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test which C++ unit tests a set of changed files selects."""
+    tests_dir = tmp_path / "tests" / "components"
+    for component in ("time", "sntp"):
+        (tests_dir / component).mkdir(parents=True)
+        (tests_dir / component / f"{component}.cpp").write_text("")
+    (tests_dir / "homeassistant").mkdir()
+    (tests_dir / "socket").mkdir()
+    monkeypatch.setattr(helpers, "root_path", str(tmp_path))
+    with (
+        patch.object(determine_jobs, "changed_files", return_value=changed_files),
+        patch.object(
+            helpers,
+            "create_components_graph",
+            return_value={"time": ["homeassistant", "sntp"]},
+        ),
+    ):
+        assert determine_jobs.determine_cpp_unit_tests() == expected
+
+
 def test_main_filters_components_without_tests(
     mock_determine_integration_tests: Mock,
     mock_should_run_clang_tidy: Mock,
diff --git a/tests/script/test_helpers.py b/tests/script/test_helpers.py
index 2c3ae95655..38b8c57368 100644
--- a/tests/script/test_helpers.py
+++ b/tests/script/test_helpers.py
@@ -2031,3 +2031,92 @@ def test_get_changed_files_from_command_gh_failure_keeps_stderr() -> None:
         pytest.raises(Exception, match="maximum number of changed files"),
     ):
         _get_changed_files_from_command(["gh", "pr", "diff", "123", "--name-only"])
+
+
+@pytest.mark.parametrize(
+    ("file_path", "expected"),
+    [
+        ("esphome/components/time/posix_tz.cpp", True),
+        ("esphome/components/time/posix_tz.h", True),
+        ("esphome/components/time/__init__.py", True),
+        ("esphome/components/sntp/time.py", True),
+        ("tests/components/time/posix_tz.cpp", True),
+        ("tests/components/time/__init__.py", True),
+        # Platform override: tests/components/<component>/<domain>/__init__.py
+        ("tests/components/template/sensor/__init__.py", True),
+        # pytest-only files do not shape the C++ test binary
+        ("tests/components/socket/conftest.py", False),
+        ("tests/components/socket/test_socket.py", False),
+        ("tests/components/time/test.esp32-idf.yaml", False),
+        ("esphome/core/time.cpp", False),
+        ("esphome/config.py", False),
+        ("script/helpers.py", False),
+        ("README.md", False),
+    ],
+)
+def test_filter_cpp_unit_test_files(file_path: str, expected: bool) -> None:
+    """Test which changed files can affect a component's C++ unit test build."""
+    assert helpers.filter_cpp_unit_test_files(file_path) is expected
+
+
+@pytest.fixture
+def cpp_unit_test_tree(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Path:
+    """Fake repo root where time, sntp and api have C++ unit tests.
+
+    homeassistant depends on time but has no C++ tests, so it must be
+    dropped from the selection; socket has only pytest files.
+    """
+    tests_dir = tmp_path / "tests" / "components"
+    for component in ("time", "sntp", "api"):
+        (tests_dir / component).mkdir(parents=True)
+        (tests_dir / component / f"{component}.cpp").write_text("")
+    (tests_dir / "homeassistant").mkdir()
+    (tests_dir / "homeassistant" / "__init__.py").write_text("")
+    (tests_dir / "socket").mkdir()
+    (tests_dir / "socket" / "conftest.py").write_text("")
+    monkeypatch.setattr(helpers, "root_path", str(tmp_path))
+    monkeypatch.setattr(
+        helpers,
+        "create_components_graph",
+        lambda: {"time": ["homeassistant", "sntp"]},
+    )
+    return tmp_path
+
+
+@pytest.mark.parametrize(
+    ("files", "expected"),
+    [
+        # Component changes expand to dependents with C++ tests
+        (["esphome/components/time/posix_tz.cpp"], ["sntp", "time"]),
+        (["esphome/components/time/__init__.py"], ["sntp", "time"]),
+        # Dependent without C++ tests is dropped
+        (["esphome/components/homeassistant/__init__.py"], []),
+        # Test changes select only that component
+        (["tests/components/time/posix_tz.cpp"], ["time"]),
+        (["tests/components/time/__init__.py"], ["time"]),
+        (["tests/components/homeassistant/__init__.py"], []),
+        (["tests/components/socket/conftest.py"], []),
+        (["tests/components/time/test.esp32-idf.yaml"], []),
+        (
+            ["esphome/components/time/__init__.py", "tests/components/api/api.cpp"],
+            ["api", "sntp", "time"],
+        ),
+        ([], []),
+    ],
+)
+@pytest.mark.usefixtures("cpp_unit_test_tree")
+def test_get_cpp_changed_components(files: list[str], expected: list[str]) -> None:
+    """Test that C++ and Python component changes select the right unit tests."""
+    assert helpers.get_cpp_changed_components(files) == expected
+
+
+def test_get_cpp_changed_components_independent_of_cwd(
+    cpp_unit_test_tree: Path,
+    tmp_path_factory: pytest.TempPathFactory,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test directories resolve against root_path, not the current directory."""
+    monkeypatch.chdir(tmp_path_factory.mktemp("elsewhere"))
+    assert helpers.get_cpp_changed_components(
+        ["tests/components/time/__init__.py"]
+    ) == ["time"]

From c2a153a9469acf53dc74b8a303ae0ccd8065b9e4 Mon Sep 17 00:00:00 2001
From: Bonne Eggleston <bonne@exciton.com.au>
Date: Mon, 24 Aug 2026 11:26:26 -0700
Subject: [PATCH 148/155] [modbus_controller] Add continuous polling option
 (#18080)

---
 esphome/components/modbus/__init__.py         |  33 +++++
 esphome/components/modbus_client/__init__.py  |   8 +-
 .../components/modbus_controller/__init__.py  |  44 ++++++-
 .../binary_sensor/__init__.py                 |   4 +-
 .../modbus_controller/modbus_controller.cpp   |  20 +--
 .../modbus_controller/modbus_controller.h     |  10 +-
 .../modbus_controller/number/__init__.py      |   4 +-
 .../modbus_controller/sensor/__init__.py      |   4 +-
 .../modbus_controller/switch/__init__.py      |   4 +-
 .../modbus_controller/text_sensor/__init__.py |   4 +-
 .../modbus_controller/test_custom_pdu.py      |  63 +++++++++-
 .../components/modbus_controller/common.yaml  |   1 +
 .../fixtures/uart_mock_modbus_continuous.yaml | 115 ++++++++++++++++++
 tests/integration/test_uart_mock_modbus.py    |  62 ++++++++++
 14 files changed, 345 insertions(+), 31 deletions(-)
 create mode 100644 tests/integration/fixtures/uart_mock_modbus_continuous.yaml

diff --git a/esphome/components/modbus/__init__.py b/esphome/components/modbus/__init__.py
index c9ba00f111..769858e72a 100644
--- a/esphome/components/modbus/__init__.py
+++ b/esphome/components/modbus/__init__.py
@@ -45,6 +45,7 @@ ModbusClient = modbus_ns.class_("ModbusClientHub", Modbus)
 ModbusDevice = modbus_ns.class_("ModbusDevice")
 ModbusClientDevice = modbus_ns.class_("ModbusClientDevice")
 ModbusServerDevice = modbus_ns.class_("ModbusServerDevice")
+CommandOptions = modbus_ns.struct("CommandOptions")
 MULTI_CONF = True
 
 CONF_ROLE = "role"
@@ -81,6 +82,19 @@ def _command_options(direction: str) -> list[_CommandOption]:
         raise ValueError(f"unknown command-options direction {direction!r}") from None
 
 
+# The write (mutating) function codes, matching modbus::helpers::is_function_code_write(). 0x17
+# (read/write multiple) is included: it mutates, so the hub treats it as a write despite its read half.
+_WRITE_FUNCTION_CODES = frozenset({0x05, 0x06, 0x0F, 0x10, 0x16, 0x17})
+
+
+def is_function_code_write(function_code: int) -> bool:
+    """True if the Modbus function code writes (mutates). The exception bit (0x80) is masked off first,
+    so an exception-flagged code still classifies by its base code - stricter than the runtime hub,
+    whose classify() treats an exception-flagged code as a read. Keep in sync with
+    modbus::helpers::is_function_code_write()."""
+    return function_code & 0x7F in _WRITE_FUNCTION_CODES
+
+
 def command_options_schema(
     *, direction: Literal["read", "write"], templatable: bool = False
 ) -> dict[cv.Optional, Any]:
@@ -98,6 +112,25 @@ def command_options_schema(
     }
 
 
+def command_options_expression(
+    config: ConfigType, *, direction: Literal["read", "write"]
+) -> cg.StructInitializer:
+    """Build the modbus::CommandOptions initializer for a config validated with
+    command_options_schema() of the same direction. For static (non-templatable) options only;
+    actions with lambda values use register_templatable_command_options() instead.
+    """
+    return cg.StructInitializer(
+        CommandOptions,
+        *(
+            # Construct the value as its declared cpp_type, so a future non-bool option (enum,
+            # uint16_t, ...) is emitted with the right type instead of whatever safe_exp() infers.
+            (option.field, option.cpp_type(config[option.conf_key]))
+            for option in _command_options(direction)
+            if option.conf_key in config
+        ),
+    )
+
+
 async def register_templatable_command_options(
     var: MockObj, config: ConfigType, args: TemplateArgsType, direction: str
 ) -> None:
diff --git a/esphome/components/modbus_client/__init__.py b/esphome/components/modbus_client/__init__.py
index 48d7c1df4f..a59eb91066 100644
--- a/esphome/components/modbus_client/__init__.py
+++ b/esphome/components/modbus_client/__init__.py
@@ -157,10 +157,6 @@ _ACTION_BASE_SCHEMA = cv.Schema(
     }
 )
 
-# The write codes recognised by modbus::helpers::is_function_code_write() - keep in sync. 0x17
-# (read/write multiple) is included: it mutates, so the hub treats it as a write despite its read half.
-_WRITE_FUNCTION_CODES = frozenset({0x05, 0x06, 0x0F, 0x10, 0x16, 0x17})
-
 
 def _no_continuous_on_write(config: ConfigType) -> ConfigType:
     """Reject `continuous: true` on a static write PDU: continuous polling only applies to reads.
@@ -170,9 +166,7 @@ def _no_continuous_on_write(config: ConfigType) -> ConfigType:
     if (
         isinstance(pdu, list)
         and config.get(CONF_CONTINUOUS) is True
-        # Masking the exception bit (0x90 -> 0x10) makes this check stricter than the runtime hub,
-        # whose classify() treats an exception-flagged code as a read and leaves continuous in place.
-        and pdu[0] & 0x7F in _WRITE_FUNCTION_CODES
+        and modbus.is_function_code_write(pdu[0])
     ):
         raise cv.Invalid(
             f"'{CONF_CONTINUOUS}: true' does not apply to a write PDU (function code "
diff --git a/esphome/components/modbus_controller/__init__.py b/esphome/components/modbus_controller/__init__.py
index 188b552a3c..924a260d37 100644
--- a/esphome/components/modbus_controller/__init__.py
+++ b/esphome/components/modbus_controller/__init__.py
@@ -11,7 +11,14 @@ from esphome.components.modbus.helpers import (
     EntityType,
 )
 import esphome.config_validation as cv
-from esphome.const import CONF_ADDRESS, CONF_ID, CONF_LAMBDA, CONF_NAME, CONF_OFFSET
+from esphome.const import (
+    CONF_ADDRESS,
+    CONF_CONTINUOUS,
+    CONF_ID,
+    CONF_LAMBDA,
+    CONF_NAME,
+    CONF_OFFSET,
+)
 from esphome.core import CORE
 from esphome.cpp_helpers import logging
 import esphome.final_validate as fv
@@ -125,6 +132,7 @@ CONFIG_SCHEMA = cv.All(
             ),
             cv.Optional(CONF_MAX_CMD_RETRIES, default=4): cv.positive_int,
             cv.Optional(CONF_OFFLINE_SKIP_UPDATES, default=0): cv.positive_int,
+            **modbus.command_options_schema(direction="read"),
             cv.Optional(
                 CONF_SERVER_REGISTERS,
             ): cv.invalid(
@@ -234,6 +242,35 @@ def migrate_custom_command(config: ConfigType) -> None:
     del config[CONF_CUSTOM_COMMAND]
 
 
+def _reject_continuous_write_custom_pdu(config: ConfigType) -> None:
+    """Final-validate: a custom_pdu whose function code writes (e.g. 0x17 read/write-multiple) cannot be
+    polled continuously - the hub ignores continuous for mutating codes and would warn on every update
+    while that range silently does not stream. Reject the combination instead. Runs after
+    migrate_custom_command, so it sees custom_pdu whether written directly or migrated from
+    custom_command."""
+    pdu = config.get(CONF_CUSTOM_PDU)
+    if pdu is None or not modbus.is_function_code_write(pdu[0]):
+        return
+    fconf = fv.full_config.get()
+    path = fconf.get_path_for_id(config[CONF_MODBUS_CONTROLLER_ID])[:-1]
+    controller = fconf.get_config_for_path(path)
+    if controller.get(CONF_CONTINUOUS) is True:
+        raise cv.Invalid(
+            f"a '{CONF_CUSTOM_PDU}' with a write function code (0x{pdu[0] & 0x7F:02X}) can't be polled "
+            f"continuously: the hub ignores 'continuous' for mutating codes. Remove 'continuous: true' "
+            f"from the '{controller[CONF_ID]}' modbus_controller, or use a read function code.",
+            [CONF_CUSTOM_PDU],
+        )
+
+
+def validate_custom_pdu_item(config: ConfigType) -> None:
+    """Final-validate for the read platforms that accept custom_pdu (sensor, binary_sensor,
+    text_sensor): migrate the deprecated custom_command, then reject a write-coded custom_pdu under a
+    continuously-polling controller."""
+    migrate_custom_command(config)
+    _reject_continuous_write_custom_pdu(config)
+
+
 def _final_validate(config: ConfigType) -> None:
     modbus.final_validate_modbus_device("modbus_controller", role="client")(config)
 
@@ -314,6 +351,11 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_max_cmd_retries(config[CONF_MAX_CMD_RETRIES]))
     cg.add(var.set_offline_skip_updates(config[CONF_OFFLINE_SKIP_UPDATES]))
+    cg.add(
+        var.set_read_options(
+            modbus.command_options_expression(config, direction="read")
+        )
+    )
     await register_modbus_device(var, config)
     await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)
 
diff --git a/esphome/components/modbus_controller/binary_sensor/__init__.py b/esphome/components/modbus_controller/binary_sensor/__init__.py
index 6ff1975b1e..366dab6062 100644
--- a/esphome/components/modbus_controller/binary_sensor/__init__.py
+++ b/esphome/components/modbus_controller/binary_sensor/__init__.py
@@ -8,9 +8,9 @@ from .. import (
     ModbusItemBaseSchema,
     SensorItem,
     add_modbus_base_properties,
-    migrate_custom_command,
     modbus_calc_properties,
     modbus_controller_ns,
+    validate_custom_pdu_item,
     validate_modbus_register,
 )
 from ..const import (
@@ -40,7 +40,7 @@ CONFIG_SCHEMA = cv.All(
     validate_modbus_register,
 )
 
-FINAL_VALIDATE_SCHEMA = migrate_custom_command
+FINAL_VALIDATE_SCHEMA = validate_custom_pdu_item
 
 
 async def to_code(config):
diff --git a/esphome/components/modbus_controller/modbus_controller.cpp b/esphome/components/modbus_controller/modbus_controller.cpp
index 21fe4ef45f..20b8f516e9 100644
--- a/esphome/components/modbus_controller/modbus_controller.cpp
+++ b/esphome/components/modbus_controller/modbus_controller.cpp
@@ -167,6 +167,7 @@ void ModbusController::queue_command(ModbusCommandItem command) {
   this->one_shot_command_items_.push_back(make_unique<ModbusCommandItem>(std::move(command)));
   // A refused frame gets no terminal callback (see the hub contract), so reclaim the item here.
   auto &item = this->one_shot_command_items_.back();
+  // We intentionally do not pass read_options_ here, because one-shot commands are usually writes, and are non-polling.
   if (!item->send()) {
     // The caller (e.g. a write entity) has usually already published optimistically - surface the loss.
     ESP_LOGW(TAG, "Command refused by hub: type=0x%X address=0x%X", static_cast<uint8_t>(item->register_type()),
@@ -203,7 +204,9 @@ void ModbusController::update() {
       ESP_LOGV(TAG, "Module offline - retrying");
       this->cmd_non_responses_ = 0;  // allow the probe through can_send()
       for (auto &cmd : this->polling_command_items_) {
-        if (!cmd.send()) {
+        // Probes carry the read-side options too, so a recovering device resumes streaming on the
+        // probe itself rather than waiting for the next update_interval.
+        if (!cmd.send(this->read_options_)) {
           ESP_LOGD(TAG, "Probe refused by hub for range 0x%X", cmd.register_address());
         }
       }
@@ -217,8 +220,9 @@ void ModbusController::update() {
   if (this->can_send()) {
     for (auto &cmd : this->polling_command_items_) {
       ESP_LOGVV(TAG, "Updating range 0x%X", cmd.register_address());
+      // read_options_ carries the controller's continuous flag (the offline probe above sends it too).
       // A refusal is already logged by the hub; note the affected range for controller-level diagnostics.
-      if (!cmd.send()) {
+      if (!cmd.send(this->read_options_)) {
         ESP_LOGD(TAG, "Poll refused by hub for range 0x%X", cmd.register_address());
       }
     }
@@ -496,16 +500,18 @@ ModbusCommandItem ModbusCommandItem::create_custom_command(
   return cmd;
 }
 
-bool ModbusCommandItem::send() {
+bool ModbusCommandItem::send(modbus::CommandOptions options) {
+  // Options pass straight through to the hub
   bool accepted;
   if (this->custom_pdu_ != nullptr) {
     // Custom polling command: send the sensor's ready-made PDU (function code + data, no address byte)
     // to this controller's own device address; the hub prepends the address and appends the CRC.
-    accepted = modbus::ModbusClientDevice::queue_pdu(std::span<const uint8_t>(*this->custom_pdu_));
+    accepted = modbus::ModbusClientDevice::queue_pdu(std::span<const uint8_t>(*this->custom_pdu_), options);
   } else if (this->function_code_ != FunctionCode::CUSTOM) {
     accepted = this->queue_pdu(modbus::helpers::create_client_pdu(
-        this->function_code_, this->start_address_, this->register_count_,
-        this->payload.empty() ? nullptr : this->payload.data(), this->payload.size()));
+                                   this->function_code_, this->start_address_, this->register_count_,
+                                   this->payload.empty() ? nullptr : this->payload.data(), this->payload.size()),
+                               options);
   } else {
     // Factory custom command: payload holds a complete raw frame (address + PDU). Send the PDU to the
     // frame's own address (which may differ from this controller's); the hub appends the CRC and routes
@@ -515,7 +521,7 @@ bool ModbusCommandItem::send() {
       ESP_LOGW(TAG, "Empty custom command frame, not sent");
       accepted = false;
     } else {
-      accepted = this->parent_->queue_pdu(frame[0], frame.subspan(1), this);
+      accepted = this->parent_->queue_pdu(frame[0], frame.subspan(1), this, options);
     }
   }
   // The on_command_sent trigger fires from on_sent() when the frame actually reaches the wire.
diff --git a/esphome/components/modbus_controller/modbus_controller.h b/esphome/components/modbus_controller/modbus_controller.h
index f36705cda4..1db07f1ee8 100644
--- a/esphome/components/modbus_controller/modbus_controller.h
+++ b/esphome/components/modbus_controller/modbus_controller.h
@@ -284,7 +284,9 @@ class ModbusCommandItem : public modbus::ModbusClientDevice {
   /// Queue this command's frame on the hub. Returns false when refused, in which case no callback ever comes.
   /// The item is the hub device, so it must stay alive until its terminal callback; a destroyed item's
   /// pending frame is silently retired.
-  bool send();
+  /// Options pass straight through to the hub; the polling path passes the controller's read-side
+  /// options so reads re-queue after each success, one-shot commands keep the default.
+  bool send(modbus::CommandOptions options = {});
 
   /// factory methods
   /** Create modbus read command
@@ -452,6 +454,10 @@ class ModbusController final : public PollingComponent {
   void set_max_cmd_retries(uint8_t max_cmd_retries) { this->max_cmd_retries_ = max_cmd_retries; }
   /// get how many times a command will be (re)sent if no response is received
   uint8_t get_max_cmd_retries() { return this->max_cmd_retries_; }
+  /// called by esphome generated code with the read-side command options applied to every poll
+  void set_read_options(modbus::CommandOptions options) { this->read_options_ = options; }
+  /// the read-side command options applied to every poll
+  const modbus::CommandOptions &read_options() const { return this->read_options_; }
 
  protected:
   /// parse sensormap_ and create range of sequential addresses
@@ -497,6 +503,8 @@ class ModbusController final : public PollingComponent {
   uint16_t offline_skip_updates_{0};
   /// How many times we will retry a command if we get no response
   uint8_t max_cmd_retries_{4};
+  /// read-side command options applied to every poll
+  modbus::CommandOptions read_options_{};
   /// Command sent callback
   CallbackManager<void(int, int)> command_sent_callback_{};
   /// Server online callback
diff --git a/esphome/components/modbus_controller/number/__init__.py b/esphome/components/modbus_controller/number/__init__.py
index 39d04e8d91..a43e10a51e 100644
--- a/esphome/components/modbus_controller/number/__init__.py
+++ b/esphome/components/modbus_controller/number/__init__.py
@@ -18,9 +18,9 @@ from .. import (
     ModbusItemBaseSchema,
     SensorItem,
     add_modbus_base_properties,
-    migrate_custom_command,
     modbus_calc_properties,
     modbus_controller_ns,
+    validate_custom_pdu_item,
 )
 from ..const import (
     CONF_BITMASK,
@@ -86,7 +86,7 @@ CONFIG_SCHEMA = cv.All(
     validate_modbus_number,
 )
 
-FINAL_VALIDATE_SCHEMA = migrate_custom_command
+FINAL_VALIDATE_SCHEMA = validate_custom_pdu_item
 
 
 async def to_code(config):
diff --git a/esphome/components/modbus_controller/sensor/__init__.py b/esphome/components/modbus_controller/sensor/__init__.py
index c3c9bd4718..2c34ef04b4 100644
--- a/esphome/components/modbus_controller/sensor/__init__.py
+++ b/esphome/components/modbus_controller/sensor/__init__.py
@@ -8,9 +8,9 @@ from .. import (
     ModbusItemBaseSchema,
     SensorItem,
     add_modbus_base_properties,
-    migrate_custom_command,
     modbus_calc_properties,
     modbus_controller_ns,
+    validate_custom_pdu_item,
     validate_modbus_register,
 )
 from ..const import (
@@ -44,7 +44,7 @@ CONFIG_SCHEMA = cv.All(
     validate_modbus_register,
 )
 
-FINAL_VALIDATE_SCHEMA = migrate_custom_command
+FINAL_VALIDATE_SCHEMA = validate_custom_pdu_item
 
 
 async def to_code(config):
diff --git a/esphome/components/modbus_controller/switch/__init__.py b/esphome/components/modbus_controller/switch/__init__.py
index 35ad12087c..dedd2ceedf 100644
--- a/esphome/components/modbus_controller/switch/__init__.py
+++ b/esphome/components/modbus_controller/switch/__init__.py
@@ -8,9 +8,9 @@ from .. import (
     ModbusItemBaseSchema,
     SensorItem,
     add_modbus_base_properties,
-    migrate_custom_command,
     modbus_calc_properties,
     modbus_controller_ns,
+    validate_custom_pdu_item,
     validate_modbus_register,
 )
 from ..const import (
@@ -45,7 +45,7 @@ CONFIG_SCHEMA = cv.All(
     validate_modbus_register,
 )
 
-FINAL_VALIDATE_SCHEMA = migrate_custom_command
+FINAL_VALIDATE_SCHEMA = validate_custom_pdu_item
 
 
 async def to_code(config):
diff --git a/esphome/components/modbus_controller/text_sensor/__init__.py b/esphome/components/modbus_controller/text_sensor/__init__.py
index e8447658e2..31f5f87a98 100644
--- a/esphome/components/modbus_controller/text_sensor/__init__.py
+++ b/esphome/components/modbus_controller/text_sensor/__init__.py
@@ -8,9 +8,9 @@ from .. import (
     ModbusItemBaseSchema,
     SensorItem,
     add_modbus_base_properties,
-    migrate_custom_command,
     modbus_calc_properties,
     modbus_controller_ns,
+    validate_custom_pdu_item,
     validate_modbus_register,
 )
 from ..const import (
@@ -55,7 +55,7 @@ CONFIG_SCHEMA = cv.All(
     validate_modbus_register,
 )
 
-FINAL_VALIDATE_SCHEMA = migrate_custom_command
+FINAL_VALIDATE_SCHEMA = validate_custom_pdu_item
 
 
 async def to_code(config):
diff --git a/tests/component_tests/modbus_controller/test_custom_pdu.py b/tests/component_tests/modbus_controller/test_custom_pdu.py
index a5d065c965..a3a18da07f 100644
--- a/tests/component_tests/modbus_controller/test_custom_pdu.py
+++ b/tests/component_tests/modbus_controller/test_custom_pdu.py
@@ -1,19 +1,27 @@
-"""Schema-level config validation for custom_pdu and the deprecated custom_command alias.
+"""Config validation for custom_pdu and the deprecated custom_command alias.
 
 custom_command took a raw frame with a leading device address byte; custom_pdu takes the PDU only.
-The old key is still accepted at the schema level and auto-migrated later in final validate (which a
-bare-schema test can't reach), so these tests only cover what the schema itself enforces: the two keys
-are mutually exclusive, and custom_pdu takes byte-sized values.
+Most of these tests cover what the schema itself enforces (the two keys are mutually exclusive, and
+custom_pdu takes byte-sized values). The last two reach the final-validate step that a bare-schema
+test cannot: a write-coded custom_pdu polled continuously is rejected there.
 """
 
 import pytest
 from voluptuous import Invalid, MultipleInvalid
 
-from esphome.components.modbus_controller import ModbusItemBaseSchema
+from esphome.components.modbus_controller import (
+    ModbusItemBaseSchema,
+    validate_custom_pdu_item,
+)
 from esphome.components.modbus_controller.const import (
     CONF_CUSTOM_COMMAND,
     CONF_CUSTOM_PDU,
+    CONF_MODBUS_CONTROLLER_ID,
 )
+from esphome.config import Config
+from esphome.const import CONF_ADDRESS, CONF_CONTINUOUS, CONF_ID
+from esphome.core import ID
+import esphome.final_validate as fv
 
 
 def test_custom_command_accepted_at_schema_level() -> None:
@@ -45,3 +53,48 @@ def test_custom_pdu_rejects_non_byte_values() -> None:
     """PDU entries are bytes; a word-sized value is a sign the old raw format is being used."""
     with pytest.raises((Invalid, MultipleInvalid)):
         ModbusItemBaseSchema({CONF_CUSTOM_PDU: [0x0103, 0x002A]})
+
+
+def _controller_full_config(*, continuous: bool) -> Config:
+    """A minimal full-config graph with one modbus_controller declaring id 'ctl', enough for the
+    final-validate to resolve the controller (and its continuous flag) from an item's
+    modbus_controller_id."""
+    ctl_id = ID("ctl", is_declaration=True)
+    config = Config()
+    config["modbus_controller"] = [
+        {CONF_ID: ctl_id, CONF_ADDRESS: 1, CONF_CONTINUOUS: continuous}
+    ]
+    config.declare_ids.append((ctl_id, ["modbus_controller", 0, CONF_ID]))
+    return config
+
+
+@pytest.fixture
+def reset_full_config():
+    token = fv.full_config.set(Config())
+    yield
+    fv.full_config.reset(token)
+
+
+def test_continuous_write_custom_pdu_rejected(reset_full_config) -> None:
+    """A write-coded custom_pdu (0x17 = read/write-multiple) under a continuous controller is
+    rejected at final validate: the hub would strip continuous from the mutating code and warn on
+    every update."""
+    fv.full_config.set(_controller_full_config(continuous=True))
+    with pytest.raises(Invalid, match="can't be polled continuously"):
+        validate_custom_pdu_item(
+            {
+                CONF_MODBUS_CONTROLLER_ID: ID("ctl"),
+                CONF_CUSTOM_PDU: [0x17, 0x00, 0x03, 0x00, 0x01],
+            }
+        )
+
+
+def test_continuous_read_custom_pdu_allowed(reset_full_config) -> None:
+    """A read-coded custom_pdu (0x03) under a continuous controller is fine - only writes stream."""
+    fv.full_config.set(_controller_full_config(continuous=True))
+    validate_custom_pdu_item(
+        {
+            CONF_MODBUS_CONTROLLER_ID: ID("ctl"),
+            CONF_CUSTOM_PDU: [0x03, 0x00, 0x2A, 0x00, 0x01],
+        }
+    )
diff --git a/tests/components/modbus_controller/common.yaml b/tests/components/modbus_controller/common.yaml
index 9c35a2f868..78bec522cf 100644
--- a/tests/components/modbus_controller/common.yaml
+++ b/tests/components/modbus_controller/common.yaml
@@ -2,6 +2,7 @@ modbus_controller:
   - id: modbus_controller1
     address: 0x2
     modbus_id: modbus_bus
+    continuous: true
     on_online:
       then:
         logger.log: "Module Online"
diff --git a/tests/integration/fixtures/uart_mock_modbus_continuous.yaml b/tests/integration/fixtures/uart_mock_modbus_continuous.yaml
new file mode 100644
index 0000000000..62b0b4c2cf
--- /dev/null
+++ b/tests/integration/fixtures/uart_mock_modbus_continuous.yaml
@@ -0,0 +1,115 @@
+esphome:
+  name: uart-mock-modbus-continuous
+
+host:
+api:
+logger:
+  level: VERBOSE
+
+# When set, the mock server stops forwarding its replies to the controller, so the controller sees
+# timeouts - used by the recovery test to drive a live continuous poll offline and back.
+globals:
+  - id: silence_server
+    type: bool
+    initial_value: "false"
+
+external_components:
+  - source:
+      type: local
+      path: EXTERNAL_COMPONENT_PATH
+
+# Dummy uart entry to satisfy modbus's DEPENDENCIES = ["uart"]
+# The actual UART bus used is the uart_mock component below
+uart:
+  baud_rate: 115200
+  port: /dev/null
+
+uart_mock:
+  - id: virtual_uart_server
+    baud_rate: 9600
+    auto_start: true
+    debug:
+    on_tx:
+      - then:
+          - if:
+              condition:
+                lambda: "return !id(silence_server);"
+              then:
+                - uart_mock.inject_rx:
+                    id: virtual_uart_controller
+                    data: !lambda return data;
+  - id: virtual_uart_controller
+    baud_rate: 9600
+    auto_start: true
+    debug:
+    on_tx:
+      - then:
+          - uart_mock.inject_rx:
+              id: virtual_uart_server
+              data: !lambda return data;
+
+modbus:
+  - uart_id: virtual_uart_server
+    id: virtual_modbus_server
+    role: server
+  - uart_id: virtual_uart_controller
+    id: virtual_modbus_controller
+    role: client
+    turnaround_time: 10ms
+    # Short timeout so the recovery test drives the poll offline quickly; when the server answers,
+    # replies arrive within turnaround_time, so this does not slow the streaming path.
+    send_wait_time: 100ms
+
+modbus_controller:
+  - address: 1
+    modbus_id: virtual_modbus_controller
+    id: modbus_controller_1
+    # A long update_interval means that without continuous polling only the boot poll would run in the
+    # test window. continuous: true re-queues the read after each success, so it streams as fast as the
+    # bus allows.
+    update_interval: 30s
+    continuous: true
+    # One retry so a silenced device trips offline fast (initial send + 1 retry, each 100ms).
+    max_cmd_retries: 1
+
+modbus_server:
+  - address: 1
+    modbus_id: virtual_modbus_server
+    id: modbus_server_1
+    registers:
+      # Each read returns the next counter value, so every poll publishes a distinct state the test can
+      # count (proving the read actually ran, not just that the state changed once).
+      - address: 0x01
+        value_type: U_WORD
+        read_lambda: |-
+          static uint16_t counter = 0;
+          return counter++;
+
+sensor:
+  - platform: modbus_controller
+    modbus_controller_id: modbus_controller_1
+    name: "continuous_reg"
+    address: 0x01
+    register_type: holding
+    value_type: U_WORD
+
+button:
+  - platform: template
+    name: "Start Scenario"
+    id: start_scenario_btn
+    # Trigger the first poll deterministically. PollingComponent's first update() would otherwise land
+    # somewhere in the 30s update_interval; once this one read completes, continuous re-queuing takes over.
+    on_press:
+      - lambda: "id(modbus_controller_1)->update();"
+
+switch:
+  # Toggles whether the mock server forwards its replies. On = silence (controller sees timeouts);
+  # off = answer again. The recovery test uses it to drive a live continuous poll offline and back.
+  - platform: template
+    name: "Silence Server"
+    id: silence_server_switch
+    optimistic: true
+    turn_on_action:
+      - lambda: "id(silence_server) = true;"
+    turn_off_action:
+      - lambda: "id(silence_server) = false;"
diff --git a/tests/integration/test_uart_mock_modbus.py b/tests/integration/test_uart_mock_modbus.py
index 09e841b4bb..c84fb34e70 100644
--- a/tests/integration/test_uart_mock_modbus.py
+++ b/tests/integration/test_uart_mock_modbus.py
@@ -736,6 +736,68 @@ async def test_uart_mock_modbus_custom_pdu(
         _assert_no_modbus_errors(error_log_lines, warning_log_lines)
 
 
+@pytest.mark.asyncio
+async def test_uart_mock_modbus_continuous(
+    yaml_config: str,
+    run_compiled: RunCompiledFunction,
+    api_client_connected: APIClientConnectedFactory,
+) -> None:
+    """Test that `continuous: true` polls faster than the update_interval.
+
+    The controller's update_interval is 30s, so without continuous polling only the boot poll would
+    run during the short test window. With continuous the read is re-queued after each success, filling
+    idle bus time, so many reads arrive. The server returns an incrementing counter, so every read is a
+    distinct published state the tracker can count. (Bus warnings are not asserted here: continuous
+    polling deliberately saturates the bus, so the occasional timing hiccup is expected and off-topic;
+    the other tests cover clean operation at normal poll rates.)
+    """
+
+    tracker = SensorTracker(["continuous_reg"])
+
+    async with (
+        run_compiled(yaml_config),
+        api_client_connected() as client,
+    ):
+        # setup_and_start_scenario presses the Start Scenario button, whose on_press triggers the
+        # controller's first update(). With continuous that one read re-queues and streams; without it
+        # the next poll would not run until the 30s update_interval elapses.
+        entities = await tracker.setup_and_start_scenario(client)
+        # Count reads over a window far shorter than the update_interval. Absent continuous polling we
+        # would see ~1 (the triggered poll); continuous re-queues, so the bus fills with reads.
+        await asyncio.sleep(3.0)
+        reads = len(tracker.sensor_states["continuous_reg"])
+        assert reads >= 5, (
+            "expected many continuous reads within the window (update_interval is 30s, so absent "
+            f"continuous polling we would see ~1), got {reads}"
+        )
+
+        # Recovery path: a live continuous poll that starts failing goes offline, and the next update()
+        # re-arms it once the device answers again. Silence the server so the poll's reads time out; with
+        # max_cmd_retries=1 and send_wait_time=100ms the device trips offline quickly and streaming stops.
+        silence = find_entity(entities, "silence_server", SwitchInfo)
+        assert silence is not None, "Silence Server switch not found"
+        start = find_entity(entities, "start_scenario", ButtonInfo)
+        assert start is not None, "Start Scenario button not found"
+
+        client.switch_command(silence.key, True)
+        await asyncio.sleep(1.0)  # let the poll fail and the device trip offline
+        plateau = len(tracker.sensor_states["continuous_reg"])
+        await asyncio.sleep(1.0)  # offline: no polls should land
+        assert len(tracker.sensor_states["continuous_reg"]) == plateau, (
+            "reads kept arriving after the server was silenced - the failed continuous poll did not stop"
+        )
+
+        # Answer again and trigger update(): the offline probe recovers the device and the continuous
+        # poll re-arms, so streaming resumes.
+        client.switch_command(silence.key, False)
+        client.button_command(start.key)
+        await asyncio.sleep(3.0)
+        resumed = len(tracker.sensor_states["continuous_reg"]) - plateau
+        assert resumed >= 5, (
+            f"continuous polling did not resume after the device recovered (got {resumed} new reads)"
+        )
+
+
 @pytest.mark.asyncio
 async def test_uart_mock_modbus_offline(
     yaml_config: str,

From b103df1bb1e57175fcd632521f645096538d69fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 14:33:24 -0500
Subject: [PATCH 149/155] Bump ruff from 0.16.3 to 0.16.4 (#18734)

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index 079c375c01..cf4b028b0e 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,6 @@
 pylint==4.0.7
 flake8==7.3.0  # also change in .pre-commit-config.yaml when updating
-ruff==0.16.3  # also change in .pre-commit-config.yaml when updating
+ruff==0.16.4  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.21.2  # also change in .pre-commit-config.yaml when updating
 prek==0.4.14  # also change in .github/workflows/ci.yml when updating
 

From 32a0a5c55cb8a9c5b392272d2d04b3dbf40401f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 14:33:39 -0500
Subject: [PATCH 150/155] Bump github/codeql-action/analyze from 4.37.7 to
 4.37.8 (#18735)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 103cecc1f9..46eed02656 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -84,6 +84,6 @@ jobs:
           exit 1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
         with:
           category: "/language:${{matrix.language}}"

From ad508d79afdb578503ae7768b8d6bd14fd0474c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 14:33:52 -0500
Subject: [PATCH 151/155] Bump github/codeql-action/init from 4.37.7 to 4.37.8
 (#18736)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 46eed02656..b46f9adab6 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -56,7 +56,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}

From 3b6c6e3dadf6edb8902feb72de945d30ea8e47a6 Mon Sep 17 00:00:00 2001
From: "esphome[bot]" <115708604+esphome[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 14:50:35 -0500
Subject: [PATCH 152/155] Bump aioesphomeapi from 46.0.0 to 46.1.0 (#18737)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 822eebc1f2..c10ddc3f53 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pyserial==3.5
 platformio==6.1.19
 esptool==5.3.1
 click==8.3.3
-aioesphomeapi==46.0.0
+aioesphomeapi==46.1.0
 aiohappyeyeballs==2.7.1  # Happy Eyeballs for requests downloads; already pulled in by aioesphomeapi
 zeroconf==0.150.0
 puremagic==2.2.0

From ca9636514362b5f270dc98c896d04c9da98edb00 Mon Sep 17 00:00:00 2001
From: guillempages <guillempages@users.noreply.github.com>
Date: Mon, 24 Aug 2026 22:07:01 +0200
Subject: [PATCH 153/155] [runtime_image] Add MIME types to image formats
 (#16361)

Co-authored-by: J. Nick Koston <nick@koston.org>
Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
Co-authored-by: J. Nick Koston <nick@home-assistant.io>
---
 .../components/online_image/online_image.cpp  | 62 +++++--------------
 .../components/runtime_image/image_format.cpp | 44 +++++++++++++
 .../components/runtime_image/image_format.h   |  7 +++
 .../runtime_image/runtime_image.cpp           |  1 -
 .../runtime_image/test_mime_types.cpp         | 61 ++++++++++++++++++
 5 files changed, 127 insertions(+), 48 deletions(-)
 create mode 100644 esphome/components/runtime_image/image_format.cpp
 create mode 100644 tests/components/runtime_image/test_mime_types.cpp

diff --git a/esphome/components/online_image/online_image.cpp b/esphome/components/online_image/online_image.cpp
index a2662ff0e3..3f2382accd 100644
--- a/esphome/components/online_image/online_image.cpp
+++ b/esphome/components/online_image/online_image.cpp
@@ -3,6 +3,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include <algorithm>
+#include <cstdio>
 
 static const char *const TAG = "online_image";
 static const char *const CONTENT_TYPE_HEADER_NAME = "content-type";
@@ -62,30 +63,11 @@ void OnlineImage::update() {
     headers.push_back({IF_MODIFIED_SINCE_HEADER_NAME, this->last_modified_});
   }
 
-  // Add Accept header based on image format
-  const char *accept_mime_type;
   runtime_image::ImageFormat format = this->get_format();
-  switch (format) {
-#ifdef USE_RUNTIME_IMAGE_BMP
-    case runtime_image::BMP:
-      accept_mime_type = "image/bmp,*/*;q=0.8";
-      break;
-#endif
-#ifdef USE_RUNTIME_IMAGE_JPEG
-    case runtime_image::JPEG:
-      accept_mime_type = "image/jpeg,*/*;q=0.8";
-      break;
-#endif
-#ifdef USE_RUNTIME_IMAGE_PNG
-    case runtime_image::PNG:
-      accept_mime_type = "image/png,*/*;q=0.8";
-      break;
-#endif
-    default:
-      accept_mime_type = "image/*,*/*;q=0.8";
-      break;
-  }
-  headers.push_back({"Accept", accept_mime_type});
+  // Accept: "<mime>,*/*;q=0.8"; 32 covers the longest MIME type plus the suffix
+  char accept_header[32];
+  snprintf(accept_header, sizeof(accept_header), "%s,*/*;q=0.8", runtime_image::get_mime_type_for_format(format));
+  headers.push_back({"Accept", accept_header});
 
   // User headers last so they can override any of the above
   for (auto &header : this->request_headers_) {
@@ -122,32 +104,18 @@ void OnlineImage::update() {
 
   if (format == runtime_image::AUTO) {
     // Try to auto-detect format from Content-Type header
-    auto content_type_header = this->downloader_->get_response_header(CONTENT_TYPE_HEADER_NAME);
-    const char *content_type = content_type_header.c_str();
-    ESP_LOGV(TAG, "Content-Type: %s", content_type);
-    // Includes aliases seen from real servers (older IIS, CDNs, S3)
-    if (str_contains_ignore_case(content_type, "image/bmp") ||
-        str_contains_ignore_case(content_type, "image/x-ms-bmp") ||
-        str_contains_ignore_case(content_type, "image/x-bmp")) {
-      format = runtime_image::BMP;
-    } else if (str_contains_ignore_case(content_type, "image/jpeg") ||
-               str_contains_ignore_case(content_type, "image/jpg")) {
-      format = runtime_image::JPEG;
-    } else if (str_contains_ignore_case(content_type, "image/png") ||
-               str_contains_ignore_case(content_type, "image/x-png")) {
-      format = runtime_image::PNG;
-    } else if (str_contains_ignore_case(content_type, "image/")) {
-      ESP_LOGW(TAG, "Unsupported image type: '%s'", content_type);
-      this->end_connection_();
-      this->download_error_callback_.call();
-      return;
+    auto content_type = this->downloader_->get_response_header(CONTENT_TYPE_HEADER_NAME);
+    ESP_LOGV(TAG, "Content-Type: %s", content_type.c_str());
+    auto mime_format = esphome::runtime_image::get_format_for_mime_type(content_type.c_str());
+    if (mime_format.has_value()) {
+      format = *mime_format;
     } else {
-      // TODO: implement auto-detection in runtime_image by sniffing the first few bytes of the image data
-      if (content_type_header.empty()) {
-        ESP_LOGW(TAG, "Server sent no Content-Type header; cannot determine image format. Set `format:` explicitly");
+      if (content_type.empty()) {
+        ESP_LOGE(TAG, "Server sent no Content-Type header; cannot determine image format. Set `format:` explicitly");
+      } else if (str_contains_ignore_case(content_type.c_str(), "image/")) {
+        ESP_LOGE(TAG, "Image format '%s' not supported.", content_type.c_str());
       } else {
-        ESP_LOGE(TAG, "Could not determine image format from Content-Type: '%s'. Set `format:` explicitly",
-                 content_type);
+        ESP_LOGE(TAG, "Server did not return an image (Content-Type: '%s')", content_type.c_str());
       }
       this->end_connection_();
       this->download_error_callback_.call();
diff --git a/esphome/components/runtime_image/image_format.cpp b/esphome/components/runtime_image/image_format.cpp
new file mode 100644
index 0000000000..3ba8871862
--- /dev/null
+++ b/esphome/components/runtime_image/image_format.cpp
@@ -0,0 +1,44 @@
+#include "esphome/core/helpers.h"
+#include "image_format.h"
+#include "image_decoder.h"
+
+namespace esphome::runtime_image {
+
+struct MimeLookup {
+  const char *mime_type;
+  ImageFormat format;
+};
+
+// The first entry per format is its canonical MIME type; the rest are aliases
+// seen from real servers (older IIS, CDNs, S3)
+static constexpr MimeLookup MIME_LOOKUP_TABLE[] = {
+#ifdef USE_RUNTIME_IMAGE_BMP
+    {"image/bmp", ImageFormat::BMP},   {"image/x-ms-bmp", ImageFormat::BMP}, {"image/x-bmp", ImageFormat::BMP},
+#endif
+#ifdef USE_RUNTIME_IMAGE_JPEG
+    {"image/jpeg", ImageFormat::JPEG}, {"image/jpg", ImageFormat::JPEG},
+#endif
+#ifdef USE_RUNTIME_IMAGE_PNG
+    {"image/png", ImageFormat::PNG},   {"image/x-png", ImageFormat::PNG},
+#endif
+};
+
+const char *get_mime_type_for_format(ImageFormat format) {
+  for (const auto &entry : MIME_LOOKUP_TABLE) {
+    if (entry.format == format) {
+      return entry.mime_type;
+    }
+  }
+  return "image/*";  // AUTO or compiled-out format
+}
+
+std::optional<ImageFormat> get_format_for_mime_type(const char *mime_type) {
+  for (const auto &entry : MIME_LOOKUP_TABLE) {
+    if (str_contains_ignore_case(mime_type, entry.mime_type)) {
+      return entry.format;
+    }
+  }
+  return std::nullopt;
+}
+
+}  // namespace esphome::runtime_image
diff --git a/esphome/components/runtime_image/image_format.h b/esphome/components/runtime_image/image_format.h
index ca6e0782b9..aff0c026b9 100644
--- a/esphome/components/runtime_image/image_format.h
+++ b/esphome/components/runtime_image/image_format.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <optional>
+
 namespace esphome::runtime_image {
 
 /**
@@ -17,4 +19,9 @@ enum ImageFormat {
   BMP,
 };
 
+/// Canonical MIME type for a format; "image/*" for AUTO/unknown
+const char *get_mime_type_for_format(ImageFormat format);
+/// Case-insensitive substring match of known media types; nullopt if none found
+std::optional<ImageFormat> get_format_for_mime_type(const char *mime_type);
+
 }  // namespace esphome::runtime_image
diff --git a/esphome/components/runtime_image/runtime_image.cpp b/esphome/components/runtime_image/runtime_image.cpp
index 254624caf4..f7417c2c8e 100644
--- a/esphome/components/runtime_image/runtime_image.cpp
+++ b/esphome/components/runtime_image/runtime_image.cpp
@@ -1,7 +1,6 @@
 #include "runtime_image.h"
 #include "image_decoder.h"
 #include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
diff --git a/tests/components/runtime_image/test_mime_types.cpp b/tests/components/runtime_image/test_mime_types.cpp
new file mode 100644
index 0000000000..de8bbc76be
--- /dev/null
+++ b/tests/components/runtime_image/test_mime_types.cpp
@@ -0,0 +1,61 @@
+#include <gtest/gtest.h>
+
+#include <optional>
+
+#include "esphome/components/runtime_image/runtime_image.h"
+
+namespace esphome::runtime_image::testing {
+
+TEST(RuntimeImageMime, FormatForKnownMimeTypes) {
+  EXPECT_EQ(get_format_for_mime_type("image/bmp"), BMP);
+  EXPECT_EQ(get_format_for_mime_type("image/x-ms-bmp"), BMP);
+  EXPECT_EQ(get_format_for_mime_type("image/x-bmp"), BMP);
+  EXPECT_EQ(get_format_for_mime_type("image/png"), PNG);
+  EXPECT_EQ(get_format_for_mime_type("image/x-png"), PNG);
+#ifdef USE_RUNTIME_IMAGE_JPEG
+  EXPECT_EQ(get_format_for_mime_type("image/jpeg"), JPEG);
+  EXPECT_EQ(get_format_for_mime_type("image/jpg"), JPEG);
+#endif  // USE_RUNTIME_IMAGE_JPEG
+}
+
+TEST(RuntimeImageMime, FormatMatchingIsCaseInsensitive) {
+  EXPECT_EQ(get_format_for_mime_type("Image/PNG"), PNG);
+  EXPECT_EQ(get_format_for_mime_type("IMAGE/BMP"), BMP);
+}
+
+TEST(RuntimeImageMime, FormatMatchesContentTypeWithParameters) {
+  // Content-Type headers may carry parameters after the media type
+  EXPECT_EQ(get_format_for_mime_type("image/png; charset=binary"), PNG);
+  EXPECT_EQ(get_format_for_mime_type("image/bmp;name=\"a.bmp\""), BMP);
+}
+
+TEST(RuntimeImageMime, UnknownMimeTypeHasNoFormat) {
+  EXPECT_EQ(get_format_for_mime_type("text/html"), std::nullopt);
+  EXPECT_EQ(get_format_for_mime_type("application/octet-stream"), std::nullopt);
+  EXPECT_EQ(get_format_for_mime_type("image/*"), std::nullopt);
+  EXPECT_EQ(get_format_for_mime_type(""), std::nullopt);
+  EXPECT_EQ(get_format_for_mime_type(nullptr), std::nullopt);
+}
+
+TEST(RuntimeImageMime, MimeTypeForFormatRoundTrip) {
+  EXPECT_STREQ(get_mime_type_for_format(BMP), "image/bmp");
+  EXPECT_STREQ(get_mime_type_for_format(PNG), "image/png");
+#ifdef USE_RUNTIME_IMAGE_JPEG
+  EXPECT_STREQ(get_mime_type_for_format(JPEG), "image/jpeg");
+#endif  // USE_RUNTIME_IMAGE_JPEG
+  // AUTO has no single MIME type and falls back to the wildcard
+  EXPECT_STREQ(get_mime_type_for_format(AUTO), "image/*");
+
+  // Every decodable format must resolve back to itself through its MIME type
+  for (ImageFormat format : {
+           BMP,
+           PNG,
+#ifdef USE_RUNTIME_IMAGE_JPEG
+           JPEG,
+#endif  // USE_RUNTIME_IMAGE_JPEG
+       }) {
+    EXPECT_EQ(get_format_for_mime_type(get_mime_type_for_format(format)), format) << format;
+  }
+}
+
+}  // namespace esphome::runtime_image::testing

From b97c87799255ce62eed22bcdcb22aae30e168a63 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Mon, 24 Aug 2026 15:27:24 -0500
Subject: [PATCH 154/155] [api] Acknowledge proxy subscribe and configuration
 requests (#18312)

Co-authored-by: J. Nick Koston <nick@koston.org>
---
 esphome/components/api/api.proto              |  29 ++++-
 esphome/components/api/api_connection.cpp     | 109 ++++++++++++------
 esphome/components/api/api_pb2.cpp            |  16 +++
 esphome/components/api/api_pb2.h              |  30 ++++-
 esphome/components/api/api_pb2_dump.cpp       |  28 +++++
 .../components/serial_proxy/serial_proxy.cpp  |  74 ++++++++----
 .../components/serial_proxy/serial_proxy.h    |  28 ++++-
 .../components/zwave_proxy/zwave_proxy.cpp    |  16 +--
 esphome/components/zwave_proxy/zwave_proxy.h  |   3 +-
 .../components/serial_proxy/serial_proxy.h    |  36 +++---
 .../components/zwave_proxy/zwave_proxy.h      |   4 +-
 .../components/api/test_api_proto.py          |  11 ++
 12 files changed, 298 insertions(+), 86 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 6ea124d155..1942ff568b 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -232,6 +232,7 @@ enum SerialProxyPortType {
 message SerialProxyInfo {
   string name = 1;                    // Human-readable port name
   SerialProxyPortType port_type = 2;  // Port type (RS232, RS485)
+  uint32 configured_line_states = 3;  // Bitmask of SerialProxyLineStateFlags this instance can drive
 }
 
 // DeviceInfoResponse max_data_length values:
@@ -2626,6 +2627,22 @@ message ZWaveProxyRequest {
   bytes data = 2;
 }
 
+enum ZWaveProxyStatus {
+  ZWAVE_PROXY_STATUS_OK = 0;             // Request completed successfully
+  ZWAVE_PROXY_STATUS_IN_USE = 1;         // Denied: another client is already subscribed
+  ZWAVE_PROXY_STATUS_NOT_SUPPORTED = 2;  // Request type not supported
+}
+
+// Acknowledges a ZWaveProxyRequest (subscribe/unsubscribe). Sent since API 1.16.
+message ZWaveProxyRequestResponse {
+  option (id) = 151;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_ZWAVE_PROXY";
+
+  ZWaveProxyRequestType type = 1;  // Which request type this responds to
+  ZWaveProxyStatus status = 2;     // Result status
+}
+
 // ==================== INFRARED ====================
 // Note: Feature and capability flag enums are defined in
 // esphome/components/infrared/infrared.h
@@ -2769,12 +2786,18 @@ message SerialProxyGetModemPinsResponse {
 
   uint32 instance = 1;          // Instance index (0-based)
   uint32 line_states = 2;       // Bitmask of SerialProxyLineStateFlags
+  SerialProxyStatus status = 3; // INVALID_ARGUMENT if the instance index is out of range (since API 1.16)
 }
 
 enum SerialProxyRequestType {
   SERIAL_PROXY_REQUEST_TYPE_SUBSCRIBE = 0;   // Subscribe to receive data from this serial proxy instance
   SERIAL_PROXY_REQUEST_TYPE_UNSUBSCRIBE = 1; // Unsubscribe from this serial proxy instance
   SERIAL_PROXY_REQUEST_TYPE_FLUSH = 2;       // Flush the serial port (block until all TX data is sent)
+  // Values below are only valid in SerialProxyRequestResponse.type, identifying which
+  // operation is being acknowledged. Sending them in SerialProxyRequest.type is an
+  // error the device answers with INVALID_ARGUMENT.
+  SERIAL_PROXY_REQUEST_TYPE_CONFIGURE = 3;      // Acknowledges a SerialProxyConfigureRequest
+  SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS = 4; // Acknowledges a SerialProxySetModemPinsRequest
 }
 
 enum SerialProxyStatus {
@@ -2783,6 +2806,8 @@ enum SerialProxyStatus {
   SERIAL_PROXY_STATUS_ERROR = 2;           // Driver or hardware error
   SERIAL_PROXY_STATUS_TIMEOUT = 3;         // Timed out before TX completed
   SERIAL_PROXY_STATUS_NOT_SUPPORTED = 4;   // Request type not supported by this instance
+  SERIAL_PROXY_STATUS_PORT_IN_USE = 5;     // Denied: another client holds the port
+  SERIAL_PROXY_STATUS_INVALID_ARGUMENT = 6; // Invalid instance index or parameter value
 }
 
 // Generic request message for simple serial proxy operations
@@ -2795,7 +2820,9 @@ message SerialProxyRequest {
   SerialProxyRequestType type = 2;      // Request type
 }
 
-// Response to a SerialProxyRequest (e.g. flush completion or failure)
+// Acknowledges a serial proxy operation; the type field identifies which
+// operation is being acknowledged. Flush has been acknowledged since the
+// message was introduced; all other acknowledgements are sent since API 1.16.
 message SerialProxyRequestResponse {
   option (id) = 147;
   option (source) = SOURCE_SERVER;
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index bb6c1695dd..05abbf0b75 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1381,7 +1381,12 @@ void APIConnection::on_z_wave_proxy_frame(const ZWaveProxyFrame &msg) {
 }
 
 void APIConnection::on_z_wave_proxy_request(const ZWaveProxyRequest &msg) {
-  zwave_proxy::global_zwave_proxy->zwave_proxy_request(this, msg.type);
+  ZWaveProxyRequestResponse resp{};
+  resp.type = msg.type;
+  resp.status = zwave_proxy::global_zwave_proxy->zwave_proxy_request(this, msg.type);
+  if (!this->send_message(resp)) {
+    API_LOG_MSG_DROPPED(TAG, "Z-Wave proxy response");
+  }
 }
 #endif
 
@@ -1550,15 +1555,50 @@ void APIConnection::send_infrared_rf_receive_event(const InfraredRFReceiveEvent
 #endif
 
 #ifdef USE_SERIAL_PROXY
+static enums::SerialProxyStatus serial_proxy_result_to_status(serial_proxy::SerialProxyResult result) {
+  switch (result) {
+    case serial_proxy::SerialProxyResult::SERIAL_PROXY_RESULT_OK:
+      return enums::SERIAL_PROXY_STATUS_OK;
+    case serial_proxy::SerialProxyResult::SERIAL_PROXY_RESULT_ASSUMED_SUCCESS:
+      return enums::SERIAL_PROXY_STATUS_ASSUMED_SUCCESS;
+    case serial_proxy::SerialProxyResult::SERIAL_PROXY_RESULT_PORT_IN_USE:
+      return enums::SERIAL_PROXY_STATUS_PORT_IN_USE;
+    case serial_proxy::SerialProxyResult::SERIAL_PROXY_RESULT_INVALID_ARGUMENT:
+      return enums::SERIAL_PROXY_STATUS_INVALID_ARGUMENT;
+    case serial_proxy::SerialProxyResult::SERIAL_PROXY_RESULT_TIMEOUT:
+      return enums::SERIAL_PROXY_STATUS_TIMEOUT;
+    case serial_proxy::SerialProxyResult::SERIAL_PROXY_RESULT_NOT_SUPPORTED:
+      return enums::SERIAL_PROXY_STATUS_NOT_SUPPORTED;
+    case serial_proxy::SerialProxyResult::SERIAL_PROXY_RESULT_ERROR:
+      return enums::SERIAL_PROXY_STATUS_ERROR;
+  }
+  return enums::SERIAL_PROXY_STATUS_ERROR;  // Unreachable; all enum values handled above
+}
+
+static void send_serial_proxy_ack(APIConnection *conn, uint32_t instance, enums::SerialProxyRequestType type,
+                                  enums::SerialProxyStatus status) {
+  SerialProxyRequestResponse resp{};
+  resp.instance = instance;
+  resp.type = type;
+  resp.status = status;
+  if (!conn->send_message(resp)) {
+    API_LOG_MSG_DROPPED(TAG, "Serial proxy response");
+  }
+}
+
 void APIConnection::on_serial_proxy_configure_request(const SerialProxyConfigureRequest &msg) {
   auto &proxies = App.get_serial_proxies();
   if (msg.instance >= proxies.size()) {
     ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range (max %" PRIu32 ")", msg.instance,
              static_cast<uint32_t>(proxies.size()));
+    send_serial_proxy_ack(this, msg.instance, enums::SERIAL_PROXY_REQUEST_TYPE_CONFIGURE,
+                          enums::SERIAL_PROXY_STATUS_INVALID_ARGUMENT);
     return;
   }
-  proxies[msg.instance]->configure(this, msg.baudrate, msg.flow_control, static_cast<uint8_t>(msg.parity),
-                                   msg.stop_bits, msg.data_size);
+  serial_proxy::SerialProxyResult result = proxies[msg.instance]->configure(
+      this, msg.baudrate, msg.flow_control, static_cast<uint8_t>(msg.parity), msg.stop_bits, msg.data_size);
+  send_serial_proxy_ack(this, msg.instance, enums::SERIAL_PROXY_REQUEST_TYPE_CONFIGURE,
+                        serial_proxy_result_to_status(result));
 }
 
 void APIConnection::on_serial_proxy_write_request(const SerialProxyWriteRequest &msg) {
@@ -1574,20 +1614,30 @@ void APIConnection::on_serial_proxy_set_modem_pins_request(const SerialProxySetM
   auto &proxies = App.get_serial_proxies();
   if (msg.instance >= proxies.size()) {
     ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
+    send_serial_proxy_ack(this, msg.instance, enums::SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS,
+                          enums::SERIAL_PROXY_STATUS_INVALID_ARGUMENT);
     return;
   }
-  proxies[msg.instance]->set_modem_pins(this, msg.line_states);
+  serial_proxy::SerialProxyResult result = proxies[msg.instance]->set_modem_pins(this, msg.line_states);
+  send_serial_proxy_ack(this, msg.instance, enums::SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS,
+                        serial_proxy_result_to_status(result));
 }
 
 void APIConnection::on_serial_proxy_get_modem_pins_request(const SerialProxyGetModemPinsRequest &msg) {
   auto &proxies = App.get_serial_proxies();
-  if (msg.instance >= proxies.size()) {
-    ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
-    return;
-  }
   SerialProxyGetModemPinsResponse resp{};
   resp.instance = msg.instance;
-  resp.line_states = proxies[msg.instance]->get_modem_pins();
+  if (msg.instance >= proxies.size()) {
+    ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
+    // Pre-1.16 clients do not read the status field and would take this error
+    // for a successful "both pins deasserted" answer; let them time out as before
+    if (!this->client_supports_api_version(1, 16)) {
+      return;
+    }
+    resp.status = enums::SERIAL_PROXY_STATUS_INVALID_ARGUMENT;
+  } else {
+    resp.line_states = proxies[msg.instance]->get_modem_pins();
+  }
   if (!this->send_message(resp)) {
     API_LOG_MSG_DROPPED(TAG, "Serial proxy response");
   }
@@ -1597,40 +1647,31 @@ void APIConnection::on_serial_proxy_request(const SerialProxyRequest &msg) {
   auto &proxies = App.get_serial_proxies();
   if (msg.instance >= proxies.size()) {
     ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
+    send_serial_proxy_ack(this, msg.instance, msg.type, enums::SERIAL_PROXY_STATUS_INVALID_ARGUMENT);
     return;
   }
+  auto *proxy = proxies[msg.instance];
+  enums::SerialProxyStatus status;
   switch (msg.type) {
     case enums::SERIAL_PROXY_REQUEST_TYPE_SUBSCRIBE:
     case enums::SERIAL_PROXY_REQUEST_TYPE_UNSUBSCRIBE:
-      proxies[msg.instance]->serial_proxy_request(this, msg.type);
+      status = serial_proxy_result_to_status(proxy->serial_proxy_request(this, msg.type));
       break;
-    case enums::SERIAL_PROXY_REQUEST_TYPE_FLUSH: {
-      SerialProxyRequestResponse resp{};
-      resp.instance = msg.instance;
-      resp.type = enums::SERIAL_PROXY_REQUEST_TYPE_FLUSH;
-      switch (proxies[msg.instance]->flush_port()) {
-        case uart::UARTFlushResult::UART_FLUSH_RESULT_SUCCESS:
-          resp.status = enums::SERIAL_PROXY_STATUS_OK;
-          break;
-        case uart::UARTFlushResult::UART_FLUSH_RESULT_ASSUMED_SUCCESS:
-          resp.status = enums::SERIAL_PROXY_STATUS_ASSUMED_SUCCESS;
-          break;
-        case uart::UARTFlushResult::UART_FLUSH_RESULT_TIMEOUT:
-          resp.status = enums::SERIAL_PROXY_STATUS_TIMEOUT;
-          break;
-        case uart::UARTFlushResult::UART_FLUSH_RESULT_FAILED:
-          resp.status = enums::SERIAL_PROXY_STATUS_ERROR;
-          break;
-      }
-      if (!this->send_message(resp)) {
-        API_LOG_MSG_DROPPED(TAG, "Serial proxy response");
-      }
+    case enums::SERIAL_PROXY_REQUEST_TYPE_FLUSH:
+      status = serial_proxy_result_to_status(proxy->flush_port(this));
+      break;
+    case enums::SERIAL_PROXY_REQUEST_TYPE_CONFIGURE:
+    case enums::SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS:
+      // Response-only discriminators; never valid in a request
+      ESP_LOGW(TAG, "Response-only serial proxy request type: %" PRIu32, static_cast<uint32_t>(msg.type));
+      status = enums::SERIAL_PROXY_STATUS_INVALID_ARGUMENT;
       break;
-    }
     default:
       ESP_LOGW(TAG, "Unknown serial proxy request type: %" PRIu32, static_cast<uint32_t>(msg.type));
+      status = enums::SERIAL_PROXY_STATUS_NOT_SUPPORTED;
       break;
   }
+  send_serial_proxy_ack(this, msg.instance, msg.type, status);
 }
 
 void APIConnection::send_serial_proxy_data(const SerialProxyDataReceived &msg) {
@@ -1757,7 +1798,7 @@ bool APIConnection::send_hello_response_(const HelloRequest &msg) {
 
   HelloResponse resp;
   resp.api_version_major = 1;
-  resp.api_version_minor = 15;
+  resp.api_version_minor = 16;
   // Send only the version string - the client only logs this for debugging and doesn't use it otherwise
   resp.server_info = ESPHOME_VERSION_REF;
   resp.name = StringRef(App.get_name());
@@ -1891,6 +1932,7 @@ bool APIConnection::send_device_info_response_() {
     auto &info = resp.serial_proxies[serial_proxy_index++];
     info.name = StringRef(proxy->get_name());
     info.port_type = proxy->get_port_type();
+    info.configured_line_states = proxy->get_configured_modem_pins();
   }
 #endif
 #ifdef USE_API_NOISE
@@ -1951,6 +1993,7 @@ bool APIConnection::send_device_capabilities_response_() {
     auto &info = resp.serial_proxies[serial_proxy_index++];
     info.name = StringRef(proxy->get_name());
     info.port_type = proxy->get_port_type();
+    info.configured_line_states = proxy->get_configured_modem_pins();
   }
 #endif
   return this->send_message(resp);
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 33611c5ee1..b5062f9e9f 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -102,12 +102,14 @@ uint8_t *SerialProxyInfo::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PAR
   uint8_t *__restrict__ pos = buffer.get_pos();
   ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 1, this->name);
   ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 2, static_cast<uint32_t>(this->port_type));
+  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 3, this->configured_line_states);
   return pos;
 }
 uint32_t SerialProxyInfo::calculate_size() const {
   uint32_t size = 0;
   size += ProtoSize::calc_length(1, this->name.size());
   size += this->port_type ? 2 : 0;
+  size += ProtoSize::calc_uint32(1, this->configured_line_states);
   return size;
 }
 #endif
@@ -3942,6 +3944,18 @@ uint32_t ZWaveProxyRequest::calculate_size() const {
   size += ProtoSize::calc_length(1, this->data_len);
   return size;
 }
+uint8_t *ZWaveProxyRequestResponse::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
+  uint8_t *__restrict__ pos = buffer.get_pos();
+  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 1, static_cast<uint32_t>(this->type));
+  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 2, static_cast<uint32_t>(this->status));
+  return pos;
+}
+uint32_t ZWaveProxyRequestResponse::calculate_size() const {
+  uint32_t size = 0;
+  size += this->type ? 2 : 0;
+  size += this->status ? 2 : 0;
+  return size;
+}
 #endif
 #ifdef USE_INFRARED
 uint8_t *ListEntitiesInfraredResponse::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
@@ -4184,12 +4198,14 @@ uint8_t *SerialProxyGetModemPinsResponse::encode(ProtoWriteBuffer &buffer PROTO_
   uint8_t *__restrict__ pos = buffer.get_pos();
   ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 1, this->instance);
   ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 2, this->line_states);
+  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 3, static_cast<uint32_t>(this->status));
   return pos;
 }
 uint32_t SerialProxyGetModemPinsResponse::calculate_size() const {
   uint32_t size = 0;
   size += ProtoSize::calc_uint32(1, this->instance);
   size += ProtoSize::calc_uint32(1, this->line_states);
+  size += this->status ? 2 : 0;
   return size;
 }
 bool SerialProxyRequest::decode_varint(uint32_t field_id, proto_varint_value_t value) {
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 13db857467..cd2f32deaf 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -334,6 +334,11 @@ enum ZWaveProxyRequestType : uint32_t {
   ZWAVE_PROXY_REQUEST_TYPE_UNSUBSCRIBE = 1,
   ZWAVE_PROXY_REQUEST_TYPE_HOME_ID_CHANGE = 2,
 };
+enum ZWaveProxyStatus : uint32_t {
+  ZWAVE_PROXY_STATUS_OK = 0,
+  ZWAVE_PROXY_STATUS_IN_USE = 1,
+  ZWAVE_PROXY_STATUS_NOT_SUPPORTED = 2,
+};
 #endif
 #ifdef USE_SERIAL_PROXY
 enum SerialProxyParity : uint32_t {
@@ -345,6 +350,8 @@ enum SerialProxyRequestType : uint32_t {
   SERIAL_PROXY_REQUEST_TYPE_SUBSCRIBE = 0,
   SERIAL_PROXY_REQUEST_TYPE_UNSUBSCRIBE = 1,
   SERIAL_PROXY_REQUEST_TYPE_FLUSH = 2,
+  SERIAL_PROXY_REQUEST_TYPE_CONFIGURE = 3,
+  SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS = 4,
 };
 enum SerialProxyStatus : uint32_t {
   SERIAL_PROXY_STATUS_OK = 0,
@@ -352,6 +359,8 @@ enum SerialProxyStatus : uint32_t {
   SERIAL_PROXY_STATUS_ERROR = 2,
   SERIAL_PROXY_STATUS_TIMEOUT = 3,
   SERIAL_PROXY_STATUS_NOT_SUPPORTED = 4,
+  SERIAL_PROXY_STATUS_PORT_IN_USE = 5,
+  SERIAL_PROXY_STATUS_INVALID_ARGUMENT = 6,
 };
 #endif
 
@@ -523,6 +532,7 @@ class SerialProxyInfo final : public ProtoMessage {
  public:
   StringRef name{};
   enums::SerialProxyPortType port_type{};
+  uint32_t configured_line_states{0};
   uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const;
   uint32_t calculate_size() const;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -3130,6 +3140,23 @@ class ZWaveProxyRequest final : public ProtoDecodableMessage {
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
   bool decode_varint(uint32_t field_id, proto_varint_value_t value) override;
 };
+class ZWaveProxyRequestResponse final : public ProtoMessage {
+ public:
+  static constexpr uint8_t MESSAGE_TYPE = 151;
+  static constexpr uint8_t ESTIMATED_SIZE = 4;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  const LogString *message_name() const override { return LOG_STR("z_wave_proxy_request_response"); }
+#endif
+  enums::ZWaveProxyRequestType type{};
+  enums::ZWaveProxyStatus status{};
+  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const;
+  uint32_t calculate_size() const;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  const char *dump_to(DumpBuffer &out) const override;
+#endif
+
+ protected:
+};
 #endif
 #ifdef USE_INFRARED
 class ListEntitiesInfraredResponse final : public InfoResponseProtoMessage {
@@ -3314,12 +3341,13 @@ class SerialProxyGetModemPinsRequest final : public ProtoDecodableMessage {
 class SerialProxyGetModemPinsResponse final : public ProtoMessage {
  public:
   static constexpr uint8_t MESSAGE_TYPE = 143;
-  static constexpr uint8_t ESTIMATED_SIZE = 8;
+  static constexpr uint8_t ESTIMATED_SIZE = 10;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   const LogString *message_name() const override { return LOG_STR("serial_proxy_get_modem_pins_response"); }
 #endif
   uint32_t instance{0};
   uint32_t line_states{0};
+  enums::SerialProxyStatus status{};
   uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const;
   uint32_t calculate_size() const;
 #ifdef HAS_PROTO_MESSAGE_DUMP
diff --git a/esphome/components/api/api_pb2_dump.cpp b/esphome/components/api/api_pb2_dump.cpp
index d54215ba2e..9f53438531 100644
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
@@ -816,6 +816,18 @@ template<> const char *proto_enum_to_string<enums::ZWaveProxyRequestType>(enums:
       return ESPHOME_PSTR("UNKNOWN");
   }
 }
+template<> const char *proto_enum_to_string<enums::ZWaveProxyStatus>(enums::ZWaveProxyStatus value) {
+  switch (value) {
+    case enums::ZWAVE_PROXY_STATUS_OK:
+      return ESPHOME_PSTR("ZWAVE_PROXY_STATUS_OK");
+    case enums::ZWAVE_PROXY_STATUS_IN_USE:
+      return ESPHOME_PSTR("ZWAVE_PROXY_STATUS_IN_USE");
+    case enums::ZWAVE_PROXY_STATUS_NOT_SUPPORTED:
+      return ESPHOME_PSTR("ZWAVE_PROXY_STATUS_NOT_SUPPORTED");
+    default:
+      return ESPHOME_PSTR("UNKNOWN");
+  }
+}
 #endif
 #ifdef USE_SERIAL_PROXY
 template<> const char *proto_enum_to_string<enums::SerialProxyParity>(enums::SerialProxyParity value) {
@@ -838,6 +850,10 @@ template<> const char *proto_enum_to_string<enums::SerialProxyRequestType>(enums
       return ESPHOME_PSTR("SERIAL_PROXY_REQUEST_TYPE_UNSUBSCRIBE");
     case enums::SERIAL_PROXY_REQUEST_TYPE_FLUSH:
       return ESPHOME_PSTR("SERIAL_PROXY_REQUEST_TYPE_FLUSH");
+    case enums::SERIAL_PROXY_REQUEST_TYPE_CONFIGURE:
+      return ESPHOME_PSTR("SERIAL_PROXY_REQUEST_TYPE_CONFIGURE");
+    case enums::SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS:
+      return ESPHOME_PSTR("SERIAL_PROXY_REQUEST_TYPE_SET_MODEM_PINS");
     default:
       return ESPHOME_PSTR("UNKNOWN");
   }
@@ -854,6 +870,10 @@ template<> const char *proto_enum_to_string<enums::SerialProxyStatus>(enums::Ser
       return ESPHOME_PSTR("SERIAL_PROXY_STATUS_TIMEOUT");
     case enums::SERIAL_PROXY_STATUS_NOT_SUPPORTED:
       return ESPHOME_PSTR("SERIAL_PROXY_STATUS_NOT_SUPPORTED");
+    case enums::SERIAL_PROXY_STATUS_PORT_IN_USE:
+      return ESPHOME_PSTR("SERIAL_PROXY_STATUS_PORT_IN_USE");
+    case enums::SERIAL_PROXY_STATUS_INVALID_ARGUMENT:
+      return ESPHOME_PSTR("SERIAL_PROXY_STATUS_INVALID_ARGUMENT");
     default:
       return ESPHOME_PSTR("UNKNOWN");
   }
@@ -914,6 +934,7 @@ const char *SerialProxyInfo::dump_to(DumpBuffer &out) const {
   MessageDumpHelper helper(out, ESPHOME_PSTR("SerialProxyInfo"));
   dump_field(out, ESPHOME_PSTR("name"), this->name);
   dump_field(out, ESPHOME_PSTR("port_type"), static_cast<enums::SerialProxyPortType>(this->port_type));
+  dump_field(out, ESPHOME_PSTR("configured_line_states"), this->configured_line_states);
   return out.c_str();
 }
 #endif
@@ -2644,6 +2665,12 @@ const char *ZWaveProxyRequest::dump_to(DumpBuffer &out) const {
   dump_bytes_field(out, ESPHOME_PSTR("data"), this->data, this->data_len);
   return out.c_str();
 }
+const char *ZWaveProxyRequestResponse::dump_to(DumpBuffer &out) const {
+  MessageDumpHelper helper(out, ESPHOME_PSTR("ZWaveProxyRequestResponse"));
+  dump_field(out, ESPHOME_PSTR("type"), static_cast<enums::ZWaveProxyRequestType>(this->type));
+  dump_field(out, ESPHOME_PSTR("status"), static_cast<enums::ZWaveProxyStatus>(this->status));
+  return out.c_str();
+}
 #endif
 #ifdef USE_INFRARED
 const char *ListEntitiesInfraredResponse::dump_to(DumpBuffer &out) const {
@@ -2753,6 +2780,7 @@ const char *SerialProxyGetModemPinsResponse::dump_to(DumpBuffer &out) const {
   MessageDumpHelper helper(out, ESPHOME_PSTR("SerialProxyGetModemPinsResponse"));
   dump_field(out, ESPHOME_PSTR("instance"), this->instance);
   dump_field(out, ESPHOME_PSTR("line_states"), this->line_states);
+  dump_field(out, ESPHOME_PSTR("status"), static_cast<enums::SerialProxyStatus>(this->status));
   return out.c_str();
 }
 const char *SerialProxyRequest::dump_to(DumpBuffer &out) const {
diff --git a/esphome/components/serial_proxy/serial_proxy.cpp b/esphome/components/serial_proxy/serial_proxy.cpp
index 4b3a907416..94cefc8700 100644
--- a/esphome/components/serial_proxy/serial_proxy.cpp
+++ b/esphome/components/serial_proxy/serial_proxy.cpp
@@ -89,12 +89,12 @@ void SerialProxy::dump_config() {
                 this->dtr_pin_ != nullptr ? "configured" : "not configured");
 }
 
-void SerialProxy::configure(api::APIConnection *api_connection, uint32_t baudrate, bool flow_control, uint8_t parity,
-                            uint8_t stop_bits, uint8_t data_size) {
+SerialProxyResult SerialProxy::configure(api::APIConnection *api_connection, uint32_t baudrate, bool flow_control,
+                                         uint8_t parity, uint8_t stop_bits, uint8_t data_size) {
 #ifdef USE_API
   if (this->port_claimed_by_other_(api_connection)) {
     ESP_LOGW(TAG, "Ignoring configure request from client without port access [%" PRIu32 "]", this->instance_index_);
-    return;
+    return SerialProxyResult::SERIAL_PROXY_RESULT_PORT_IN_USE;
   }
 #endif
   ESP_LOGD(TAG,
@@ -105,25 +105,29 @@ void SerialProxy::configure(api::APIConnection *api_connection, uint32_t baudrat
   auto *uart_comp = this->parent_;
   if (uart_comp == nullptr) {
     ESP_LOGE(TAG, "UART component not available");
-    return;
+    return SerialProxyResult::SERIAL_PROXY_RESULT_ERROR;
   }
 
   // Validate all parameters before applying any (values come from a remote client)
   if (baudrate == 0) {
     ESP_LOGW(TAG, "Invalid baud rate: 0");
-    return;
+    return SerialProxyResult::SERIAL_PROXY_RESULT_INVALID_ARGUMENT;
   }
   if (stop_bits < 1 || stop_bits > 2) {
     ESP_LOGW(TAG, "Invalid stop bits: %u (must be 1 or 2)", stop_bits);
-    return;
+    return SerialProxyResult::SERIAL_PROXY_RESULT_INVALID_ARGUMENT;
   }
   if (data_size < 5 || data_size > 8) {
     ESP_LOGW(TAG, "Invalid data bits: %u (must be 5-8)", data_size);
-    return;
+    return SerialProxyResult::SERIAL_PROXY_RESULT_INVALID_ARGUMENT;
   }
   if (parity > 2) {
     ESP_LOGW(TAG, "Invalid parity: %u (must be 0-2)", parity);
-    return;
+    return SerialProxyResult::SERIAL_PROXY_RESULT_INVALID_ARGUMENT;
+  }
+  if (flow_control) {
+    ESP_LOGW(TAG, "Hardware flow control requested but is not yet supported");
+    return SerialProxyResult::SERIAL_PROXY_RESULT_NOT_SUPPORTED;
   }
 
   // Apply validated parameters
@@ -143,10 +147,7 @@ void SerialProxy::configure(api::APIConnection *api_connection, uint32_t baudrat
 #if defined(USE_ESP8266) || defined(USE_ESP32)
   uart_comp->load_settings(true);
 #endif
-
-  if (flow_control) {
-    ESP_LOGW(TAG, "Hardware flow control requested but is not yet supported");
-  }
+  return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
 }
 
 void SerialProxy::write_from_client(api::APIConnection *api_connection, const uint8_t *data, size_t len) {
@@ -163,13 +164,20 @@ void SerialProxy::write_from_client(api::APIConnection *api_connection, const ui
   this->write_array(data, len);
 }
 
-void SerialProxy::set_modem_pins(api::APIConnection *api_connection, uint32_t line_states) {
+SerialProxyResult SerialProxy::set_modem_pins(api::APIConnection *api_connection, uint32_t line_states) {
 #ifdef USE_API
   if (this->port_claimed_by_other_(api_connection)) {
     ESP_LOGW(TAG, "Ignoring modem pin request from client without port access [%" PRIu32 "]", this->instance_index_);
-    return;
+    return SerialProxyResult::SERIAL_PROXY_RESULT_PORT_IN_USE;
   }
 #endif
+  // Asserting a pin that is not configured must fail so the client learns the signal never
+  // reached the wire; deasserting an absent pin is harmless and stays allowed. Clients can
+  // avoid this by masking against SerialProxyInfo.configured_line_states.
+  if ((line_states & ~this->get_configured_modem_pins()) != 0) {
+    ESP_LOGW(TAG, "Requested modem pin not configured on serial proxy [%" PRIu32 "]", this->instance_index_);
+    return SerialProxyResult::SERIAL_PROXY_RESULT_NOT_SUPPORTED;
+  }
   const bool rts = (line_states & SERIAL_PROXY_LINE_STATE_FLAG_RTS) != 0;
   const bool dtr = (line_states & SERIAL_PROXY_LINE_STATE_FLAG_DTR) != 0;
   ESP_LOGV(TAG, "Setting modem pins [%" PRIu32 "]: RTS=%s, DTR=%s", this->instance_index_, ONOFF(rts), ONOFF(dtr));
@@ -182,6 +190,7 @@ void SerialProxy::set_modem_pins(api::APIConnection *api_connection, uint32_t li
     this->dtr_state_ = dtr;
     this->dtr_pin_->digital_write(dtr);
   }
+  return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
 }
 
 uint32_t SerialProxy::get_modem_pins() const {
@@ -189,9 +198,26 @@ uint32_t SerialProxy::get_modem_pins() const {
          (this->dtr_state_ ? static_cast<uint32_t>(SERIAL_PROXY_LINE_STATE_FLAG_DTR) : 0u);
 }
 
-uart::UARTFlushResult SerialProxy::flush_port() {
+SerialProxyResult SerialProxy::flush_port(api::APIConnection *api_connection) {
+#ifdef USE_API
+  // Flushing stalls the port, so it gets the same ownership check as writes
+  if (this->port_claimed_by_other_(api_connection)) {
+    ESP_LOGW(TAG, "Ignoring flush from client without port access [%" PRIu32 "]", this->instance_index_);
+    return SerialProxyResult::SERIAL_PROXY_RESULT_PORT_IN_USE;
+  }
+#endif
   ESP_LOGV(TAG, "Flushing serial proxy [%" PRIu32 "]", this->instance_index_);
-  return this->flush();
+  switch (this->flush()) {
+    case uart::UARTFlushResult::UART_FLUSH_RESULT_SUCCESS:
+      return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
+    case uart::UARTFlushResult::UART_FLUSH_RESULT_ASSUMED_SUCCESS:
+      return SerialProxyResult::SERIAL_PROXY_RESULT_ASSUMED_SUCCESS;
+    case uart::UARTFlushResult::UART_FLUSH_RESULT_TIMEOUT:
+      return SerialProxyResult::SERIAL_PROXY_RESULT_TIMEOUT;
+    case uart::UARTFlushResult::UART_FLUSH_RESULT_FAILED:
+      return SerialProxyResult::SERIAL_PROXY_RESULT_ERROR;
+  }
+  return SerialProxyResult::SERIAL_PROXY_RESULT_ERROR;  // Unreachable; all enum values handled above
 }
 
 #ifdef USE_API
@@ -200,12 +226,13 @@ bool SerialProxy::port_claimed_by_other_(api::APIConnection *api_connection) con
          this->api_connection_->is_connection_setup();
 }
 
-void SerialProxy::serial_proxy_request(api::APIConnection *api_connection, api::enums::SerialProxyRequestType type) {
+SerialProxyResult SerialProxy::serial_proxy_request(api::APIConnection *api_connection,
+                                                    api::enums::SerialProxyRequestType type) {
   switch (type) {
     case api::enums::SERIAL_PROXY_REQUEST_TYPE_SUBSCRIBE:
       if (this->api_connection_ == api_connection) {
         ESP_LOGV(TAG, "API connection is already subscribed to serial proxy [%" PRIu32 "]", this->instance_index_);
-        return;
+        return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
       }
       if (this->api_connection_ != nullptr) {
         // A living subscriber keeps exclusive access. Its connection may be dead without
@@ -213,26 +240,27 @@ void SerialProxy::serial_proxy_request(api::APIConnection *api_connection, api::
         // in that case let the new client take over instead of locking it out.
         if (this->api_connection_->is_connection_setup()) {
           ESP_LOGE(TAG, "Only one API subscription is allowed at a time");
-          return;
+          return SerialProxyResult::SERIAL_PROXY_RESULT_PORT_IN_USE;
         }
         ESP_LOGW(TAG, "Previous subscriber disconnected; taking over subscription");
       }
       this->api_connection_ = api_connection;
       this->enable_loop();
       ESP_LOGV(TAG, "API connection subscribed to serial proxy [%" PRIu32 "]", this->instance_index_);
-      break;
+      return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
     case api::enums::SERIAL_PROXY_REQUEST_TYPE_UNSUBSCRIBE:
+      // Unsubscribe is idempotent: not being subscribed is not an error
       if (this->api_connection_ != api_connection) {
         ESP_LOGV(TAG, "API connection is not subscribed to serial proxy [%" PRIu32 "]", this->instance_index_);
-        return;
+        return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
       }
       this->api_connection_ = nullptr;
       this->disable_loop();
       ESP_LOGV(TAG, "API connection unsubscribed from serial proxy [%" PRIu32 "]", this->instance_index_);
-      break;
+      return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
     default:
       ESP_LOGW(TAG, "Unknown serial proxy request type: %" PRIu32, static_cast<uint32_t>(type));
-      break;
+      return SerialProxyResult::SERIAL_PROXY_RESULT_NOT_SUPPORTED;
   }
 }
 #endif
diff --git a/esphome/components/serial_proxy/serial_proxy.h b/esphome/components/serial_proxy/serial_proxy.h
index 268c1b52be..a0e47ee686 100644
--- a/esphome/components/serial_proxy/serial_proxy.h
+++ b/esphome/components/serial_proxy/serial_proxy.h
@@ -38,6 +38,17 @@ enum SerialProxyLineStateFlag : uint32_t {
   SERIAL_PROXY_LINE_STATE_FLAG_DTR = 1 << 1,  ///< DTR (Data Terminal Ready)
 };
 
+/// Result of a client-initiated operation; mapped to api::enums::SerialProxyStatus by the API layer
+enum class SerialProxyResult : uint8_t {
+  SERIAL_PROXY_RESULT_OK,                ///< Operation completed or request accepted
+  SERIAL_PROXY_RESULT_ASSUMED_SUCCESS,   ///< Platform cannot confirm TX drain; success assumed
+  SERIAL_PROXY_RESULT_PORT_IN_USE,       ///< Denied: another live client holds the port
+  SERIAL_PROXY_RESULT_INVALID_ARGUMENT,  ///< A parameter value is out of range
+  SERIAL_PROXY_RESULT_ERROR,             ///< Driver or hardware error
+  SERIAL_PROXY_RESULT_TIMEOUT,           ///< Timed out before TX completed
+  SERIAL_PROXY_RESULT_NOT_SUPPORTED,     ///< Requested feature is not available on this instance
+};
+
 /// Maximum bytes to read from UART in a single loop iteration
 inline constexpr size_t SERIAL_PROXY_MAX_READ_SIZE = 256;
 
@@ -73,14 +84,14 @@ class SerialProxy final : public uart::UARTDevice, public Component {
   /// @param parity Parity setting (0=none, 1=even, 2=odd)
   /// @param stop_bits Number of stop bits (1 or 2)
   /// @param data_size Number of data bits (5-8)
-  void configure(api::APIConnection *api_connection, uint32_t baudrate, bool flow_control, uint8_t parity,
-                 uint8_t stop_bits, uint8_t data_size);
+  SerialProxyResult configure(api::APIConnection *api_connection, uint32_t baudrate, bool flow_control, uint8_t parity,
+                              uint8_t stop_bits, uint8_t data_size);
 
   /// Get the currently subscribed API connection (nullptr if none)
   api::APIConnection *get_api_connection() { return this->api_connection_; }
 
   /// Handle a subscribe/unsubscribe request from an API client
-  void serial_proxy_request(api::APIConnection *api_connection, api::enums::SerialProxyRequestType type);
+  SerialProxyResult serial_proxy_request(api::APIConnection *api_connection, api::enums::SerialProxyRequestType type);
 
   /// Write data received from an API client to the serial device
   /// @param api_connection The API connection sending the data
@@ -89,13 +100,20 @@ class SerialProxy final : public uart::UARTDevice, public Component {
   void write_from_client(api::APIConnection *api_connection, const uint8_t *data, size_t len);
 
   /// Set modem pin states from a bitmask of SerialProxyLineStateFlag values
-  void set_modem_pins(api::APIConnection *api_connection, uint32_t line_states);
+  SerialProxyResult set_modem_pins(api::APIConnection *api_connection, uint32_t line_states);
 
   /// Get current modem pin states as a bitmask of SerialProxyLineStateFlag values
   uint32_t get_modem_pins() const;
 
+  /// Get the modem pins this instance can drive as a bitmask of SerialProxyLineStateFlag values
+  uint32_t get_configured_modem_pins() const {
+    return (this->rts_pin_ != nullptr ? static_cast<uint32_t>(SERIAL_PROXY_LINE_STATE_FLAG_RTS) : 0u) |
+           (this->dtr_pin_ != nullptr ? static_cast<uint32_t>(SERIAL_PROXY_LINE_STATE_FLAG_DTR) : 0u);
+  }
+
   /// Flush the serial port (block until all TX data is sent)
-  uart::UARTFlushResult flush_port();
+  /// @param api_connection The API connection requesting the flush
+  SerialProxyResult flush_port(api::APIConnection *api_connection);
 
   /// Set the RTS GPIO pin (from YAML configuration)
   void set_rts_pin(GPIOPin *pin) { this->rts_pin_ = pin; }
diff --git a/esphome/components/zwave_proxy/zwave_proxy.cpp b/esphome/components/zwave_proxy/zwave_proxy.cpp
index 6e3f109ca1..68750295e1 100644
--- a/esphome/components/zwave_proxy/zwave_proxy.cpp
+++ b/esphome/components/zwave_proxy/zwave_proxy.cpp
@@ -194,12 +194,13 @@ void ZWaveProxy::api_connection_authenticated(api::APIConnection *conn) {
   }
 }
 
-void ZWaveProxy::zwave_proxy_request(api::APIConnection *api_connection, api::enums::ZWaveProxyRequestType type) {
+api::enums::ZWaveProxyStatus ZWaveProxy::zwave_proxy_request(api::APIConnection *api_connection,
+                                                             api::enums::ZWaveProxyRequestType type) {
   switch (type) {
     case api::enums::ZWAVE_PROXY_REQUEST_TYPE_SUBSCRIBE:
       if (this->api_connection_ == api_connection) {
         ESP_LOGV(TAG, "API connection is already subscribed");
-        return;
+        return api::enums::ZWAVE_PROXY_STATUS_OK;
       }
       if (this->api_connection_ != nullptr) {
         // A living subscriber keeps exclusive access. Its connection may be dead without
@@ -207,25 +208,26 @@ void ZWaveProxy::zwave_proxy_request(api::APIConnection *api_connection, api::en
         // in that case let the new client take over instead of locking it out.
         if (this->api_connection_->is_connection_setup()) {
           ESP_LOGE(TAG, "Only one API subscription is allowed at a time");
-          return;
+          return api::enums::ZWAVE_PROXY_STATUS_IN_USE;
         }
         ESP_LOGW(TAG, "Previous subscriber disconnected; taking over subscription");
       }
       this->api_connection_ = api_connection;
       ESP_LOGV(TAG, "API connection is now subscribed");
-      break;
+      return api::enums::ZWAVE_PROXY_STATUS_OK;
 
     case api::enums::ZWAVE_PROXY_REQUEST_TYPE_UNSUBSCRIBE:
+      // Unsubscribe is idempotent: not being subscribed is not an error
       if (this->api_connection_ != api_connection) {
         ESP_LOGV(TAG, "API connection is not subscribed");
-        return;
+        return api::enums::ZWAVE_PROXY_STATUS_OK;
       }
       this->api_connection_ = nullptr;
-      break;
+      return api::enums::ZWAVE_PROXY_STATUS_OK;
 
     default:
       ESP_LOGW(TAG, "Unknown request type: %" PRIu32, static_cast<uint32_t>(type));
-      break;
+      return api::enums::ZWAVE_PROXY_STATUS_NOT_SUPPORTED;
   }
 }
 
diff --git a/esphome/components/zwave_proxy/zwave_proxy.h b/esphome/components/zwave_proxy/zwave_proxy.h
index cb60139ef8..75225d84a8 100644
--- a/esphome/components/zwave_proxy/zwave_proxy.h
+++ b/esphome/components/zwave_proxy/zwave_proxy.h
@@ -60,7 +60,8 @@ class ZWaveProxy final : public uart::UARTDevice, public Component {
   bool can_proceed() override;
 
   void api_connection_authenticated(api::APIConnection *conn);
-  void zwave_proxy_request(api::APIConnection *api_connection, api::enums::ZWaveProxyRequestType type);
+  api::enums::ZWaveProxyStatus zwave_proxy_request(api::APIConnection *api_connection,
+                                                   api::enums::ZWaveProxyRequestType type);
   api::APIConnection *get_api_connection() { return this->api_connection_; }
 
   uint32_t get_feature_flags() const { return ZWaveProxyFeature::FEATURE_ZWAVE_PROXY_ENABLED; }
diff --git a/tests/benchmarks/stubs/esphome/components/serial_proxy/serial_proxy.h b/tests/benchmarks/stubs/esphome/components/serial_proxy/serial_proxy.h
index d8b068fb36..6fc20f3350 100644
--- a/tests/benchmarks/stubs/esphome/components/serial_proxy/serial_proxy.h
+++ b/tests/benchmarks/stubs/esphome/components/serial_proxy/serial_proxy.h
@@ -13,17 +13,18 @@ namespace api {
 class APIConnection;
 }  // namespace api
 
-namespace uart {
-enum class UARTFlushResult : uint8_t {
-  UART_FLUSH_RESULT_SUCCESS,
-  UART_FLUSH_RESULT_ASSUMED_SUCCESS,
-  UART_FLUSH_RESULT_TIMEOUT,
-  UART_FLUSH_RESULT_FAILED,
-};
-}  // namespace uart
-
 namespace serial_proxy {
 
+enum class SerialProxyResult : uint8_t {
+  SERIAL_PROXY_RESULT_OK,
+  SERIAL_PROXY_RESULT_ASSUMED_SUCCESS,
+  SERIAL_PROXY_RESULT_PORT_IN_USE,
+  SERIAL_PROXY_RESULT_INVALID_ARGUMENT,
+  SERIAL_PROXY_RESULT_ERROR,
+  SERIAL_PROXY_RESULT_TIMEOUT,
+  SERIAL_PROXY_RESULT_NOT_SUPPORTED,
+};
+
 class SerialProxy {
  public:
   void set_instance_index(uint32_t index) { this->instance_index_ = index; }
@@ -31,13 +32,20 @@ class SerialProxy {
   const char *get_name() const { return ""; }
   api::enums::SerialProxyPortType get_port_type() const { return {}; }
   api::APIConnection *get_api_connection() { return nullptr; }
-  void serial_proxy_request(api::APIConnection *conn, api::enums::SerialProxyRequestType type) {}
-  void configure(api::APIConnection *api_connection, uint32_t baudrate, bool flow_control, uint8_t parity,
-                 uint32_t stop_bits, uint32_t data_size) {}
+  SerialProxyResult serial_proxy_request(api::APIConnection *conn, api::enums::SerialProxyRequestType type) {
+    return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
+  }
+  SerialProxyResult configure(api::APIConnection *api_connection, uint32_t baudrate, bool flow_control, uint8_t parity,
+                              uint8_t stop_bits, uint8_t data_size) {
+    return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
+  }
   void write_from_client(api::APIConnection *api_connection, const uint8_t *data, size_t len) {}
-  void set_modem_pins(api::APIConnection *api_connection, uint32_t line_states) {}
+  SerialProxyResult set_modem_pins(api::APIConnection *api_connection, uint32_t line_states) {
+    return SerialProxyResult::SERIAL_PROXY_RESULT_OK;
+  }
   uint32_t get_modem_pins() const { return 0; }
-  uart::UARTFlushResult flush_port() { return uart::UARTFlushResult::UART_FLUSH_RESULT_SUCCESS; }
+  uint32_t get_configured_modem_pins() const { return 0; }
+  SerialProxyResult flush_port(api::APIConnection *api_connection) { return SerialProxyResult::SERIAL_PROXY_RESULT_OK; }
 
  protected:
   uint32_t instance_index_{0};
diff --git a/tests/benchmarks/stubs/esphome/components/zwave_proxy/zwave_proxy.h b/tests/benchmarks/stubs/esphome/components/zwave_proxy/zwave_proxy.h
index b4ccd8fd00..3abbf7d257 100644
--- a/tests/benchmarks/stubs/esphome/components/zwave_proxy/zwave_proxy.h
+++ b/tests/benchmarks/stubs/esphome/components/zwave_proxy/zwave_proxy.h
@@ -15,7 +15,9 @@ namespace zwave_proxy {
 class ZWaveProxy {
  public:
   api::APIConnection *get_api_connection() { return nullptr; }
-  void zwave_proxy_request(api::APIConnection *conn, api::enums::ZWaveProxyRequestType type) {}
+  api::enums::ZWaveProxyStatus zwave_proxy_request(api::APIConnection *conn, api::enums::ZWaveProxyRequestType type) {
+    return api::enums::ZWAVE_PROXY_STATUS_OK;
+  }
   void send_frame(api::APIConnection *api_connection, const uint8_t *data, size_t length) {}
   void api_connection_authenticated(api::APIConnection *conn) {}
   uint32_t get_feature_flags() const { return 0; }
diff --git a/tests/unit_tests/components/api/test_api_proto.py b/tests/unit_tests/components/api/test_api_proto.py
index 35aa5ff529..31297911f5 100644
--- a/tests/unit_tests/components/api/test_api_proto.py
+++ b/tests/unit_tests/components/api/test_api_proto.py
@@ -263,6 +263,17 @@ def test_device_capabilities_response_has_id_150() -> None:
     )
 
 
+def test_z_wave_proxy_request_response_has_id_151() -> None:
+    body = _extract_proto_message(PROTO_TEXT, "ZWaveProxyRequestResponse")
+    match = re.search(r"option \(id\) = (\d+);", body)
+    assert match is not None, "ZWaveProxyRequestResponse is missing `option (id)`"
+    assert int(match.group(1)) == 151, (
+        f"ZWaveProxyRequestResponse has id {match.group(1)}, expected 151. "
+        "Message ids are part of the wire protocol and must not change once "
+        "assigned."
+    )
+
+
 def test_superseded_fields_are_not_marked_deprecated_in_proto() -> None:
     """The six superseded fields must not carry `[deprecated = true]` in
     api.proto, or the generator drops them and old clients stop receiving

From 7c5105b16ea3f44a500494884415de6d3d6e3111 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Tue, 25 Aug 2026 06:36:06 +1000
Subject: [PATCH 155/155] [key_collector][mipi_rgb] Suppress compilation
 warnings (#18721)

---
 esphome/components/key_collector/key_collector.cpp | 2 ++
 esphome/components/mipi_rgb/mipi_rgb.cpp           | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/components/key_collector/key_collector.cpp b/esphome/components/key_collector/key_collector.cpp
index cb7d47b7f0..69b7a6a7c6 100644
--- a/esphome/components/key_collector/key_collector.cpp
+++ b/esphome/components/key_collector/key_collector.cpp
@@ -14,6 +14,7 @@ void KeyCollector::loop() {
 }
 
 void KeyCollector::dump_config() {
+#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_CONFIG
   ESP_LOGCONFIG(TAG, "Key Collector:");
   if (this->min_length_ > 0)
     ESP_LOGCONFIG(TAG, "  min length: %d", this->min_length_);
@@ -35,6 +36,7 @@ void KeyCollector::dump_config() {
     ESP_LOGCONFIG(TAG, "  allowed keys '%s'", this->allowed_keys_.c_str());
   if (this->timeout_ > 0)
     ESP_LOGCONFIG(TAG, "  entry timeout: %0.1f", this->timeout_ / 1000.0);
+#endif
 }
 
 void KeyCollector::add_provider(key_provider::KeyProvider *provider) {
diff --git a/esphome/components/mipi_rgb/mipi_rgb.cpp b/esphome/components/mipi_rgb/mipi_rgb.cpp
index b07460fdba..7421d8ad83 100644
--- a/esphome/components/mipi_rgb/mipi_rgb.cpp
+++ b/esphome/components/mipi_rgb/mipi_rgb.cpp
@@ -345,7 +345,7 @@ int MipiRgb::get_height() {
   }
 }
 
-static const char *get_pin_name(GPIOPin *pin, std::span<char, GPIO_SUMMARY_MAX_LEN> buffer) {
+[[maybe_unused]] static const char *get_pin_name(GPIOPin *pin, std::span<char, GPIO_SUMMARY_MAX_LEN> buffer) {
   if (pin == nullptr)
     return "None";
   pin->dump_summary(buffer.data(), buffer.size());