Bypass the cache when the resolved config enables secure options the snapshot cannot see

.agents/skills/hardware-test/SKILL.md

@@ -1,123 +0,0 @@
----
-name: hardware-test
-description: Test an ESPHome change on real boards over USB. Use this whenever a task asks to test, verify, reproduce, bench, A/B or soak a pull request, a branch or a crash on hardware, or mentions flashing, serial logs, esphome upload, a captive portal or fallback AP test, or results to post on a PR. Covers finding the serial ports, building from the right checkout, flashing each chip family (including the LibreTiny kits that stock tools cannot flash), bounded log capture, proven test flows and how to report results.
-allowed-tools: Read, Write, Edit, Bash, Glob, Grep
----
-
-# Hardware testing
-
-The goal of a hardware test is evidence a reviewer can trust: which build ran on which board, what was
-driven, what the logs show, and the same flow on a `dev` build when a quirk could be pre-existing.
-`$SKILL` below is this directory (`.agents/skills/hardware-test`).
-
-## Ground rules
-
-1. **Serial ports cannot be shared.** One bounded capture per port, stopped before any flash on that
-   port, never an open-ended `esphome logs`. Stop a capture with `pkill -f "[s]erial_capture.py <port> "`,
-   naming the port so a capture on another board survives; the bracket keeps the pattern from matching
-   the shell that runs it. Never run `esphome logs` in a
-   `while true` loop: the loop respawns it and holds the port.
-2. **Credentials stay local.** Put a `secrets.yaml` next to the scratch configs and reference it with
-   `!secret`. Never paste a config with credentials into a PR, never commit scratch configs or logs.
-3. **Build from the tree under test.** `python -m esphome` puts the current directory first on
-   `sys.path`, so run it with the checkout or worktree as the working directory and pass the yaml by
-   its absolute path. A venv `esphome` entry point may import an installed snapshot instead of the
-   checkout. Confirm with `python -c 'import esphome; print(esphome.__file__)'`, and for an A/B grep
-   the build's `src/` for the change before trusting any number.
-4. **PR build and baseline build get different `name:` values.** Builds share
-   `.esphome/build/<name>`, so the same name means `esphome upload` can flash the wrong binary. Saved
-   Wi-Fi credentials are keyed by the name too, so a test that must start unprovisioned gets a fresh
-   name every run.
-5. **Flash and RAM deltas are measured against the PR's merge base** (`git merge-base origin/dev HEAD`
-   checked out in a throwaway worktree), with the baseline commit named in the table. When a delta
-   looks odd, diff symbol sizes (`nm -S -C --size-sort` from the matching toolchain) before quoting it.
-6. **Prove a quirk is pre-existing before blaming the PR:** run the identical flow on a `dev` build in
-   the same session and say so in the results.
-7. **Pipe safely.** Set `PYTHONUNBUFFERED=1` on any `esphome run` or `esphome logs` whose output is
-   piped, or lines land minutes late. Bound every long command with `timeout` (coreutils) or
-   `perl -e 'alarm shift; exec @ARGV' <seconds> <command>` on macOS without it.
-
-## Workflow
-
-1. **Find the boards:** `python $SKILL/scripts/ports.py` (any Python with pyserial, for example the
-   ESPHome venv). Port names follow the USB hub port and change on every replug, so never reuse a name
-   from an earlier session. CH340 adapters (D1 mini, BW15 kit, BK7238, CB3S) all look the same; tell
-   them apart with a 10 s capture using `serial_capture.py --reset` (ESP8266 prints its ROM banner at
-   74880 baud, LibreTiny boards print `[LT]` and ESPHome lines, BK7238 prints its bootloader version).
-   `ports.py --wait 2e8a` blocks until a Pico re-enumerates.
-2. **Make a scratch directory** outside the checkout, with `secrets.yaml` and the templates you need.
-   One yaml per board per variant, file name equal to `name:`.
-3. **Compile** in the right tree:
-   `(cd <worktree> && PYTHONUNBUFFERED=1 timeout 1500 python -m esphome compile <abs yaml> > <name>-compile.log 2>&1)`.
-   Keep the RAM and flash lines at the end. Two ESP-IDF or two LibreTiny builds at the same time race
-   over tool caches; run them one at a time.
-4. **Flash** per chip family (table below). Stop the capture on that port first.
-5. **Capture** with `serial_capture.py PORT SECONDS OUT` in the background, then poll the file with
-   `grep` in an `until ... sleep 2` loop with a cap. USB CDC boards (Pico, nRF52, native USB ESP32)
-   drop the port on reboot; the script reopens it until its deadline.
-6. **Drive** the test: a second board running a client config, `curl`, an aioesphomeapi script that
-   presses a template button and subscribes to logs, MQTT publishes, or `interval:` and `on_boot:`
-   automations in the config itself.
-7. **Analyze** with `grep -a -c` counts over the capture and keep an `-events.txt` extract of the lines
-   that matter. Decode crashes with the platform's `addr2line` (see `reference/boards.md`).
-8. **Report** on the PR as a table: build SHA, board and framework, what was driven, counts, result,
-   plus the `dev` control row and the exact flow in a `<details>` block. No credentials, no port names,
-   no IP addresses.
-
-## Flashing by chip family
-
-| Board | Flash | Log |
-|---|---|---|
-| ESP8266 D1 mini (CH340) | `python -m esphome upload <yaml> --device <port>` | `serial_capture.py` at 115200; `esphome logs` on some CH340s emits garbage after the RTS reset. A failed esptool write can wedge the adapter until the board is replugged. `esptool erase_flash` before a test that needs an unprovisioned device: the preference sector survives a reflash |
-| ESP32 devkit (CP2102 or CH340) | `esphome upload --device <port>`, ESP-IDF or Arduino | `serial_capture.py`. Default Wi-Fi light sleep delays API driven actions by seconds; judge timing from device logs. `power_save_mode: none` for OTA overlap tests |
-| ESP32-S3, C3, C6, H2 native USB | `esphome upload --device /dev/cu.usbmodem*` | `logger: hardware_uart: USB_SERIAL_JTAG`. The USB console can wedge when the app takes over the console (0 bytes, esptool `No serial data received`); replug, or watch through `esphome logs --device <name>.local` |
-| Pico W / Pico 2 W | `esphome upload --device <port>` (1200 baud touch); first flash ever via BOOTSEL and `--device /Volumes/RPI-RP2` or `RP2350` | port re-enumerates after upload: `ports.py --wait 2e8a` then capture |
-| BW15 kit (RTL8720CF, rtl87xx) | `~/.platformio/penv/.libretiny/bin/python $SKILL/scripts/flash_rtl87xx_kit.py flash write -d <port> <build>/.pioenvs/<name>/*.uf2`. Plain `esphome upload` and plain ltchiptool time out because opening the port asserts DTR/RTS and holds the chip in reset | `serial_capture.py --released`, never `esphome logs` |
-| BK7238 / CB3S (bk72xx, RTS on CEN) | `~/.platformio/penv/.libretiny/bin/python $SKILL/scripts/flash_bk72xx.py flash write -d <port> <uf2>` (about 75 s) | logs are on UART2 by default; `logger: hardware_uart: UART1` puts them on the flashing adapter. Opening the port resets the chip, so keep one capture open for the whole test |
-| LN882H | ltchiptool forces 1 Mbaud for writes; weak adapters need `LN882H_YM_BAUDRATE` patched to 115200 in the penv's `ln882htool.py`; short BOOT to GND while the tool connects | OTA after the first flash |
-| nRF52840 Dongle (PCA10059) | Nordic `nrfutil nrf5sdk-tools dfu usb-serial` on the bootloader port, or `dfu: true` in the config so the 1200 baud touch pin-resets into the bootloader; adafruit-nrfutil is refused | app has two CDC ports, ESPHome log on the second |
-| Adafruit-style nRF52 (UF2 bootloader) | `UF2BOOT` volume or adafruit-nrfutil; `dfu: true` works through GPREGRET | single CDC port |
-| Any reachable device | `esphome upload <yaml> --device <ip or name.local>`; `--file <bin>` for a prebuilt image | `esphome logs --device <ip>` bounded with `timeout` |
-
-ESP-IDF OTA image: `.esphome/build/<name>/build/firmware.ota.bin`. LibreTiny OTA port is 8892.
-
-## Scripts in `$SKILL/scripts`
-
-- `ports.py`: list ports with VID:PID, product, serial and a board guess; `--wait VID[:PID]`,
-  `--product NAME`, `--serial SN` (one specific board, whatever path it comes back under) and
-  `--serial-of PORT` (the serial number behind a path).
-- `serial_capture.py PORT SECONDS OUT [--baud] [--released] [--reset] [--append]`: bounded timestamped
-  capture, ANSI stripped, `LOG_SECRET` text written as `<secret>`, reopens a vanished port, exits at the
-  deadline. OUT is truncated unless `--append` is given, so counts over it cover one run.
-- `flash_rtl87xx_kit.py`: ltchiptool wrapper for the BW15 kit whose CH340 drives CEN (RTS) and the boot
-  strap (DTR). `flash read` needs the family `realtek-ambz2`; `flash write` does not.
-- `flash_bk72xx.py`: ltchiptool wrapper for BK72xx boards whose RTS drives CEN.
-- `wifisave_hammer.sh KIND DUT_PORT DUT_YAML DUT_TREE CLIENT_PORT CLIENT_YAML CLIENT_TREE [SETTLE]`:
-  the fallback AP plus captive portal hammer end to end (compile, flash, capture, counts) with the
-  templates below. KIND is `esp`, `pico`, `bw15` or `bk`. It ends with `RESULT PASS` (exit 0),
-  `RESULT FAIL` (exit 3: a crash, a reboot after the AP came up, or the device never joined the network),
-  `RESULT INVALID`
-  (exit 2: a precondition was missed, the stimulus was insufficient, or a capture did not last the run)
-  or exits 1 when a build, flash or port step failed.
-
-## Templates in `$SKILL/templates`
-
-- `dut-fallback-ap.yaml` (package): a device that never finds its network, falls back to its AP and
-  serves the captive portal. `example-dut.yaml` is the per-run file with the platform block.
-- `client-wifisave.yaml` (package): joins that AP, posts N bogus `/wifisave` requests, then the real
-  credentials from `!secret`. `example-client.yaml` is the per-run file. `bogus_saves: "1"` gives a
-  plain provisioning check.
-
-## When something looks wrong
-
-- A capture stopped early or a line is missing: check the timestamps before trusting it.
-- The client never joins the AP: another board may still run an AP with the same SSID, or the device
-  booted with saved credentials because the name was reused. One AP device at a time on the bench.
-- Builds come out byte-identical between branches: the wrong tree was imported (rule 3).
-- Multicast from the host never arrives on some access points: test it device to device. Broadcast
-  is lossy under Wi-Fi power save, unicast is not. Throttle UDP floods to a fixed packet rate.
-- `api:` reboots a board after 15 min without a client: `reboot_timeout: 0s` on `api:` and `mqtt:` for
-  soak tests.
-
-`reference/boards.md` has per-chip facts and crash decoding; `reference/recipes.md` has the proven
-flows. Add new findings there.

.agents/skills/hardware-test/reference/boards.md

@@ -1,138 +0,0 @@
-# Board facts
-
-Ports are not listed on purpose: they follow the USB hub port and change on every replug. Run
-`scripts/ports.py`.
-
-## ESP8266 (D1 mini, NodeMCU, CH340 or CP2102)
-
-- Opening the port usually resets the board through DTR, but not always; `serial_capture.py --reset`
-  pulses RTS to capture from boot. 74880 baud shows the ROM boot messages (`rst cause`, `boot mode`).
-- `esphome logs` on some CH340s emits thousands of duplicated garbage lines right after the RTS reset;
-  a plain pyserial capture at 115200 is reliable.
-- A failed esptool write can wedge the adapter (`termios` error 22, or an open that hangs) until replug.
-- The preference sector survives a reflash: a provisioned API key or saved Wi-Fi credentials stay
-  active. `esptool erase_flash` gives a clean device.
-- `Panic core_esp8266_main.cpp:191 __yield` with `ctx: sys` means a yield from lwIP context (a web
-  handler, an lwIP callback). Decode stacks with
-  `xtensa-lx106-elf-addr2line -e <build>/.pioenvs/<name>/firmware.elf -f -C -i <addr...>` from the
-  toolchain under `~/.platformio/packages/toolchain-xtensa/bin/` (PlatformIO builds) or the ESPHome
-  cache directory (native toolchain builds).
-- Constant data lives in RAM unless marked `PROGMEM`; with 80 KB of RAM a few hundred bytes are worth a
-  row in the PR.
-- AsyncMqttClient drops inbound topics over 128 characters; topics of 255 or more wrap a counter and
-  stall the link until the broker drops TCP.
-
-## ESP32 classic devkit
-
-- Takes ESP-IDF and Arduino. Default Wi-Fi light sleep delays API driven actions by up to 6 s; judge
-  timings from device logs, not from the host. `power_save_mode: none` for OTA overlap tests (an IDF web
-  upload of 739 KB took 107 s with power save and 45 s without).
-- Receives only a few percent of IPv6 multicast on some access points with power save on; a raw lwIP
-  socket loses the same, so that is the AP or driver, not a PR.
-- Decode with `xtensa-esp32-elf-addr2line` from the IDF tools directory against
-  `<build>/.pioenvs/<name>/firmware.elf` (PlatformIO) or `<build>/build/<name>.elf` (IDF native).
-- Clean reboot between runs with the capture stopped: `esptool --after hard_reset chip_id`.
-- Trigger a forced crash only after the app is marked valid (45 s after boot is plenty), never on an
-  image still pending OTA rollback.
-- Signed OTA testing: build with `esp32.framework.advanced.signed_ota_verification.verification_keys`
-  under a different name, sign with `python -m espsecure sign_data --version 2 --keyfile
-  tests/components/esp32/dummy_signing_key.pem`, upload with `esphome upload --file`. The verifier
-  refuses unsigned images afterwards, so restore with a signed plain build.
-
-## ESP32-S3, C3, C6, H2 with native USB
-
-- `/dev/cu.usbmodem*`, esptool works, `logger: hardware_uart: USB_SERIAL_JTAG`.
-- The USB console can die at the moment the app takes over the console during a reboot (log stops after
-  `Disabling RNG early entropy source`, then 0 bytes, esptool reports `No serial data received`). Only a
-  USB replug fixes it. Fallback: `esphome logs --device <name>.local` (API log stream, which drops lines
-  while Wi-Fi is off).
-- The ESP32-P4 before silicon revision 3 is bricked by rev3-only firmware (boot loop at bootloader entry).
-
-## RP2040 / RP2350 (Pico W, Pico 2 W)
-
-- The CDC port re-enumerates after every reboot and after `esphome upload` (1200 baud touch). Re-detect
-  with `ports.py --wait 2e8a` before capturing; `serial_capture.py` reopens on its own if the port
-  vanishes mid-capture.
-- First flash ever: BOOTSEL, then `esphome upload --device /Volumes/RPI-RP2` (or `RP2350`).
-- arduino-pico creates the lwIP netif in `WiFi.begin()`, so any IGMP join during component setup fails;
-  joins must wait for `network::is_connected()`.
-- Parallel Pico builds race on package extraction after a PlatformIO package wipe; one at a time.
-- An RTS pulse from pyserial does not reset the board; reboot with `App.safe_reboot()` or the touch.
-
-## BW15 kit (RTL8720CF, LibreTiny rtl87xx)
-
-- The kit's CH340 wires RTS to CEN and DTR to PA00 (boot strap). A plain pyserial open asserts both and
-  holds the chip in reset, which is why `esphome upload`, plain `ltchiptool` and `esphome logs` all fail
-  ("Timeout while linking", or silence). `scripts/flash_rtl87xx_kit.py` sets DTR high and RTS released
-  on every open, pulses RTS once so the ROM answers `ping`, and after the command drops DTR and pulses
-  RTS to boot the app. Run it with the PlatformIO LibreTiny penv Python.
-- `flash write -d <port> <uf2>` takes no family argument; `flash read -d <port> -s 0 -l <len>
-  realtek-ambz2 <out>` does.
-- Capture with `serial_capture.py --released`. The ESPHome log is on the flashing UART already.
-- The macOS CH340 driver only pushes DTR/RTS to the wire once a session has driven them, so the first
-  plain open after a replug streams logs and the second is silent; always open with the lines released.
-- Driver quirks seen on `dev`: `WiFi.begin` can refuse the real network on the first try after bogus
-  credentials (it connects after two cooldowns); right after connecting while the AP is still up the
-  driver can bus-fault in `rtw_is_adapter_up` (`R0 = 0xdeadbeef`) and reboot; the AP restarts on every
-  STA retry, so stations cannot stay joined; `WiFi.begin` fails synchronously for an absent network and
-  lands in a cooldown at once; connecting blocks the loop 2.5 to 4.1 s.
-- Decode faults with `arm-none-eabi-addr2line -e <build>/.pioenvs/<name>/raw_firmware.elf -f -C -i <PC>`
-  from `~/.platformio/packages/toolchain-gccarmnoneeabi/bin/` (`raw_firmware.elf`, not `firmware.elf`).
-  Fault dumps print PC, LR and R0 to R3.
-- The AmebaZ2 SDK sets `LWIP_TCPIP_CORE_LOCKING 0`.
-
-## BK7238, WB3S, CB3S (BK7231N) (LibreTiny bk72xx, CH340, RTS on CEN)
-
-- Stock ltchiptool closes and reopens the port after its reset, and pyserial raises both lines on open,
-  holding CEN low through the BootROM window. `scripts/flash_bk72xx.py` opens with both released and
-  pulses the reset right before the link checks. A write takes about 75 s. Only a CEN or power reset
-  reaches the downloader; no software reboot does.
-- ESPHome logs on UART2 by default; `logger: hardware_uart: UART1` puts them on the flashing adapter.
-- Opening the port resets the chip (bootloader banner on every open, even with DTR/RTS low), so keep one
-  capture open for the whole test and never reopen mid-phase.
-- Callbacks run on the `async_tcp` task and log lines can lose a byte. Wi-Fi connect takes tens of ms;
-  radio enable 160 to 278 ms, disable about 200 ms.
-
-## BW16 kit (RTL8720DN, AmebaD)
-
-- The kit's own USB-C (CH340) is on LOG_UART and flashes fine. Its two-transistor circuit resets while
-  RTS alone is asserted and straps BURN while DTR alone is; both asserted does nothing. ROM entry is
-  esptool's classic sequence (`dtr:false,rts:true` 100 ms, `dtr:true,rts:false` 400 ms, both false); the
-  first pulse after a replug can be lost, retry up to three times.
-- Any reopen resets the chip, 460800 is flaky, 115200 is solid: one open per session, in-place baud
-  changes only. The ROM and the loader NAK continuously while idle, so ACK scans must drain first.
-- The AmebaD core has no mDNS responder (`mdns: disabled: true`).
-
-## LN882H
-
-- ltchiptool forces 1 Mbaud for writes; adapters that cannot hold it fail with "Timeout while linking"
-  or die mid-write. Patch `LN882H_YM_BAUDRATE` in the penv's `ltchiptool/soc/ln882h/util/ln882htool.py`
-  to 115200 (lost on reprovision). Weak 3.3 V from the adapter: feed the module's 5 V pad instead. Short
-  BOOT to GND while the tool connects. OTA afterwards.
-- `USE_WIFI_AP_EXCLUSIVE` (one radio mode at a time) exists only on LN882x; compile-check changes there.
-
-## nRF52840
-
-- Nordic PCA10059 dongle: the factory Open DFU bootloader enumerates as `1915:521F` on its own port
-  name; the app as `2FE3:0100` with two CDC ports, ESPHome log on the second. Only Nordic
-  `nrfutil nrf5sdk-tools` works (`pkg generate --hw-version 52 --sd-req 0x00 --application-version 1
-  --application zephyr.hex app.zip`, then `dfu usb-serial -pkg app.zip -p <port>`); ESPHome downloads
-  it on the first build. GPREGRET does not enter the bootloader; a pin reset through P0.19 does, which
-  `dfu: true` wires up on this board. A pulsing red LED means bootloader; the side RESET button
-  re-enters it.
-- Makerdiary MDK USB dongle: UF2 bootloader without SoftDevice, app at 0x1000, `UF2BOOT` volume,
-  adafruit-nrfutil, GPREGRET 0x57 works. RGB LED active low (red P0.23, green P0.22, blue P0.24),
-  button P0.18.
-
-## ESP Thread Border Router board v1.2 (S3 host + H2 RCP)
-
-- S3 host on USB JTAG serial, H2 RCP on its own USB. Spinel UART1 from the host: `rx_pin: GPIO17`,
-  `tx_pin: GPIO18`, RCP reset `GPIO7` active low, 460800. The config needs `network: enable_ipv6: true`.
-- The shipped H2 firmware fails `CheckRadioCapabilities` with IDF 5.5; build `examples/openthread/ot_rcp`
-  for esp32h2 with ESPHome's own IDF (`IDF_PATH` at the cached framework, its penv and tools,
-  `IDF_PYTHON_CHECK_CONSTRAINTS=no`) and flash with esptool at 0x0, 0x8000 and 0x10000.
-- A crash-looping S3 pulses the H2 reset every boot, so the H2 cannot be flashed and the S3 will not
-  enter its bootloader over USB. Hold S3 BOOT, tap S3 RST, flash the H2, release, then replug both.
-- `dns-sd -L <name> _meshcop._udp local.` shows the `omr` prefix; it disappears when routing is dead.
-  Keep one capture per chip; never reset the H2 over USB mid-test unless that is the test (the host
-  logs `Unexpected RCP reset: RESET_OTHER` and recovers).

.agents/skills/hardware-test/reference/recipes.md

@@ -1,117 +0,0 @@
-# Proven test flows
-
-Each flow names the pull requests it was used on, so their result tables show what to post.
-
-## Captive portal `/wifisave` hammer (#20802, #20784)
-
-Reproduces a `/wifisave` arriving during the STA cooldown, and proves a fix on every board.
-Device under test: `templates/example-dut.yaml` (bogus network, `ap:` with `ap_timeout: 15s`,
-`captive_portal:`). Client: `templates/example-client.yaml` on an ESP32 or a D1 mini; it joins the
-device's AP, posts 15 bogus saves 3 s apart, then the real credentials. With the portal up the cooldown
-is 30 s, so nearly every save lands inside one. Driver: `scripts/wifisave_hammer.sh`. Settle 40 s on
-ESP boards, 90 s on the BW15 (its first attempt on the real network fails, see boards.md).
-
-Counts that matter: `Requested WiFi Settings Change` (saves received), `Exiting cooldown early`, crash
-markers, boots (`Log initialized`), and the client's `bogus save status 200` and `real save status 200`.
-A healthy run: every save answered 200, one cooldown exit per save (two on the BW15, whose retry enters
-the adapter restart), no panic, and the real credentials connect the device within about 10 s.
-
-Fault injection for AP start failures: wrap `this->ap_setup_ = this->wifi_start_ap_(this->ap_)` in
-`setup_ap_config_()` with an `HWTEST_AP_FAIL_COUNT` build flag
-(`esphome: platformio_options: build_flags: -DHWTEST_AP_FAIL_COUNT=2`), raise the portal's "Captive
-portal started" from LOGV to LOGI, and after provisioning curl the device's STA address: connection
-refused proves the portal's server is gone.
-
-## `reboot_timeout` with a fallback AP (#9958)
-
-Only one board runs the AP at a time, or stations join the wrong one. AP probe: bogus network,
-`ap: {ssid, password, ap_timeout: 5s}`, `reboot_timeout: 60s`, `logger: level: VERBOSE` (ESP32 and
-ESP8266 log `AP client connected MAC=` at verbose), `on_boot: logger.log: BOOT`. Station probes:
-`reboot_timeout: 0s`, `interval: 150s` running `wifi.disable`, `delay: 20s`, `wifi.enable` (60 s cycles
-are too short to cover the due moment). Pass pattern: "Can't connect; rebooting" exactly 60 s after boot
-with no station joined, no reboot for minutes while one is, then a reboot within a second of the last
-disconnect. The BW15 restarts its AP on every STA retry and cannot be tested this way.
-
-## MQTT (#20433, #17935, #20762, #20767, #20768)
-
-A local mosquitto with `allow_anonymous true`, `log_type all` and `log_dest file`: the broker log gives
-each subscription's QoS, the device address (`New client connected from <ip> as <name>-<mac>`) and exact
-subscribe counts. Kill and restart mosquitto to exercise `on_disconnect` (reason 0) and resubscription.
-Keep `reboot_timeout: 0s` on `api:` and `mqtt:`. The ESP-IDF outbox swings free heap about 2 kB right
-after bulk subscribe and unsubscribe; read the heap seconds later over several rounds before calling a
-leak. Spawned subscriptions need about 2.5 s to reach the broker before the next publish.
-`esphome logs --device MQTT` only uses the MQTT transport when the config has no `api:`. Driver pattern: a
-paho script publishes and polls the serial capture file.
-
-## UDP, multicast, sockets (#20556 to #20559, #20585, #20590)
-
-A listener on port 9 needs no privileges on macOS. Test multicast device to device; host to device
-multicast never arrives on some access points, and `239.255.x.x` groups are unreliable even to a stock
-listener. Broadcast to boards is lossy under power save, unicast is not. Flood at a fixed packet rate
-(the host hits `ENOBUFS` unthrottled); 1500 packets per second survived on every board. A forced Wi-Fi
-reconnect on the Pico keeps IGMP membership. Set a long loop interval from `wifi.on_connect`
-(`App.set_loop_interval(20000)`), not `on_boot`, or Wi-Fi connect crawls. The `logger.log` action
-rejects `%.*s`; use a lambda.
-
-## OTA overlap and lock (#20588), OTA timeouts (#19041), deflate (#19037)
-
-All overlap orders (a web upload during a native OTA and the reverse) must be refused; the lock release
-after an interrupted web upload waits about 14 s (ESP8266) or 7 s (ESP-IDF) for disconnect detection. A
-refused web client on `web_server_idf` never gets the busy reply; the connection drops at reboot.
-`pkill -f "a\|b"` does not alternate; use two pkills.
-
-## DHCP lease cache (#17767)
-
-Cycle 20 s awake, `deep_sleep.enter 30s`, wake, 20 s, `App.safe_reboot()`, logging `millis()` at the
-`wifi.connected` condition. An RTS hardware reset must fall back to DHCP; a software reboot and a deep
-sleep wake must apply the cache. `esphome run --no-logs` silently skipped the upload on one board; use
-`upload` then `logs`.
-
-## HDMI-CEC two-board wire (#9189)
-
-Two boards on one wire: promiscuous mode, a 0x8F request answered with 0x90 0x00, a `destination:`
-filter on the reply handler, template buttons for each target plus lambdas calling
-`send(source, dest, span)` as another initiator. Healthy numbers: device-side turnaround 15 to 22 ms,
-round trip 144 to 156 ms. Press buttons over the API; judge timings from device logs (ESP32 light sleep
-lags the press).
-
-## LD2450 polygon zones (#20154)
-
-To make a target "leave" without anyone moving, set the radar's Zone-1 numbers over the target and
-switch the zone type to `Filter` (the count drops to 0 within 0.5 s); set it back to `Disabled` after.
-Writing those numbers blocks the ld2450 loop about 50 ms.
-
-## Scheduler and loop wake A/B (#20356)
-
-An external component whose template button arms an SDK `os_timer` (50 ms, one shot) on the ESP8266;
-the callback runs in SYS context, records `millis()` and calls `set_timeout` or `defer`; the timeout
-logs the elapsed time and loop count delta. Drive with an aioesphomeapi script (`subscribe_logs` plus
-`button_command`). Build the same yaml twice with different names, one per tree.
-
-## Noise handshake and OTA encryption on the ESP8266 (#19062, #19233)
-
-Host side timing is useless on a weak link; use an on-device bench with the minimum of five runs over
-two boots. Provision a key with `noise_encryption_set_key` through aioesphomeapi and upload with
-`espota2.run_ota(host, 8266, None, bin, noise_psk=key)` when the key is not in the yaml.
-
-## ESP-NOW on the ESP8266 (#14407)
-
-The NONOS SDK only delivers broadcast ESP-NOW frames while the station is associated or a soft-AP is
-up; a hidden, open, client-less soft-AP (60 s beacon, DHCP stopped) makes broadcasts arrive. In AP-only
-mode the device transmits from the soft-AP MAC.
-
-## Wi-Fi Easy Connect (DPP) enrollee (#17934)
-
-Only an Android phone configures: Settings, network details, Add device, Share Wi-Fi (the Wi-Fi list's
-QR scanner makes the phone an enrollee). Render the URI with the `qrcode` module and open the PNG.
-`esp32: framework: log_level: DEBUG` plus `sdkconfig_options: CONFIG_WPA_DEBUG_PRINT: y` prints the
-supplicant state machine.
-
-## Thread border router (#18104)
-
-See boards.md for the ESP Thread BR board. Check that the H2 answers Spinel before blaming a PR.
-
-## nRF52840 dongle boards (#19009, #20814)
-
-Test config: the two LEDs as inverted GPIO outputs, the button as an inverted pull-up binary sensor, a
-10 s alive interval. To retest the nrfutil download path, move the cached `sdk-nrf/nrfutil` aside first.

.agents/skills/hardware-test/scripts/flash_bk72xx.py

@@ -1,51 +0,0 @@
-"""ltchiptool for boards whose RTS drives CEN: reset and link on one open port.
-
-Stock ltchiptool closes and reopens the port after its DTR/RTS reset, and
-pyserial raises both lines on open, holding CEN low through the BootROM's
-listen window. Open with both lines released and pulse the reset right
-before the LinkChecks instead.
-"""
-
-import sys
-
-import bk7231tools.serial.main as bk_main
-from ltchiptool.__main__ import cli
-from ltchiptool.soc.bk72xx.flash import BK72XXFlash
-from serial import Serial
-
-
-class ReleasedSerial(Serial):
-    def __init__(self, port=None, **kwargs):
-        super().__init__(None, **kwargs)
-        self.dtr = False
-        self.rts = False
-        self.port = port
-        self.open()
-
-
-bk_main.Serial = ReleasedSerial
-
-_connect = BK72XXFlash.flash_connect
-
-
-def flash_hw_reset(self) -> None:
-    self._reset_pending = True
-
-
-def flash_connect(self) -> None:
-    pending = getattr(self, "_reset_pending", False)
-    if self.bk and self.conn.linked and not pending:
-        return
-    self.flash_build_protocol()
-    if pending:
-        self._reset_pending = False
-        self.bk.hw_reset()
-        self.conn.linked = False  # the chip rebooted, so link again below
-    _connect(self)
-
-
-BK72XXFlash.flash_hw_reset = flash_hw_reset
-BK72XXFlash.flash_connect = flash_connect
-
-sys.argv = ["ltchiptool", *sys.argv[1:]]
-cli()

.agents/skills/hardware-test/scripts/flash_rtl87xx_kit.py

@@ -1,87 +0,0 @@
-"""ltchiptool for the BW15 kit whose CH340 drives CEN (RTS) and PA00 (DTR).
-
-A plain open asserts both lines and holds the chip in reset. Here every open keeps DTR high and RTS
-released; the first open pulses RTS so the ROM comes up; after the command DTR low plus an RTS pulse
-boots the app. The exit status is ltchiptool's; 2 means the flash succeeded but the app was not
-booted (boot pulse failed, or no -d PORT to send it to), so the board sits in the ROM until reset.
-
-Usage: python flash_rtl87xx_kit.py flash write -d <port> firmware.uf2
-"""
-
-import sys
-import time
-
-import serial
-
-_first = [True]
-_orig_open = serial.Serial.open
-
-
-def _open(self):
-    self.dtr = True  # PA00 high: ROM download mode on the next reset
-    self.rts = False  # CEN released
-    _orig_open(self)
-    if _first[0]:
-        _first[0] = False
-        self.rts = True
-        time.sleep(0.1)
-        self.rts = False
-        time.sleep(0.3)  # reset into the ROM
-        self.reset_input_buffer()
-
-
-serial.Serial.open = _open
-
-from ltchiptool.__main__ import cli_entrypoint  # noqa: E402
-
-
-def port_argument(argv: list[str]) -> str | None:
-    for i, a in enumerate(argv):
-        if a in ("-d", "--device") and i + 1 < len(argv):
-            return argv[i + 1]
-        if a.startswith(("-d=", "--device=")):
-            return a.split("=", 1)[1]
-        if a.startswith("-d") and len(a) > 2:
-            return a[2:]
-    return None
-
-
-def boot_app(port: str) -> None:
-    s = serial.Serial(port=None)
-    s.port = port
-    s.dtr = False
-    s.rts = False
-    _orig_open(s)
-    s.rts = True
-    time.sleep(0.1)
-    s.rts = False
-    s.close()
-
-
-def main() -> int:
-    rc = 1
-    try:
-        result = cli_entrypoint.main(args=sys.argv[1:], standalone_mode=False)
-        rc = int(result) if isinstance(result, int) else 0
-    finally:
-        port = port_argument(sys.argv)
-        if not port:
-            print(
-                "[flash_rtl87xx_kit] no -d PORT given, the application was not booted",
-                file=sys.stderr,
-            )
-            if rc == 0:
-                rc = 2
-        else:
-            try:
-                boot_app(port)
-                print("[flash_rtl87xx_kit] application booted")
-            except (serial.SerialException, OSError) as err:
-                print(f"[flash_rtl87xx_kit] boot pulse failed: {err}", file=sys.stderr)
-                if rc == 0:
-                    rc = 2  # flashed, but the board is still in the ROM: press reset
-    return rc
-
-
-if __name__ == "__main__":
-    sys.exit(main())

.agents/skills/hardware-test/scripts/ports.py

@@ -1,123 +0,0 @@
-"""List the boards on USB, or wait for one to enumerate.
-
-  ports.py                          table: port, vid:pid, product, serial number, guess
-  ports.py --wait 2e8a              print the first port with VID 0x2e8a once it appears (default 60 s)
-  ports.py --wait 1a86:7523 --timeout 30
-  ports.py --product "USB Serial"   first port whose USB product string matches (case-insensitive)
-  ports.py --wait 2e8a --serial SN  the port of one specific board, whatever name it comes back under
-  ports.py --serial-of PORT         print the USB serial number behind a port name
-
-Run with a Python that has pyserial (any ESPHome venv). Port names follow the hub port on macOS, so
-re-run this after every replug instead of trusting a name from an earlier session.
-"""
-
-import argparse
-import sys
-import time
-
-from serial.tools import list_ports
-
-GUESS = [
-    (
-        (0x1A86, 0x7523),
-        "CH340: D1 mini, BW15 kit, BK7238/CB3S or LN882H adapter; identify by the boot banner",
-    ),
-    ((0x1A86, 0x55D3), "CH343: ESP32-P4 devkit console"),
-    ((0x1A86, 0x55D4), "CH343: ESP32 devkit"),
-    ((0x1A86, None), "WCH CH34x USB serial bridge"),
-    ((0x10C4, 0xEA60), "CP2102: classic ESP32 devkit (esp32dev)"),
-    (
-        (0x303A, 0x1001),
-        "Espressif USB JTAG serial: S3/C3/C6/H2 native USB (logger hardware_uart USB_SERIAL_JTAG)",
-    ),
-    (
-        (0x2E8A, None),
-        "Raspberry Pi Pico W / Pico 2 W CDC; the port vanishes and comes back on every reboot",
-    ),
-    ((0x1915, 0x521F), "nRF52840 Dongle (PCA10059) in the Open DFU bootloader"),
-    (
-        (0x2FE3, 0x0100),
-        "nRF52840 Dongle running a Zephyr app; two CDC ports, ESPHome log on the second",
-    ),
-    ((0x1915, 0xCAFE), "Makerdiary nRF52840 MDK dongle running a Zephyr app"),
-    ((0x239A, None), "Adafruit style nRF52 board (UF2 bootloader family)"),
-]
-
-
-def guess(vid: int, pid: int) -> str:
-    for (gv, gp), text in GUESS:
-        if vid == gv and (gp is None or pid == gp):
-            return text
-    return ""
-
-
-def parse_id(text: str) -> tuple[int, int | None]:
-    vid, _, pid = text.partition(":")
-    return int(vid, 16), (int(pid, 16) if pid else None)
-
-
-def matches(
-    port, vid: int | None, pid: int | None, product: str | None, serial: str | None
-) -> bool:
-    if vid is not None and (port.vid != vid or (pid is not None and port.pid != pid)):
-        return False
-    if product and (port.product or "").lower() != product.lower():
-        return False
-    return not serial or (port.serial_number or "") == serial
-
-
-def main() -> int:
-    ap = argparse.ArgumentParser(
-        description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
-    )
-    ap.add_argument(
-        "--wait",
-        metavar="VID[:PID]",
-        help="block until a matching port appears, print it",
-    )
-    ap.add_argument("--product", help="USB product string to match")
-    ap.add_argument("--serial", help="USB serial number to match")
-    ap.add_argument(
-        "--serial-of", metavar="PORT", help="print the USB serial number of PORT"
-    )
-    ap.add_argument("--timeout", type=float, default=60)
-    args = ap.parse_args()
-
-    if args.serial_of:
-        for p in list_ports.comports():
-            if p.device == args.serial_of and p.serial_number:
-                print(p.serial_number)
-                return 0
-        print(f"no USB serial number for {args.serial_of}", file=sys.stderr)
-        return 1
-
-    vid = pid = None
-    if args.wait:
-        vid, pid = parse_id(args.wait)
-
-    if args.wait or args.product or args.serial:
-        deadline = time.time() + args.timeout
-        while True:
-            for p in sorted(list_ports.comports(), key=lambda p: p.device):
-                if p.vid and matches(p, vid, pid, args.product, args.serial):
-                    print(p.device)
-                    return 0
-            if time.time() >= deadline:
-                print("no matching port", file=sys.stderr)
-                return 1
-            time.sleep(1)
-
-    rows = [p for p in list_ports.comports() if p.vid]
-    if not rows:
-        print("no USB serial ports")
-        return 1
-    for p in sorted(rows, key=lambda p: p.device):
-        print(
-            f"{p.device:32} {p.vid:04x}:{p.pid:04x}  {p.product or '?':34} "
-            f"{p.serial_number or '':18} {guess(p.vid, p.pid)}"
-        )
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

.agents/skills/hardware-test/scripts/serial_capture.py

@@ -1,157 +0,0 @@
-"""Bounded, timestamped serial capture that always exits and closes the port.
-
-  serial_capture.py PORT SECONDS OUTFILE [--baud 115200] [--released] [--reset] [--append]
-
-  default      open with DTR/RTS as pyserial leaves them (asserted); fine for ESP devkits and the Pico.
-  --released   drive DTR and RTS low before opening: the BW15 and BK7238 CH340 kits strap the boot pin
-               (DTR) and reset (RTS), so a plain open holds the chip in reset.
-  --reset      pulse reset after opening (DTR low, RTS high 100 ms, RTS low) to capture a fresh boot.
-  --baud       115200 by default; 74880 shows the ESP8266 ROM boot messages.
-  --append     keep what OUTFILE already holds; by default it is truncated so counts cover this run only.
-
-Exit status 1 when nothing was received (wrong port name, or a port another capture still holds).
-Text ESPHome marks as secret (LOG_SECRET, the Wi-Fi password) is written as <secret>.
-Lines are written as [HH:MM:SS]text with ANSI colour stripped and flushed one by one, so a shell
-loop can grep the file while the capture runs. If the port is missing or disappears (USB CDC boards
-re-enumerate on reboot) the script retries until the deadline, and follows the board by its USB serial
-number when it comes back under another device path.
-
-Never run an open-ended serial session: every capture has a deadline, and a flash on the same port
-needs the capture stopped first (pkill -f "[s]erial_capture.py" does not match the killing shell).
-"""
-
-import argparse
-import contextlib
-import pathlib
-import re
-import sys
-import time
-
-import serial
-from serial.tools import list_ports
-
-ANSI = re.compile(rb"\x1b\[[0-9;]*[A-Za-z]")
-# ESPHome's LOG_SECRET span (a Wi-Fi password); a span cut off before its end marker is secret to the end
-SECRET = re.compile(rb"\x1b\[8m.*?(?:\x1b\[28m|$)", re.DOTALL)
-PORT_ERRORS = (serial.SerialException, OSError)
-
-
-def identify(port: str) -> tuple[str | None, int]:
-    """USB serial number of the port and its position among that device's ports (a dongle has two)."""
-    ports = sorted(list_ports.comports(), key=lambda p: p.device)
-    serial_number = next((p.serial_number for p in ports if p.device == port), None)
-    siblings = [
-        p.device for p in ports if serial_number and p.serial_number == serial_number
-    ]
-    return serial_number, siblings.index(port) if port in siblings else 0
-
-
-def current_path(port: str, serial_number: str | None, index: int) -> str:
-    """The port's current device path: a USB CDC board can come back under a new name after a reboot."""
-    if serial_number:
-        ports = sorted(list_ports.comports(), key=lambda p: p.device)
-        siblings = [p.device for p in ports if p.serial_number == serial_number]
-        if index < len(siblings):
-            return siblings[index]
-    return port
-
-
-def open_port(args: argparse.Namespace, path: str) -> serial.Serial:
-    s = serial.Serial(port=None, baudrate=args.baud, timeout=0.2)
-    s.port = path
-    if args.released:
-        s.dtr = False
-        s.rts = False
-    s.open()
-    if args.reset:
-        try:
-            s.dtr = False
-            s.rts = True
-            time.sleep(0.1)
-            s.rts = False
-            s.reset_input_buffer()
-        except PORT_ERRORS:
-            s.close()
-            raise
-    return s
-
-
-def write_line(out, tag: bytes, data: bytes) -> None:
-    stamp = time.strftime("[%H:%M:%S]").encode()
-    out.write(stamp + tag + ANSI.sub(b"", SECRET.sub(b"<secret>", data)) + b"\n")
-    out.flush()
-
-
-def note(out, text: str) -> None:
-    write_line(out, b"[capture] ", text.encode())
-
-
-def capture(args: argparse.Namespace, out) -> int:
-    """Returns the number of bytes received."""
-    deadline = time.time() + args.seconds
-    buf = b""
-    s = None
-    received = 0
-    serial_number, index = None, 0
-    while time.time() < deadline:
-        if s is None:
-            path = current_path(args.port, serial_number, index)
-            try:
-                s = open_port(args, path)
-                args.reset = False  # only reset on the first open
-                if serial_number is None:
-                    serial_number, index = identify(path)
-                if path != args.port:
-                    note(out, f"reopened as {path}")
-            except PORT_ERRORS as err:
-                note(out, f"open failed: {err}")
-                time.sleep(1)
-                continue
-        try:
-            data = s.read(4096)
-        except PORT_ERRORS as err:
-            if buf:  # keep the cut-off line apart from the next boot's first line
-                write_line(out, b"[partial]", buf)
-                buf = b""
-            note(out, f"port lost: {err}")
-            with contextlib.suppress(*PORT_ERRORS):
-                s.close()
-            s = None
-            time.sleep(1)
-            continue
-        if not data:
-            continue
-        received += len(data)
-        buf += data
-        while b"\n" in buf:
-            line, buf = buf.split(b"\n", 1)
-            write_line(out, b"", line.rstrip(b"\r"))
-    if buf:
-        write_line(out, b"[partial]", buf)
-    if s is not None:
-        s.close()
-    return received
-
-
-def main() -> int:
-    ap = argparse.ArgumentParser(
-        description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
-    )
-    ap.add_argument("port")
-    ap.add_argument("seconds", type=float)
-    ap.add_argument("outfile")
-    ap.add_argument("--baud", type=int, default=115200)
-    ap.add_argument("--released", action="store_true")
-    ap.add_argument("--reset", action="store_true")
-    ap.add_argument("--append", action="store_true")
-    args = ap.parse_args()
-    with pathlib.Path(args.outfile).open("ab" if args.append else "wb") as out:
-        received = capture(args, out)
-    if received == 0:
-        print(f"[capture] nothing received from {args.port}", file=sys.stderr)
-        return 1
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main())

.agents/skills/hardware-test/scripts/wifisave_hammer.sh

@@ -1,133 +0,0 @@
-#!/bin/bash
-# wifisave_hammer.sh: the device under test (DUT) falls back to its AP; a client board joins it and posts
-# /wifisave repeatedly, then the real credentials. Compiles, flashes, captures both serial logs and
-# prints counts. Configs come from templates/example-dut.yaml and templates/example-client.yaml.
-#
-# Usage: wifisave_hammer.sh DUT_KIND DUT_PORT DUT_YAML DUT_TREE CLIENT_PORT CLIENT_YAML CLIENT_TREE [SETTLE_S]
-#   DUT_KIND    esp (esphome upload), pico (upload, then re-find the CDC port by USB serial number),
-#               bw15 (flash_rtl87xx_kit.py) or bk (flash_bk72xx.py)
-#   *_YAML      absolute path; the file name without .yaml must equal the config's `name`
-#   *_TREE      checkout or worktree whose esphome code must build that yaml (cwd for python -m esphome)
-#   SETTLE_S    seconds to keep capturing after the client reports the real save (default 40; BW15 wants 90)
-# Env: PY (python with esphome; default DUT_TREE/venv/bin/python, else python3 on PATH; an explicit PY must exist), LTPY
-#      (LibreTiny penv python with ltchiptool; default ~/.platformio/penv/.libretiny/bin/python)
-# Output next to each yaml: NAME-compile.log, NAME-upload.log, NAME-serial.log, NAME-capture.err, and DUT NAME-events.txt
-# (addresses redacted so the extract can go on a PR; the serial logs themselves stay local).
-# Exit status: 0 RESULT PASS (no crash marker or reboot after the AP came up, the device joined the network,
-# and real stimulus: saves answered and a cooldown exit); 3 RESULT FAIL (the counts show
-# a failure); 2 RESULT INVALID (a precondition or the stimulus was missed, or a capture did not last the run);
-# 1 when a build, flash or port step fails (nothing is reported).
-set -u
-SKILL=$(cd "$(dirname "$0")/.." && pwd)
-KIND=$1; DPORT=$2; DYAML=$3; DTREE=$4; CPORT=$5; CYAML=$6; CTREE=$7; SETTLE=${8:-40}
-if [ -n "${PY:-}" ]; then [ -x "$PY" ] || { echo "[hammer] FAILED: PY=$PY is not executable"; exit 1; }
-else PY=$DTREE/venv/bin/python; [ -x "$PY" ] || PY=$(command -v python3) || { echo "[hammer] FAILED: no python found, set PY"; exit 1; }; fi
-LTPY=${LTPY:-$HOME/.platformio/penv/.libretiny/bin/python}
-DDIR=$(dirname "$DYAML"); DNAME=$(basename "$DYAML" .yaml)
-CDIR=$(dirname "$CYAML"); CNAME=$(basename "$CYAML" .yaml)
-DLOG=$DDIR/$DNAME-serial.log; CLOG=$CDIR/$CNAME-serial.log
-INVALID=""
-AP_WAIT=120; UPLOAD_WAIT=300; SAVE_WAIT=240
-# Crash signatures (extended regex), not bare words: "aborting connection attempt" is a normal Wi-Fi retry line
-CRASH_RE='Panic |abort\(\)|Fatal exception|Exception \(|Guru Meditation|HardFault|Bus Fault|Backtrace:|Soft WDT reset|wdt reset|Brownout|rst cause:[24]'
-# Boot banners and port losses are counted apart: a Pico reboot shows as a port loss (and maybe a banner too),
-# while on a UART board a port loss comes from the adapter or the hub, not the chip
-BANNER_RE='Log initialized'; LOSS_RE='\[capture\] port lost'
-DUT_CAPTURE=$((AP_WAIT + UPLOAD_WAIT + SAVE_WAIT + SETTLE + 60)); CLIENT_CAPTURE=$((SAVE_WAIT + SETTLE + 60))
-
-bound() { local t=$1; shift; if command -v timeout >/dev/null; then timeout "$t" "$@"; else perl -e 'alarm shift; exec @ARGV' "$t" "$@"; fi; }
-count() { LC_ALL=C grep -a -c "$1" "$2"; }
-wait_for() { # wait_for FILE PATTERN SECONDS -> prints elapsed, status 1 on timeout
-  local n=0; until LC_ALL=C grep -a -q "$2" "$1"; do sleep 2; n=$((n+2)); [ $n -ge "$3" ] && { echo "$n"; return 1; }; done; echo "$n"; }
-# Only this run's captures: another capture on the host (a soak on a third board) must survive
-stop_tails() { pkill -f "[s]erial_capture.py $DPORT " 2>/dev/null; pkill -f "[s]erial_capture.py $CPORT " 2>/dev/null; sleep 1; }
-fail() { echo "[hammer] FAILED: $1"; stop_tails; exit 1; }
-port_never_opened() { # an open failure and no line that is not a capture note: the port, not the firmware
-  LC_ALL=C grep -a -q '\[capture\] open failed' "$1" && ! LC_ALL=C grep -a -q -v '^\[[0-9:]*\]\[capture\]' "$1"; }
-compile() { # compile YAML TREE
-  (cd "$2" && PYTHONUNBUFFERED=1 bound 1500 "$PY" -m esphome compile "$1" > "${1%.yaml}-compile.log" 2>&1); local rc=$?
-  echo "[hammer] compile $(basename "$1"): rc=$rc"; return $rc; }
-esp_upload() { # esp_upload YAML PORT TREE
-  (cd "$3" && bound $UPLOAD_WAIT "$PY" -m esphome upload "$1" --device "$2" > "${1%.yaml}-upload.log" 2>&1)
-  local ok; ok=$(count 'Successfully uploaded' "${1%.yaml}-upload.log"); echo "[hammer] upload $(basename "$1"): ok=$ok"; [ "$ok" -ge 1 ]; }
-
-stop_tails
-compile "$DYAML" "$DTREE" || fail "DUT build failed, see $DDIR/$DNAME-compile.log"
-compile "$CYAML" "$CTREE" || fail "client build failed, see $CDIR/$CNAME-compile.log"
-
-TAILOPT=""
-case $KIND in
-  esp) esp_upload "$DYAML" "$DPORT" "$DTREE" || fail "DUT upload failed" ;;
-  pico)
-    SN=$("$PY" "$SKILL/scripts/ports.py" --serial-of "$DPORT") || fail "no USB serial number for $DPORT"
-    esp_upload "$DYAML" "$DPORT" "$DTREE" || fail "DUT upload failed"
-    # The Pico drops its CDC port on reboot and may already be back: take whatever path this board has now;
-    # the capture follows the serial number if the path changes again
-    DPORT=$("$PY" "$SKILL/scripts/ports.py" --wait 2e8a --serial "$SN" --timeout 60) || fail "pico did not re-enumerate"
-    echo "[hammer] pico port after upload: $DPORT"; sleep 2 ;;
-  bw15|bk)
-    UF2=$(ls "$DDIR/.esphome/build/$DNAME/.pioenvs/$DNAME/"*.uf2 2>/dev/null | head -1)
-    [ -n "$UF2" ] || fail "no uf2 under $DDIR/.esphome/build/$DNAME"
-    echo "[hammer] uf2: ${UF2##*/}"
-    W=$SKILL/scripts/flash_rtl87xx_kit.py; [ "$KIND" = bk ] && W=$SKILL/scripts/flash_bk72xx.py
-    (cd "$DDIR" && bound 400 "$LTPY" "$W" flash write -d "$DPORT" "$UF2" > "$DDIR/$DNAME-upload.log" 2>&1); rc=$?
-    echo "[hammer] $KIND flash: rc=$rc"; [ $rc -eq 0 ] || fail "DUT flash failed, see $DDIR/$DNAME-upload.log"
-    TAILOPT="--released" ;;
-  *) echo "unknown DUT_KIND $KIND"; exit 1 ;;
-esac
-
-: > "$DLOG"; ("$PY" "$SKILL/scripts/serial_capture.py" "$DPORT" $DUT_CAPTURE "$DLOG" $TAILOPT 2> "${DLOG%-serial.log}-capture.err" &)
-if ! n=$(wait_for "$DLOG" "Captive portal\|Starting fallback AP" $AP_WAIT); then
-  [ -s "$DLOG" ] || fail "the DUT capture produced nothing (the capture itself failed), see ${DLOG%-serial.log}-capture.err"
-  port_never_opened "$DLOG" && fail "could not open $DPORT (held by another process, or the wrong port), see $DLOG"
-  fail "DUT never raised its AP within ${n}s, see $DLOG"
-fi
-echo "[hammer] DUT fallback AP after ${n}s"; sleep 2
-# reboots are counted from here; the first banner may predate the capture
-BANNER_BASE=$(count "$BANNER_RE" "$DLOG"); LOSS_BASE=$(count "$LOSS_RE" "$DLOG")
-
-esp_upload "$CYAML" "$CPORT" "$CTREE" || fail "client upload failed"
-: > "$CLOG"; ("$PY" "$SKILL/scripts/serial_capture.py" "$CPORT" $CLIENT_CAPTURE "$CLOG" 2> "${CLOG%-serial.log}-capture.err" &)
-if n=$(wait_for "$CLOG" "real save status\|posting the real" $SAVE_WAIT); then
-  echo "[hammer] client posted the real credentials after ${n}s; settling ${SETTLE}s"; sleep "$SETTLE"
-else
-  [ -s "$CLOG" ] || fail "the client capture produced nothing (the capture itself failed), see ${CLOG%-serial.log}-capture.err"
-  port_never_opened "$CLOG" && fail "could not open $CPORT (held by another process, or the wrong port), see $CLOG"
-  INVALID="client never reached the real save within ${n}s"; echo "[hammer] WARNING: $INVALID"
-fi
-
-# A verdict needs complete evidence: both captures must have lasted the run and logged no error of their own
-for spec in "$DPORT:${DLOG%-serial.log}-capture.err" "$CPORT:${CLOG%-serial.log}-capture.err"; do
-  port=${spec%%:*}; err=${spec#*:}
-  pgrep -f "[s]erial_capture.py $port " >/dev/null || INVALID="${INVALID:+$INVALID; }the capture on $port ended before the run did, see $err"
-  [ -s "$err" ] && INVALID="${INVALID:+$INVALID; }the capture on $port reported an error, see $err"
-done
-CRASHES=$(LC_ALL=C grep -a -c -E "$CRASH_RE" "$DLOG")
-BANNERS=$(( $(count "$BANNER_RE" "$DLOG") - BANNER_BASE )); LOSSES=$(( $(count "$LOSS_RE" "$DLOG") - LOSS_BASE ))
-if [ "$KIND" = pico ]; then
-  REBOOTS=$BANNERS; [ "$LOSSES" -gt "$REBOOTS" ] && REBOOTS=$LOSSES  # one reboot can show as both, so take the larger
-else
-  REBOOTS=$BANNERS; [ "$LOSSES" -gt 0 ] && INVALID="${INVALID:+$INVALID; }the DUT port dropped $LOSSES time(s) mid-run (adapter or hub, not the chip)"
-fi
-STA=$(LC_ALL=C grep -a 'IP Address:' "$DLOG" | grep -v -c '192\.168\.4\.'); REAL=$(LC_ALL=C grep -a -o 'real save status [-0-9]*' "$CLOG" | tail -1 | awk '{print $4}')
-SAVES=$(count 'Requested WiFi Settings Change' "$DLOG"); EXITS=$(count 'cooldown early' "$DLOG"); ANSWERED=$(count 'bogus save status 200' "$CLOG")
-echo "[hammer] $DNAME: saves requested $SAVES, cooldown exits $EXITS, crash markers $CRASHES, after the AP came up: boot banners $BANNERS, port losses $LOSSES, reboots $REBOOTS; STA addresses $STA"
-FAILED=$(count 'bogus save status -1' "$CLOG")
-echo "[hammer] $CNAME: bogus saves answered $ANSWERED, failed $FAILED, real save status ${REAL:-none}"
-# Only whole messages, matched where the message starts, so a credential line or an odd SSID never gets in
-LC_ALL=C grep -a -E "^\[[0-9:]+\](\[[A-Z]\]\[[a-z_]+:[0-9]+\]: *(Exiting cooldown early|Starting fallback AP|Captive portal|Requested WiFi Settings Change|Retry phase|Connected\$|IP Address: )|\[capture\] port lost|($CRASH_RE))" "$DLOG" | LC_ALL=C tr -cd '\11\12\15\40-\176' | sed -E 's/(IP Address: )[^ ]+/\1<redacted>/' | cut -c1-110 | head -80 > "$DDIR/$DNAME-events.txt"
-echo "[hammer] events: $DDIR/$DNAME-events.txt"
-stop_tails
-[ -z "$INVALID" ] || { echo "[hammer] RESULT INVALID: $INVALID"; exit 2; }
-# Provisioning is proven by the device joining the network; the client's answer to the real save can time
-# out because the device leaves the AP before replying, so its status is information only
-if [ "$CRASHES" -gt 0 ] || [ "$REBOOTS" -gt 0 ] || [ "$STA" -lt 1 ]; then
-  echo "[hammer] RESULT FAIL: crash markers $CRASHES, reboots $REBOOTS, STA addresses $STA, real save status ${REAL:-none}"; exit 3
-fi
-# A pass needs the stimulus the flow is about: at least half the configured bogus saves answered and one cooldown exit
-CONFIGURED=$(LC_ALL=C grep -a -E '^[[:space:]]*bogus_saves:' "$CYAML" | head -1 | tr -dc '0-9'); CONFIGURED=${CONFIGURED:-15}
-if [ "$EXITS" -lt 1 ] || [ $((ANSWERED * 2)) -lt "$CONFIGURED" ]; then
-  echo "[hammer] RESULT INVALID: insufficient stimulus (bogus saves answered $ANSWERED of $CONFIGURED, cooldown exits $EXITS)"; exit 2
-fi
-[ "$FAILED" -eq 0 ] || echo "[hammer] WARNING: $FAILED of $CONFIGURED bogus saves got no answer"
-echo "[hammer] RESULT PASS"; exit 0

.agents/skills/hardware-test/templates/client-wifisave.yaml

@@ -1,77 +0,0 @@
-# Package for the client board: it joins the device under test's AP (priority 10), posts
-# `bogus_saves` bogus /wifisave requests `save_interval` apart, then posts the real credentials once.
-# Include from a per-run yaml that holds the platform block and the substitutions (example-client.yaml);
-# real_ssid and real_psk come from the scratch directory's secrets.yaml and must be URL safe.
-# Set bogus_saves to 1 for a plain provisioning check. Log lines the driver script counts:
-#   "bogus save N", "bogus save status 200", "posting the real credentials", "real save status 200"
-# The hammer is a single-mode script, so a reconnect to the AP (the device under test rebooted) does not
-# start a second series on top of the first.
-substitutions:
-  ap_password: hwtestpass
-  bogus_saves: "15"
-  save_interval: 3s
-  bogus_ssid: hwtest-no-such-network
-  bogus_psk: nosuchpassword
-
-esphome:
-  name: ${name}
-
-logger:
-  level: DEBUG
-
-http_request:
-  id: http
-  verify_ssl: false
-  timeout: 10s
-
-wifi:
-  id: wifi_id
-  networks:
-    - ssid: ${ap_ssid}
-      password: ${ap_password}
-      priority: 10
-    - ssid: ${real_ssid}
-      password: ${real_psk}
-  on_connect:
-    - lambda: |-
-        char b[40];
-        ESP_LOGI("test", "connected, ip %s", id(wifi_id).get_ip_addresses()[0].str_to(b));
-    - if:
-        condition:
-          lambda: |-
-            char b[40];
-            return strncmp(id(wifi_id).get_ip_addresses()[0].str_to(b), "192.168.4.", 10) == 0;
-        then:
-          - script.execute: hammer
-
-script:
-  - id: hammer
-    mode: single
-    then:
-      - delay: 3s
-      - logger.log: "hammering /wifisave with bogus credentials"
-      - repeat:
-          count: ${bogus_saves}
-          then:
-            - lambda: ESP_LOGI("test", "bogus save %u", (unsigned) iteration + 1);
-            - http_request.get:
-                url: "http://192.168.4.1/wifisave?ssid=${bogus_ssid}&psk=${bogus_psk}"
-                capture_response: true
-                on_response:
-                  - lambda: ESP_LOGI("test", "bogus save status %d", response->status_code);
-                on_error:
-                  - lambda: ESP_LOGW("test", "bogus save status -1");
-            - delay: ${save_interval}
-      - logger.log: "posting the real credentials"
-      - http_request.get:
-          url: "http://192.168.4.1/wifisave?ssid=${real_ssid}&psk=${real_psk}"
-          capture_response: true
-          on_response:
-            - lambda: ESP_LOGI("test", "real save status %d", response->status_code);
-          on_error:
-            - lambda: ESP_LOGW("test", "real save status -1");
-
-interval:
-  - interval: 5s
-    then:
-      - lambda: ESP_LOGI("test", "alive %u s", (unsigned) (millis() / 1000));

.agents/skills/hardware-test/templates/dut-fallback-ap.yaml

@@ -1,31 +0,0 @@
-# Package for a device under test that never finds its network, falls back to its AP and serves the
-# captive portal. Include it from a per-run yaml that holds the platform block and the substitutions
-# (see example-dut.yaml). Bump `name` on every run: saved credentials are keyed by it, and a reused
-# name boots straight onto the real network and never raises the AP.
-substitutions:
-  ap_password: hwtestpass
-  ap_timeout: 15s
-  bogus_ssid: hwtest-no-such-network
-  bogus_psk: nosuchpassword
-
-esphome:
-  name: ${name}
-
-logger:
-  level: DEBUG
-
-wifi:
-  networks:
-    - ssid: ${bogus_ssid}
-      password: ${bogus_psk}
-  ap:
-    ssid: ${ap_ssid}
-    password: ${ap_password}
-    ap_timeout: ${ap_timeout}
-
-captive_portal:
-
-interval:
-  - interval: 5s
-    then:
-      - lambda: ESP_LOGI("test", "alive %u s", (unsigned) (millis() / 1000));

.agents/skills/hardware-test/templates/example-client.yaml

@@ -1,18 +0,0 @@
-# Client board for the /wifisave hammer. Copy into a scratch directory next to a secrets.yaml;
-# ap_ssid must match the device under test, real_ssid and real_psk must be URL safe.
-substitutions:
-  name: hwtest-client-1
-  ap_ssid: hwtest-ap
-  real_ssid: !secret wifi_ssid
-  real_psk: !secret wifi_password
-  bogus_saves: "15"
-
-esp32:
-  board: esp32dev
-  framework:
-    type: esp-idf
-
-# esp8266: {board: d1_mini}
-
-packages:
-  hwtest: !include client-wifisave.yaml

.agents/skills/hardware-test/templates/example-dut.yaml

@@ -1,16 +0,0 @@
-# Device under test for the /wifisave hammer. Copy into a scratch directory, keep the file name equal
-# to `name`, pick one platform block, bump `name` every run.
-substitutions:
-  name: hwtest-dut-1
-  ap_ssid: hwtest-ap
-
-esp8266:
-  board: d1_mini
-
-# esp32: {board: esp32dev, framework: {type: esp-idf}}
-# rtl87xx: {board: bw15}
-# bk72xx: {board: generic-bk7238}   # plus logger: {hardware_uart: UART1}, BK72xx logs on UART2 by default
-# rp2040: {board: rpipico2w}
-
-packages:
-  hwtest: !include dut-fallback-ap.yaml

.github/actions/restore-python/action.yml

@@ -32,7 +32,7 @@ runs:
       # detects the activated venv via ``VIRTUAL_ENV`` so the venv layout
       # downstream jobs rely on is preserved.
       if: steps.cache-venv.outputs.cache-hit != 'true'
-      uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+      uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
       with:
         enable-cache: true
         # Pull request saves land in per-PR scopes nothing else can

.github/scripts/auto-label-pr/index.js

@@ -53,7 +53,7 @@ module.exports = async ({ github, context }) => {
   });
   const currentLabels = currentLabelsData.map(label => label.name);
   const managedLabels = currentLabels.filter(label =>
-    label.startsWith('component: ') || label.startsWith('platform: ') || MANAGED_LABELS.includes(label)
+    label.startsWith('component: ') || MANAGED_LABELS.includes(label)
   );
 
   // Check for mega-PR early - if present, skip most automatic labeling

.github/scripts/auto-label-pr/reviews.js

@@ -42,8 +42,8 @@ function generateReviewMessages(finalLabels, originalLabelCount, deprecatedInfo,
     let message = `${TOO_BIG_MARKER}\n### 📦 Pull Request Size\n\n`;
 
     message +=
-      `Hey @${prAuthor}, thanks for the contribution. This PR is on the ` +
-      `large side `;
+      `Hey @${prAuthor}, thanks for the contribution! Just a heads up, ` +
+      `this PR is on the large side `;
 
     if (tooManyLabels && tooManyChanges) {
       message +=
@@ -57,31 +57,16 @@ function generateReviewMessages(finalLabels, originalLabelCount, deprecatedInfo,
     }
 
     message += `, which makes it harder for maintainers to review.\n\n`;
-    let condition;
-    if (tooManyLabels && tooManyChanges) {
-      condition =
-        `is at most ${TOO_BIG_THRESHOLD} lines (excluding tests) and touches ` +
-        `at most ${MAX_LABELS} components/areas`;
-    } else if (tooManyLabels) {
-      condition = `touches at most ${MAX_LABELS} components/areas`;
-    } else {
-      condition = `is at most ${TOO_BIG_THRESHOLD} lines (excluding tests)`;
-    }
     message +=
-      `**This PR will not be reviewed until it ${condition}.** We know ` +
-      `that is not what you want to hear after this much work, and we want ` +
-      `to be upfront so you do not wait for a review that is not coming: ` +
-      `please split the change. The label is removed automatically once ` +
-      `the PR ${condition}.\n\n`;
+      `Smaller, focused PRs tend to be reviewed much faster since they ` +
+      `fit into the short gaps between other maintainer work; large ones ` +
+      `often have to wait for a rare long uninterrupted block of time. ` +
+      `If you can break this up into smaller pieces that can be reviewed ` +
+      `independently, it will almost certainly land faster overall.\n\n`;
     message +=
-      `There is no exception you can request. Rarely, a maintainer agrees in ` +
-      `\`#devs\` on [Discord](https://esphome.io/chat) to review a change that ` +
-      `genuinely cannot be split as one piece and adds the \`mega-pr\` label, ` +
-      `but that is rare enough that you should plan on splitting rather than ` +
-      `wait for it. Smaller, focused PRs are picked up much faster because ` +
-      `they fit into the short gaps between other maintainer work. For a new ` +
-      `component, the first PR brings the hub and a single platform (for ` +
-      `example \`sensor\`); each further platform is its own PR on top of it.\n\n`;
+      `Before putting more time in, it's also worth popping into ` +
+      `\`#devs\` on [Discord](https://esphome.io/chat) so we can help ` +
+      `you scope things and flag anything already in flight.\n\n`;
     message +=
       `For more details (including how to split the work up), see: ` +
       `https://developers.esphome.io/contributing/submitting-your-work/` +
@@ -229,7 +214,6 @@ async function handleMaintainerAccessComment(github, context, maintainerAccess)
 }
 
 module.exports = {
-  generateReviewMessages,
   handleReviews,
   handleMaintainerAccessComment
 };

.github/scripts/auto-label-pr/tests/reviews.test.js

@@ -1,38 +0,0 @@
-const { describe, it } = require('node:test');
-const assert = require('node:assert/strict');
-const { generateReviewMessages } = require('../reviews');
-
-const MAX_LABELS = 15;
-const TOO_BIG_THRESHOLD = 1000;
-
-function tooBigMessage(labelCount, additions) {
-  const files = [{ filename: 'esphome/components/a/a.cpp', additions, deletions: 0 }];
-  const messages = generateReviewMessages(['too-big'], labelCount, null, files, additions, 0, 'someone', MAX_LABELS, TOO_BIG_THRESHOLD);
-  assert.equal(messages.length, 1);
-  return messages[0];
-}
-
-describe('too-big review message', () => {
-  it('names the line cap when the PR is too long', () => {
-    const message = tooBigMessage(3, 1500);
-    assert.match(message, /will not be reviewed until it is at most 1000 lines \(excluding tests\)\./);
-    assert.match(message, /removed automatically once the PR is at most 1000 lines/);
-    assert.doesNotMatch(message, /components\/areas\./);
-  });
-
-  it('names the area cap when the PR touches too many areas but is short', () => {
-    const message = tooBigMessage(20, 200);
-    assert.match(message, /will not be reviewed until it touches at most 15 components\/areas\./);
-    assert.doesNotMatch(message, /until it is at most 1000 lines/);
-  });
-
-  it('names both caps when both are exceeded', () => {
-    const message = tooBigMessage(20, 1500);
-    assert.match(message, /is at most 1000 lines \(excluding tests\) and touches at most 15 components\/areas\./);
-  });
-
-  it('tells new-component authors to bring one platform first', () => {
-    assert.match(tooBigMessage(3, 1500), /hub and a single platform/);
-    assert.match(tooBigMessage(3, 1500), /mega-pr/);
-  });
-});

.github/workflows/auto-label-pr.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}

.github/workflows/ci-api-proto.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Set up uv
         # ``--system`` (below) installs into the setup-python interpreter;
         # no venv is created or restored by this workflow.
-        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
           enable-cache: true
           # Pull-request-only workflow: a save could never be shared and
@@ -97,7 +97,7 @@ jobs:
         run: git diff
       - if: failure()
         name: Archive artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: generated-proto-files
           path: |

.github/workflows/ci-docker.yml

@@ -128,7 +128,7 @@ jobs:
 
       - name: Upload compile-test image artifact
         if: matrix.os == 'ubuntu-24.04' && matrix.build_type == 'docker'
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           # The tar is already compressed, so upload it as-is. archive: false
           # skips the redundant zip and makes the file name the artifact name
@@ -210,7 +210,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Download image artifact
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: compile-test-image.tar.zst
       - name: Load image
@@ -219,6 +219,5 @@ jobs:
         run: |
           docker run --rm \
             -v "${{ github.workspace }}/docker/test_configs:/config" \
-            -e ESPHOME_LDGEN_STRICT=1 \
             "ghcr.io/esphome/esphome-amd64:${{ needs.check-docker.outputs.tag }}" \
             compile "${{ matrix.id }}.yaml"

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
         # detects the activated venv via ``VIRTUAL_ENV`` so downstream jobs
         # that ``. venv/bin/activate`` see an identical layout.
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
           enable-cache: true
           # Pull request saves land in per-PR scopes nothing else can
@@ -81,8 +81,8 @@ jobs:
       - name: Install apt packages (cached)
         uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
         with:
-          packages: libsdl2-dev libmbedtls-dev ccache
-          version: 1.2
+          packages: libsdl2-dev ccache
+          version: 1.1
 
   determine-jobs:
     name: Determine which jobs to run
@@ -286,7 +286,7 @@ jobs:
           fi
           echo "version=$version" >> "$GITHUB_OUTPUT"
       - name: Run prek
-        uses: j178/prek-action@1382ad72dea72f9d53832f2bcb65b3e87a947204 # v3.0.1
+        uses: j178/prek-action@4e14d07f9231acabce116ccfca13b13dd9755ece # v3.0.0
         with:
           prek-version: ${{ steps.prek.outputs.version }}
           # This job only runs on pull requests, so nothing ever populates
@@ -299,7 +299,7 @@ jobs:
       # Pushes any fixes the hooks made back to the pull request. This step
       # must keep its default name: the GitHub App that performs the push
       # locates the workflow run by that name.
-      - uses: pre-commit-ci/lite-action@062bca0919bc9d6e66755cc05074b70c77e111fc # v1.2.0
+      - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 # v1.1.0
         if: always()
         with:
           msg: apply automatic formatting fixes
@@ -395,8 +395,6 @@ jobs:
       - common
       - determine-jobs
     if: needs.determine-jobs.outputs.integration-tests == 'true'
-    # A hung test is failed by pytest's --timeout below; this bounds the rest
-    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -417,8 +415,8 @@ jobs:
         timeout-minutes: 10
         uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
         with:
-          packages: libsdl2-dev libmbedtls-dev ccache
-          version: 1.2
+          packages: libsdl2-dev ccache
+          version: 1.1
       - name: Set up Python 3.13
         id: python
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
@@ -440,7 +438,7 @@ jobs:
       - name: Set up uv
         # Only needed on cache miss to populate the venv.
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
           enable-cache: true
           # Pull request saves land in per-PR scopes nothing else can
@@ -473,14 +471,13 @@ jobs:
             exit 1
           fi
           echo "Bucket ${{ matrix.bucket.name }}: running ${#test_files[@]} integration tests"
-          # A hung test fails after 30 min: the 15 min shared build lock wait plus a cold compile
-          pytest -vv --no-cov --tb=native --durations=30 -n auto --dist worksteal --timeout=1800 \
+          pytest -vv --no-cov --tb=native --durations=30 -n auto --dist worksteal \
             --junitxml=junit-integration.xml "${test_files[@]}"
       - name: Upload test artifacts
         # Tests that compare rendered output write the image they actually got here, so a
         # failure can be looked at without reproducing the whole build locally.
         if: failure()
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: integration-test-artifacts-${{ matrix.bucket.name }}
           path: test_artifacts/
@@ -491,7 +488,7 @@ jobs:
         # script/update_integration_test_durations.py; only full matrix dev
         # runs produce usable data.
         if: github.ref == 'refs/heads/dev' && needs.determine-jobs.outputs.integration-run-all == 'true'
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: junit-integration-${{ strategy.job-index }}
           path: junit-integration.xml
@@ -531,7 +528,7 @@ jobs:
           script/check_import_time.py --check --har importtime.har
       - name: Upload waterfall HAR
         if: always()
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: import-time-waterfall
           path: importtime.har
@@ -629,7 +626,7 @@ jobs:
             apt-get install -y libc6-dbg
 
       - name: Run CodSpeed benchmarks
-        uses: CodSpeedHQ/action@f842b9a3ffe213dbb81768fd7f7eeb4dfcf1c369 # v5.4.2
+        uses: CodSpeedHQ/action@373d6868929f444bc08d901fd0eb0ad52a8875ea # v5.2.1
         with:
           run: |
             . venv/bin/activate
@@ -683,7 +680,7 @@ jobs:
         include:
           - id: clang-tidy
             name: Run script/clang-tidy for ESP8266
-            options: --environment esp8266-arduino-tidy --grep USE_ESP8266 --grep USE_SOCKET_IMPL_LWIP_TCP --grep USE_SHD_FIRMWARE_DATA
+            options: --environment esp8266-arduino-tidy --grep USE_ESP8266
             pio_cache_key: tidyesp8266
           - id: clang-tidy
             name: Run script/clang-tidy for ESP32 Arduino
@@ -696,16 +693,12 @@ jobs:
             ignore_errors: false
           - id: clang-tidy
             name: Run script/clang-tidy for RP2
-            options: --environment rp2-tidy --grep USE_RP2 --grep USE_BLE_SCAN_RESPONSE_MERGER
+            options: --environment rp2-tidy --grep USE_RP2
             pio_cache_key: tidyrp2
-          - id: clang-tidy
-            name: Run script/clang-tidy for host
-            options: --environment host-tidy --grep USE_HOST
-            pio_cache_key: tidyhost
           - id: clang-tidy
             name: Run script/clang-tidy for LibreTiny
             environments: bk72xx-tidy ln882h-tidy rtl87xxb-tidy rtl87xxc-tidy
-            options: --grep USE_LIBRETINY --grep USE_BK72XX --grep USE_RTL87XX --grep USE_LN882X --grep USE_LN882H_BLE --grep USE_SOCKET_IMPL_LWIP_SOCKETS
+            options: --grep USE_LIBRETINY --grep USE_BK72XX --grep USE_RTL87XX --grep USE_LN882X
             pio_cache_key: tidylibretiny
 
     steps:
@@ -714,16 +707,6 @@ jobs:
         with:
           # Need history for HEAD~1 to work for checking changed files
           fetch-depth: 2
-      - name: Install apt packages (cached)
-        if: matrix.pio_cache_key == 'tidyhost'
-        # libsdl2-dev is needed by the sdl component on the host, libmbedtls-dev
-        # by dsmr and dlms_meter. Packages and version must match seed-apt-cache
-        # exactly.
-        timeout-minutes: 10
-        uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
-        with:
-          packages: libsdl2-dev libmbedtls-dev ccache
-          version: 1.2
 
       - name: Restore Python
         id: restore-python
@@ -910,20 +893,14 @@ jobs:
       matrix:
         include:
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 IDF 1/5
-            options: --environment esp32-idf-tidy --split-num 5 --split-at 1
+            name: Run script/clang-tidy for ESP32 IDF 1/3
+            options: --environment esp32-idf-tidy --split-num 3 --split-at 1
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 IDF 2/5
-            options: --environment esp32-idf-tidy --split-num 5 --split-at 2
+            name: Run script/clang-tidy for ESP32 IDF 2/3
+            options: --environment esp32-idf-tidy --split-num 3 --split-at 2
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 IDF 3/5
-            options: --environment esp32-idf-tidy --split-num 5 --split-at 3
-          - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 IDF 4/5
-            options: --environment esp32-idf-tidy --split-num 5 --split-at 4
-          - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 IDF 5/5
-            options: --environment esp32-idf-tidy --split-num 5 --split-at 5
+            name: Run script/clang-tidy for ESP32 IDF 3/3
+            options: --environment esp32-idf-tidy --split-num 3 --split-at 3
 
     steps:
       - name: Check out code from GitHub
@@ -1006,14 +983,14 @@ jobs:
           - id: clang-tidy
             name: Run script/clang-tidy for ESP32 S3
             # yamllint disable-line rule:line-length
-            options: --environment esp32s3-idf-tidy --grep SOC_TEMP_SENSOR_SUPPORTED --grep USE_ESP32_VARIANT_ESP32S3 --grep USE_LOGGER_USB_CDC --grep SOC_I2S_SUPPORTS_TDM --grep USE_OPENTHREAD
+            options: --environment esp32s3-idf-tidy --grep SOC_TEMP_SENSOR_SUPPORTED --grep USE_ESP32_VARIANT_ESP32S3 --grep USE_LOGGER_USB_CDC
             tidy_environment: esp32s3-idf-tidy
           - id: clang-tidy
             name: Run script/clang-tidy for ESP32 P4
             # P4 has no native Wi-Fi/BLE; those run over the hosted co-processor,
             # so their code paths differ -- lint them under the P4 build too.
             # yamllint disable-line rule:line-length
-            options: --environment esp32p4-idf-tidy --grep USE_ESP32_VARIANT_ESP32P4 --grep CONFIG_IDF_TARGET_ESP32P4 --grep USE_ESP32_HOSTED --grep USE_WIFI --grep USE_BLE
+            options: --environment esp32p4-idf-tidy --grep USE_ESP32_VARIANT_ESP32P4 --grep USE_ESP32_HOSTED --grep USE_WIFI --grep USE_BLE
             tidy_environment: esp32p4-idf-tidy
           - id: clang-tidy
             name: Run script/clang-tidy for ESP32 C6
@@ -1119,8 +1096,8 @@ jobs:
         timeout-minutes: 10
         uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
         with:
-          packages: libsdl2-dev libmbedtls-dev ccache
-          version: 1.2
+          packages: libsdl2-dev ccache
+          version: 1.1
 
       - name: Check out code from GitHub
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -1248,19 +1225,12 @@ jobs:
 
           if [ -n "$compile_csv" ]; then
             # Run compilation with grouping and isolation
-            # The bootloader has no ESPHome code and these builds never
-            # flash; the check_idf_py batch keeps the full build so the
-            # native sub-build and the equivalence check stay covered.
-            skip_flag="--skip-bootloader"
-            if [[ "${{ matrix.batch.check_idf_py }}" == "true" ]]; then
-              skip_flag=""
-            fi
-            python3 script/test_build_components.py -e compile -c "$compile_csv" -f --isolate "$directly_changed_csv" $skip_flag
+            python3 script/test_build_components.py -e compile -c "$compile_csv" -f --isolate "$directly_changed_csv"
             if [[ "${{ matrix.batch.check_idf_py }}" == "true" ]]; then
               # The real idf.py must find nothing to configure or build in a
               # tree built above; catches drift on ESP-IDF bumps.
               echo "Checking the native ESP-IDF build matches idf.py"
-              python3 script/check_idf_py_equivalence.py
+              python3 script/check_idf_py_equivalence.py --require-cached-bootloader
             fi
           else
             echo "All components in this batch are validate-only -- skipping compile stage."
@@ -1352,91 +1322,6 @@ jobs:
           # config first, so a separate config pass is redundant.
           python3 script/test_build_components.py -e compile -t esp8266-ard -c "$TEST_COMPONENTS" -f --toolchain arduino --fail-on-no-tests
 
-  test-esp8266-native-windows:
-    name: Compile esp8266 with the native toolchain on Windows (ccache ${{ matrix.ccache }})
-    runs-on: windows-latest
-    needs:
-      - common
-      - determine-jobs
-    if: github.event_name == 'pull_request' && needs.determine-jobs.outputs.esp8266-native == 'true'
-    # A hung compiler must fail the job, not hold the runner for six hours.
-    timeout-minutes: 40
-    strategy:
-      fail-fast: false
-      matrix:
-        # Both ways the build runs on Windows: ESPHome Desktop bundles
-        # ccache and puts it on PATH, a pip install has none.
-        ccache: ["1", "0"]
-    env:
-      ESPHOME_CCACHE_ENABLE: ${{ matrix.ccache }}
-      # The test script prints characters the cp1252 console cannot encode
-      PYTHONUTF8: "1"
-      # The exact static build ESPHome Desktop ships
-      CCACHE_URL: https://github.com/ccache/ccache/releases/download/v4.14/ccache-4.14-windows-x86_64.zip
-      CCACHE_SHA256: 2568347a697e103ca1b073981c704ad76fb2507d066c38dba038dd73399d968f
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-
-      - name: Install ccache
-        if: matrix.ccache == '1'
-        shell: pwsh
-        run: |
-          $dir = Join-Path $env:RUNNER_TEMP "ccache"
-          New-Item -ItemType Directory -Force $dir | Out-Null
-          $zip = Join-Path $dir "ccache.zip"
-          Invoke-WebRequest -Uri $env:CCACHE_URL -OutFile $zip
-          $hash = (Get-FileHash $zip -Algorithm SHA256).Hash.ToLower()
-          if ($hash -ne $env:CCACHE_SHA256) {
-            Write-Host "::error::ccache archive sha256 $hash does not match $env:CCACHE_SHA256"
-            exit 1
-          }
-          Expand-Archive -Path $zip -DestinationPath $dir
-          $bin = Get-ChildItem -Path $dir -Recurse -Filter ccache.exe | Select-Object -First 1
-          Add-Content -Path $env:GITHUB_PATH -Value $bin.DirectoryName
-          & $bin.FullName --version
-
-      - name: Compile
-        shell: pwsh
-        # One component test: web_server brings wifi, api and the async web
-        # server libraries, the shape of a typical ESP8266 device
-        run: |
-          . .\venv\Scripts\Activate.ps1
-          $arguments = "script/test_build_components.py", "-e", "compile", "-t", "esp8266-ard", "-c", "web_server", "--base-only", "--toolchain", "arduino", "--fail-on-no-tests"
-          $p = Start-Process -FilePath python -ArgumentList $arguments -NoNewWindow -PassThru
-          # Reading the handle keeps ExitCode available after the process exits
-          $null = $p.Handle
-          if (-not $p.WaitForExit(25 * 60 * 1000)) {
-            Write-Host "::error::The compile did not finish in 25 minutes; processes still running:"
-            Get-CimInstance Win32_Process |
-              Where-Object { $_.CommandLine -match 'xtensa|ccache|ninja|esphome' } |
-              Select-Object ProcessId, ParentProcessId, CreationDate, CommandLine |
-              Format-List | Out-String -Width 4096 | Write-Host
-            Get-Process |
-              Where-Object { $_.Name -match 'cc1|ccache|ninja|xtensa|python' } |
-              Select-Object Id, Name, CPU, WorkingSet64 |
-              Format-Table | Out-String | Write-Host
-            taskkill /PID $p.Id /T /F
-            exit 1
-          }
-          exit $p.ExitCode
-
-      - name: Show ccache statistics
-        # Also after a failed or killed compile: the counters say whether
-        # ccache was ever reached
-        if: always() && matrix.ccache == '1'
-        shell: pwsh
-        # The build keeps its store under the esphome tools cache
-        run: |
-          $env:CCACHE_DIR = Join-Path $env:LOCALAPPDATA "esphome\Cache\arduino8266\ccache"
-          ccache -s
-
   device-builder:
     name: Test downstream esphome/device-builder
     runs-on: ubuntu-24.04
@@ -1465,7 +1350,7 @@ jobs:
         # install step (order-of-magnitude faster on cold boots,
         # with its own wheel cache). actions/setup-python still
         # provides the interpreter.
-        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
           enable-cache: true
           # Pull request saves land in per-PR scopes nothing else can
@@ -1524,27 +1409,31 @@ jobs:
             echo "::warning::ci_memory_impact_extract.py not found on target branch, skipping memory impact analysis"
           fi
 
-      # The build below uses --base-only, so skip unless the target branch has
-      # test.<platform>.yaml for every requested component (test-*.yaml
-      # variants alone compile nothing, and a partial set would compare a
-      # smaller target build against the PR build). Checked here, not in
-      # determine-jobs.py, because determine-jobs runs on the PR branch and
-      # cannot see the target branch.
+      # Check if test files exist on the target branch for the requested
+      # components and platform. When a PR adds new test files for a platform,
+      # the target branch won't have them yet, so skip instead of failing.
+      # This check must be done here (not in determine-jobs.py) because
+      # determine-jobs runs on the PR branch and cannot see what the target
+      # branch has.
       - name: Check for test files on target branch
         id: check-tests
         if: steps.check-script.outputs.skip != 'true'
         run: |
           components='${{ toJSON(fromJSON(needs.determine-jobs.outputs.memory_impact).components) }}'
           platform="${{ fromJSON(needs.determine-jobs.outputs.memory_impact).platform }}"
-          missing=""
+          found=false
           for component in $(echo "$components" | jq -r '.[]'); do
-            if [ ! -f "tests/components/${component}/test.${platform}.yaml" ]; then
-              missing="${missing} ${component}"
-            fi
+            # Check for test files matching the platform (test.platform.yaml or test-*.platform.yaml)
+            for f in tests/components/${component}/test*.${platform}.yaml; do
+              if [ -f "$f" ]; then
+                found=true
+                break 2
+              fi
+            done
           done
-          if [ -n "$missing" ]; then
+          if [ "$found" = false ]; then
             echo "skip=true" >> $GITHUB_OUTPUT
-            echo "::warning::No test.${platform}.yaml on target branch for${missing}, skipping memory impact analysis"
+            echo "::warning::No test files found on target branch for platform ${platform}, skipping memory impact analysis"
           else
             echo "skip=false" >> $GITHUB_OUTPUT
           fi
@@ -1664,7 +1553,7 @@ jobs:
           fi
 
       - name: Upload memory analysis JSON
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: memory-analysis-target
           path: memory-analysis-target.json
@@ -1727,7 +1616,7 @@ jobs:
             --platform "$platform"
 
       - name: Upload memory analysis JSON
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: memory-analysis-pr
           path: memory-analysis-pr.json
@@ -1757,13 +1646,13 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
       - name: Download target analysis JSON
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: memory-analysis-target
           path: ./memory-analysis
         continue-on-error: true
       - name: Download PR analysis JSON
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: memory-analysis-pr
           path: ./memory-analysis
@@ -1807,7 +1696,6 @@ jobs:
       - test-build-components-split
       - test-esp32-platformio
       - test-esp8266-native
-      - test-esp8266-native-windows
       - device-builder
       - memory-impact-target-branch
       - memory-impact-pr-branch

.github/workflows/codeowner-review-request.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}

.github/workflows/codeql.yml

@@ -56,7 +56,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+        uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -84,6 +84,6 @@ jobs:
           exit 1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+        uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/external-component-bot.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -125,20 +125,14 @@ jobs:
             }
 
             async function getEsphomeAndComponentChanges(github, owner, repo, prNumber) {
-                const changedFiles = await github.paginate(
-                    github.rest.pulls.listFiles,
-                    {
-                        owner: owner,
-                        repo: repo,
-                        pull_number: prNumber,
-                        per_page: 100,
-                    }
-                );
+                const changedFiles = await github.rest.pulls.listFiles({
+                    owner: owner,
+                    repo: repo,
+                    pull_number: prNumber,
+                });
 
-                // Files used only for development and CI, which do not affect use as an external component
-                const ignoredFiles = ["esphome/core/defines.h", "esphome/idf_component.yml"];
-                const esphomeChanges = changedFiles
-                    .filter(file => !ignoredFiles.includes(file.filename) && file.filename.startsWith('esphome/'))
+                const esphomeChanges = changedFiles.data
+                    .filter(file => file.filename !== "esphome/core/defines.h" && file.filename.startsWith('esphome/'))
                     .map(file => {
                         const match = file.filename.match(/esphome\/([^/]+)/);
                         return match ? match[1] : null;
@@ -150,7 +144,7 @@ jobs:
                 }
 
                 const uniqueEsphomeChanges = [...new Set(esphomeChanges)];
-                const componentChanges = changedFiles
+                const componentChanges = changedFiles.data
                     .filter(file => file.filename.startsWith('esphome/components/'))
                     .map(file => {
                         const match = file.filename.match(/esphome\/components\/([^/]+)\//);

.github/workflows/release.yml

@@ -162,7 +162,7 @@ jobs:
       #     version: ${{ needs.init.outputs.tag }}
 
       - name: Upload digests
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: digests-${{ matrix.platform.arch }}
           path: /tmp/digests
@@ -195,7 +195,7 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Download digests
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           pattern: digests-*
           path: /tmp/digests
@@ -245,7 +245,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}

.github/workflows/stale.yml

@@ -16,18 +16,16 @@ jobs:
     # No GITHUB_TOKEN permissions: the reusable workflow mints an ESPHome
     # GitHub App token so the labels, comments and closures come from
     # esphome[bot] instead of github-actions[bot].
-    uses: esphome/workflows/.github/workflows/stale.yml@4fbce13026c393d6eb6b247e394dcd9ef1af76c2  # main
+    uses: esphome/workflows/.github/workflows/stale.yml@cc3e76de337dc59bc1cba8da58d963cd23b873f1  # main
     secrets:
       ESPHOME_GITHUB_APP_PRIVATE_KEY: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
     with:
       # Live only on dev: a workflow_dispatch from any other branch is a dry run
       dry-run: ${{ github.ref != 'refs/heads/dev' }}
       days-before-stale: 90
-      days-before-stale-conflicting: 30
       days-before-close: 7
       stale-label: stale
       exempt-label: not-stale
-      conflict-label: needs-rebase
       ignored-users: esphbot,codecov-commenter
       stale-pr-message: >
         There hasn't been any activity on this pull request recently. This
@@ -38,18 +36,6 @@ jobs:
         to keep it open. Also, please merge the latest dev branch into your
         branch to ensure that it's up to date with the latest changes.
 
-        Thank you for your contribution!
-      conflict-pr-message: >
-        This pull request has merge conflicts. Please merge the latest dev
-        branch into your branch to resolve them.
-      stale-conflicting-pr-message: >
-        The merge conflicts on this pull request have not been resolved for
-        30 days, so it has been marked as stale and will be closed if they
-        are not resolved within 7 days.
-
-        Please merge the latest dev branch into your branch. Once the pull
-        request is mergeable again the stale label is removed.
-
         Thank you for your contribution!
       stale-issue-message: >
         There hasn't been any activity on this issue recently. Due to the

.github/workflows/status-check-labels.yml

@@ -7,6 +7,10 @@ on:
 permissions:
   pull-requests: read  # issues.listLabelsOnIssue to detect blocking labels (needs-docs, needs-developer-docs, merge-after-release, chained-pr)
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
 jobs:
   check:
     name: Check blocking labels

.github/workflows/sync-dependency-versions.yml

@@ -15,8 +15,6 @@ on:
   # base branch checkout, so fork code never runs with the token.
   pull_request_target:
     types: [opened, synchronize, reopened]
-    branches:
-      - dev
     paths:
       - requirements_dev.txt
       - requirements_test.txt
@@ -43,7 +41,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}

.github/workflows/sync-device-classes.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -47,7 +47,7 @@ jobs:
         # setup-python interpreter so subsequent ``prek`` /
         # ``script/run-in-env.py`` steps find the deps without a
         # ``uv run`` prefix.
-        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
           enable-cache: true
           # Pin uv version so the action does not have to fetch the

.github/workflows/sync-integration-durations.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
         with:
           client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ ci:
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.17.0
+    rev: v0.16.9
     hooks:
       # Run the linter.
       - id: ruff
@@ -36,7 +36,7 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.22.0
+    rev: v3.21.2
     hooks:
       - id: pyupgrade
         args: [--py312-plus]

AGENTS.md

@@ -67,7 +67,6 @@ file does, and it is the authority when they disagree. The most useful starting
         - Function-local constants: `lower_snake_case`
         - Protected/private fields: `lower_snake_case_with_trailing_underscore_`
         - Favor descriptive names over abbreviations
-        - Device components are named brand plus model (`siemens_ira211`), without a protocol-family prefix
         - Enumerator names: prefix every value of an `enum class` with the enum name converted to
           `UPPER_SNAKE_CASE` (e.g. `UARTFlushResult::UART_FLUSH_RESULT_SUCCESS`). Never use bare
           names like `SUCCESS`, `FAILURE`, `OK`, or `FAIL`: platform SDK headers define macros with
@@ -144,9 +143,6 @@ file does, and it is the authority when they disagree. The most useful starting
 
 *   **C++ Preprocessor Directives:**
     *   **Avoid `#define` for constants:** Using `#define` for constants is discouraged and should be replaced with `const` variables or enums.
-    *   **A constant with a compile-time initializer is `static constexpr`,** not `static const`, at namespace scope
-        and inside functions; `static const` is only for a value computed at run time. A function-local
-        `static constexpr` table is a static constant to clang-tidy, so it is `UPPER_SNAKE_CASE` too.
     *   **Use `#define` only for:**
         - Conditional compilation (`#ifdef`, `#ifndef`)
         - Compile-time sizes calculated during Python code generation (e.g., configuring `std::array` or `StaticVector` dimensions via `cg.add_define()`)
@@ -181,15 +177,6 @@ file does, and it is the authority when they disagree. The most useful starting
         Pick the primitive by cadence: under 250 ms use a gated `loop()`; 500 ms and above use
         `set_interval`. Full reasoning, including why `set_interval` costs more below 500 ms:
         https://developers.esphome.io/architecture/components/advanced/#quick-rule-of-thumb
-    *   **Repeating work:** use `set_interval`, never a `set_timeout` that re-arms itself; every re-arm
-        rebuilds the callback and re-queues a scheduler item, and the period drifts.
-    *   **Scheduler ids:** name a timer only when it must be cancelled or replaced, and use a
-        `static constexpr uint32_t` id, never a string. Ids are per component instance and cannot clash with other
-        components, so number them from 0 and keep all of a component's ids together in one place.
-        ```cpp
-        static constexpr uint32_t READ_TIMEOUT_ID = 0;
-        this->set_timeout(READ_TIMEOUT_ID, 50, [this]() { this->read_(); });
-        ```
     *   **Don't override a default with the same value:** if a base class method already returns what you
         want, do not override it. `Component::get_setup_priority()` returns `setup_priority::DATA`, so a
         component that wants `DATA` should simply leave it alone.
@@ -197,45 +184,6 @@ file does, and it is the authority when they disagree. The most useful starting
         // Bad - this is exactly what the base class already does
         float get_setup_priority() const override { return setup_priority::DATA; }
         ```
-    *   **Constant data lives in RAM on ESP8266** unless marked `PROGMEM`: `const` tables, class-scope
-        constant arrays, and in-class `std::array` initializers (a `.rodata` template plus a copy). Mark the
-        table `PROGMEM` and read it with `progmem_memcpy()` or `progmem_read_byte()` (`esphome/core/hal.h`);
-        for a table of structs copy the whole entry out and return the copy, never a pointer into flash.
-        On other platforms they are a plain `memcpy` and dereference, so no `#ifdef` is needed. Declare log tags with
-        `ESPHOME_LOG_TAG(TAG, "name")`, pass status text as `LOG_STR`, e.g.
-        `this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL))`, and give an action whose payload is a byte array
-        a `TEMPLATABLE_BYTES` field so a static code stays in flash.
-    *   **Fixed sets of names** (status words, model names): a `PROGMEM_STRING_TABLE` (`esphome/core/progmem.h`),
-        logged with `get_log_str` and `LOG_STR_ARG`, copied out with `ESPHOME_strncpy_P` before `publish_state`.
-        A `dump_config` helper that picks a name returns `const LogString *` from `LOG_STR(...)`.
-    *   **CRCs and bit tricks** come from `esphome/core/helpers.h` (`crc8`, `crc16`, `reverse_bits`, `encode_uint16`);
-        pick the helper's polynomial and bit-order arguments instead of writing a CRC loop.
-    *   **An unset float is `NAN`**, not `optional<float>`; the optional costs 4 to 8 bytes of padding per member.
-    *   **`PollingComponent` first runs `update()`** after a random share of the interval; call `this->update()` at the
-        end of `setup()` when the entities need a state at boot.
-    *   **A multi-step command sequence** leaves the step pending when the answer is malformed, so the existing
-        resend and give-up logic handles it; never advance on an answer that was only logged.
-    *   **Entities that each watch a register field:** one class taking register, shift, mask and match from a Python
-        tuple table, in typed `StaticVector`s sized by `cg.slot_counter`; not a template per bit, not a virtual
-        listener base (a second vptr per entity).
-    *   **A global feature define** says the code is compiled in, not that this instance uses it: keep the
-        per-instance check (`if (this->aux_device_ == ...)`) inside the `#ifdef`.
-    *   **Model-specific code** sits behind a define the Python side emits only for configs that use that model
-        (`cg.add_define("USE_SELEC_METER_EM4M")`), so the other models' builds leave it out; the runtime model check
-        stays inside the `#ifdef`.
-    *   **Failures after `setup()`:** `mark_failed()` is for `setup()` only. A runtime read or write failure
-        sets `status_set_warning()` and the next success clears it; writes skip work when `is_failed()`.
-    *   **`dump_config()` already prints the failure reason:** for a failed component, core prints
-        `<component> is marked FAILED: <reason>` right after the component's `dump_config()`, using the reason
-        passed to `mark_failed()`. So `dump_config()` never checks `is_failed()` to log a failure, and no
-        `error_code_` member exists only to pick that message. Pass the reason where setup fails instead:
-        `this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL))` for a failed bus transfer, a short specific reason
-        otherwise (`LOG_STR("Wrong chip ID")`). Core also logs it at that moment, so no `ESP_LOGE` repeats it
-        before `mark_failed()`; keep a separate line only when it prints a value read at run time, such as the
-        chip ID that did not match. Only the first reason is kept, so do not call `status_set_error()` before
-        `mark_failed()` and do not mark the component failed again after a helper already did.
-    *   **Fixed platform facts compile to nothing:** gate on `#ifdef USE_ESP8266` and friends, not on a
-        runtime check of something the build already knows.
     *   **Logging string literals:** wrap literals passed as `%s` arguments in `LOG_STR_LITERAL()` so they
         can be stored in flash rather than RAM.
         ```cpp
@@ -282,10 +230,6 @@ file does, and it is the authority when they disagree. The most useful starting
         ```
 
     *   **Component Metadata:**
-        - `DOMAIN`: Required in every component's `__init__.py`, set to the component's own name as a plain
-          string (e.g. `DOMAIN = "my_component"`). Other code refers to the component through it, e.g.
-          `from esphome.components.my_component import DOMAIN`. Keep it in alphabetical order with the other
-          metadata constants. CI (`lint_component_domain`) fails without it.
         - `DEPENDENCIES`: List of required components
         - `AUTO_LOAD`: Components to automatically load
         - `CONFLICTS_WITH`: Incompatible components
@@ -299,7 +243,6 @@ file does, and it is the authority when they disagree. The most useful starting
         import esphome.config_validation as cv
         from esphome.const import CONF_KEY, CONF_ID
 
-        DOMAIN = "my_component"
         CONF_PARAM = "param"  # A constant that does not yet exist in esphome/const.py
 
         my_component_ns = cg.esphome_ns.namespace("my_component")
@@ -441,25 +384,6 @@ file does, and it is the authority when they disagree. The most useful starting
                 )
         ```
 
-        When the callback's parameters differ from the automation's arguments, or the trigger should only
-        fire for some values, pass `params`, `forward` and `when`; the helper then generates a capture-less
-        lambda (stored inline, nothing allocated). Name the parent with `automation.parent_ref(var)` and build
-        `forward` from `MockObj` calls, not f-strings of C++:
-        ```python
-        parent = automation.parent_ref(var)
-        index = cg.RawExpression("index")
-        await automation.build_callback_automation(
-            var,
-            "add_on_state_callback",
-            [(cg.StringRef, "x"), (cg.size_t, "i")],
-            conf,
-            params=[(cg.size_t, "index")],
-            forward=[cg.StringRef(parent.option_at(index)), index],
-        )
-        ```
-        `build_parent_callback_automation`, `build_trigger_callback`, `build_callback_automations` and
-        `build_trigger_automations` cover the other shapes; see their docstrings in `esphome/automation.py`.
-
         **C++ -- no trigger class needed.** The callback registration method must be templatized to accept both `std::function` and lightweight forwarder structs (which avoid heap allocation):
         ```cpp
         class MyComponent : public Component {
@@ -579,12 +503,8 @@ file does, and it is the authority when they disagree. The most useful starting
         `cover.is_open`, `rtttl.is_playing` and `component.is_idle` are in-tree examples.
 
 *   **Type Hints:** Type-hint all function signatures, including test functions and config validators (e.g. `def validate_x(config: ConfigType) -> ConfigType:`, `def test_x() -> None:`). Import `ConfigType` from `esphome.types`.
-    An intentionally empty body (an unused `register_dumper` builder, for example) gets a one-line docstring, not `pass`.
 
 *   **Configuration Validation:**
-    *   **One schema per model:** when a component's options depend on a `model` key, use `cv.typed_schema({...},
-        key=CONF_MODEL, default_type=...)` with each model's own keys and defaults, not one schema plus a validator
-        that rejects keys and fills defaults afterwards.
     *   **Reuse existing validators:** Before writing a custom validator, check for an existing one in `config_validation.py` and compose it in `cv.All(...)` rather than duplicating logic across components. For example, rename a config key with `cv.rename_key(CONF_OLD, CONF_NEW, removed_in="2026.6.0")`, and reject mutually-exclusive keys with `cv.has_at_most_one_key(...)` / `cv.has_exactly_one_key(...)`. See how `api` composes `cv.has_exactly_one_key` + `cv.rename_key`.
     *   **Common Validators:** `cv.int_`, `cv.float_`, `cv.string`, `cv.boolean`, `cv.int_range(min=0, max=100)`, `cv.positive_int`, `cv.percentage`.
     *   **Complex Validation:** `cv.All(cv.string, cv.Length(min=1, max=50))`, `cv.Any(cv.int_, cv.string)`.
@@ -618,18 +538,6 @@ file does, and it is the authority when they disagree. The most useful starting
 *   **Testing:**
     *   **Python:** Run unit tests with `pytest`.
     *   **C++:** Use `clang-tidy` for static analysis.
-    *   **C++ unit tests:** gtests in `tests/components/<component>/*.cpp`, run with
-        `script/cpp_unit_test.py <component>`; see `tests/components/README.md`. Set the loop clock in a test
-        with `LoopBlockingGuard{nullptr, nullptr, now_ms}`; the runner resets it before every test.
-    *   **Integration tests:** `tests/integration/` runs real firmware on the host. Serial components prove
-        timeouts and recovery with the `uart_mock` fixture (`tests/integration/test_uart_mock_*.py`). Its
-        `responses` match on content every time they see it; to answer a repeated request differently, use an
-        `on_tx` lambda with a static counter and `inject_to_rx_buffer` (see `uart_mock_ld2412_requery_after_giveup.yaml`).
-    *   **Keep build-test variants few:** one `test.<platform>.yaml` per platform the code actually differs
-        on. A variant per board for platform-identical code only adds CI time.
-    *   **A test that needs a shared component in a particular state** (`esp32_ble` security settings, an option
-        that PSRAM rejects) cannot be grouped: the merged block wins and the whole batch fails. Add the component to
-        `ISOLATED_COMPONENTS` in `script/analyze_component_buses.py`, or move the option to a `test-<variant>` file.
     *   **Component Tests:** YAML-based compilation tests are located in `tests/`. The structure is as follows:
         ```
         tests/
@@ -676,7 +584,6 @@ file does, and it is the authority when they disagree. The most useful starting
             name: My Sensor
         ```
         Components that define buses directly are flagged as "NEEDS MIGRATION" and cannot be grouped, increasing CI build time.
-        `!extend` and `!remove` in a `test.*.yaml` also make the component ungroupable; add a standalone entity with its own id instead.
 
     *   **Testing All Components Together:** To verify that all components can be tested together without ID conflicts or configuration issues, use:
         ```bash

CODEOWNERS

@@ -39,17 +39,12 @@ esphome/components/am43/sensor/* @buxtronix
 esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
-esphome/components/apc1/* @ademuri
-esphome/components/apc_proteous/* @clydebarrow
 esphome/components/apds9306/* @aodrenah
-esphome/components/apds9930/* @iyesin
 esphome/components/api/* @esphome/core
 esphome/components/aqi/* @freekode @jasstrong @ximex
-esphome/components/aranet/* @patrickod
 esphome/components/as5600/* @ammmze
 esphome/components/as5600/sensor/* @ammmze
 esphome/components/as7341/* @mrgnr
-esphome/components/as734x/* @latonita @mrgnr
 esphome/components/async_tcp/* @esphome/core
 esphome/components/at581x/* @X-Ryl669
 esphome/components/atc_mithermometer/* @ahpohl
@@ -70,7 +65,6 @@ esphome/components/bedjet/climate/* @jhansche
 esphome/components/bedjet/fan/* @jhansche
 esphome/components/bedjet/sensor/* @javawizard @jhansche
 esphome/components/beken_spi_led_strip/* @Mat931
-esphome/components/bh1745/* @latonita
 esphome/components/bh1750/* @OttoWinter
 esphome/components/bh1900nux/* @B48D81EFCC
 esphome/components/binary_sensor/* @esphome/core
@@ -106,9 +100,6 @@ esphome/components/bmp581_i2c/* @danielkent-net @kahrendt
 esphome/components/bmp581_spi/* @danielkent-net @kahrendt
 esphome/components/bp1658cj/* @Cossid
 esphome/components/bp5758d/* @Cossid
-esphome/components/bq25186/* @Rapsssito
-esphome/components/bq27220/* @rggammon
-esphome/components/bq76972/* @limpkin
 esphome/components/bridge/* @kbx81
 esphome/components/bthome_mithermometer/* @nagyrobi
 esphome/components/button/* @esphome/core
@@ -157,7 +148,6 @@ esphome/components/delonghi/* @grob6000
 esphome/components/dew_point/* @CFlix
 esphome/components/dfplayer/* @glmnet
 esphome/components/dfrobot_sen0395/* @niklasweber
-esphome/components/dfrobot_sen0609/* @remcom
 esphome/components/dht/* @OttoWinter
 esphome/components/display_menu_base/* @numo68
 esphome/components/dlms_meter/* @latonita @PolarGoose @SimonFischer04 @Tomer27cz
@@ -166,10 +156,8 @@ esphome/components/ds1307/* @badbadc0ffee
 esphome/components/ds1603l/* @JakeLC15
 esphome/components/ds2484/* @mrk-its
 esphome/components/ds248x/* @tomwellnitz
-esphome/components/ds3231/* @linkedupbits
 esphome/components/dsmr/* @glmnet @PolarGoose
 esphome/components/duty_time/* @dudanov
-esphome/components/ecocomfort2/* @gledian
 esphome/components/ee895/* @Stock-M
 esphome/components/ektf2232/touchscreen/* @jesserockz
 esphome/components/emc2101/* @ellull
@@ -186,7 +174,6 @@ esphome/components/es7243e/* @kbx81
 esphome/components/es8156/* @kbx81
 esphome/components/es8311/* @kahrendt @kroimon
 esphome/components/es8388/* @P4uLT
-esphome/components/es9038q2m_katana/* @GioMez
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @bdraco @jesserockz @Rapsssito
 esphome/components/esp32_ble_client/* @bdraco @jesserockz
@@ -196,34 +183,26 @@ esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_hosted/* @swoboda1337
 esphome/components/esp32_hosted/update/* @swoboda1337
-esphome/components/esp32_power_management/* @rwrozelle
 esphome/components/esp32_rmt/* @jesserockz
 esphome/components/esp32_rmt_led_strip/* @jesserockz
 esphome/components/esp8266/* @esphome/core
 esphome/components/esp_ldo/* @clydebarrow
-esphome/components/espectre/* @francescopace
-esphome/components/esphome/ota/* @esphome/core
 esphome/components/espnow/* @jesserockz
 esphome/components/espnow/packet_transport/* @EasilyBoredEngineer
 esphome/components/ethernet_info/* @gtjadsonsantos
 esphome/components/event/* @nohat
-esphome/components/exponential_moving_average/* @clydebarrow
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
 esphome/components/ezo_pmp/* @carlos-sarmiento
-esphome/components/ezsp_proxy_tap/* @kbx81 @puddly
 esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
 esphome/components/file/* @esphome/core
-esphome/components/filter_lifetime/* @tuct
 esphome/components/fingerprint_grow/* @alexborro @loongyh @OnFreund
 esphome/components/font/* @clydebarrow @esphome/core
-esphome/components/friedrich/* @rwrozelle
 esphome/components/fs3000/* @kahrendt
 esphome/components/ft5x06/* @clydebarrow
 esphome/components/ft63x6/* @gpambrozio
-esphome/components/fusb302b/* @remcom
 esphome/components/gcja5/* @gcormier
 esphome/components/gdk101/* @Szewcson
 esphome/components/gl_r01_i2c/* @pkejval
@@ -245,14 +224,9 @@ esphome/components/gt911/* @clydebarrow @jesserockz
 esphome/components/haier/* @paveldn
 esphome/components/haier/binary_sensor/* @paveldn
 esphome/components/haier/button/* @paveldn
-esphome/components/haier/select/* @paveldn
 esphome/components/haier/sensor/* @paveldn
 esphome/components/haier/switch/* @paveldn
 esphome/components/haier/text_sensor/* @paveldn
-esphome/components/haier_tundra/* @fauxpark
-esphome/components/haier_tundra/button/* @fauxpark
-esphome/components/haier_tundra/switch/* @fauxpark
-esphome/components/haier_water_heater/* @TheLexus
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
@@ -261,7 +235,6 @@ esphome/components/hc8/* @omartijn
 esphome/components/hdc2010/* @optimusprimespace @ssieb
 esphome/components/hdc2080/* @G-Pereira @jesserockz
 esphome/components/hdc302x/* @joshuasing
-esphome/components/hdmi_cec/* @JosVanEijndhoven
 esphome/components/he60r/* @clydebarrow
 esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
@@ -272,11 +245,8 @@ esphome/components/hmac_md5/* @dwmw2
 esphome/components/hmac_sha256/* @dwmw2
 esphome/components/hoermann_hcp/* @zweckj
 esphome/components/homeassistant/* @esphome/core @OttoWinter
-esphome/components/homeassistant/button/* @jesserockz
 esphome/components/homeassistant/number/* @landonr
-esphome/components/homeassistant/select/* @jesserockz
 esphome/components/homeassistant/switch/* @Links2004
-esphome/components/homeassistant/text/* @jesserockz
 esphome/components/honeywell_hih_i2c/* @Benichou34
 esphome/components/honeywellabp/* @RubyBailey
 esphome/components/honeywellabp2_i2c/* @jpfaff
@@ -288,7 +258,6 @@ esphome/components/http_request/ota/* @oarcher
 esphome/components/http_request/update/* @jesserockz
 esphome/components/htu31d/* @betterengineering
 esphome/components/hub75/* @stuartparmenter
-esphome/components/husb238/* @latonita
 esphome/components/hydreon_rgxx/* @functionpointer
 esphome/components/hyt271/* @Philippe12
 esphome/components/i2c/* @esphome/core
@@ -296,9 +265,7 @@ esphome/components/i2c_device/* @gabest11
 esphome/components/i2s_audio/* @jesserockz
 esphome/components/i2s_audio/microphone/* @jesserockz
 esphome/components/i2s_audio/speaker/* @jesserockz @kahrendt
-esphome/components/i2s_clockless_led_strip/* @j9brown
 esphome/components/iaqcore/* @yozik04
-esphome/components/icm20689/* @lboue
 esphome/components/icnt86/* @danepowell
 esphome/components/ili9xxx/* @clydebarrow @nielsnl68
 esphome/components/improv_base/* @esphome/core
@@ -315,7 +282,6 @@ esphome/components/inkplate/* @jesserockz @JosipKuci
 esphome/components/integration/* @OttoWinter
 esphome/components/internal_temperature/* @Mat931
 esphome/components/interval/* @esphome/core
-esphome/components/ir_rf_base/* @bdraco @kbx81
 esphome/components/ir_rf_proxy/* @kbx81
 esphome/components/it8951/* @koosoli @limengdu @Passific
 esphome/components/jsn_sr04t/* @Mafus1
@@ -327,11 +293,9 @@ esphome/components/kuntze/* @ssieb
 esphome/components/lc709203f/* @ilikecake
 esphome/components/lcd_menu/* @numo68
 esphome/components/ld2410/* @regevbr @sebcaps
-esphome/components/ld2410s/* @NovakIrs
 esphome/components/ld2412/* @Rihan9
 esphome/components/ld2420/* @descipher
 esphome/components/ld2450/* @hareeshmu
-esphome/components/ld2460/* @jesusvallejo
 esphome/components/ld24xx/* @kbx81
 esphome/components/ld6002b/* @hepter
 esphome/components/ledc/* @OttoWinter
@@ -340,10 +304,6 @@ esphome/components/libretiny_pwm/* @kuba2k2
 esphome/components/light/* @esphome/core
 esphome/components/lightwaverf/* @max246
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
-esphome/components/lis2dw12/* @latonita
-esphome/components/lis2dw12_i2c/* @latonita
-esphome/components/lis2dw12_spi/* @latonita
-esphome/components/lis3dh/* @zebble
 esphome/components/lm75b/* @beormund
 esphome/components/ln882h_ble/* @Bl00d-B0b
 esphome/components/ln882h_ble_tracker/* @Bl00d-B0b
@@ -351,7 +311,6 @@ esphome/components/ln882x/* @lamauny
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
 esphome/components/logger/select/* @clydebarrow
-esphome/components/lp5562/* @DennisGaida
 esphome/components/lps22/* @nagisa
 esphome/components/lsm6ds/* @clydebarrow
 esphome/components/ltr390/* @latonita @sjtrny
@@ -362,9 +321,7 @@ esphome/components/m5stack_8angle/* @rnauber
 esphome/components/mapping/* @clydebarrow
 esphome/components/matrix_keypad/* @ssieb
 esphome/components/max17043/* @blacknell
-esphome/components/max17048/* @B48D81EFCC
 esphome/components/max31865/* @DAVe3283
-esphome/components/max31888/* @JiriPrchal
 esphome/components/max44009/* @berfenger
 esphome/components/max6956/* @looping40
 esphome/components/max7219digit/* @rspaargaren
@@ -383,6 +340,7 @@ esphome/components/mcp4461/* @p1ngb4ck
 esphome/components/mcp4728/* @berfenger
 esphome/components/mcp47a1/* @jesserockz
 esphome/components/mcp9600/* @mreditor97
+esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
 esphome/components/media_player/* @jesserockz
@@ -391,14 +349,11 @@ esphome/components/micro_wake_word/* @jesserockz @kahrendt
 esphome/components/micronova/* @edenhaus @jorre05
 esphome/components/microphone/* @jesserockz @kahrendt
 esphome/components/mics_4514/* @jesserockz
-esphome/components/mics_5524/* @nliaudat
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
-esphome/components/midea_portasplit/* @Fexiven
 esphome/components/mipi_dsi/* @clydebarrow
 esphome/components/mipi_rgb/* @clydebarrow
 esphome/components/mipi_spi/* @clydebarrow
-esphome/components/mistral_ir/* @lerhum
 esphome/components/mitsubishi/* @RubyBailey
 esphome/components/mitsubishi_cn105/* @crnjan
 esphome/components/mixer/speaker/* @kahrendt
@@ -437,8 +392,6 @@ esphome/components/noblex/* @AGalfra
 esphome/components/noise/* @esphome/core
 esphome/components/npi19/* @bakerkj
 esphome/components/nrf52/* @tomaszduda23
-esphome/components/ns2009/* @tchilov
-esphome/components/ns2009/touchscreen/* @tchilov
 esphome/components/number/* @esphome/core
 esphome/components/one_wire/* @ssieb
 esphome/components/online_image/* @clydebarrow @guillempages
@@ -449,12 +402,10 @@ esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/packet_transport/* @clydebarrow
 esphome/components/pca6416a/* @Mat931
-esphome/components/pca9505/* @ajfriesen @ssieb
 esphome/components/pca9554/* @bdraco @clydebarrow @hwstar
 esphome/components/pcf85063/* @brogon
 esphome/components/pcf8563/* @KoenBreeman
 esphome/components/pcm5122/* @remcom
-esphome/components/pd_pioneer_ir/* @martinsah
 esphome/components/pi4ioe5v6408/* @jesserockz
 esphome/components/pid/* @OttoWinter
 esphome/components/pipsolar/* @andreashergert1984
@@ -473,7 +424,6 @@ esphome/components/pn7160/* @jesserockz @kbx81
 esphome/components/pn7160_i2c/* @jesserockz @kbx81
 esphome/components/pn7160_spi/* @jesserockz @kbx81
 esphome/components/pn71xx/* @jesserockz @kbx81
-esphome/components/power_management/* @rwrozelle
 esphome/components/power_supply/* @esphome/core
 esphome/components/preferences/* @esphome/core
 esphome/components/provisioning/* @esphome/core
@@ -494,8 +444,6 @@ esphome/components/rc522/* @glmnet
 esphome/components/rc522_i2c/* @glmnet
 esphome/components/rc522_spi/* @glmnet
 esphome/components/rd03d/* @jasstrong
-esphome/components/remko_ar715/* @naKruul
-esphome/components/renogy_inverter_ble/* @emilioaray-dev
 esphome/components/resampler/speaker/* @kahrendt
 esphome/components/restart/* @esphome/core
 esphome/components/rf_bridge/* @jesserockz
@@ -513,10 +461,8 @@ esphome/components/rtttl/* @glmnet @ximex
 esphome/components/runtime_image/* @clydebarrow @guillempages @kahrendt
 esphome/components/runtime_stats/* @bdraco
 esphome/components/rx8025t/* @remcom
-esphome/components/rx8111/* @techdregs
 esphome/components/rx8130/* @beormund
 esphome/components/safe_mode/* @jsuanet @kbx81 @paulmonigatti
-esphome/components/samsung/* @jorofi
 esphome/components/scd4x/* @martgras @sjtrny
 esphome/components/script/* @esphome/core
 esphome/components/sdl/* @bdm310 @clydebarrow
@@ -545,14 +491,11 @@ esphome/components/sfa30/* @ghsensdev
 esphome/components/sfa40/* @NoQuarrel
 esphome/components/sgp40/* @SenexCrenshaw
 esphome/components/sgp4x/* @martgras @SenexCrenshaw
-esphome/components/sh1122_base/* @pl4nkton
-esphome/components/sh1122_spi/* @pl4nkton
 esphome/components/sha256/* @esphome/core
 esphome/components/shelly_dimmer/* @edge90 @rnauber
 esphome/components/sht3xd/* @mrtoy-me
 esphome/components/sht4x/* @sjtrny
 esphome/components/shutdown/* @esphome/core @jsuanet
-esphome/components/siemens_ira211/* @fonix232
 esphome/components/sigma_delta_output/* @Cat-Ion
 esphome/components/sim800l/* @glmnet
 esphome/components/sm10bit_base/* @Cossid
@@ -569,7 +512,6 @@ esphome/components/sound_level/* @kahrendt
 esphome/components/spa06_base/* @danielkent-net
 esphome/components/spa06_i2c/* @danielkent-net
 esphome/components/spa06_spi/* @danielkent-net
-esphome/components/spd2010/* @grischard
 esphome/components/speaker/* @jesserockz @kahrendt
 esphome/components/speaker/media_player/* @kahrendt @synesthesiam
 esphome/components/speaker_source/* @kahrendt
@@ -599,7 +541,6 @@ esphome/components/st7735/* @SenexCrenshaw
 esphome/components/st7789v/* @kbx81
 esphome/components/st7920/* @marsjan155
 esphome/components/statsd/* @Links2004
-esphome/components/stcc4/* @j9brown
 esphome/components/stts22h/* @B48D81EFCC
 esphome/components/substitutions/* @esphome/core
 esphome/components/sun/* @OttoWinter
@@ -613,15 +554,12 @@ esphome/components/syslog/* @clydebarrow
 esphome/components/systa_bus/* @Mat931
 esphome/components/t6615/* @tylermenezes
 esphome/components/tas2780/* @remcom
-esphome/components/tas58xx/* @mrtoy-me @remcom
 esphome/components/tc74/* @sethgirvan
-esphome/components/tca8418/* @zebble
 esphome/components/tca9548a/* @andreashergert1984
 esphome/components/tca9555/* @mobrembski
 esphome/components/tcl112/* @glmnet
-esphome/components/tcp_uart/* @Bascht74
 esphome/components/tee501/* @Stock-M
-esphome/components/teleinfo/* @0hax @FredM67
+esphome/components/teleinfo/* @0hax
 esphome/components/tem3200/* @bakerkj
 esphome/components/template/alarm_control_panel/* @grahambrown11 @hwstar
 esphome/components/template/datetime/* @rfdarter
@@ -633,15 +571,12 @@ esphome/components/thermopro_ble/* @sittner
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @esphome/core
 esphome/components/tinyusb/* @kbx81
-esphome/components/tinyusb_keyboard/* @frederikbolding
 esphome/components/tlc5947/* @rnauber
 esphome/components/tlc5971/* @IJIJI
 esphome/components/tm1621/* @Philippe12
 esphome/components/tm1637/* @glmnet
 esphome/components/tm1638/* @skykingjwc
 esphome/components/tm1651/* @mrtoy-me
-esphome/components/tmc2209/* @remcom
-esphome/components/tmc22xx/* @remcom
 esphome/components/tmp102/* @timsavage
 esphome/components/tmp1075/* @sybrenstuvel
 esphome/components/tmp117/* @Azimath
@@ -664,13 +599,11 @@ esphome/components/uart/button/* @ssieb
 esphome/components/uart/event/* @eoasmxd
 esphome/components/uart/packet_transport/* @clydebarrow
 esphome/components/uart_mux/* @kbx81
-esphome/components/uart_tcp/* @Bascht74
 esphome/components/udp/* @clydebarrow
 esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
 esphome/components/ufm01/* @ljungqvist
 esphome/components/ultrasonic/* @ssieb @swoboda1337
-esphome/components/unicode/* @esphome/core
 esphome/components/update/* @jesserockz
 esphome/components/uponor_smatrix/* @kroimon
 esphome/components/usb_cdc_acm/* @kbx81
@@ -693,7 +626,7 @@ esphome/components/web_server_idf/* @dentra
 esphome/components/weikai/* @DrCoolZic
 esphome/components/weikai_i2c/* @DrCoolZic
 esphome/components/weikai_spi/* @DrCoolZic
-esphome/components/whirlpool/* @arpena @glmnet
+esphome/components/whirlpool/* @glmnet
 esphome/components/whynter/* @aeonsablaze
 esphome/components/wiegand/* @ssieb
 esphome/components/wireguard/* @droscy @lhoracek @thomas0bernard
@@ -714,7 +647,6 @@ esphome/components/xiaomi_body_scale/* @dckiller51
 esphome/components/xiaomi_hhccjcy10/* @fariouche
 esphome/components/xiaomi_lywsd02mmc/* @juanluss31
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
-esphome/components/xiaomi_mccgq02hl/* @ahpohl @morph027
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
 esphome/components/xiaomi_rtcgq02lm/* @jesserockz

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.11.0-dev
+PROJECT_NUMBER         = 2026.10.0-dev
 
 # 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

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.24.0
+RUN uv pip install --no-cache-dir esphome-device-builder==1.17.2
 
 RUN \
     platformio settings set enable_telemetry No \

esphome/__main__.py

@@ -7,7 +7,6 @@ import importlib
 import logging
 import os
 from pathlib import Path
-import platform
 import re
 import sys
 import time
@@ -19,6 +18,7 @@ from typing import TYPE_CHECKING, Protocol
 from esphome import const, platform_hooks
 from esphome.build_helpers.native import analysis_backend, native_backend
 from esphome.const import (
+    ALLOWED_NAME_CHARS,
     ARGUMENT_HELP_DEVICE,
     BUNDLE_EXTENSION,
     CONF_API,
@@ -36,6 +36,7 @@ from esphome.const import (
     CONF_LOGGER,
     CONF_MDNS,
     CONF_MQTT,
+    CONF_NAME,
     CONF_NAME_ADD_MAC_SUFFIX,
     CONF_OTA,
     CONF_PASSWORD,
@@ -48,24 +49,19 @@ from esphome.const import (
     CONF_WEB_SERVER,
     CONF_WIFI,
     ENV_NOGITIGNORE,
-    KEY_CORE,
     KEY_ESP32,
-    KEY_TARGET_PLATFORM,
     KEY_VARIANT,
-    PLATFORM_HOST,
     SECRETS_FILES,
-    ErrorFormat,
     Toolchain,
 )
 from esphome.core import CORE, EsphomeError, coroutine
 from esphome.enum import StrEnum
-from esphome.helpers import IS_MACOS, get_bool_env, indent, is_ip_address
+from esphome.helpers import get_bool_env, indent, is_ip_address
 from esphome.log import AnsiFore, color, setup_log
 from esphome.stacktrace import LogLineProcessor
 from esphome.types import ConfigType
 from esphome.upload_targets import PortType, get_port_type
 from esphome.util import (
-    ESPHOME_COMMAND,
     PICOTOOL_PACKAGE,
     FlashImage,
     detect_rp2040_bootsel,
@@ -73,7 +69,6 @@ from esphome.util import (
     get_serial_ports,
     is_picotool_usb_permission_error,
     list_yaml_files,
-    read_secret_line,
     run_external_command,
     run_external_process,
     safe_print,
@@ -90,6 +85,7 @@ if TYPE_CHECKING:
 
 _LOGGER = logging.getLogger(__name__)
 
+ESPHOME_COMMAND = [sys.executable, "-m", "esphome"]
 
 # Maximum buffer size for serial log reading to prevent unbounded memory growth
 SERIAL_BUFFER_MAX_SIZE = 65536
@@ -154,7 +150,6 @@ class ArgsProtocol(Protocol):
     file: str | None
     no_logs: bool
     only_generate: bool
-    skip_bootloader: bool
     show_secrets: bool
     dashboard: bool
     configuration: str
@@ -483,9 +478,12 @@ def has_ota() -> bool:
 
 def has_native_ota() -> bool:
     """Check if native API OTA upload is available (``platform: esphome``)."""
-    from esphome.espota2 import esphome_ota_items
-
-    return bool(esphome_ota_items(CORE.config))
+    if CONF_OTA not in CORE.config:
+        return False
+    return any(
+        ota_item.get(CONF_PLATFORM) == CONF_ESPHOME
+        for ota_item in CORE.config[CONF_OTA]
+    )
 
 
 def has_web_server_ota() -> bool:
@@ -831,14 +829,6 @@ def write_cpp_file() -> int:
 
 
 def compile_program(args: ArgsProtocol, config: ConfigType) -> int:
-    if CORE.skip_bootloader and not (CORE.is_esp32 and CORE.using_toolchain_esp_idf):
-        # Debug only: an orchestrator cannot see YAML toolchain overrides,
-        # so this is its expected no-op, and a full build is safe.
-        _LOGGER.debug(
-            "--skip-bootloader ignored: only supported on ESP32 with the "
-            "esp-idf toolchain"
-        )
-        CORE.skip_bootloader = False
     # Keep this gate here, NOT in config validation: device-builder needs
     # `esphome config` to keep succeeding with placeholders so onboarding can run.
     if CONF_WIFI in config:
@@ -869,10 +859,7 @@ def compile_program(args: ArgsProtocol, config: ConfigType) -> int:
             return rc
 
         # Create factory.bin, ota.bin, and firmware.elf copy
-        if not toolchain.create_factory_bin():
-            # A build whose factory image could not be produced must not
-            # exit 0; downloads would serve an image from an older build.
-            return 1
+        toolchain.create_factory_bin()
         toolchain.create_ota_bin()
         toolchain.create_elf_copy()
         from esphome.build_helpers.idedata import warn_if_idedata_missing
@@ -937,14 +924,11 @@ def _check_and_emit_build_info() -> None:
 
 def _get_configured_xtal_freq() -> int | None:
     """Read the configured crystal frequency from the sdkconfig file."""
+    from esphome.espidf import parse_sdkconfig
+
     sdkconfig_path = CORE.relative_build_path(f"sdkconfig.{CORE.name}")
-    if not sdkconfig_path.is_file():
-        return None
-    with suppress(OSError, ValueError):
-        content = sdkconfig_path.read_text()
-        for line in content.splitlines():
-            if line.startswith("CONFIG_XTAL_FREQ="):
-                return int(line.split("=", 1)[1])
+    with suppress(OSError, ValueError, KeyError):
+        return int(parse_sdkconfig(sdkconfig_path)["CONFIG_XTAL_FREQ"])
     return None
 
 
@@ -990,9 +974,8 @@ def upload_using_esptool(
         # and partitions included where the target needs them)
         image = native.get_factory_firmware_path()
         if not image.is_file():
-            hint = getattr(native, "missing_image_hint", lambda: None)()
             raise EsphomeError(
-                hint or f"{image} does not exist; compile the configuration first"
+                f"{image} does not exist; compile the configuration first"
             )
         flash_images = [FlashImage(path=image, offset="0x0")]
     else:
@@ -1233,28 +1216,14 @@ def upload_program(
     config: ConfigType, args: ArgsProtocol, devices: list[str]
 ) -> tuple[int, str | None]:
     host = devices[0]
-    port_type = get_port_type(host)
-    ota_key = getattr(args, "ota_key", None)
-    if ota_key and port_type in (PortType.SERIAL, PortType.BOOTSEL):
-        _LOGGER.warning(
-            "The presented OTA key only applies to network uploads; ignored for %s",
-            host,
-        )
-
     platform_upload = platform_hooks.get_platform_hook(
         CORE.target_platform, "upload_program"
     )
     if platform_upload is not None and platform_upload(config, args, host):
-        if ota_key and port_type not in (PortType.SERIAL, PortType.BOOTSEL):
-            # A platform's own network path (nrf52 mcumgr) has no key handshake
-            _LOGGER.warning(
-                "The presented OTA key only applies to the %s OTA platform; "
-                "ignored for %s",
-                CONF_ESPHOME,
-                host,
-            )
         return 0, host
 
+    port_type = get_port_type(host)
+
     # MQTT and MQTTIP are also OTA paths; MQTTIP gets resolved to a real IP later by
     # _resolve_network_devices(). Only SERIAL and BOOTSEL are non-OTA upload paths.
     is_partition_table = getattr(args, "partition_table", False)
@@ -1297,8 +1266,6 @@ def upload_program(
     network_devices = _resolve_network_devices(devices, config, args)
 
     if chosen_platform == CONF_WEB_SERVER:
-        if ota_key:
-            raise EsphomeError(OTA_KEY_PLATFORM_ERROR)
         if is_partition_table or is_bootloader:
             raise EsphomeError(
                 f"{option_string} is only supported with the esphome OTA platform; "
@@ -1312,17 +1279,6 @@ def upload_program(
     return _upload_via_native_api(config, network_devices, args)
 
 
-def _ota_upload_platforms(config: ConfigType) -> dict[str, None]:
-    """The network OTA platforms the config provides, one entry each, in
-    config order; the web_server final-validate hook merges duplicates."""
-    return {
-        ota_platform: None
-        for ota_item in config.get(CONF_OTA, [])
-        if (ota_platform := ota_item.get(CONF_PLATFORM))
-        in (CONF_ESPHOME, CONF_WEB_SERVER)
-    }
-
-
 def _choose_ota_platform(config: ConfigType, requested: str | None) -> str:
     """Pick the OTA platform to use, optionally honoring ``--ota-platform``.
 
@@ -1330,12 +1286,22 @@ def _choose_ota_platform(config: ConfigType, requested: str | None) -> str:
     The native API uses challenge-response auth with MD5/SHA256 hashing of a
     server-issued nonce, so the password is never sent over the wire; the
     ``web_server`` path uses HTTP Basic auth which transmits credentials in
-    cleartext over the LAN. (The native path also compresses the upload:
-    gzip on ESP8266 and RP2040, which inflate it at reboot, and a deflate
-    stream on ESP32/LibreTiny, which inflate it as it arrives.) Falls back to
+    cleartext over the LAN. (The native path also supports gzip compression
+    on ESP8266, where flash space is tight; on ESP32/RP2040/LibreTiny the
+    backend reports ``supports_compression() == false`` and the firmware is
+    sent uncompressed regardless of which platform is used.) Falls back to
     ``web_server`` only when that is the only available platform.
     """
-    available = _ota_upload_platforms(config)
+    # Use a dict (insertion-ordered) instead of a list so error messages and
+    # membership checks see one entry per platform even if the user has
+    # multiple ``ota:`` items of the same platform; the web_server OTA
+    # platform's final-validate hook merges duplicates anyway.
+    available: dict[str, None] = {}
+    for ota_item in config.get(CONF_OTA, []):
+        platform = ota_item.get(CONF_PLATFORM)
+        if platform in (CONF_ESPHOME, CONF_WEB_SERVER):
+            available[platform] = None
+
     if not available:
         raise EsphomeError(
             f"Cannot upload Over the Air as the {CONF_OTA} configuration is not "
@@ -1356,17 +1322,14 @@ def _choose_ota_platform(config: ConfigType, requested: str | None) -> str:
     return CONF_WEB_SERVER
 
 
-def _esphome_ota_conf(config: ConfigType) -> ConfigType | None:
-    """The validated esphome OTA platform block, if configured."""
-    from esphome.espota2 import esphome_ota_items
-
-    return next(iter(esphome_ota_items(config)), None)
-
-
 def _upload_via_native_api(
     config: ConfigType, network_devices: list[str], args: ArgsProtocol
 ) -> tuple[int, str | None]:
-    ota_conf = _esphome_ota_conf(config) or {}
+    ota_conf: ConfigType = {}
+    for ota_item in config.get(CONF_OTA, []):
+        if ota_item.get(CONF_PLATFORM) == CONF_ESPHOME:
+            ota_conf = ota_item
+            break
 
     from esphome import espota2
     from esphome.components.noise import static_encryption_key
@@ -1376,15 +1339,9 @@ def _upload_via_native_api(
     # Fail closed: an encryption block whose key did not resolve must never
     # fall back to a plaintext upload
     noise_psk = None
-    old_noise_psk = None
     plaintext_fallback = False
     allow_plaintext_upload = False
-    if ota_key := getattr(args, "ota_key", None):
-        # The user presents a key the device still runs instead of the
-        # configured one (a key change in progress); an explicit key never
-        # downgrades to plaintext
-        noise_psk = ota_key
-    elif (encryption_conf := ota_conf.get(CONF_ENCRYPTION)) is not None:
+    if (encryption_conf := ota_conf.get(CONF_ENCRYPTION)) is not None:
         noise_psk = encryption_conf.get(CONF_KEY)
         allow_plaintext_upload = bool(
             encryption_conf.get(espota2.CONF_ALLOW_PLAINTEXT_UPLOAD)
@@ -1397,8 +1354,6 @@ def _upload_via_native_api(
         # Ensure the key is a string, as required by the underlying OTA implementation.
         # It arrives here as a SensitiveStr which aioesphomeapi rejects.
         noise_psk = str(noise_psk)
-        if old_key := encryption_conf.get(espota2.CONF_OLD_KEY):
-            old_noise_psk = str(old_key)
     elif api_key := static_encryption_key(config.get(CONF_API) or {}):
         # Remove before 2027.3.0: the api key is tried, falling back to plaintext
         noise_psk = str(api_key)
@@ -1423,12 +1378,6 @@ def _upload_via_native_api(
         ota_type = espota2.OTA_TYPE_UPDATE_PARTITION_TABLE
     elif getattr(args, "bootloader", False):
         check_partition_access("--bootloader")
-        if (
-            getattr(args, "file", None) is None
-            and (native := native_backend())
-            and (hint := getattr(native, "missing_image_hint", lambda: None)())
-        ):
-            raise EsphomeError(hint)
         binary = CORE.bootloader_bin
         ota_type = espota2.OTA_TYPE_UPDATE_BOOTLOADER
     if getattr(args, "file", None) is not None:
@@ -1448,30 +1397,19 @@ def _upload_via_native_api(
         noise_psk,
         plaintext_fallback=plaintext_fallback,
         allow_plaintext_upload=allow_plaintext_upload,
-        old_noise_psk=old_noise_psk,
     )
 
 
-def _old_key_notice(config: ConfigType) -> None:
-    """After `run`, whose image was just built from this config; a plain
-    `upload` may send a stale image that still carries the previous key."""
-    from esphome import espota2
-
-    for item in espota2.esphome_ota_items(config):
-        if (item.get(CONF_ENCRYPTION) or {}).get(espota2.CONF_OLD_KEY):
-            _LOGGER.warning(espota2.OLD_KEY_REMOVE_NOTICE)
-
-
 def _upload_via_web_server(
     config: ConfigType, network_devices: list[str], binary: Path
 ) -> tuple[int, str | None]:
     from esphome import web_server_ota
-    from esphome.espota2 import esphome_ota_items
     from esphome.web_server_helpers import get_web_server_connection
 
     if any(
-        ota_item.get(CONF_ENCRYPTION) is not None
-        for ota_item in esphome_ota_items(config)
+        ota_item.get(CONF_PLATFORM) == CONF_ESPHOME
+        and ota_item.get(CONF_ENCRYPTION) is not None
+        for ota_item in config.get(CONF_OTA, [])
     ):
         _LOGGER.warning(
             "This config has OTA encryption, but the web_server OTA path sends "
@@ -1779,60 +1717,7 @@ def command_compile(args: ArgsProtocol, config: ConfigType) -> int | None:
     return 0
 
 
-ENV_OTA_KEY = "ESPHOME_OTA_KEY"
-OTA_KEY_PLATFORM_ERROR = (
-    f"--prompt-ota-key and {ENV_OTA_KEY} only apply to the {CONF_ESPHOME} OTA "
-    "platform; to flash by serial instead, name the port with --device"
-)
-
-
-def _read_ota_key(args: ArgsProtocol, config: ConfigType) -> None:
-    """Take the key to present to the device for this upload, from the
-    prompt or from ESPHOME_OTA_KEY, before any compile so the prompt is
-    not buried in build output."""
-    prompt = getattr(args, "prompt_ota_key", False)
-    env_key = getattr(args, "env_ota_key", None)
-    if not prompt and env_key is None:
-        return
-    if CORE.data.get(KEY_CORE, {}).get(KEY_TARGET_PLATFORM) == PLATFORM_HOST:
-        _LOGGER.warning("A host program runs locally; the presented OTA key is ignored")
-        return
-    # The HTTP path has no key handshake; decide before prompting or
-    # compiling. A serial target is a serial flash: the key is not even
-    # asked for, and --ota-platform means nothing to it. Every entry must
-    # be serial: a missing port is skipped and the next entry may be a host
-    devices = getattr(args, "device", None) or []
-    serial_target = bool(devices) and all(
-        device == "SERIAL"
-        or get_port_type(device) in (PortType.SERIAL, PortType.BOOTSEL)
-        for device in devices
-    )
-    chosen = (
-        _choose_ota_platform(config, getattr(args, "ota_platform", None))
-        if not serial_target and _ota_upload_platforms(config)
-        else None
-    )
-    if chosen == CONF_WEB_SERVER:
-        raise EsphomeError(OTA_KEY_PLATFORM_ERROR)
-    from esphome.components.noise import validate_encryption_key
-    from esphome.config_validation import Invalid
-
-    if serial_target:
-        _LOGGER.warning(
-            "The presented OTA key only applies to network uploads; ignored for %s",
-            ", ".join(devices),
-        )
-        return
-    key = read_secret_line("OTA encryption key: ") if prompt else env_key
-    try:
-        validate_encryption_key(key)
-    except Invalid as err:
-        raise EsphomeError(f"Invalid OTA encryption key: {err}") from err
-    args.ota_key = key
-
-
 def command_upload(args: ArgsProtocol, config: ConfigType) -> int | None:
-    _read_ota_key(args, config)
     # Get devices, resolving special identifiers like OTA
     devices = choose_upload_log_host(
         default=args.device,
@@ -1868,19 +1753,6 @@ def command_logs(args: ArgsProtocol, config: ConfigType) -> int | None:
 
 
 def command_run(args: ArgsProtocol, config: ConfigType) -> int | None:
-    if (
-        CORE.skip_bootloader
-        and CORE.is_esp32
-        and CORE.using_toolchain_esp_idf
-        and any(
-            get_port_type(device) == PortType.SERIAL for device in (args.device or [])
-        )
-    ):
-        # Fail before the compile: the result could never flash over serial.
-        # Elsewhere the flag is ignored, so serial stays fine there.
-        _LOGGER.error("--skip-bootloader builds cannot be flashed over serial")
-        return 1
-    _read_ota_key(args, config)
     exit_code = write_cpp(config)
     if exit_code != 0:
         return exit_code
@@ -1906,7 +1778,6 @@ def command_run(args: ArgsProtocol, config: ConfigType) -> int | None:
     exit_code, successful_device = upload_program(config, args, devices)
     if exit_code == 0:
         _LOGGER.info("Successfully uploaded program.")
-        _old_key_notice(config)
     else:
         _LOGGER.warning("Failed to upload to %s", devices)
         return exit_code
@@ -2043,10 +1914,7 @@ def run_multiple_configs(
         safe_print()
 
         cmd = command_builder(f)
-        # The parent already logged the Intel macOS warning; children skip it.
-        rc = run_external_process(
-            *cmd, env={**os.environ, _INTEL_MACOS_WARNED_ENV: "1"}
-        )
+        rc = run_external_process(*cmd)
 
         if rc == 0:
             print_bar(f"[{color(AnsiFore.BOLD_GREEN, 'SUCCESS')}] {str(f)}")
@@ -2233,9 +2101,155 @@ def command_analyze_memory(args: ArgsProtocol, config: ConfigType) -> int:
 
 
 def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
-    from esphome.cli.rename import command_rename as run
+    from esphome import yaml_util
 
-    return run(args, config)
+    new_name = args.name
+    for c in new_name:
+        if c not in ALLOWED_NAME_CHARS:
+            safe_print(
+                color(
+                    AnsiFore.BOLD_RED,
+                    f"'{c}' is an invalid character for names. Valid characters are: "
+                    f"{ALLOWED_NAME_CHARS} (lowercase, no spaces)",
+                )
+            )
+            return 1
+    # Load existing yaml file
+    raw_contents = CORE.config_path.read_text(encoding="utf-8")
+
+    yaml = yaml_util.load_yaml(CORE.config_path)
+    if CONF_ESPHOME not in yaml or CONF_NAME not in yaml[CONF_ESPHOME]:
+        safe_print(
+            color(
+                AnsiFore.BOLD_RED, "Complex YAML files cannot be automatically renamed."
+            )
+        )
+        return 1
+    old_name = yaml[CONF_ESPHOME][CONF_NAME]
+    match = re.match(r"^\$\{?([a-zA-Z0-9_]+)\}?$", old_name)
+    if match is None:
+        # Only swap the ``name:`` line that sits directly under the
+        # top-level ``esphome:`` block. A naked ``re.sub`` would
+        # also clobber any other ``name:`` line whose value happens
+        # to match (e.g. a sensor / output / wifi entry sharing the
+        # device's hostname), silently rewriting unrelated user
+        # configuration. The pattern anchors:
+        # - at the start of the line so ``friendly_name:``,
+        #   ``device_name:`` etc. don't match the trailing ``name:``
+        #   substring; and
+        # - at the end of the value (lookahead for whitespace +
+        #   comment + EOL) so ``old_name`` doesn't match as a
+        #   prefix of a longer value (``kitchen`` vs ``kitchen2``).
+        name_pattern = re.compile(
+            rf"^(\s*)name:\s+[\"']?{re.escape(old_name)}[\"']?(?=\s*(?:#|$))"
+        )
+        out_lines: list[str] = []
+        in_esphome_block = False
+        for line in raw_contents.splitlines(keepends=True):
+            if line and not line[0].isspace() and line.strip():
+                in_esphome_block = line.lstrip().startswith("esphome:")
+                out_lines.append(line)
+                continue
+            if in_esphome_block:
+                line = name_pattern.sub(rf'\1name: "{new_name}"', line, count=1)
+            out_lines.append(line)
+        new_raw = "".join(out_lines)
+    else:
+        old_name = yaml[CONF_SUBSTITUTIONS][match.group(1)]
+        if (
+            len(
+                re.findall(
+                    rf"^\s+{match.group(1)}:\s+[\"']?{old_name}[\"']?",
+                    raw_contents,
+                    flags=re.MULTILINE,
+                )
+            )
+            > 1
+        ):
+            safe_print(
+                color(AnsiFore.BOLD_RED, "Too many matches in YAML to safely rename")
+            )
+            return 1
+
+        new_raw = re.sub(
+            rf"^(\s+{match.group(1)}):\s+[\"']?{old_name}[\"']?",
+            f'\\1: "{new_name}"',
+            raw_contents,
+            flags=re.MULTILINE,
+        )
+
+    # ``new_name == old_name`` (after substitution resolution) is
+    # a no-op rewrite that would still queue a pointless re-flash.
+    # Catch it before the path-equality check below — covers the
+    # case where the config filename doesn't match the device name
+    # (e.g. ``weird-file.yaml`` whose ``esphome.name`` is
+    # ``kitchen``; running ``esphome rename weird-file.yaml kitchen``
+    # would otherwise just re-flash the same hostname).
+    if new_name == old_name:
+        safe_print(
+            color(
+                AnsiFore.BOLD_RED,
+                f"'{new_name}' is already the device's name.",
+            )
+        )
+        return 1
+
+    new_path: Path = CORE.config_dir / (new_name + ".yaml")
+    if new_path.resolve() == CORE.config_path.resolve():
+        safe_print(
+            color(
+                AnsiFore.BOLD_RED,
+                f"'{new_name}' is already the device's name.",
+            )
+        )
+        return 1
+    if new_path.exists():
+        safe_print(
+            color(
+                AnsiFore.BOLD_RED,
+                f"Cannot rename: {new_path} already exists. "
+                "Refusing to overwrite an existing configuration.",
+            )
+        )
+        return 1
+    safe_print(
+        f"Updating {color(AnsiFore.CYAN, str(CORE.config_path))} to {color(AnsiFore.CYAN, str(new_path))}"
+    )
+    print()
+
+    new_path.write_text(new_raw, encoding="utf-8")
+
+    rc = run_external_process(*ESPHOME_COMMAND, "config", str(new_path))
+    if rc != 0:
+        safe_print(color(AnsiFore.BOLD_RED, "Rename failed. Reverting changes."))
+        new_path.unlink()
+        return 1
+
+    cli_args = [
+        "run",
+        str(new_path),
+        "--no-logs",
+        "--device",
+        CORE.address,
+    ]
+
+    if args.dashboard:
+        cli_args.insert(0, "--dashboard")
+
+    try:
+        rc = run_external_process(*ESPHOME_COMMAND, *cli_args)
+    except KeyboardInterrupt:
+        rc = 1
+    if rc != 0:
+        new_path.unlink()
+        return 1
+
+    if CORE.config_path != new_path:
+        CORE.config_path.unlink()
+
+    safe_print(color(AnsiFore.BOLD_GREEN, "SUCCESS"))
+    print()
+    return 0
 
 
 PRE_CONFIG_ACTIONS = {
@@ -2270,15 +2284,6 @@ SIMPLE_CONFIG_ACTIONS = [
 ]
 
 
-def _add_skip_bootloader_arg(parser: argparse.ArgumentParser) -> None:
-    parser.add_argument(
-        "--skip-bootloader",
-        help="Do not build the bootloader or the factory image; "
-        "the result can only be flashed over OTA.",
-        action="store_true",
-    )
-
-
 def _add_states_args(parser: argparse.ArgumentParser) -> None:
     """Add mutually exclusive ``--states``/``--no-states`` flags to a parser.
 
@@ -2302,25 +2307,6 @@ def _add_states_args(parser: argparse.ArgumentParser) -> None:
     )
 
 
-def _error_format(value: str) -> ErrorFormat:
-    try:
-        return ErrorFormat(value.lower())
-    except ValueError:
-        choices = ", ".join(ErrorFormat)
-        raise argparse.ArgumentTypeError(
-            f"invalid choice: '{value}' (choose from {choices})"
-        ) from None
-
-
-ARGUMENT_HELP_PROMPT_OTA_KEY = (
-    "Ask for the OTA encryption key to present to the device instead of using "
-    "the one in the configuration, for a device that still runs a previous key. "
-    "The key is read without echo, or as one line from stdin when that is not "
-    "a terminal; it is never taken from the command line. A calling program "
-    f"can hand the key over in the {ENV_OTA_KEY} environment variable instead."
-)
-
-
 def parse_args(argv):
     options_parser = argparse.ArgumentParser(add_help=False)
     options_parser.add_argument(
@@ -2383,17 +2369,6 @@ def parse_args(argv):
         ),
     )
 
-    options_parser.add_argument(
-        "--error-format",
-        type=_error_format,
-        metavar="{" + ",".join(f.value for f in ErrorFormat) + "}",
-        help=(
-            "How configuration errors are shown. 'yaml' shows them inside the "
-            "failing YAML; 'line' prints one 'file:line:column: error: message' "
-            "line per error. Default: $ESPHOME_ERROR_FORMAT, else 'yaml'."
-        ),
-    )
-
     parser = argparse.ArgumentParser(
         description=f"ESPHome {const.__version__}", parents=[options_parser]
     )
@@ -2450,7 +2425,6 @@ def parse_args(argv):
         help="Only generate source code, do not compile.",
         action="store_true",
     )
-    _add_skip_bootloader_arg(parser_compile)
 
     parser_upload = subparsers.add_parser(
         "upload",
@@ -2489,11 +2463,6 @@ def parse_args(argv):
         help="Upload as partition table (OTA).",
         action="store_true",
     )
-    parser_upload.add_argument(
-        "--prompt-ota-key",
-        action="store_true",
-        help=ARGUMENT_HELP_PROMPT_OTA_KEY,
-    )
     parser_upload.add_argument(
         "--bootloader",
         help="Upload as bootloader (OTA).",
@@ -2519,7 +2488,7 @@ def parse_args(argv):
         "-r",
         action="store_true",
         help="Reset the device before starting serial logs.",
-        default=get_bool_env("ESPHOME_SERIAL_LOGGING_RESET"),
+        default=os.getenv("ESPHOME_SERIAL_LOGGING_RESET"),
     )
     _add_states_args(parser_logs)
 
@@ -2552,7 +2521,6 @@ def parse_args(argv):
     parser_run.add_argument(
         "--no-logs", help="Disable starting logs.", action="store_true"
     )
-    _add_skip_bootloader_arg(parser_run)
 
     _add_states_args(parser_run)
 
@@ -2561,7 +2529,7 @@ def parse_args(argv):
         "-r",
         action="store_true",
         help="Reset the device before starting serial logs.",
-        default=get_bool_env("ESPHOME_SERIAL_LOGGING_RESET"),
+        default=os.getenv("ESPHOME_SERIAL_LOGGING_RESET"),
     )
     parser_run.add_argument(
         "--ota-platform",
@@ -2574,11 +2542,6 @@ def parse_args(argv):
             "(HTTP Basic auth) when that is the only configured platform."
         ),
     )
-    parser_run.add_argument(
-        "--prompt-ota-key",
-        action="store_true",
-        help=ARGUMENT_HELP_PROMPT_OTA_KEY,
-    )
 
     parser_clean = subparsers.add_parser(
         "clean-mqtt",
@@ -2707,18 +2670,9 @@ def parse_args(argv):
         args, unknown_args = parser.parse_known_args(arguments)
         if unknown_args:
             _LOGGER.warning("Ignored unrecognized arguments: %s", unknown_args)
-    else:
-        args = parser.parse_args(arguments)
+        return args
 
-    # Read here rather than as the option default, so a bad value is reported
-    # against the environment variable instead of --error-format
-    if args.error_format is None:
-        env_value = os.getenv("ESPHOME_ERROR_FORMAT", ErrorFormat.YAML.value)
-        try:
-            args.error_format = _error_format(env_value)
-        except argparse.ArgumentTypeError as err:
-            parser.error(f"ESPHOME_ERROR_FORMAT: {err}")
-    return args
+    return parser.parse_args(arguments)
 
 
 def _warn_if_source_tree_mismatch() -> None:
@@ -2764,34 +2718,12 @@ def _warn_if_source_tree_mismatch() -> None:
     )
 
 
-_INTEL_MACOS_REMOVAL = "2027.6.0"
-_INTEL_MACOS_WARNED_ENV = "ESPHOME_INTEL_MACOS_WARNED"
-
-
-def _warn_if_intel_macos() -> None:
-    """Warn that Intel (x86_64) Python on macOS loses support by _INTEL_MACOS_REMOVAL."""
-    if (
-        not IS_MACOS
-        or platform.machine() != "x86_64"
-        or _INTEL_MACOS_WARNED_ENV in os.environ
-    ):
-        return
-    _LOGGER.warning(
-        "Support for Intel Macs will end in ESPHome %s or earlier. The Python "
-        "packages ESPHome depends on have stopped publishing Intel macOS builds, "
-        "so future releases will not install on this machine. On an Apple "
-        "Silicon Mac, switch to a native arm64 Python.",
-        _INTEL_MACOS_REMOVAL,
-    )
-
-
 def run_esphome(argv):
     from esphome.address_cache import AddressCache
 
     args = parse_args(argv)
     CORE.dashboard = args.dashboard
     CORE.testing_mode = args.testing_mode
-    CORE.error_format = args.error_format
 
     # Create address cache from command-line arguments
     CORE.address_cache = AddressCache.from_cli_args(
@@ -2804,25 +2736,7 @@ def run_esphome(argv):
         args.log_level = "CRITICAL"
 
     setup_log(log_level=args.log_level)
-    # Taken out of the environment before any command runs, so no build
-    # tool inherits a key a calling program handed over
-    args.env_ota_key = os.environ.pop(ENV_OTA_KEY, None)
-    if args.command in ("upload", "run"):
-        # One key is one device's; several configs run in child processes
-        # that would never see it
-        if (args.env_ota_key is not None or args.prompt_ota_key) and len(
-            args.configuration
-        ) > 1:
-            raise EsphomeError(
-                f"--prompt-ota-key and {ENV_OTA_KEY} take one configuration; "
-                f"{len(args.configuration)} were given"
-            )
-    elif args.env_ota_key is not None:
-        _LOGGER.warning(
-            "%s is set but the %s command does not use it", ENV_OTA_KEY, args.command
-        )
     _warn_if_source_tree_mismatch()
-    _warn_if_intel_macos()
 
     if args.command in PRE_CONFIG_ACTIONS:
         try:
@@ -2866,7 +2780,6 @@ def run_esphome(argv):
 
     CORE.config_path = conf_path
     CORE.dashboard = args.dashboard
-    CORE.skip_bootloader = getattr(args, "skip_bootloader", False)
     if args.toolchain is not None:
         # CLI toolchain wins over esp32.toolchain in YAML.
         CORE.toolchain = args.toolchain

esphome/address_cache.py

@@ -148,13 +148,6 @@ class AddressCache:
                 continue
             hostname, ips = arg.split("=", 1)
             # Normalize hostname for consistent lookups
-            normalized = normalize_hostname(hostname.strip())
-            addresses = [ip for value in ips.split(",") if (ip := value.strip())]
-            if not normalized or not addresses:
-                _LOGGER.warning(
-                    "Invalid cache entry: %s (hostname and at least one address are required)",
-                    arg,
-                )
-                continue
-            cache[normalized] = addresses
+            normalized = normalize_hostname(hostname)
+            cache[normalized] = [ip.strip() for ip in ips.split(",")]
         return cache

esphome/arduino8266/framework.py

@@ -24,10 +24,9 @@ from esphome.core import EsphomeError, Version
 from esphome.framework_helpers import str_to_lst_of_str
 from esphome.platformio.registry import (
     Download,
-    PackageSpec,
     Resolver,
     get_systype,
-    install_packages,
+    install_package,
     prefetch_packages,
 )
 
@@ -49,40 +48,40 @@ class FrameworkRelease(NamedTuple):
 # Arduino core version -> its build in esphome-libs/arduino-esp8266
 FRAMEWORK_RELEASES: dict[Version, FrameworkRelease] = {
     Version(3, 1, 2): FrameworkRelease(
-        "3.1.2-esphome.3",
-        "3af533a85163804e164500a5b254dc23b922080e25ecb7dc37b3dd8ac84651db",
-        37185650,
+        "3.1.2-esphome.1",
+        "e80751e3123676b967143e39c61f2d8693946db4c7806f2a83dcaaf797ecd582",
+        37189311,
     ),
 }
 
 TOOLCHAIN_PACKAGE = "toolchain-xtensa-lx106-elf"
 # gcc 10.3, the toolchain Arduino core 3.x builds with; the build
 # generator's compile flags are tuned to it.
-TOOLCHAIN_VERSION = "10.3.0-esphome.3"
+TOOLCHAIN_VERSION = "10.3.0-esphome.2"
 _TOOLCHAIN_RELEASES = (
     "https://github.com/esphome-libs/xtensa-lx106-elf-toolchain/releases/"
 )
 # Registry system tag -> (sha256, size) of that host's archive
 TOOLCHAIN_BUILDS: dict[str, tuple[str, int]] = {
     "darwin_arm64": (
-        "ad0ea929238d9b527c43e0d20257acc2a5680bdb0d2b1cf8f2c99169786217e9",
-        60747260,
+        "849cede44d4d5c6ea0f14099783239f559f46327bea314281814f2652b486201",
+        60830321,
     ),
     "darwin_x86_64": (
-        "997090cac80c8eb59604ec52b73fb3568e5f2d9b2971f83c3f2a5c545c9c949c",
-        64065752,
+        "ca69904daabf0c5983b372423e5e62f49182a793e992c052e94666852470c897",
+        64149487,
     ),
     "linux_aarch64": (
-        "403f14d0d5755682fcd6eaea1e4c457a1d8cad30690e52fb0c804d8db266b908",
-        67487067,
+        "60a49a4f082bf246544bd409a9517dbbcab19bb30ac9decbee544b896aaccbd6",
+        67573397,
     ),
     "linux_x86_64": (
-        "64f21fa3ba736b363dc8c234dbbb39e005e574e33de08a78e9a00c55a64ae706",
-        68343668,
+        "1fba33ca1494ec79f2776e0e37eca93282d30f8bb9992f5f4f9a655d6fff1db4",
+        68431336,
     ),
     "windows_amd64": (
-        "1e62abf8df041ce5158f5770dffef955f2f981ce7f7adee88fcd5a8197705aa6",
-        67536405,
+        "af9066b0e5bf036f04f2bd9d08b89b81a7f183c57dac0abcaff71dd861cf5f3b",
+        67664137,
     ),
 }
 
@@ -152,14 +151,14 @@ def check_and_install(framework_version: Version) -> InstalledPaths:
     toolchain_path = get_toolchain_path()
     # One spec per package: the prefetch and the installs must agree
     specs = (
-        PackageSpec(
+        (
             FRAMEWORK_PACKAGE,
             release.tag,
             framework_path,
             ESPHOME_ARDUINO8266_FRAMEWORK_MIRRORS,
             ("cores/esp8266", "tools/sdk", "libraries"),
         ),
-        PackageSpec(
+        (
             TOOLCHAIN_PACKAGE,
             TOOLCHAIN_VERSION,
             toolchain_path,
@@ -175,10 +174,18 @@ def check_and_install(framework_version: Version) -> InstalledPaths:
         resolvers[FRAMEWORK_PACKAGE] = release.download
     if not ESPHOME_ARDUINO8266_TOOLCHAIN_MIRRORS:
         resolvers[TOOLCHAIN_PACKAGE] = toolchain_download
-    # Fetch both archives at once; the installs verify and extract them.
-    # One spec list for both, so the two phases cannot drift.
-    prefetch_packages(specs, downloads_dir, resolvers)
-    install_packages(specs, downloads_dir, resolvers)
+    # Fetch both archives at once; the installs below verify and extract
+    prefetch_packages([spec[:4] for spec in specs], downloads_dir, resolvers)
+    for name, version, dest, mirrors, expect in specs:
+        install_package(
+            name,
+            version,
+            dest,
+            mirrors,
+            downloads_dir,
+            expect=expect,
+            resolve=resolvers.get(name),
+        )
     return InstalledPaths(
         framework=framework_path, toolchain=toolchain_path, ninja=ninja_path
     )

esphome/automation.py

@@ -1,4 +1,4 @@
-from collections.abc import Awaitable, Callable, Sequence
+from collections.abc import Callable
 from dataclasses import dataclass, field
 import logging
 import string
@@ -21,9 +21,9 @@ from esphome.const import (
     CONF_TYPE_ID,
     CONF_UPDATE_INTERVAL,
 )
-from esphome.core import CORE, ID, EsphomeError, HexInt, Lambda
+from esphome.core import CORE, ID, EsphomeError, Lambda
 from esphome.cpp_generator import (
-    Expression,
+    FlashStringLiteral,
     LambdaExpression,
     MockObj,
     MockObjClass,
@@ -35,32 +35,6 @@ from esphome.types import ConfigType, SafeExpType
 from esphome.util import Registry
 
 
-def progmem_bytes(name: str, data: bytes | list[int]) -> MockObj:
-    """Shared PROGMEM table for constant bytes; equal payloads share one, empty is nullptr."""
-    if not data:
-        return cg.nullptr
-    return cg.shared_progmem_array(
-        name, cg.uint8, cg.ArrayInitializer(*(HexInt(x) for x in data))
-    )
-
-
-async def templatable_bytes(
-    value: Any,
-    args: TemplateArgsType,
-    set_template: MockObj,
-    set_static: MockObj,
-    table_name: str,
-) -> None:
-    """Set a TemplatableBytes: a lambda via set_template, constant bytes via set_static."""
-    if cg.is_template(value):
-        fn = await cg.templatable(value, args, cg.std_vector.template(cg.uint8))
-        cg.add(set_template(fn))
-    elif len(value) > 0xFFFF:
-        raise EsphomeError(f"Byte payload is {len(value)} bytes; the maximum is 65535")
-    else:
-        cg.add(set_static(progmem_bytes(table_name, value), len(value)))
-
-
 def maybe_simple_id(*validators):
     """Allow a raw ID to be specified in place of a config block.
     If the value that's being validated is a dictionary, it's passed as-is to the specified validators. Otherwise, it's
@@ -245,26 +219,11 @@ ApplyCondition = cg.esphome_ns.class_("ApplyCondition", Condition)
 
 def flash_string(config: ConfigType, value: str) -> str:
     """Default renderer for ``std::string`` constants; copies the literal out of flash on ESP8266."""
-    return str(cg.progmem_string(value))
-
-
-def flash_compare(config: ConfigType, value: str) -> str:
-    """Default renderer for ``std::string`` constants in conditions; compares in flash on ESP8266."""
     if CORE.is_esp8266:
-        return f"::esphome::ProgmemStringRef{{PSTR({cg.safe_exp(value)}), {len(value.encode('utf-8'))}}}"
+        return f"progmem_string({FlashStringLiteral(value)})"
     return str(cg.safe_exp(value))
 
 
-def _default_std_string(
-    members: list[tuple[str, Any, Any]], renderer: Callable[[ConfigType, str], str]
-) -> list[tuple[str, Any, Any]]:
-    """Give ``cg.std_string`` members without a renderer the given default."""
-    return [
-        (key, t, fn or (renderer if t is cg.std_string else None))
-        for key, t, fn in members
-    ]
-
-
 def literal_with_length(config: ConfigType, value: str) -> str:
     """Renderer for a ``(const char *, size_t)`` target: a plain literal plus its byte length.
 
@@ -274,24 +233,13 @@ def literal_with_length(config: ConfigType, value: str) -> str:
     return f"{cg.safe_exp(value)}, {len(value.encode('utf-8'))}"
 
 
-def string_ref_literal(config: ConfigType, value: str) -> str:
-    """Renderer for a ``StringRef`` comparison: a flash literal on ESP8266, else ``StringRef(literal, length)``."""
-    if CORE.is_esp8266:
-        return str(cg.FlashStringLiteral(value))
-    return f"StringRef({literal_with_length(config, value)})"
-
-
-def _names_parent(text: str) -> bool:
-    return any(f == "parent" for _, f, _, _ in string.Formatter().parse(text))
-
-
 @dataclass(frozen=True)
 class ApplyCall:
     """One statement from config keys, e.g. ``"set_range({}, {})"`` with ``((CONF_LOW, cg.float_), ...)``.
 
     Each arg is ``(conf_key, type_)`` or ``(conf_key, type_, const_fn)``. A ``conf_key`` may be a
-    path into nested sections. ``target`` and a plain ``str`` ``type_`` (raw C++ type text) may
-    name the parent object as ``{parent}``. ``const_fn(config, value)`` renders a constant's argument text; a lambda or an
+    path into nested sections. A plain ``str`` ``type_`` is raw C++ type text and may use
+    ``{parent}``. ``const_fn(config, value)`` renders a constant's argument text; a lambda or an
     id bypasses it. The statement is skipped when none of its keys is set, always emitted when it
     has no keys, and a partial set is a config error.
     """
@@ -303,13 +251,13 @@ class ApplyCall:
         fields = [
             f for _, f, _, _ in string.Formatter().parse(self.target) if f is not None
         ]
-        if any(f not in ("", "parent") for f in fields):
+        if any(fields):
             raise ValueError(
-                f"apply target {self.target!r}: only {{}} and {{parent}} placeholders"
+                f"apply target {self.target!r}: only bare {{}} placeholders"
             )
-        if (count := fields.count("")) != len(self.args):
+        if len(fields) != len(self.args):
             raise ValueError(
-                f"apply target {self.target!r} has {count} "
+                f"apply target {self.target!r} has {len(fields)} "
                 f"placeholder(s) for {len(self.args)} config key(s)"
             )
         if any(len(arg) not in (2, 3) for arg in self.args):
@@ -317,12 +265,6 @@ class ApplyCall:
                 f"apply target {self.target!r}: each arg is (conf_key, type_[, const_fn])"
             )
 
-    @property
-    def names_parent(self) -> bool:
-        return _names_parent(self.target) or any(
-            isinstance(arg[1], str) and _names_parent(arg[1]) for arg in self.args
-        )
-
     @property
     def members(self) -> list[tuple[Any, Any, Any]]:
         """Each arg as ``(conf_key, type_, const_fn or None)``."""
@@ -397,16 +339,9 @@ def _check_key_in_schema(
         schema = schema.schema[markers[part]]
 
 
-def parent_ref(var: MockObj) -> MockObj:
-    """``var`` named from global scope, so a trigger argument cannot shadow it.
-
-    Also how a generated callback names its Automation.
-    """
-    return MockObj(f"::{var}", "->")
-
-
 async def _apply_parent(config: ConfigType, id_key: str = CONF_ID) -> str:
-    return str(parent_ref(await cg.get_variable(config[id_key])))
+    # Global-scope qualified so a trigger arg named like the id cannot shadow it.
+    return f"::{await cg.get_variable(config[id_key])}"
 
 
 def _apply_lambda_args(args: TemplateArgsType) -> TemplateArgsType:
@@ -426,27 +361,19 @@ def _apply_function(
 ) -> MockObj:
     """Emit the generated function and declare ``id_`` as the ``ApplyAction`` or
     ``ApplyCondition`` templated on it, so ``play()`` calls it directly."""
-    fn = apply_static_function(id_, return_type, lambda_args, statements)
+    fn = cg.static_function(
+        f"esphome__{id_.id}__fn", return_type, lambda_args, statements
+    )
     return cg.new_Pvariable(id_, cg.TemplateArguments(fn, *template_arg))
 
 
-def apply_static_function(
-    id_: ID,
-    return_type: SafeExpType,
-    params: TemplateArgsType,
-    statements: list[str],
-) -> MockObj:
-    """Emit the static function generated for ``id_`` and return an expression naming it."""
-    return cg.static_function(f"esphome__{id_.id}__fn", return_type, params, statements)
-
-
 async def _render_values(
     name: str,
     target: str,
     members: list[tuple[Any, Any, Any]],
     values: list[Any],
     config: ConfigType,
-    parent: str | None,
+    parent: str,
     lambda_args: TemplateArgsType,
     compare: bool = False,
 ) -> list[str]:
@@ -490,22 +417,6 @@ def register_apply_action(
 ) -> None:
     """Register an action that only forwards config values to its parent, with no C++ class.
 
-    See ``apply_action_builder``.
-    """
-    register_action(name, ApplyAction, schema, synchronous=True)(
-        apply_action_builder(name, schema, *fields, call=call, id_key=id_key)
-    )
-
-
-def apply_action_builder(
-    name: str,
-    schema: cv.Schema,
-    *fields: ApplyField | ApplyCall,
-    call: str | None = None,
-    id_key: str = CONF_ID,
-) -> Callable[..., Awaitable[MockObj]]:
-    """The builder ``register_apply_action`` registers, for a caller that wraps it.
-
     Generates one static function with the parent (read from ``id_key``) and constants baked
     in, lambdas called inline with the trigger args, and an ``ApplyAction`` templated on it.
     A constant that is an id (``cv.use_id`` under ``cv.templatable``) is the object it names.
@@ -516,7 +427,10 @@ def apply_action_builder(
     statements_spec = [
         (
             c.target,
-            _default_std_string(c.members, flash_string),
+            [
+                (key, t, fn or (flash_string if t is cg.std_string else None))
+                for key, t, fn in c.members
+            ],
         )
         for c in (f if isinstance(f, ApplyCall) else f.call() for f in fields)
     ]
@@ -537,12 +451,12 @@ def apply_action_builder(
         statements: list[str] = []
         for target, members in statements_spec:
             values = _apply_values(config, members)
-            if not _apply_call_active(members, values):
+            if members and all(value is None for value in values):
                 continue
             exprs = await _render_values(
                 name, target, members, values, config, parent, lambda_args
             )
-            statements.append(f"{receiver}{target.format(*exprs, parent=parent)};")
+            statements.append(f"{receiver}{target.format(*exprs)};")
         if call:
             statements = [
                 f"auto apply_call = {parent}->{call}();",
@@ -553,28 +467,7 @@ def apply_action_builder(
             action_id, cg.void, template_arg, lambda_args, statements
         )
 
-    return builder
-
-
-def _apply_call_active(members: list[tuple[Any, Any, Any]], values: list[Any]) -> bool:
-    """An ``ApplyCall`` is emitted unless it has keys and none of them is set."""
-    return not members or any(value is not None for value in values)
-
-
-async def _render_check(
-    name: str,
-    target: str,
-    members: list[tuple[Any, Any, Any]],
-    values: list[Any],
-    config: ConfigType,
-    parent: str | None,
-    lambda_args: TemplateArgsType,
-) -> str:
-    """Render a boolean check with ``values`` compared against config."""
-    exprs = await _render_values(
-        name, target, members, values, config, parent, lambda_args, compare=True
-    )
-    return target.format(*exprs, parent=parent)
+    register_action(name, ApplyAction, schema, synchronous=True)(builder)
 
 
 def register_apply_condition(
@@ -585,12 +478,11 @@ def register_apply_condition(
     ``check`` is applied to the parent: ``"is_playing()"`` becomes ``parent->is_playing()``; an
     ``ApplyCall`` such as ``ApplyCall("state == {}", ((CONF_STATE, cg.bool_),))`` compares
     against config values, all of which must be present. Write ``== false`` to negate.
-    A ``cg.std_string`` constant stays in flash on ESP8266 and supports only ``==`` or ``!=``
-    against a ``std::string`` or ``StringRef`` member; other string types are plain literals.
+    String constants are plain literals, so compare a ``std::string`` or ``StringRef`` member.
     Generates one static predicate and an ``ApplyCondition`` templated on it.
     """
     call = check if isinstance(check, ApplyCall) else ApplyCall(check)
-    members = _default_std_string(call.members, flash_compare)
+    members = call.members
     _check_key_in_schema(name, schema, id_key)
     for conf_key, _, _ in members:
         _check_key_in_schema(name, schema, conf_key)
@@ -603,16 +495,22 @@ def register_apply_condition(
     ) -> MockObj:
         parent = await _apply_parent(config, id_key)
         lambda_args = _apply_lambda_args(args)
-        values = _apply_values(config, members)
-        check = await _render_check(
-            name, call.target, members, values, config, parent, lambda_args
+        exprs = await _render_values(
+            name,
+            call.target,
+            members,
+            _apply_values(config, members),
+            config,
+            parent,
+            lambda_args,
+            compare=True,
         )
         return _apply_function(
             condition_id,
             cg.bool_,
             template_arg,
             lambda_args,
-            [f"return {parent}->{check};"],
+            [f"return {parent}->{call.target.format(*exprs)};"],
         )
 
     register_condition(name, ApplyCondition, schema)(builder)
@@ -748,22 +646,54 @@ XorCondition = cg.esphome_ns.class_("XorCondition", Condition)
 
 
 @register_condition("and", AndCondition, validate_condition_list)
-@register_condition("all", AndCondition, validate_condition_list)
-@register_condition("or", OrCondition, validate_condition_list)
-@register_condition("any", OrCondition, validate_condition_list)
-@register_condition("xor", XorCondition, validate_condition_list)
-async def condition_group_to_code(
+async def and_condition_to_code(
     config: ConfigType,
     condition_id: ID,
     template_arg: cg.TemplateArguments,
     args: TemplateArgsType,
 ) -> MockObj:
     conditions = await build_condition_list(config, template_arg, args)
-    # A group of one is that condition for and, or and xor; skip the wrapper.
-    if len(conditions) == 1:
-        return conditions[0]
     return cg.new_Pvariable(
-        condition_id, cg.TemplateArguments(len(conditions), *template_arg), *conditions
+        condition_id, cg.TemplateArguments(len(conditions), *template_arg), conditions
+    )
+
+
+@register_condition("or", OrCondition, validate_condition_list)
+async def or_condition_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
+    conditions = await build_condition_list(config, template_arg, args)
+    return cg.new_Pvariable(
+        condition_id, cg.TemplateArguments(len(conditions), *template_arg), conditions
+    )
+
+
+@register_condition("all", AndCondition, validate_condition_list)
+async def all_condition_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
+    conditions = await build_condition_list(config, template_arg, args)
+    return cg.new_Pvariable(
+        condition_id, cg.TemplateArguments(len(conditions), *template_arg), conditions
+    )
+
+
+@register_condition("any", OrCondition, validate_condition_list)
+async def any_condition_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
+    conditions = await build_condition_list(config, template_arg, args)
+    return cg.new_Pvariable(
+        condition_id, cg.TemplateArguments(len(conditions), *template_arg), conditions
     )
 
 
@@ -778,6 +708,19 @@ async def not_condition_to_code(
     return cg.new_Pvariable(condition_id, template_arg, condition)
 
 
+@register_condition("xor", XorCondition, validate_condition_list)
+async def xor_condition_to_code(
+    config: ConfigType,
+    condition_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
+    conditions = await build_condition_list(config, template_arg, args)
+    return cg.new_Pvariable(
+        condition_id, cg.TemplateArguments(len(conditions), *template_arg), conditions
+    )
+
+
 @register_condition("lambda", LambdaCondition, cv.returning_lambda)
 async def lambda_condition_to_code(
     config: ConfigType,
@@ -879,13 +822,11 @@ async def if_action_to_code(
     condition = await build_condition(config[cond_conf], template_arg, args)
     var = cg.new_Pvariable(action_id, if_template_arg, condition)
     if CONF_THEN in config:
-        for action in await build_action_list(config[CONF_THEN], template_arg, args):
-            cg.add(var.add_then_action(action))
-        cg.add(var.finish_then())
+        actions = await build_action_list(config[CONF_THEN], template_arg, args)
+        cg.add(var.add_then(actions))
     if has_else:
-        for action in await build_action_list(config[CONF_ELSE], template_arg, args):
-            cg.add(var.add_else_action(action))
-        cg.add(var.finish_else())
+        actions = await build_action_list(config[CONF_ELSE], template_arg, args)
+        cg.add(var.add_else(actions))
     return var
 
 
@@ -908,27 +849,11 @@ async def while_action_to_code(
 ) -> MockObj:
     condition = await build_condition(config[CONF_CONDITION], template_arg, args)
     var = cg.new_Pvariable(action_id, template_arg, condition)
-    for action in await build_action_list(config[CONF_THEN], template_arg, args):
-        cg.add(var.add_then_action(action))
-    cg.add(var.finish_then())
+    actions = await build_action_list(config[CONF_THEN], template_arg, args)
+    cg.add(var.add_then(actions))
     return var
 
 
-def _shadow_iteration(args: TemplateArgsType) -> TemplateArgsType:
-    """Rename an inherited `iteration` so the inner repeat's own counter can shadow it."""
-    names = {name for _, name in args}
-    renamed: TemplateArgsType = []
-    for type_, name in args:
-        if name == "iteration":
-            depth = 1
-            while f"iteration_{depth}" in names:
-                depth += 1
-            name = f"iteration_{depth}"
-            names.add(name)
-        renamed.append((type_, name))
-    return renamed
-
-
 @register_action(
     "repeat",
     RepeatAction,
@@ -952,11 +877,9 @@ async def repeat_action_to_code(
     actions = await build_action_list(
         config[CONF_THEN],
         cg.TemplateArguments(cg.uint32, *template_arg.args),
-        [(cg.uint32, "iteration"), *_shadow_iteration(args)],
+        [(cg.uint32, "iteration"), *args],
     )
-    for action in actions:
-        cg.add(var.add_then_action(action))
-    cg.add(var.finish_then())
+    cg.add(var.add_then(actions))
     return var
 
 
@@ -1092,141 +1015,30 @@ def has_non_synchronous_actions(actions: ConfigType) -> bool:
     Non-synchronous actions (delay, wait_until, script.wait, etc.) store
     trigger args for later execution, making non-owning types like StringRef
     unsafe.
-
-    Accepts an action list, a single action, or an automation. Only the keys of
-    action entries are looked up as action names; the options of an action are
-    only searched for nested action lists (``then:``, ``else:``, ...), so an
-    option that shares a name with an action, such as the ``delay:`` option of
-    ``speaker_source.set_playlist_delay``, is not mistaken for that action.
     """
     if isinstance(actions, list):
         return any(has_non_synchronous_actions(item) for item in actions)
     if isinstance(actions, dict):
-        for key, options in actions.items():
+        for key in actions:
             if key in ACTION_REGISTRY and not ACTION_REGISTRY[key].synchronous:
                 return True
-            if _options_have_non_synchronous_actions(options):
-                return True
+        return any(
+            has_non_synchronous_actions(v)
+            for v in actions.values()
+            if isinstance(v, (list, dict))
+        )
     return False
 
 
-def _options_have_non_synchronous_actions(options: Any) -> bool:
-    """Search an action's options for nested action lists, without treating option keys as actions."""
-    if isinstance(options, list):
-        return has_non_synchronous_actions(options)
-    if isinstance(options, dict):
-        return any(_options_have_non_synchronous_actions(v) for v in options.values())
-    return False
-
-
-def validate_no_deferring_actions(
-    context: str, data: str = "the trigger data"
-) -> Callable[[ConfigType], ConfigType]:
-    """Return a validator that rejects deferring actions in a validated automation.
-
-    Use it for triggers whose arguments only live while the callback runs (views into a reused
-    buffer, a JSON document freed on return, ...): deferring actions keep the arguments for later.
-
-    :param context: Where the automation is, for the error message, e.g. ``"on_json and on_data"``.
-    :param data: What is only valid while the automation runs, for the error message.
-    """
-
-    def validator(value: ConfigType) -> ConfigType:
-        if has_non_synchronous_actions(value):
-            raise cv.Invalid(
-                f"Deferring actions (delay, wait_until, script.wait, ...) are not allowed in "
-                f"{context}: {data} is only valid while the automation runs. Copy what you need "
-                "into globals first, then defer in a separate script or automation."
-            )
-        return value
-
-    return validator
-
-
-def validate_synchronous_automation(
-    context: str,
-    data: str = "the trigger data",
-    extra_schema=None,
-    extra_validators=None,
-    single: bool = False,
-) -> cv.All:
-    """``validate_automation()`` that also rejects deferring actions.
-
-    See ``validate_no_deferring_actions()`` for ``context`` and ``data``; the other parameters are
-    passed to ``validate_automation()``.
-    """
-    return cv.All(
-        validate_automation(
-            extra_schema=extra_schema,
-            extra_validators=extra_validators,
-            single=single,
-        ),
-        validate_no_deferring_actions(context, data),
-    )
-
-
-async def _new_automation(
-    args: TemplateArgsType, config: ConfigType, *ctor_args: MockObj
-) -> MockObj:
-    """Create the Automation for ``config`` with its actions."""
-    templ = cg.TemplateArguments(*(arg[0] for arg in args))
-    obj = cg.new_Pvariable(config[CONF_AUTOMATION_ID], templ, *ctor_args)
-    actions = await build_action_list(config[CONF_THEN], templ, args)
-    for action in actions:
-        cg.add(obj.add_action(action))
-    return obj
-
-
 async def build_automation(
     trigger: MockObj, args: TemplateArgsType, config: ConfigType
 ) -> MockObj:
-    return await _new_automation(args, config, trigger)
-
-
-async def build_trigger_callback(
-    args: TemplateArgsType,
-    config: ConfigType,
-    params: TemplateArgsType,
-    forward: Sequence[str | Expression] | None = None,
-    when: str | ApplyCall | None = None,
-    parent: MockObj | None = None,
-) -> LambdaExpression:
-    """Build the Automation for ``config`` and return a stateless callback that triggers it.
-
-    ``params`` are the parent callback's parameters, ``forward`` the expressions passed to
-    ``trigger()`` (default: the parameter names; write the parent as ``parent_ref(var)``),
-    ``when`` a filter the callback returns early on, skipped like any ``ApplyCall`` when none
-    of its keys is set. ``when`` may name ``parent`` as ``{parent}``, e.g.
-    ``"{parent}->is_fully_open()"``.
-    """
-    members: list[tuple[Any, Any, Any]] = []
-    if when is not None:
-        call = when if isinstance(when, ApplyCall) else ApplyCall(when)
-        members = call.members
-        if parent is None and call.names_parent:
-            raise ValueError(f"trigger filter {call.target!r} names {{parent}}")
-    obj = await _new_automation(args, config)
-    lambda_args = _apply_lambda_args(params)
-    statements: list[str] = []
-    if when is not None:
-        values = _apply_values(config, members)
-        if _apply_call_active(members, values):
-            check = await _render_check(
-                "trigger filter",
-                call.target,
-                members,
-                values,
-                config,
-                None if parent is None else str(parent_ref(parent)),
-                lambda_args,
-            )
-            statements.append(f"if (!({check}))\n  return;")
-    if forward is None:
-        forward = [name for _, name in params]
-    statements.append(f"{parent_ref(obj)}->trigger({', '.join(map(str, forward))});")
-    return LambdaExpression(
-        ["\n".join(statements)], lambda_args, capture="", return_type=cg.void
-    )
+    arg_types = [arg[0] for arg in args]
+    templ = cg.TemplateArguments(*arg_types)
+    obj = cg.new_Pvariable(config[CONF_AUTOMATION_ID], templ, trigger)
+    actions = await build_action_list(config[CONF_THEN], templ, args)
+    cg.add(obj.add_actions(actions))
+    return obj
 
 
 async def build_callback_automation(
@@ -1235,9 +1047,6 @@ async def build_callback_automation(
     args: TemplateArgsType,
     config: ConfigType,
     forwarder: MockObj | MockObjClass | None = None,
-    params: TemplateArgsType | None = None,
-    forward: Sequence[str | Expression] | None = None,
-    when: str | ApplyCall | None = None,
 ) -> None:
     """Build an Automation and register it as a callback on the parent.
 
@@ -1249,9 +1058,6 @@ async def build_callback_automation(
     pointer-sized (single Automation* field) to fit inline in Callback::ctx_
     and avoid heap allocation.
 
-    With ``params``, ``forward`` or ``when`` the callback is instead the stateless
-    lambda of ``build_trigger_callback``; ``forwarder`` cannot be combined with them.
-
     :param parent: The component object (e.g., button, sensor).
     :param callback_method: Name of the callback method (e.g., "add_on_press_callback").
     :param args: Automation template args as list of (type, name) tuples.
@@ -1260,56 +1066,22 @@ async def build_callback_automation(
         TriggerForwarder<Ts...>. Pass any struct type whose aggregate init takes
         a single Automation pointer (e.g., TriggerOnTrueForwarder).
     """
-    if params is not None or forward is not None or when is not None:
-        if forwarder is not None:
-            raise ValueError(
-                "forwarder cannot be combined with params, forward or when"
-            )
-        callback = await build_trigger_callback(
-            args, config, args if params is None else params, forward, when, parent
-        )
-        cg.add(getattr(parent, callback_method)(callback))
-        return
-    obj = await _new_automation(args, config)
+    arg_types = [arg[0] for arg in args]
+    templ = cg.TemplateArguments(*arg_types)
+    obj = cg.new_Pvariable(config[CONF_AUTOMATION_ID], templ)
+    actions = await build_action_list(config[CONF_THEN], templ, args)
+    cg.add(obj.add_actions(actions))
     # Use template forwarder structs for deduplication. The compiler generates
     # one operator() per forwarder type; different automation pointers are just
     # data in the struct.
     if forwarder is None:
-        forwarder = TriggerForwarder.template(*(arg[0] for arg in args))
+        forwarder = TriggerForwarder.template(templ)
     # RawExpression for aggregate init — both forwarder and obj are codegen
     # MockObjs (not user input), and there's no Expression type for positional
     # aggregate initialization (StructInitializer uses named fields).
     cg.add(getattr(parent, callback_method)(cg.RawExpression(f"{forwarder}{{{obj}}}")))
 
 
-async def build_parent_callback_automation(
-    parent: MockObj, callback_method: str, arg: tuple[Any, str], config: ConfigType
-) -> None:
-    """Register an Automation that receives ``parent`` from a callback that carries nothing.
-
-    ``arg`` is the automation's ``(type, name)``, e.g. ``(Fan.operator("ptr"), "x")``.
-    """
-    await build_callback_automation(
-        parent, callback_method, [arg], config, params=[], forward=[parent_ref(parent)]
-    )
-
-
-async def build_trigger_automations(
-    parent: MockObj | None,
-    config: ConfigType,
-    entries: tuple[tuple[str, TemplateArgsType], ...],
-) -> None:
-    """Instantiate each entry's Trigger class, with ``parent`` when given, and build its automations.
-
-    ``entries`` are ``(conf_key, args)`` pairs; the class comes from the entry's ``CONF_TRIGGER_ID``.
-    """
-    ctor_args = () if parent is None else (parent,)
-    for conf_key, args in entries:
-        for conf in config.get(conf_key, []):
-            trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], *ctor_args)
-            await build_automation(trigger, args, conf)
-
-
 @dataclass(frozen=True, slots=True)
 class CallbackAutomation:
     """A single callback automation entry for build_callback_automations."""
@@ -1318,9 +1090,6 @@ class CallbackAutomation:
     callback_method: str
     args: TemplateArgsType = field(default_factory=list)
     forwarder: MockObj | MockObjClass | None = None
-    params: TemplateArgsType | None = None
-    forward: Sequence[str | Expression] | None = None
-    when: str | ApplyCall | None = None
 
 
 async def build_callback_automations(
@@ -1342,7 +1111,4 @@ async def build_callback_automations(
                 entry.args,
                 conf,
                 forwarder=entry.forwarder,
-                params=entry.params,
-                forward=entry.forward,
-                when=entry.when,
             )

esphome/build_gen/arduino8266.py

@@ -54,7 +54,6 @@ from esphome.components.esp8266.const import (
     KEY_ESP8266,
     KEY_FLASH_SIZE,
     KEY_SCANF_FLOAT,
-    THROW_STUBS_HEADER,
 )
 from esphome.core import CORE, EsphomeError
 from esphome.framework_helpers import get_project_cxx_compile_flags
@@ -1057,7 +1056,7 @@ def write_project(paths: InstalledPaths, ccache: str | None) -> bool:
     cxx = (toolchain_tool(paths.toolchain, "g++"),)
     lines = [
         *tool_lines((toolchain_tool(paths.toolchain, "gcc"),), cxx, ccache),
-        *compile_rule_lines(ccache),
+        *compile_rule_lines(),
         *ar_rule_lines(toolchain_tool(paths.toolchain, "ar")),
         *pch_rule_lines(),
         "rule link",
@@ -1066,10 +1065,10 @@ def write_project(paths: InstalledPaths, ccache: str | None) -> bool:
         "  rspfile_content = $in_newline",
         "  description = LINK $out",
         "rule elf2bin",
-        # --flash_size follows PlatformIO: ldscript filename first, then
-        # upload.maximum_size, so the header always matches the layout.
+        # --flash_size deliberately stays board-derived, as under
+        # PlatformIO (which reads upload.maximum_size, not the ldscript).
         # -W: the framework's own elf2bin.py trips SyntaxWarning on 3.12+.
-        f"  command = $python -W ignore::SyntaxWarning {_q(framework / 'tools' / 'elf2bin.py')} --eboot {_q(framework / 'bootloaders' / 'eboot' / 'eboot.elf')} --app $in --flash_mode {flash_mode} --flash_freq {_FLASH_FREQ_MHZ} --flash_size {_elf2bin_flash_size(board, flash_ld_name)} --path {_q(toolchain_bin)} --out $out",
+        f"  command = $python -W ignore::SyntaxWarning {_q(framework / 'tools' / 'elf2bin.py')} --eboot {_q(framework / 'bootloaders' / 'eboot' / 'eboot.elf')} --app $in --flash_mode {flash_mode} --flash_freq {_FLASH_FREQ_MHZ} --flash_size {_flash_size_str(BOARDS[board][KEY_FLASH_SIZE])} --path {_q(toolchain_bin)} --out $out",
         "  description = BIN $out",
         "rule copy",
         "  command = $python $buildtool copy $in $out",
@@ -1088,8 +1087,32 @@ def write_project(paths: InstalledPaths, ccache: str | None) -> bool:
     if "USE_ESP8266_WAVEFORM_STUBS" in flag_defines:
         core_exclude |= _CORE_EXCLUDE_WAVEFORM
 
-    # esp8266/__init__ pins build_src_flags (the throw_stubs force-include), as on
-    # the PlatformIO path; -include paths resolve against the source root
+    archives = []
+    # variant_dir existence was already enforced with the include dirs
+    variant_sources = collect_sources(variant_dir)
+    if variant_sources:
+        objs = compile_edges(lines, variant_sources, variant_dir, "variant")
+        lines.append(f"build libFrameworkArduinoVariant.a: ar {' '.join(objs)}")
+        archives.append("libFrameworkArduinoVariant.a")
+
+    core_objs = compile_edges(
+        lines, collect_sources(core_dir, core_exclude), core_dir, "core"
+    )
+    if not core_objs:
+        # An empty archive would link into a wall of undefined references
+        # (app_entry, the exception vectors) far from the cause
+        raise EsphomeError(
+            f"{_INCOMPLETE_INSTALL}: no core sources in {core_dir}; {_CLEAN_HINT}"
+        )
+    lines.append(f"build libFrameworkArduino.a: ar {' '.join(core_objs)}")
+    archives.append("libFrameworkArduino.a")
+
+    lib_archives, direct_objs = library_edges(lines, libraries)
+    archives += lib_archives
+
+    # One source of truth with the PlatformIO path: esp8266/__init__ pins
+    # build_src_flags (the throw_stubs force-include); -include paths
+    # resolve against the source root
     src_other: list[str] = []
     src_includes: list[str] = []
     src_it = iter(
@@ -1108,45 +1131,7 @@ def write_project(paths: InstalledPaths, ccache: str | None) -> bool:
             src_includes.append(tok[len("-include") :])
         else:
             src_other.append(_shell_token(tok))
-    # The throw stubs abort: none anywhere with exceptions on, else the core and
-    # libraries get them too (src keeps them after its pch include)
-    if config.exceptions:
-        src_includes = [h for h in src_includes if h != THROW_STUBS_HEADER]
     include_flags = [f"-include {_q(src_dir / h)}" for h in src_includes]
-    framework_flags = ""
-    if THROW_STUBS_HEADER in src_includes:
-        stubs_flag = include_flags[src_includes.index(THROW_STUBS_HEADER)]
-        lines.append(f"frameworkflags = {stubs_flag}")
-        framework_flags = "$frameworkflags"
-    archives = []
-    # variant_dir existence was already enforced with the include dirs
-    variant_sources = collect_sources(variant_dir)
-    if variant_sources:
-        objs = compile_edges(
-            lines, variant_sources, variant_dir, "variant", flags=framework_flags
-        )
-        lines.append(f"build libFrameworkArduinoVariant.a: ar {' '.join(objs)}")
-        archives.append("libFrameworkArduinoVariant.a")
-
-    core_objs = compile_edges(
-        lines,
-        collect_sources(core_dir, core_exclude),
-        core_dir,
-        "core",
-        flags=framework_flags,
-    )
-    if not core_objs:
-        # An empty archive would link into a wall of undefined references
-        # (app_entry, the exception vectors) far from the cause
-        raise EsphomeError(
-            f"{_INCOMPLETE_INSTALL}: no core sources in {core_dir}; {_CLEAN_HINT}"
-        )
-    lines.append(f"build libFrameworkArduino.a: ar {' '.join(core_objs)}")
-    archives.append("libFrameworkArduino.a")
-
-    lib_archives, direct_objs = library_edges(lines, libraries, framework_flags)
-    archives += lib_archives
-
     # One shared variable instead of repeating the flags line on every src
     # edge (hundreds of edges in a real project)
     lines.append(f"srcflags = {' '.join(src_other + include_flags)}")
@@ -1204,28 +1189,3 @@ def _flash_size_str(flash_size: int) -> str:
     """Flash size argument for elf2bin (e.g. ``4M``, ``512K``)."""
     mb = 1024 * 1024
     return f"{flash_size // mb}M" if flash_size >= mb else f"{flash_size // 1024}K"
-
-
-# Same pattern PlatformIO's _get_flash_size applies to the ldscript path
-_LD_FLASH_SIZE_RE = re.compile(r"\.flash\.(\d+[mk]).*\.ld")
-# The framework elf2bin.py's --flash_size choices
-_ELF2BIN_FLASH_SIZES = frozenset({"256K", "512K", "1M", "2M", "4M", "8M", "16M"})
-
-
-def _elf2bin_flash_size(board: str, flash_ld_name: str) -> str:
-    """Image-header flash size as PlatformIO derives it: ldscript filename,
-    else board_upload.maximum_size, else the board table. The SDK clamps the
-    chip to the header size at boot, so a header smaller than the linked
-    layout breaks OTA writes on the running device."""
-    if match := _LD_FLASH_SIZE_RE.search(flash_ld_name):
-        token = match.group(1)
-        base = 1024 if token[-1] == "k" else 1024 * 1024
-        return _flash_size_str(int(token[:-1]) * base)
-    if max_size := _pio_option("board_upload.maximum_size", ""):
-        if (
-            not max_size.isdigit()
-            or (size := _flash_size_str(int(max_size))) not in _ELF2BIN_FLASH_SIZES
-        ):
-            raise EsphomeError(f"Invalid board_upload.maximum_size value {max_size!r}")
-        return size
-    return _flash_size_str(BOARDS[board][KEY_FLASH_SIZE])

esphome/build_gen/espidf.py

@@ -21,7 +21,7 @@ from esphome.framework_helpers import (
     get_project_cxx_compile_flags,
     get_project_link_flags,
 )
-from esphome.helpers import get_bool_env, mkdir_p, write_file_if_changed
+from esphome.helpers import mkdir_p, write_file_if_changed
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -36,83 +36,6 @@ list(FILTER esphome_cxx_compile_options EXCLUDE REGEX "^-std=")
 list(APPEND esphome_cxx_compile_options "-std={standard}")
 idf_build_set_property(CXX_COMPILE_OPTIONS "${{esphome_cxx_compile_options}}")"""
 
-# Drops the app archive from ldgen's inputs so app-only edits skip the
-# sections.ld regeneration. Safe: no mapping fragment references it
-# (run_compile re-checks each build). Filters only the top-level call;
-# the prior definition stays reachable with an underscore prefix.
-_LDGEN_OVERRIDE = """\
-if(COMMAND __ldgen_get_lib_deps_of_target)
-    set_property(GLOBAL PROPERTY ESPHOME_LDGEN_ARMED 1)
-    function(__ldgen_get_lib_deps_of_target target out_list_var)
-        if(NOT COMMAND ___ldgen_get_lib_deps_of_target)
-            message(FATAL_ERROR "ESPHome ldgen override lost the original "
-                "implementation; set ESPHOME_LDGEN_FULL_DEPS=1 and rebuild.")
-        endif()
-        ___ldgen_get_lib_deps_of_target(${target} ${out_list_var})
-        if(out_list_var STREQUAL "ldgen_libraries")
-            set_property(GLOBAL PROPERTY ESPHOME_LDGEN_FILTERED 1)
-            list(LENGTH ${out_list_var} esphome_ldgen_before)
-            list(REMOVE_ITEM ${out_list_var} idf::src __idf_src)
-            list(LENGTH ${out_list_var} esphome_ldgen_after)
-            if(esphome_ldgen_before EQUAL esphome_ldgen_after)
-                message(@SEVERITY@ "ESPHome ldgen app archive exclusion matched "
-                    "nothing; app edits will regenerate sections.ld.")
-            endif()
-        endif()
-        set(${out_list_var} "${${out_list_var}}" PARENT_SCOPE)
-    endfunction()
-else()
-    message(@MISSING@ "ESPHome ldgen override target not found; "
-        "app edits will regenerate sections.ld.")
-endif()"""
-
-# lwip sources that compile to empty objects with the option off (their own
-# #if guard). (option, regex valid for both Python and CMake); a source is
-# only dropped when its option is defined and off, so a renamed option
-# keeps it.
-LWIP_EMPTY_SOURCES: tuple[tuple[str, str], ...] = (
-    ("CONFIG_LWIP_PPP_SUPPORT", "/netif/ppp/"),
-    ("CONFIG_LWIP_IPV6", "/core/ipv6/"),
-    ("CONFIG_LWIP_AUTOIP", "/core/ipv4/autoip[.]c$"),
-    ("CONFIG_LWIP_STATS", "/core/stats[.]c$"),
-)
-# Drift guard only: keep every lwip source.
-LWIP_FULL_SOURCES_ENV = "ESPHOME_LWIP_FULL_SOURCES"
-
-# Drops the empty objects after project(), once the lwip target exists.
-_LWIP_EMPTY_SOURCES_FILTER = f"""\
-idf_build_get_property(esphome_build_components BUILD_COMPONENTS)
-if(lwip IN_LIST esphome_build_components AND NOT DEFINED ENV{{{LWIP_FULL_SOURCES_ENV}}})
-    idf_component_get_property(esphome_lwip_lib lwip COMPONENT_LIB)
-    get_target_property(esphome_lwip_srcs ${{esphome_lwip_lib}} SOURCES)
-@FILTERS@
-    set_property(TARGET ${{esphome_lwip_lib}} PROPERTY SOURCES ${{esphome_lwip_srcs}})
-endif()"""
-
-
-def lwip_empty_source_gate(option: str, regex: str) -> str:
-    return (
-        f"    if(DEFINED {option} AND NOT {option})\n"
-        f'        list(FILTER esphome_lwip_srcs EXCLUDE REGEX "{regex}")\n'
-        "    endif()"
-    )
-
-
-def _lwip_empty_sources_filter() -> str:
-    gates = "\n".join(lwip_empty_source_gate(*entry) for entry in LWIP_EMPTY_SOURCES)
-    return _LWIP_EMPTY_SOURCES_FILTER.replace("@FILTERS@", gates)
-
-
-# Runs after project() so the walk has happened; catches the remaining
-# silent path where the top-level out-var was renamed.
-_LDGEN_OVERRIDE_CHECK = """\
-get_property(esphome_ldgen_armed GLOBAL PROPERTY ESPHOME_LDGEN_ARMED)
-get_property(esphome_ldgen_filtered GLOBAL PROPERTY ESPHOME_LDGEN_FILTERED)
-if(esphome_ldgen_armed AND NOT esphome_ldgen_filtered)
-    message(@SEVERITY@ "ESPHome ldgen override never filtered the app "
-        "archive; app edits will regenerate sections.ld.")
-endif()"""
-
 
 def get_available_components() -> list[str] | None:
     """List the built-in ESP-IDF components from ``project_description.json``.
@@ -160,11 +83,11 @@ def _cmake_quote(value: str) -> str:
 
 # CONFIG_APP_BUILD_BOOTLOADER is hidden and force-selected, so it can only be
 # cleared at the CMake level (the same state IDF's RAM-app build type uses).
-# The macro is IDF's __build_process_project_includes plus a few added lines;
-# the flag is ignored and the bootloader builds as usual if IDF changes it.
+# The macro is IDF's __build_process_project_includes plus two added lines;
+# esphome.espidf.bootloader falls back to in-tree if an IDF update changes it.
 IDF_BOOTLOADER_OVERRIDE = """\
-# ESPHome bootloader skip switch; see esphome/espidf/toolchain.py.
-if(ESPHOME_SKIP_BOOTLOADER)
+# ESPHome cached bootloader switch; see esphome/espidf/bootloader.py.
+if(ESPHOME_USE_CACHED_BOOTLOADER)
     macro(__build_process_project_includes)
         idf_build_get_property(sdkconfig_cmake SDKCONFIG_CMAKE)
         include(${sdkconfig_cmake})
@@ -173,9 +96,6 @@ if(ESPHOME_SKIP_BOOTLOADER)
         # skipped) bootloader project_include leaks; keep it defined, or
         # its empty TARGET_SRC_NAME sends file(GLOB_RECURSE) across /.
         idf_build_get_property(idf_target IDF_TARGET)
-        # partition_table's V1 ECDSA signing reads this key, which the
-        # skipped bootloader project_include also sets.
-        get_filename_component(SECURE_BOOT_SIGNING_KEY "${CONFIG_SECURE_BOOT_SIGNING_KEY}" ABSOLUTE BASE_DIR "${project_dir}")
         idf_build_get_property(build_properties __BUILD_PROPERTIES)
         foreach(build_property ${build_properties})
             idf_build_get_property(val ${build_property})
@@ -196,15 +116,11 @@ if(ESPHOME_SKIP_BOOTLOADER)
 endif()
 """
 
-# The lines the override adds to IDF's macro; idf_macro_matches() below
-# strips them before comparing with the live macro.
+# The lines the override adds to IDF's macro; the staleness tripwire in
+# esphome.espidf.bootloader strips them before comparing with the live macro.
 BOOTLOADER_OVERRIDE_ADDED_LINES = (
     'set(CONFIG_APP_BUILD_BOOTLOADER "")',
     "idf_build_get_property(idf_target IDF_TARGET)",
-    (
-        "get_filename_component(SECURE_BOOT_SIGNING_KEY"
-        ' "${CONFIG_SECURE_BOOT_SIGNING_KEY}" ABSOLUTE BASE_DIR "${project_dir}")'
-    ),
 )
 
 _MACRO = re.compile(
@@ -230,42 +146,16 @@ _EXPECTED_MACRO = [
 ]
 
 
-def idf_macro_matches(idf_path: Path) -> bool:
+def idf_macro_matches() -> bool:
     """Whether IDF's macro still matches the copy the override replays."""
-    build_cmake = idf_path / "tools" / "cmake" / "build.cmake"
+    from esphome.espidf import toolchain
+
+    # pylint: disable-next=protected-access
+    build_cmake = toolchain._get_idf_path() / "tools" / "cmake" / "build.cmake"
     live = _normalized_macro(build_cmake.read_text(encoding="utf-8"))
     return live == _EXPECTED_MACRO
 
 
-def _cmake_args_for_write(minimal: bool) -> dict[str, str]:
-    """The cg.add_cmake_arg() values for one project write.
-
-    The discovery (minimal) write lets every built-in component register so
-    the list it finds, cached per target, serves any exclusion set; the full
-    write drops the excluded names from that list and passes all of them to
-    IDF. Names outside the framework's components directory (managed
-    components) stay excluded on the discovery write too, since the list
-    only holds built-in ones. A checkout supplied through IDF_PATH caches
-    nothing, so its discovery keeps every exclusion.
-    """
-    from esphome.espidf.toolchain import _esphome_manages_idf, _get_idf_path
-
-    args = dict(CORE.cmake_args)
-    if (
-        not minimal
-        or not _esphome_manages_idf()
-        or not (excluded := args.get("EXCLUDE_COMPONENTS"))
-    ):
-        return args
-    root = _get_idf_path() / "components"
-    outside = [name for name in excluded.split(";") if not (root / name).is_dir()]
-    if outside:
-        args["EXCLUDE_COMPONENTS"] = ";".join(outside)
-    else:
-        del args["EXCLUDE_COMPONENTS"]
-    return args
-
-
 def get_project_cmakelists(
     minimal: bool = False, builtin_components: list[str] | None = None
 ) -> str:
@@ -311,28 +201,13 @@ def get_project_cmakelists(
         else ""
     )
 
-    # Stops the ~3s sections.ld regeneration on app-only edits; see
-    # _LDGEN_OVERRIDE. ESPHOME_LDGEN_FULL_DEPS=1 restores stock behavior;
-    # ESPHOME_LDGEN_STRICT=1 (CI) fails the configure when an IDF bump
-    # breaks the override instead of degrading to stock deps.
-    if get_bool_env("ESPHOME_LDGEN_FULL_DEPS"):
-        ldgen_override = ""
-        ldgen_override_check = ""
-    else:
-        strict = get_bool_env("ESPHOME_LDGEN_STRICT")
-        severity = "FATAL_ERROR" if strict else "WARNING"
-        missing = "FATAL_ERROR" if strict else "STATUS"
-        ldgen_override = _LDGEN_OVERRIDE.replace("@SEVERITY@", severity).replace(
-            "@MISSING@", missing
-        )
-        ldgen_override_check = _LDGEN_OVERRIDE_CHECK.replace("@SEVERITY@", severity)
-
     # 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.
+    # 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(_cmake_args_for_write(minimal).items())
+        for name, value in sorted(CORE.cmake_args.items())
     )
 
     # Per-project list exposed as a CMake variable so converted PIO libs
@@ -355,10 +230,10 @@ def get_project_cmakelists(
     # 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: the discovery list
-    # (cached per target) still holds them, and requiring an excluded
-    # component pulls it back into the build (IDF requirement expansion
-    # overrides EXCLUDE_COMPONENTS).
+    # 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).
     # Derived from the EXCLUDE_COMPONENTS cmake arg emitted above so the
     # two can never disagree within one generated file.
     builtin_components_property = (
@@ -404,8 +279,6 @@ set(EXTRA_COMPONENT_DIRS ${{CMAKE_SOURCE_DIR}}/src)
 include($ENV{{IDF_PATH}}/tools/cmake/project.cmake)
 
 {IDF_BOOTLOADER_OVERRIDE}
-{ldgen_override}
-
 {cpp_standard_options}
 
 {cxx_compile_options}
@@ -418,31 +291,21 @@ include($ENV{{IDF_PATH}}/tools/cmake/project.cmake)
 
 project({CORE.name})
 
-{ldgen_override_check}
-
-{_lwip_empty_sources_filter()}
+# Record the bootloader customization channels the cache cannot replay;
+# esphome.espidf.bootloader bypasses the cache when any is non-empty.
+idf_build_get_property(esphome_bl_dirs BOOTLOADER_EXTRA_COMPONENT_DIRS)
+idf_build_get_property(esphome_bl_args EXTRA_CMAKE_ARGS)
+file(WRITE ${{CMAKE_BINARY_DIR}}/esphome_bootloader_hooks.txt
+     "${{esphome_bl_dirs}}${{BOOTLOADER_IGNORE_EXTRA_COMPONENT}}${{esphome_bl_args}}")
 
 # Emit per-memory-type JSON size data for ESPHome to read post-build.
 # json2 stays small; raw dumps every symbol (~2s on a large map) and
 # this command runs inside the link edge, blocking everything downstream.
-# IDF's size target depends on the map, so ninja has to know the link
-# writes it for size to build in the same run as all. IDF declares the
-# map itself since espressif/esp-idf#19201 (and in cmakev2), and ninja
-# rejects two rules for one output, so declare it here only when IDF has
-# not. add_custom_command(OUTPUT) marks its outputs GENERATED.
-get_source_file_property(esphome_map_declared
-    ${{CMAKE_BINARY_DIR}}/${{CMAKE_PROJECT_NAME}}.map GENERATED)
-if(esphome_map_declared)
-    set(esphome_map_byproducts)
-else()
-    set(esphome_map_byproducts BYPRODUCTS ${{CMAKE_BINARY_DIR}}/${{CMAKE_PROJECT_NAME}}.map)
-endif()
 add_custom_command(
     TARGET ${{CMAKE_PROJECT_NAME}}.elf POST_BUILD
     COMMAND ${{PYTHON}} -m esp_idf_size {size_ng_flag} --format=json2
             -o ${{CMAKE_BINARY_DIR}}/esp_idf_size.json
             ${{CMAKE_PROJECT_NAME}}.map
-    ${{esphome_map_byproducts}}
     WORKING_DIRECTORY ${{CMAKE_BINARY_DIR}}
     VERBATIM
 )
@@ -591,9 +454,10 @@ def write_project(
     )
 
     # Snapshot the exclusion set so has_outdated_files() can trigger a
-    # reconfigure when it changes. The ESPHOME_PROJECT_BUILTIN_COMPONENTS
-    # property drops excluded names, so re-including one (e.g. a config
-    # gains mqtt) needs a reconfigure to rebuild it from the discovery list.
+    # 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()),

esphome/build_gen/host.py

@@ -240,7 +240,7 @@ def write_project(compilers: HostCompilers, ccache: str | None) -> bool:
 
     lines = [
         *tool_lines(compilers.cc, compilers.cxx, ccache),
-        *compile_rule_lines(ccache),
+        *compile_rule_lines(),
         *pch_rule_lines(),
         "rule link",
         "  command = $cxx -o $out $linkflags @$out.rsp $archives $libdirflags $libflags",

esphome/build_helpers/ninja_gen.py

@@ -74,40 +74,33 @@ def tool_lines(
         # path gets
         f"python = {_q(strip_win_long_path_prefix(sys.executable))}",
         f"buildtool = {_q(_BUILD_TOOL)}",
-        *([f"ccache = {_q(ccache)}"] if ccache else []),
+        f"ccache = {_q(ccache) if ccache else ''}",
         "",
     ]
 
 
-def compile_rule_lines(ccache: str | None) -> list[str]:
-    """The compile rules; ``$own_includes`` is empty unless an edge sets it.
-
-    ``ccache`` is the launcher ``tool_lines`` was given; the same test here
-    keeps the variable and the rules in step. It is spliced in rather than
-    left as an empty variable: a leading space on the command line makes
-    CreateProcess fail on Windows.
-    """
-    launcher = "$ccache " if ccache else ""
+def compile_rule_lines() -> list[str]:
+    """The compile rules; ``$own_includes`` is empty unless an edge sets it."""
     return [
         "rule c",
-        f"  command = {launcher}$cc -MMD -MF $out.d $own_includes $cflags $flags -c $in -o $out",
+        "  command = $ccache $cc -MMD -MF $out.d $own_includes $cflags $flags -c $in -o $out",
         "  depfile = $out.d",
         "  deps = gcc",
         "  description = CC $out",
         "rule cxx",
-        f"  command = {launcher}$cxx -MMD -MF $out.d $own_includes $cxxflags $flags -c $in -o $out",
+        "  command = $ccache $cxx -MMD -MF $out.d $own_includes $cxxflags $flags -c $in -o $out",
         "  depfile = $out.d",
         "  deps = gcc",
         "  description = CXX $out",
         "rule aspp",
-        f"  command = {launcher}$cc -MMD -MF $out.d -x assembler-with-cpp $own_includes $asflags $flags -c $in -o $out",
+        "  command = $ccache $cc -MMD -MF $out.d -x assembler-with-cpp $own_includes $asflags $flags -c $in -o $out",
         "  depfile = $out.d",
         "  deps = gcc",
         "  description = AS $out",
         # Plain assembler, as SCons's ASCOM: no preprocessor, so no
         # depfile and no $flags (defines/includes) either
         "rule asm",
-        f"  command = {launcher}$cc -x assembler $asflags -c $in -o $out",
+        "  command = $ccache $cc -x assembler $asflags -c $in -o $out",
         "  description = AS $out",
     ]
 
@@ -214,12 +207,10 @@ def compile_edges(
 
 
 def library_edges(
-    lines: list[str], libraries: list[ArduinoLibrary], extra_flags: str = ""
+    lines: list[str], libraries: list[ArduinoLibrary]
 ) -> tuple[list[str], list[str]]:
     """Emit every library's compile and archive edges.
 
-    ``extra_flags`` (raw ninja text) precede each library's own flags.
-
     Returns the archive names and the objects that link directly. A
     library's own include dirs lead its compile lines, as PlatformIO searched
     them first: the include path is one global list, so another library's
@@ -241,7 +232,7 @@ def library_edges(
             lib.sources,
             common_parent(lib.sources),
             f"lib/{lib.name}",
-            flags=" ".join(filter(None, [extra_flags, *map(_shell_token, lib.flags)])),
+            flags=" ".join(_shell_token(f) for f in lib.flags),
             own_includes=" ".join(f"-I{_q(d)}" for d in lib.include_dirs),
         )
         if not lib.lib_archive:

esphome/bundle.py

@@ -102,21 +102,25 @@ _KNOWN_FILE_EXTENSIONS = frozenset(
 )
 
 
+# Matches !secret references in YAML text.  An optional surrounding
+# quote pair around the key is allowed and ignored: YAML treats
+# ``!secret 'foo'`` and ``!secret foo`` as the same key.  This is
+# intentionally a simple regex scan rather than a YAML parse — it may
+# match inside comments or multi-line strings, which is the conservative
+# direction (include more secrets rather than fewer).
+_SECRET_RE = re.compile(r"""!secret\s+['"]?([^\s'"]+)""")
+
+
 def _find_used_secret_keys(yaml_files: list[Path]) -> set[str]:
     """Scan YAML files for ``!secret <key>`` references."""
     keys: set[str] = set()
     for fpath in yaml_files:
         try:
             text = fpath.read_text(encoding="utf-8")
-        except (OSError, UnicodeDecodeError) as err:
-            _LOGGER.warning(
-                "Could not scan %s for !secret references (%s); the bundled "
-                "secret set may be incomplete",
-                fpath,
-                err,
-            )
+        except (OSError, UnicodeDecodeError):
             continue
-        keys |= yaml_util.find_secret_references(text)
+        for match in _SECRET_RE.finditer(text):
+            keys.add(match.group(1))
     return keys
 
 
@@ -418,18 +422,6 @@ class ConfigBundleCreator:
         must ship every candidate so the remote build can pick any one.
         """
         discovered = yaml_util.discover_user_yaml_files(self._config_path)
-        if discovered.load_errors:
-            _LOGGER.warning(
-                "Bundle may be incomplete; could not load all configuration files: %s",
-                "; ".join(discovered.load_errors),
-            )
-        if discovered.unresolved:
-            _LOGGER.warning(
-                "Bundle may be incomplete; %d !include path(s) use "
-                "substitutions and cannot be captured: %s",
-                len(discovered.unresolved),
-                ", ".join(discovered.unresolved),
-            )
         self._secrets_paths.update(discovered.secrets)
         # A !secret inside a file this re-parse does not reach (for example
         # a git-fetched package the builder re-fetches) still resolves

esphome/cli/__init__.py

@@ -1,2 +0,0 @@
-"""Commands of the esphome command line, one module each, imported by
-__main__ only when they run so that startup stays light."""

esphome/cli/rename.py

@@ -1,164 +0,0 @@
-"""``esphome rename``."""
-
-from __future__ import annotations
-
-import argparse
-from pathlib import Path
-import re
-
-from esphome import yaml_edit, yaml_util
-from esphome.const import (
-    ALLOWED_NAME_CHARS,
-    CONF_ESPHOME,
-    CONF_NAME,
-    CONF_SUBSTITUTIONS,
-)
-from esphome.core import CORE, EsphomeError
-from esphome.log import AnsiFore, color
-from esphome.types import ConfigType
-from esphome.util import ESPHOME_COMMAND, run_external_process, safe_print
-
-
-def _revert(new_path: Path, why: str) -> int:
-    """Say why the rename stopped and take the new file back; an orphan the
-    next attempt would trip over is reported."""
-    safe_print(color(AnsiFore.BOLD_RED, f"Rename failed: {why}"))
-    try:
-        new_path.unlink(missing_ok=True)
-    except OSError as err:
-        safe_print(color(AnsiFore.BOLD_RED, f"Could not remove {new_path}: {err}"))
-    return 1
-
-
-def command_rename(args: argparse.Namespace, config: ConfigType) -> int | None:
-    """Rename the device: a new file with the name line rewritten, validated
-    and installed, then the old file removed."""
-    new_name = args.name
-    for c in new_name:
-        if c not in ALLOWED_NAME_CHARS:
-            safe_print(
-                color(
-                    AnsiFore.BOLD_RED,
-                    f"'{c}' is an invalid character for names. Valid characters are: "
-                    f"{ALLOWED_NAME_CHARS} (lowercase, no spaces)",
-                )
-            )
-            return 1
-
-    yaml = yaml_util.load_yaml(CORE.config_path)
-
-    def name_edit() -> tuple[str, yaml_edit.LineEdit]:
-        """The name and the line to rewrite: the name's own line, or the
-        substitution's line it comes from, as a plain value in this file."""
-        esphome_conf = yaml.get(CONF_ESPHOME)
-        if not isinstance(esphome_conf, dict) or CONF_NAME not in esphome_conf:
-            raise EsphomeError(f"no '{CONF_ESPHOME}: {CONF_NAME}:' in the file")
-        old_name = str(esphome_conf[CONF_NAME])
-        mapping, field = esphome_conf, CONF_NAME
-        if match := re.match(r"^\$\{?([a-zA-Z0-9_]+)\}?$", old_name):
-            mapping, field = yaml.get(CONF_SUBSTITUTIONS), match.group(1)
-            if not isinstance(mapping, dict) or field not in mapping:
-                raise EsphomeError(f"the substitution '{field}' is not in the file")
-            old_name = str(mapping[field])
-        # Only read here; the rewritten text goes to a new file, so the
-        # source may live anywhere the config path points to
-        source = yaml_edit.source_of(mapping, field)
-        if source is None or source[0].resolve() != CORE.config_path.resolve():
-            raise EsphomeError(f"'{field}' was not read from {CORE.config_path}")
-        doc, line_no = source
-        text = yaml_edit.line_at(doc, line_no)
-        if (line_match := yaml_edit.field_line_re(field, old_name).match(text)) is None:
-            raise EsphomeError(f"'{field}' is not a plain value on {doc}:{line_no + 1}")
-        # The new value is always quoted, whatever the old line had
-        return old_name, yaml_edit.LineEdit(
-            doc, line_no, text, yaml_edit.rewrite(line_match, new_name, '"')
-        )
-
-    try:
-        old_name, edit = name_edit()
-    except EsphomeError as err:
-        safe_print(
-            color(
-                AnsiFore.BOLD_RED,
-                f"Complex YAML files cannot be automatically renamed: {err}",
-            )
-        )
-        return 1
-
-    # ``new_name == old_name`` (after substitution resolution) is
-    # a no-op rewrite that would still queue a pointless re-flash.
-    # Catch it before the path-equality check below — covers the
-    # case where the config filename doesn't match the device name
-    # (e.g. ``weird-file.yaml`` whose ``esphome.name`` is
-    # ``kitchen``; running ``esphome rename weird-file.yaml kitchen``
-    # would otherwise just re-flash the same hostname).
-    if new_name == old_name:
-        safe_print(
-            color(
-                AnsiFore.BOLD_RED,
-                f"'{new_name}' is already the device's name.",
-            )
-        )
-        return 1
-
-    new_path: Path = CORE.config_dir / (new_name + ".yaml")
-    if new_path.resolve() == CORE.config_path.resolve():
-        safe_print(
-            color(
-                AnsiFore.BOLD_RED,
-                f"'{new_name}' is already the device's name.",
-            )
-        )
-        return 1
-    if new_path.exists():
-        safe_print(
-            color(
-                AnsiFore.BOLD_RED,
-                f"Cannot rename: {new_path} already exists. "
-                "Refusing to overwrite an existing configuration.",
-            )
-        )
-        return 1
-    safe_print(
-        f"Updating {color(AnsiFore.CYAN, str(CORE.config_path))} to {color(AnsiFore.CYAN, str(new_path))}"
-    )
-    print()
-
-    try:
-        yaml_edit.write_keeping_mode(
-            new_path,
-            yaml_edit.rewritten_text(yaml_edit.read_text(CORE.config_path), [edit]),
-            like=CORE.config_path,
-        )
-    except EsphomeError as err:
-        return _revert(new_path, str(err))
-
-    if run_external_process(*ESPHOME_COMMAND, "config", str(new_path)) != 0:
-        return _revert(new_path, "the new configuration does not validate")
-
-    cli_args = [
-        "run",
-        str(new_path),
-        "--no-logs",
-        "--device",
-        CORE.address,
-    ]
-
-    if args.dashboard:
-        cli_args.insert(0, "--dashboard")
-
-    try:
-        rc = run_external_process(*ESPHOME_COMMAND, *cli_args)
-    except KeyboardInterrupt:
-        rc = 1
-    if rc != 0:
-        return _revert(
-            new_path,
-            "the install did not finish; the device may already run the new name",
-        )
-
-    CORE.config_path.unlink()
-
-    safe_print(color(AnsiFore.BOLD_GREEN, "SUCCESS"))
-    print()
-    return 0

esphome/codegen.py

@@ -31,20 +31,15 @@ from esphome.cpp_generator import (  # noqa: F401
     add_global,
     add_library,
     add_platformio_option,
-    extern_progmem_array,
     get_variable,
     get_variable_with_full_id,
-    is_static_pointer,
     is_template,
     new_Pvariable,
     new_variable,
     process_lambda,
     progmem_array,
-    progmem_string,
     safe_exp,
     set_cpp_standard,
-    shared_progmem_array,
-    shared_progmem_string,
     statement,
     static_const_array,
     static_function,

esphome/components/a01nyub/__init__.py

@@ -1,2 +1 @@
 CODEOWNERS = ["@MrSuicideParrot"]
-DOMAIN = "a01nyub"

esphome/components/a01nyub/a01nyub.cpp

@@ -6,7 +6,7 @@
 
 namespace esphome::a01nyub {
 
-ESPHOME_LOG_TAG(TAG, "a01nyub.sensor");
+static const char *const TAG = "a01nyub.sensor";
 
 void A01nyubComponent::loop() {
   uint8_t data;

esphome/components/a02yyuw/__init__.py

@@ -1,2 +1 @@
 CODEOWNERS = ["@TH-Braemer"]
-DOMAIN = "a02yyuw"

esphome/components/a02yyuw/a02yyuw.cpp

@@ -6,7 +6,7 @@
 
 namespace esphome::a02yyuw {
 
-ESPHOME_LOG_TAG(TAG, "a02yyuw.sensor");
+static const char *const TAG = "a02yyuw.sensor";
 
 void A02yyuwComponent::loop() {
   uint8_t data;

esphome/components/a4988/__init__.py

@@ -1 +0,0 @@
-DOMAIN = "a4988"

esphome/components/a4988/a4988.cpp

@@ -3,7 +3,7 @@
 
 namespace esphome::a4988 {
 
-ESPHOME_LOG_TAG(TAG, "a4988.stepper");
+static const char *const TAG = "a4988.stepper";
 
 void A4988::setup() {
   if (this->sleep_pin_ != nullptr) {

esphome/components/absolute_humidity/__init__.py

@@ -1,2 +1 @@
 CODEOWNERS = ["@DAVe3283"]
-DOMAIN = "absolute_humidity"

esphome/components/absolute_humidity/absolute_humidity.cpp

@@ -3,7 +3,7 @@
 
 namespace esphome::absolute_humidity {
 
-ESPHOME_LOG_TAG(TAG, "absolute_humidity.sensor");
+static const char *const TAG{"absolute_humidity.sensor"};
 
 void AbsoluteHumidityComponent::setup() {
   this->temperature_sensor_->add_on_state_callback([this](float state) {

esphome/components/ac_dimmer/__init__.py

@@ -1 +0,0 @@
-DOMAIN = "ac_dimmer"

esphome/components/ac_dimmer/ac_dimmer.cpp

@@ -14,7 +14,7 @@
 
 namespace esphome::ac_dimmer {
 
-ESPHOME_LOG_TAG(TAG, "ac_dimmer");
+static const char *const TAG = "ac_dimmer";
 
 // Global array to store dimmer objects
 static AcDimmerDataStore *all_dimmers[32];  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)

esphome/components/ac_dimmer/hw_timer_esp_idf.cpp

@@ -9,7 +9,7 @@
 #include "esp_clk_tree.h"
 #include "soc/clk_tree_defs.h"
 
-ESPHOME_LOG_TAG(TAG, "hw_timer_esp_idf");
+static const char *const TAG = "hw_timer_esp_idf";
 
 namespace esphome::ac_dimmer {
 

esphome/components/adalight/__init__.py

@@ -9,7 +9,6 @@ from esphome.cpp_generator import MockObj
 from esphome.types import ConfigType
 
 DEPENDENCIES = ["uart"]
-DOMAIN = "adalight"
 
 adalight_ns = cg.esphome_ns.namespace("adalight")
 AdalightLightEffect = adalight_ns.class_(

esphome/components/adalight/adalight_light_effect.cpp

@@ -3,7 +3,7 @@
 
 namespace esphome::adalight {
 
-ESPHOME_LOG_TAG(TAG, "adalight_light_effect");
+static const char *const TAG = "adalight_light_effect";
 
 static const uint32_t ADALIGHT_ACK_INTERVAL = 1000;
 static const uint32_t ADALIGHT_RECEIVE_TIMEOUT = 1000;

esphome/components/adc/__init__.py

@@ -22,7 +22,6 @@ from esphome.core import CORE
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@esphome/core"]
-DOMAIN = "adc"
 
 adc_ns = cg.esphome_ns.namespace("adc")
 

esphome/components/adc/adc_sensor.h

@@ -128,10 +128,10 @@ class ADCSensor final : public sensor::Sensor, public PollingComponent, public v
 #endif  // USE_RP2
 
  protected:
-  uint8_t sample_count_{1};  // Must match DEFAULT_SAMPLES in sensor.py
-  bool output_raw_{false};   // Must match CONF_RAW default in sensor.py
+  uint8_t sample_count_{1};
+  bool output_raw_{false};
   InternalGPIOPin *pin_;
-  SamplingMode sampling_mode_{SamplingMode::AVG};  // Must match DEFAULT_SAMPLING_MODE in sensor.py
+  SamplingMode sampling_mode_{SamplingMode::AVG};
 
 #ifdef USE_ESP32
   float sample_autorange_();
@@ -139,7 +139,7 @@ class ADCSensor final : public sensor::Sensor, public PollingComponent, public v
   bool autorange_{false};
   adc_oneshot_unit_handle_t adc_handle_{nullptr};
   adc_cali_handle_t calibration_handle_{nullptr};
-  adc_atten_t attenuation_{ADC_ATTEN_DB_0};  // Must match DEFAULT_ATTENUATION in sensor.py
+  adc_atten_t attenuation_{ADC_ATTEN_DB_0};
   adc_channel_t channel_{};
   adc_unit_t adc_unit_{};
   struct SetupFlags {

esphome/components/adc/adc_sensor_common.cpp

@@ -3,7 +3,7 @@
 
 namespace esphome::adc {
 
-ESPHOME_LOG_TAG(TAG, "adc");
+static const char *const TAG = "adc";
 
 const LogString *sampling_mode_to_str(SamplingMode mode) {
   switch (mode) {

esphome/components/adc/adc_sensor_esp32.cpp

@@ -6,7 +6,7 @@
 
 namespace esphome::adc {
 
-ESPHOME_LOG_TAG(TAG, "adc");
+static const char *const TAG = "adc";
 
 adc_oneshot_unit_handle_t ADCSensor::shared_adc_handles[2] = {nullptr, nullptr};
 

esphome/components/adc/adc_sensor_esp8266.cpp

@@ -13,7 +13,7 @@ ADC_MODE(ADC_VCC)
 
 namespace esphome::adc {
 
-ESPHOME_LOG_TAG(TAG, "adc");
+static const char *const TAG = "adc";
 
 void ADCSensor::setup() {
 #ifndef USE_ADC_SENSOR_VCC

esphome/components/adc/adc_sensor_libretiny.cpp

@@ -5,7 +5,7 @@
 
 namespace esphome::adc {
 
-ESPHOME_LOG_TAG(TAG, "adc");
+static const char *const TAG = "adc";
 
 void ADCSensor::setup() {
 #ifndef USE_ADC_SENSOR_VCC

esphome/components/adc/adc_sensor_rp2.cpp

@@ -17,7 +17,7 @@
 
 namespace esphome::adc {
 
-ESPHOME_LOG_TAG(TAG, "adc");
+static const char *const TAG = "adc";
 
 // The on-die temperature sensor sits on the last ADC channel: input 4 on RP2040
 // and RP2350A, but input 8 on RP2350B, which has eight external channels rather

esphome/components/adc/adc_sensor_zephyr.cpp

@@ -7,7 +7,7 @@
 
 namespace esphome::adc {
 
-ESPHOME_LOG_TAG(TAG, "adc");
+static const char *const TAG = "adc";
 
 void ADCSensor::setup() {
   if (!adc_is_ready_dt(this->channel_)) {

esphome/components/adc/sensor.py

@@ -48,11 +48,6 @@ AUTO_LOAD = ["voltage_sampler"]
 CONF_SAMPLES = "samples"
 CONF_SAMPLING_MODE = "sampling_mode"
 
-# Keep in sync with the initializers in adc_sensor.h
-DEFAULT_ATTENUATION = "0db"
-DEFAULT_SAMPLING_MODE = "avg"
-DEFAULT_SAMPLES = 1
-
 
 _attenuation = cv.enum(ATTENUATION_MODES, lower=True)
 _sampling_mode = cv.enum(SAMPLING_MODES, lower=True)
@@ -70,10 +65,7 @@ def validate_config(config: ConfigType) -> ConfigType:
     ):
         raise cv.Invalid("ESP32-S31 only supports 'attenuation: 0db'")
 
-    if (
-        config.get(CONF_ATTENUATION, None) == "auto"
-        and config.get(CONF_SAMPLES, DEFAULT_SAMPLES) > 1
-    ):
+    if config.get(CONF_ATTENUATION, None) == "auto" and config.get(CONF_SAMPLES, 1) > 1:
         raise cv.Invalid(
             "Automatic attenuation cannot be used when multisampling is set"
         )
@@ -121,16 +113,12 @@ CONFIG_SCHEMA = cv.All(
         {
             cv.Required(CONF_PIN): validate_adc_pin,
             cv.Optional(CONF_RAW, default=False): cv.boolean,
-            cv.SplitDefault(CONF_ATTENUATION, esp32=DEFAULT_ATTENUATION): cv.All(
+            cv.SplitDefault(CONF_ATTENUATION, esp32="0db"): cv.All(
                 cv.only_on_esp32, _attenuation
             ),
             cv.OnlyWith(CONF_NRF_SAADC, PLATFORM_NRF52): cv.declare_id(adc_dt_spec),
-            cv.Optional(CONF_SAMPLES, default=DEFAULT_SAMPLES): cv.int_range(
-                min=1, max=255
-            ),
-            cv.Optional(
-                CONF_SAMPLING_MODE, default=DEFAULT_SAMPLING_MODE
-            ): _sampling_mode,
+            cv.Optional(CONF_SAMPLES, default=1): cv.int_range(min=1, max=255),
+            cv.Optional(CONF_SAMPLING_MODE, default="avg"): _sampling_mode,
         }
     )
     .extend(cv.polling_component_schema("60s")),
@@ -167,13 +155,9 @@ async def to_code(config: ConfigType) -> None:
         pin = await cg.gpio_pin_expression(config[CONF_PIN])
         cg.add(var.set_pin(pin))
 
-    # Skip the setters when the config matches the C++ initializers.
-    if config[CONF_RAW]:
-        cg.add(var.set_output_raw(True))
-    if (samples := config[CONF_SAMPLES]) != DEFAULT_SAMPLES:
-        cg.add(var.set_sample_count(samples))
-    if (sampling_mode := config[CONF_SAMPLING_MODE]) != DEFAULT_SAMPLING_MODE:
-        cg.add(var.set_sampling_mode(sampling_mode))
+    cg.add(var.set_output_raw(config[CONF_RAW]))
+    cg.add(var.set_sample_count(config[CONF_SAMPLES]))
+    cg.add(var.set_sampling_mode(config[CONF_SAMPLING_MODE]))
 
     if CORE.is_esp32:
         # Re-enable ESP-IDF's ADC driver (excluded by default to save compile time)
@@ -182,7 +166,7 @@ async def to_code(config: ConfigType) -> None:
         if attenuation := config.get(CONF_ATTENUATION):
             if attenuation == "auto":
                 cg.add(var.set_autorange(cg.global_ns.true))
-            elif attenuation != DEFAULT_ATTENUATION:
+            else:
                 cg.add(var.set_attenuation(attenuation))
 
         variant = get_esp32_variant()

esphome/components/adc128s102/__init__.py

@@ -5,7 +5,6 @@ from esphome.const import CONF_ID
 from esphome.types import ConfigType
 
 DEPENDENCIES = ["spi"]
-DOMAIN = "adc128s102"
 MULTI_CONF = True
 CODEOWNERS = ["@DeerMaximum"]
 

esphome/components/adc128s102/adc128s102.cpp

@@ -3,7 +3,7 @@
 
 namespace esphome::adc128s102 {
 
-ESPHOME_LOG_TAG(TAG, "adc128s102");
+static const char *const TAG = "adc128s102";
 
 float ADC128S102::get_setup_priority() const { return setup_priority::HARDWARE; }
 

esphome/components/adc128s102/sensor/adc128s102_sensor.cpp

@@ -4,7 +4,7 @@
 
 namespace esphome::adc128s102 {
 
-ESPHOME_LOG_TAG(TAG, "adc128s102.sensor");
+static const char *const TAG = "adc128s102.sensor";
 
 ADC128S102Sensor::ADC128S102Sensor(uint8_t channel) : channel_(channel) {}
 

esphome/components/addressable_light/__init__.py

@@ -1 +0,0 @@
-DOMAIN = "addressable_light"

esphome/components/addressable_light/addressable_light_display.cpp

@@ -3,7 +3,7 @@
 
 namespace esphome::addressable_light {
 
-ESPHOME_LOG_TAG(TAG, "addressable_light.display");
+static const char *const TAG = "addressable_light.display";
 
 int AddressableLightDisplay::get_width_internal() { return this->width_; }
 int AddressableLightDisplay::get_height_internal() { return this->height_; }

esphome/components/ade7880/__init__.py

@@ -1 +0,0 @@
-DOMAIN = "ade7880"

esphome/components/ade7880/ade7880.cpp

@@ -15,7 +15,7 @@
 
 namespace esphome::ade7880 {
 
-ESPHOME_LOG_TAG(TAG, "ade7880");
+static const char *const TAG = "ade7880";
 
 void IRAM_ATTR ADE7880Store::gpio_intr(ADE7880Store *arg) { arg->reset_done = true; }
 

esphome/components/ade7953/__init__.py

@@ -1,2 +1 @@
 CODEOWNERS = ["@angelnu"]
-DOMAIN = "ade7953"

esphome/components/ade7953_base/__init__.py

@@ -27,7 +27,6 @@ from esphome.cpp_generator import MockObj
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@angelnu"]
-DOMAIN = "ade7953_base"
 
 CONF_CURRENT_A = "current_a"
 CONF_CURRENT_B = "current_b"

esphome/components/ade7953_base/ade7953_base.cpp

@@ -5,7 +5,7 @@
 
 namespace esphome::ade7953_base {
 
-ESPHOME_LOG_TAG(TAG, "ade7953");
+static const char *const TAG = "ade7953";
 
 constexpr uint16_t CONFIG_DEFAULT = 0x8004u;
 constexpr uint16_t CONFIG_LOCK_BIT = 0x8000u;

esphome/components/ade7953_i2c/__init__.py

@@ -1,2 +1 @@
 CODEOWNERS = ["@angelnu"]
-DOMAIN = "ade7953_i2c"

esphome/components/ade7953_i2c/ade7953_i2c.cpp

@@ -4,7 +4,7 @@
 
 namespace esphome::ade7953_i2c {
 
-ESPHOME_LOG_TAG(TAG, "ade7953");
+static const char *const TAG = "ade7953";
 
 void AdE7953I2c::dump_config() {
   ESP_LOGCONFIG(TAG, "ADE7953_i2c:");

esphome/components/ade7953_spi/__init__.py

@@ -1,2 +1 @@
 CODEOWNERS = ["@angelnu"]
-DOMAIN = "ade7953_spi"

esphome/components/ade7953_spi/ade7953_spi.cpp

@@ -4,7 +4,7 @@
 
 namespace esphome::ade7953_spi {
 
-ESPHOME_LOG_TAG(TAG, "ade7953");
+static const char *const TAG = "ade7953";
 
 // Datasheet requires at least 1.2µs after clearing CONFIG LOCK_BIT before raising CS
 constexpr uint8_t CONFIG_LOCK_SETTLE_US = 2;

esphome/components/ads1115/__init__.py

@@ -5,7 +5,6 @@ from esphome.const import CONF_ID
 from esphome.types import ConfigType
 
 DEPENDENCIES = ["i2c"]
-DOMAIN = "ads1115"
 MULTI_CONF = True
 
 ads1115_ns = cg.esphome_ns.namespace("ads1115")

esphome/components/ads1115/ads1115.cpp

@@ -4,14 +4,14 @@
 
 namespace esphome::ads1115 {
 
-ESPHOME_LOG_TAG(TAG, "ads1115");
+static const char *const TAG = "ads1115";
 static const uint8_t ADS1115_REGISTER_CONVERSION = 0x00;
 static const uint8_t ADS1115_REGISTER_CONFIG = 0x01;
 
 void ADS1115Component::setup() {
   uint16_t value;
   if (!this->read_byte_16(ADS1115_REGISTER_CONVERSION, &value)) {
-    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
+    this->mark_failed();
     return;
   }
 
@@ -58,7 +58,7 @@ void ADS1115Component::setup() {
   config |= 0b0000000000000011;
 
   if (!this->write_byte_16(ADS1115_REGISTER_CONFIG, config)) {
-    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
+    this->mark_failed();
     return;
   }
   this->prev_config_ = config;
@@ -66,6 +66,9 @@ void ADS1115Component::setup() {
 void ADS1115Component::dump_config() {
   ESP_LOGCONFIG(TAG, "ADS1115:");
   LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
+  }
 }
 float ADS1115Component::request_measurement(ADS1115Multiplexer multiplexer, ADS1115Gain gain,
                                             ADS1115Resolution resolution, ADS1115Samplerate samplerate) {

esphome/components/ads1115/sensor/ads1115_sensor.cpp

@@ -4,7 +4,7 @@
 
 namespace esphome::ads1115 {
 
-ESPHOME_LOG_TAG(TAG, "ads1115.sensor");
+static const char *const TAG = "ads1115.sensor";
 
 float ADS1115Sensor::sample() {
   return this->parent_->request_measurement(this->multiplexer_, this->gain_, this->resolution_, this->samplerate_);

esphome/components/ads1118/__init__.py

@@ -6,7 +6,6 @@ from esphome.types import ConfigType
 
 CODEOWNERS = ["@solomondg1"]
 DEPENDENCIES = ["spi"]
-DOMAIN = "ads1118"
 MULTI_CONF = True
 
 CONF_ADS1118_ID = "ads1118_id"

esphome/components/ads1118/ads1118.cpp

@@ -4,7 +4,7 @@
 
 namespace esphome::ads1118 {
 
-ESPHOME_LOG_TAG(TAG, "ads1118");
+static const char *const TAG = "ads1118";
 static const uint8_t ADS1118_DATA_RATE_860_SPS = 0b111;
 
 void ADS1118::setup() {

esphome/components/ads1118/sensor/ads1118_sensor.cpp

@@ -4,7 +4,7 @@
 
 namespace esphome::ads1118 {
 
-ESPHOME_LOG_TAG(TAG, "ads1118.sensor");
+static const char *const TAG = "ads1118.sensor";
 
 void ADS1118Sensor::dump_config() {
   LOG_SENSOR("  ", "ADS1118 Sensor", this);

esphome/components/ags10/__init__.py

@@ -1,2 +1 @@
 CODEOWNERS = ["@mak-42"]
-DOMAIN = "ags10"

esphome/components/ags10/ags10.cpp

@@ -4,7 +4,7 @@
 #include <cinttypes>
 
 namespace esphome::ags10 {
-ESPHOME_LOG_TAG(TAG, "ags10");
+static const char *const TAG = "ags10";
 
 // Data acquisition.
 static const uint8_t REG_TVOC = 0x00;

esphome/components/ags10/sensor.py

@@ -62,10 +62,16 @@ async def to_code(config: ConfigType) -> None:
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
-    sensors = sensor.sub_sensors(config)
-    await sensors(CONF_TVOC, var.set_tvoc)
-    await sensors(CONF_VERSION, var.set_version)
-    await sensors(CONF_RESISTANCE, var.set_resistance)
+    sens = await sensor.new_sensor(config[CONF_TVOC])
+    cg.add(var.set_tvoc(sens))
+
+    if version_config := config.get(CONF_VERSION):
+        sens = await sensor.new_sensor(version_config)
+        cg.add(var.set_version(sens))
+
+    if resistance_config := config.get(CONF_RESISTANCE):
+        sens = await sensor.new_sensor(resistance_config)
+        cg.add(var.set_resistance(sens))
 
 
 AGS10_NEW_I2C_ADDRESS_SCHEMA = cv.maybe_simple_value(

esphome/components/aht10/__init__.py

@@ -1 +0,0 @@
-DOMAIN = "aht10"

esphome/components/aht10/aht10.cpp

@@ -19,7 +19,7 @@
 
 namespace esphome::aht10 {
 
-ESPHOME_LOG_TAG(TAG, "aht10");
+static const char *const TAG = "aht10";
 static const uint8_t AHT10_INITIALIZE_CMD[] = {0xE1, 0x08, 0x00};
 static const uint8_t AHT20_INITIALIZE_CMD[] = {0xBE, 0x08, 0x00};
 static const uint8_t AHT10_MEASURE_CMD[] = {0xAC, 0x33, 0x00};
@@ -52,7 +52,8 @@ void AHT10Component::setup() {
       break;
   }
   if (error_code != i2c::ERROR_OK) {
-    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
+    this->mark_failed();
     return;
   }
   uint8_t cal_attempts = 0;
@@ -60,17 +61,20 @@ void AHT10Component::setup() {
   while (data & AHT10_STATUS_BUSY) {
     delay(AHT10_DEFAULT_DELAY);
     if (this->read(&data, 1) != i2c::ERROR_OK) {
-      this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
+      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
+      this->mark_failed();
       return;
     }
     ++cal_attempts;
     if (cal_attempts > AHT10_INIT_ATTEMPTS) {
-      this->mark_failed(LOG_STR("Initialization timed out"));
+      ESP_LOGE(TAG, "Initialization timed out");
+      this->mark_failed();
       return;
     }
   }
   if ((data & 0x68) != 0x08) {  // Bit[6:5] = 0b00, NORMAL mode and Bit[3] = 0b1, CALIBRATED
-    this->mark_failed(LOG_STR("Initialization failed"));
+    ESP_LOGE(TAG, "Initialization failed");
+    this->mark_failed();
     return;
   }
 }
@@ -148,6 +152,9 @@ void AHT10Component::update() {
 void AHT10Component::dump_config() {
   ESP_LOGCONFIG(TAG, "AHT10:");
   LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
+  }
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
 }

esphome/components/aht10/sensor.py

@@ -57,6 +57,10 @@ async def to_code(config: ConfigType) -> None:
     await i2c.register_i2c_device(var, config)
     cg.add(var.set_variant(config[CONF_VARIANT]))
 
-    sensors = sensor.sub_sensors(config)
-    await sensors(CONF_TEMPERATURE, var.set_temperature_sensor)
-    await sensors(CONF_HUMIDITY, var.set_humidity_sensor)
+    if temperature := config.get(CONF_TEMPERATURE):
+        sens = await sensor.new_sensor(temperature)
+        cg.add(var.set_temperature_sensor(sens))
+
+    if humidity := config.get(CONF_HUMIDITY):
+        sens = await sensor.new_sensor(humidity)
+        cg.add(var.set_humidity_sensor(sens))

esphome/components/aic3204/__init__.py

@@ -1 +0,0 @@
-DOMAIN = "aic3204"

esphome/components/aic3204/aic3204.cpp

@@ -6,11 +6,12 @@
 
 namespace esphome::aic3204 {
 
-ESPHOME_LOG_TAG(TAG, "aic3204");
+static const char *const TAG = "aic3204";
 
 #define ERROR_CHECK(err, msg) \
   if (!(err)) { \
-    this->mark_failed(LOG_STR(msg)); \
+    ESP_LOGE(TAG, msg); \
+    this->mark_failed(); \
     return; \
   }
 
@@ -107,6 +108,10 @@ void AIC3204::setup() {
 void AIC3204::dump_config() {
   ESP_LOGCONFIG(TAG, "AIC3204:");
   LOG_I2C_DEVICE(this);
+
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
+  }
 }
 
 bool AIC3204::set_mute_off() {

esphome/components/airthings_ble/__init__.py

@@ -6,7 +6,6 @@ from esphome.types import ConfigType
 
 AUTO_LOAD = ["ble_device_base"]
 CODEOWNERS = ["@jeromelaban"]
-DOMAIN = "airthings_ble"
 
 airthings_ble_ns = cg.esphome_ns.namespace("airthings_ble")
 AirthingsListener = airthings_ble_ns.class_(

esphome/components/airthings_ble/airthings_listener.cpp

@@ -4,7 +4,7 @@
 
 namespace esphome::airthings_ble {
 
-ESPHOME_LOG_TAG(TAG, "airthings_ble");
+static const char *const TAG = "airthings_ble";
 
 bool AirthingsListener::parse_device(const ble_device_base::ESPBTDevice &device) {
   for (auto &it : device.get_manufacturer_datas()) {

esphome/components/airthings_wave_base/__init__.py

@@ -24,7 +24,6 @@ from esphome.cpp_generator import MockObj
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@ncareau", "@jeromelaban"]
-DOMAIN = "airthings_wave_base"
 
 DEPENDENCIES = ["ble_client"]
 

esphome/components/airthings_wave_base/airthings_wave_base.cpp

@@ -8,10 +8,7 @@
 
 namespace esphome::airthings_wave_base {
 
-ESPHOME_LOG_TAG(TAG, "airthings_wave_base");
-
-static constexpr uint32_t BATTERY_READ_TIMEOUT_ID = 0;
-static constexpr uint32_t RESPONSE_TIMEOUT_ID = 1;
+static const char *const TAG = "airthings_wave_base";
 
 void AirthingsWaveBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                             esp_ble_gattc_cb_param_t *param) {
@@ -184,7 +181,7 @@ void AirthingsWaveBase::read_battery_(uint8_t *raw_value, uint16_t value_len) {
     // read the battery again at the configured update interval
     if (this->battery_update_interval_ != this->update_interval_) {
       this->read_battery_next_update_ = false;
-      this->set_timeout(BATTERY_READ_TIMEOUT_ID, this->battery_update_interval_,
+      this->set_timeout("battery", this->battery_update_interval_,
                         [this]() { this->read_battery_next_update_ = true; });
     }
   }
@@ -207,7 +204,7 @@ void AirthingsWaveBase::response_received_() {
 }
 
 void AirthingsWaveBase::set_response_timeout_() {
-  this->set_timeout(RESPONSE_TIMEOUT_ID, 30 * 1000, [this]() {
+  this->set_timeout("response_timeout", 30 * 1000, [this]() {
     this->responses_pending_ = 1;
     this->response_received_();
   });